Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c627f2ce authored by Kevin Cernekee's avatar Kevin Cernekee Committed by Rob Herring
Browse files

serial: 8250: Add support for big-endian MMIO accesses 



Add cases for UPIO_MEM32BE wherever there are currently cases handling
UPIO_MEM32.

Signed-off-by: default avatarKevin Cernekee <cernekee@gmail.com>
Reviewed-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 65a71007

drivers/tty/serial/8250/8250_core.c

+20 −0
Original line number Diff line number Diff line
@@ -439,6 +439,18 @@ static unsigned int mem32_serial_in(struct uart_port *p, int offset) 
	return readl(p->membase + offset);

}



static void mem32be_serial_out(struct uart_port *p, int offset, int value)

{

	offset = offset << p->regshift;

	iowrite32be(value, p->membase + offset);

}



static unsigned int mem32be_serial_in(struct uart_port *p, int offset)

{

	offset = offset << p->regshift;

	return ioread32be(p->membase + offset);

}



static unsigned int io_serial_in(struct uart_port *p, int offset)

{

	offset = offset << p->regshift;
@@ -477,6 +489,11 @@ static void set_io_from_upio(struct uart_port *p) 
		p->serial_out = mem32_serial_out;

		break;



	case UPIO_MEM32BE:

		p->serial_in = mem32be_serial_in;

		p->serial_out = mem32be_serial_out;

		break;



#if defined(CONFIG_MIPS_ALCHEMY) || defined(CONFIG_SERIAL_8250_RT288X)

	case UPIO_AU:

		p->serial_in = au_serial_in;
@@ -502,6 +519,7 @@ serial_port_out_sync(struct uart_port *p, int offset, int value) 
	switch (p->iotype) {

	case UPIO_MEM:

	case UPIO_MEM32:

	case UPIO_MEM32BE:

	case UPIO_AU:

		p->serial_out(p, offset, value);

		p->serial_in(p, UART_LCR);	/* safe, no side-effects */
@@ -2743,6 +2761,7 @@ static int serial8250_request_std_resource(struct uart_8250_port *up) 
	case UPIO_AU:

	case UPIO_TSI:

	case UPIO_MEM32:

	case UPIO_MEM32BE:

	case UPIO_MEM:

		if (!port->mapbase)

			break;
@@ -2779,6 +2798,7 @@ static void serial8250_release_std_resource(struct uart_8250_port *up) 
	case UPIO_AU:

	case UPIO_TSI:

	case UPIO_MEM32:

	case UPIO_MEM32BE:

	case UPIO_MEM:

		if (!port->mapbase)

			break;

drivers/tty/serial/8250/8250_early.c

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ unsigned int __weak __init serial8250_early_in(struct uart_port *port, int offse 
		return readb(port->membase + offset);

	case UPIO_MEM32:

		return readl(port->membase + (offset << 2));

	case UPIO_MEM32BE:

		return ioread32be(port->membase + (offset << 2));

	case UPIO_PORT:

		return inb(port->iobase + offset);

	default:
@@ -61,6 +63,9 @@ void __weak __init serial8250_early_out(struct uart_port *port, int offset, int 
	case UPIO_MEM32:

		writel(value, port->membase + (offset << 2));

		break;

	case UPIO_MEM32BE:

		iowrite32be(value, port->membase + (offset << 2));

		break;

	case UPIO_PORT:

		outb(value, port->iobase + offset);

		break;