diff options
| author | Thomas Bogendoerfer <tbogendoerfer@suse.de> | 2020-01-09 11:34:28 +0100 |
|---|---|---|
| committer | Paul Burton <paulburton@kernel.org> | 2020-01-10 00:30:56 +0100 |
| commit | 10cf8300ecada10f4bd6c9be78439cce98ae6d8b (patch) | |
| tree | f7c4812c986b08cfc8e853c6cea57622c26de581 /drivers/net/ethernet/sgi | |
| parent | MIPS: PCI: Support mapping of INTB/C/D for pci-xtalk-bridge (diff) | |
| download | linux-10cf8300ecada10f4bd6c9be78439cce98ae6d8b.tar.xz linux-10cf8300ecada10f4bd6c9be78439cce98ae6d8b.zip | |
MIPS: SGI-IP27: fix readb/writeb addressing
Our chosen byte swapping, which is what firmware already uses, is to
do readl/writel by normal lw/sw intructions (data invariance). This
also means we need to mangle addresses for u8 and u16 accesses. The
mangling for 16bit has been done aready, but 8bit one was missing.
Correcting this causes different addresses for accesses to the
SuperIO and local bus of the IOC3 chip. This is fixed by changing
byte order in ioc3 and m48rtc_rtc structs.
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: Paul Burton <paulburton@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: linux-rtc@vger.kernel.org
Diffstat (limited to 'drivers/net/ethernet/sgi')
| -rw-r--r-- | drivers/net/ethernet/sgi/ioc3-eth.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c index d242906ae233..4ebb58b8572e 100644 --- a/drivers/net/ethernet/sgi/ioc3-eth.c +++ b/drivers/net/ethernet/sgi/ioc3-eth.c @@ -1079,6 +1079,16 @@ static int ioc3_is_menet(struct pci_dev *pdev) * Can't use UPF_IOREMAP as the whole of IOC3 resources have already been * registered. */ +static unsigned int ioc3_serial_in(struct uart_port *p, int offset) +{ + return readb(p->membase + (offset ^ 3)); +} + +static void ioc3_serial_out(struct uart_port *p, int offset, int value) +{ + writeb(value, p->membase + (offset ^ 3)); +} + static void ioc3_8250_register(struct ioc3_uartregs __iomem *uart) { #define COSMISC_CONSTANT 6 @@ -1093,6 +1103,8 @@ static void ioc3_8250_register(struct ioc3_uartregs __iomem *uart) .membase = (unsigned char __iomem *)uart, .mapbase = (unsigned long)uart, + .serial_in = ioc3_serial_in, + .serial_out = ioc3_serial_out, } }; unsigned char lcr; |