Use resource_size_t for serial port IO addresses
At present, various parts of the serial code use unsigned long to define resource addresses. This is a problem, because some 32-bit platforms have physical addresses larger than 32-bits, and have mmio serial uarts located above the 4GB point. This patch changes the type of mapbase in both struct uart_port and struct plat_serial8250_port to resource_size_t, which can be configured to be 64 bits on such platforms. The mapbase in serial_struct can't safely be changed, because that structure is user visible. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Paul Mackerras <paulus@samba.org> Cc: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
f695baf2df
commit
4f640efb31
@ -626,7 +626,7 @@ static int uart_get_info(struct uart_state *state,
|
||||
tmp.hub6 = port->hub6;
|
||||
tmp.io_type = port->iotype;
|
||||
tmp.iomem_reg_shift = port->regshift;
|
||||
tmp.iomem_base = (void *)port->mapbase;
|
||||
tmp.iomem_base = (void *)(unsigned long)port->mapbase;
|
||||
|
||||
if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
|
||||
return -EFAULT;
|
||||
@ -1666,10 +1666,11 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i)
|
||||
return 0;
|
||||
|
||||
mmio = port->iotype >= UPIO_MEM;
|
||||
ret = sprintf(buf, "%d: uart:%s %s%08lX irq:%d",
|
||||
ret = sprintf(buf, "%d: uart:%s %s%08llX irq:%d",
|
||||
port->line, uart_type(port),
|
||||
mmio ? "mmio:0x" : "port:",
|
||||
mmio ? port->mapbase : (unsigned long) port->iobase,
|
||||
mmio ? (unsigned long long)port->mapbase
|
||||
: (unsigned long long) port->iobase,
|
||||
port->irq);
|
||||
|
||||
if (port->type == PORT_UNKNOWN) {
|
||||
@ -2069,7 +2070,7 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)
|
||||
case UPIO_TSI:
|
||||
case UPIO_DWAPB:
|
||||
snprintf(address, sizeof(address),
|
||||
"MMIO 0x%lx", port->mapbase);
|
||||
"MMIO 0x%llx", (unsigned long long)port->mapbase);
|
||||
break;
|
||||
default:
|
||||
strlcpy(address, "*unknown*", sizeof(address));
|
||||
|
Reference in New Issue
Block a user