mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-31 12:52:29 -04:00
serial: 8250: handle ixp4xx register endianness correctly
Unlike modern SoCs that just work in both big-endian and little-endian mode using the readl()/writel() or readb()/writeb() accessors, the internal registers on ixp4xx behave like native-endian 32-bit registers in both modes, which requires adjusting the register address when using 8-bit access. The existing dts files are written for big-endian kernels and 8-bit access, which does not work with little-endian kernels. Add a quirk that makes the 8250 OF driver: 1. Mask off any hardcoded offset. 2. Add the += 3 offset if and only if we are running on big endian. This should work in all combinations of big-endian and little-endian kernels with either variant of the DTS file. Signed-off-by: Arnd Bergmann <arnd@arndb.de> [linusw@kernel.org: Modified to just play with the offset] Signed-off-by: Linus Walleij <linusw@kernel.org> Link: https://patch.msgid.link/20260709-ixp4xx-serial-hackfix-v2-1-465fc8e4c54c@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
7ea38c49e7
commit
a76c010ec3
@@ -23,6 +23,7 @@
|
||||
* console=uart8250,mmio32,0xff5e0000,115200n8
|
||||
*/
|
||||
|
||||
#include <linux/align.h>
|
||||
#include <linux/tty.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/console.h>
|
||||
@@ -177,6 +178,23 @@ OF_EARLYCON_DECLARE(ns16550a, "ns16550a", early_serial8250_setup);
|
||||
OF_EARLYCON_DECLARE(uart, "nvidia,tegra20-uart", early_serial8250_setup);
|
||||
OF_EARLYCON_DECLARE(uart, "snps,dw-apb-uart", early_serial8250_setup);
|
||||
|
||||
static int __init early_serial8250_xscale_setup(struct earlycon_device *device,
|
||||
const char *options)
|
||||
{
|
||||
/*
|
||||
* Adjust for BE32 register accesses: drop any hardcoded
|
||||
* address for the big endian byte target, add it explicitly
|
||||
* if running on BE32.
|
||||
*/
|
||||
device->port.membase = PTR_ALIGN_DOWN(device->port.membase, 4);
|
||||
if (IS_ENABLED(CONFIG_CPU_ENDIAN_BE32))
|
||||
device->port.membase += 3;
|
||||
device->port.regshift = 2;
|
||||
|
||||
return early_serial8250_setup(device, options);
|
||||
}
|
||||
OF_EARLYCON_DECLARE(uart, "intel,xscale-uart", early_serial8250_xscale_setup);
|
||||
|
||||
static int __init early_serial8250_rs2_setup(struct earlycon_device *device,
|
||||
const char *options)
|
||||
{
|
||||
@@ -184,7 +202,6 @@ static int __init early_serial8250_rs2_setup(struct earlycon_device *device,
|
||||
|
||||
return early_serial8250_setup(device, options);
|
||||
}
|
||||
OF_EARLYCON_DECLARE(uart, "intel,xscale-uart", early_serial8250_rs2_setup);
|
||||
OF_EARLYCON_DECLARE(uart, "mrvl,mmp-uart", early_serial8250_rs2_setup);
|
||||
OF_EARLYCON_DECLARE(uart, "mrvl,pxa-uart", early_serial8250_rs2_setup);
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
* Copyright (C) 2006 Arnd Bergmann <arnd@arndb.de>, IBM Corp.
|
||||
*/
|
||||
|
||||
#include <linux/align.h>
|
||||
#include <linux/bits.h>
|
||||
#include <linux/console.h>
|
||||
#include <linux/math.h>
|
||||
@@ -122,6 +123,17 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
|
||||
if (ret)
|
||||
goto err_pmruntime;
|
||||
|
||||
if (IS_ENABLED(CONFIG_CPU_XSCALE) && type == PORT_XSCALE) {
|
||||
/*
|
||||
* Adjust for BE32 register accesses: drop any hardcoded
|
||||
* address for the big endian byte target, add it explicitly
|
||||
* if running on BE32.
|
||||
*/
|
||||
port->mapbase = PTR_ALIGN_DOWN(port->mapbase, 4);
|
||||
if (IS_ENABLED(CONFIG_CPU_ENDIAN_BE32))
|
||||
port->mapbase += 3;
|
||||
}
|
||||
|
||||
/* Get clk rate through clk driver if present */
|
||||
if (!port->uartclk) {
|
||||
struct clk *bus_clk;
|
||||
|
||||
Reference in New Issue
Block a user