renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 13:43:55 +08:00
Code

powerpc/legacy_serial: Support MVME5100 UARTS with shifted registers

Browse Source 
This patch adds support to legacy serial for
UARTS with shifted registers.

The MVME5100 Single Board Computer is a PowerPC platform
that has 16550 style UARTS with register addresses that are
16 bytes apart (shifted by 4).

Commit 	309257484c
"powerpc: Cleanup udbg_16550 and add support for LPC PIO-only UARTs"
added support to udbg_16550 for shifted registers by adding a "stride"
parameter to the initialisation operations for Programmed IO and
Memory Mapped IO.

As a consequence it is now possible to use the services of legacy serial
to provide early serial console messages for the MVME5100.

An added benefit of this is that the serial console will always be
"ttyS0" irrespective of whether the computer is fitted with extra
PCI 8250 interface boards or not.

I have tested this patch using the four PowerPC platforms available to me:

	MVME5100 - shifted registers,
	SAM440EP - unshifted registers,
	MPC8349 - unshifted registers,
	MVME4100 - unshifted registers.

Signed-off-by: Stephen Chivers <schivers@csc.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Stephen Chivers 2014-04-20 09:43:10 +10:00 committed by Benjamin Herrenschmidt
parent 147c05168f
commit 13ae40370f
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/powerpc/kernel/legacy_serial.c
View File

@ -71,8 +71,9 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
phys_addr_t taddr, unsigned long irq, phys_addr_t taddr, unsigned long irq,
upf_t flags, int irq_check_parent) upf_t flags, int irq_check_parent)
{ {
const __be32 *clk, *spd; const __be32 *clk, *spd, *rs;
u32 clock = BASE_BAUD * 16; u32 clock = BASE_BAUD * 16;
u32 shift = 0;
int index; int index;
/* get clock freq. if present */ /* get clock freq. if present */
@ -83,6 +84,11 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
/* get default speed if present */ /* get default speed if present */
spd = of_get_property(np, "current-speed", NULL); spd = of_get_property(np, "current-speed", NULL);
/* get register shift if present */
rs = of_get_property(np, "reg-shift", NULL);
if (rs && *rs)
shift = be32_to_cpup(rs);
/* If we have a location index, then try to use it */ /* If we have a location index, then try to use it */
if (want_index >= 0 && want_index < MAX_LEGACY_SERIAL_PORTS) if (want_index >= 0 && want_index < MAX_LEGACY_SERIAL_PORTS)
index = want_index; index = want_index;
@ -126,6 +132,7 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
legacy_serial_ports[index].uartclk = clock; legacy_serial_ports[index].uartclk = clock;
legacy_serial_ports[index].irq = irq; legacy_serial_ports[index].irq = irq;
legacy_serial_ports[index].flags = flags; legacy_serial_ports[index].flags = flags;
legacy_serial_ports[index].regshift = shift;
legacy_serial_infos[index].taddr = taddr; legacy_serial_infos[index].taddr = taddr;
legacy_serial_infos[index].np = of_node_get(np); legacy_serial_infos[index].np = of_node_get(np);
legacy_serial_infos[index].clock = clock; legacy_serial_infos[index].clock = clock;
@ -163,9 +170,8 @@ static int __init add_legacy_soc_port(struct device_node *np,
if (of_get_property(np, "clock-frequency", NULL) == NULL) if (of_get_property(np, "clock-frequency", NULL) == NULL)
return -1; return -1;
/* if reg-shift or offset, don't try to use it */ /* if reg-offset don't try to use it */
if ((of_get_property(np, "reg-shift", NULL) != NULL) || if ((of_get_property(np, "reg-offset", NULL) != NULL))
(of_get_property(np, "reg-offset", NULL) != NULL))
return -1; return -1;
/* if rtas uses this device, don't try to use it as well */ /* if rtas uses this device, don't try to use it as well */
@ -315,17 +321,20 @@ static void __init setup_legacy_serial_console(int console)
struct legacy_serial_info *info = &legacy_serial_infos[console]; struct legacy_serial_info *info = &legacy_serial_infos[console];
struct plat_serial8250_port *port = &legacy_serial_ports[console]; struct plat_serial8250_port *port = &legacy_serial_ports[console];
void __iomem *addr; void __iomem *addr;
unsigned int stride;
stride = 1 << port->regshift;
/* Check if a translated MMIO address has been found */ /* Check if a translated MMIO address has been found */
if (info->taddr) { if (info->taddr) {
addr = ioremap(info->taddr, 0x1000); addr = ioremap(info->taddr, 0x1000);
if (addr == NULL) if (addr == NULL)
return; return;
udbg_uart_init_mmio(addr, 1); udbg_uart_init_mmio(addr, stride);
} else { } else {
/* Check if it's PIO and we support untranslated PIO */ /* Check if it's PIO and we support untranslated PIO */
if (port->iotype == UPIO_PORT && isa_io_special) if (port->iotype == UPIO_PORT && isa_io_special)
udbg_uart_init_pio(port->iobase, 1); udbg_uart_init_pio(port->iobase, stride);
else else
return; return;
} }

1
arch/powerpc/platforms/embedded6xx/Kconfig
View File

@ -65,6 +65,7 @@ config MVME5100
select PPC_INDIRECT_PCI select PPC_INDIRECT_PCI
select PPC_I8259 select PPC_I8259
select PPC_NATIVE select PPC_NATIVE
select PPC_UDBG_16550
help help
This option enables support for the Motorola (now Emerson) MVME5100 This option enables support for the Motorola (now Emerson) MVME5100
board. board.