The patch 92d7223a74235054f2aa7227d207d9c57f84dca0 ("alpha: io: reorder
barriers to guarantee writeX() and iowriteX() ordering #2") broke boot on
the Alpha Avanti platform.
The patch changes timing between accesses to the ISA bus, in particular,
it reduces the time between "write" access and a subsequent "read" access.
This causes lock-up when accessing the real time clock and serial ports.
This patch fixes the serial ports by adding a small delay before the "inb"
instruction.
We introduce a global variable serial_port_needs_delay - it is defined on
Alpha and zero on all other architectures. We also introduce a new
per-port flag UPQ_DELAY_BEFORE_READ, the flag is set if we have the
specific PCI-ISA bridge (i.e. if serial_port_needs_delay is ture) and if
the serial port is an ISA port.
Signed-off-by: Mikulas Patocka <mpatocka@xxxxxxxxxx>
Fixes: 92d7223a7423 ("alpha: io: reorder barriers to guarantee writeX() and iowriteX() ordering #2")
Cc: stable@xxxxxxxxxxxxxxx # v4.17+
---
arch/alpha/include/asm/pci.h | 3 +++
arch/alpha/kernel/pci.c | 4 ++++
drivers/tty/serial/8250/8250_core.c | 16 ++++++++++------
drivers/tty/serial/8250/8250_port.c | 3 +++
include/linux/pci.h | 4 ++++
include/linux/serial_core.h | 1 +
6 files changed, 25 insertions(+), 6 deletions(-)
Index: linux-stable/arch/alpha/include/asm/pci.h
===================================================================
--- linux-stable.orig/arch/alpha/include/asm/pci.h 2020-05-07 09:57:02.000000000 +0200
+++ linux-stable/arch/alpha/include/asm/pci.h 2020-05-07 09:57:02.000000000 +0200
@@ -97,4 +97,7 @@ extern void pci_adjust_legacy_attr(struc
extern int pci_create_resource_files(struct pci_dev *dev);
extern void pci_remove_resource_files(struct pci_dev *dev);
+extern int serial_port_needs_delay;
+#define serial_port_needs_delay serial_port_needs_delay
+
#endif /* __ALPHA_PCI_H */
Index: linux-stable/arch/alpha/kernel/pci.c
===================================================================
--- linux-stable.orig/arch/alpha/kernel/pci.c 2020-05-07 09:57:02.000000000 +0200
+++ linux-stable/arch/alpha/kernel/pci.c 2020-05-07 09:57:02.000000000 +0200
@@ -61,9 +61,13 @@ struct pci_controller *pci_isa_hose;
* Quirks.
*/
+int serial_port_needs_delay = 0;
+EXPORT_SYMBOL(serial_port_needs_delay);
+
static void quirk_isa_bridge(struct pci_dev *dev)
{
dev->class = PCI_CLASS_BRIDGE_ISA << 8;
+ serial_port_needs_delay = 1;
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_isa_bridge);
Index: linux-stable/drivers/tty/serial/8250/8250_port.c
===================================================================
--- linux-stable.orig/drivers/tty/serial/8250/8250_port.c 2020-05-07 09:57:02.000000000 +0200
+++ linux-stable/drivers/tty/serial/8250/8250_port.c 2020-05-07 09:57:02.000000000 +0200
@@ -442,6 +442,9 @@ static unsigned int mem32be_serial_in(st
static unsigned int io_serial_in(struct uart_port *p, int offset)
{
+ if (unlikely(p->quirks & UPQ_DELAY_BEFORE_READ))
+ ndelay(300);
+
offset = offset << p->regshift;
return inb(p->iobase + offset);
}
Index: linux-stable/include/linux/pci.h
===================================================================
--- linux-stable.orig/include/linux/pci.h 2020-05-07 09:57:02.000000000 +0200
+++ linux-stable/include/linux/pci.h 2020-05-07 09:57:02.000000000 +0200
@@ -2384,6 +2384,10 @@ static inline bool pci_is_thunderbolt_at
return false;
}
+#ifndef serial_port_needs_delay
+#define serial_port_needs_delay 0
+#endif
+
#if defined(CONFIG_PCIEPORTBUS) || defined(CONFIG_EEH)
void pci_uevent_ers(struct pci_dev *pdev, enum pci_ers_result err_type);
#endif
Index: linux-stable/drivers/tty/serial/8250/8250_core.c
===================================================================
--- linux-stable.orig/drivers/tty/serial/8250/8250_core.c 2020-05-07 09:57:02.000000000 +0200
+++ linux-stable/drivers/tty/serial/8250/8250_core.c 2020-05-07 12:37:59.000000000 +0200
@@ -34,6 +34,7 @@
#include <linux/uaccess.h>
#include <linux/pm_runtime.h>
#include <linux/io.h>
+#include <linux/pci.h>
#ifdef CONFIG_SPARC
#include <linux/sunserialcore.h>
#endif
@@ -487,9 +488,18 @@ static void univ8250_rsa_support(struct
#define univ8250_rsa_support(x) do { } while (0)
#endif /* CONFIG_SERIAL_8250_RSA */
+/*
+ * This "device" covers _all_ ISA 8250-compatible serial devices listed
+ * in the table in include/asm/serial.h
+ */
+static struct platform_device *serial8250_isa_devs;
+
static inline void serial8250_apply_quirks(struct uart_8250_port *up)
{
up->port.quirks |= skip_txen_test ? UPQ_NO_TXEN_TEST : 0;
+ if (serial_port_needs_delay &&
+ serial8250_isa_devs && up->port.dev == &serial8250_isa_devs->dev)
+ up->port.quirks |= UPQ_DELAY_BEFORE_READ;
}
static void __init serial8250_isa_init_ports(void)
@@ -903,12 +913,6 @@ static struct platform_driver serial8250
};
/*
- * This "device" covers _all_ ISA 8250-compatible serial devices listed
- * in the table in include/asm/serial.h
- */
-static struct platform_device *serial8250_isa_devs;
-
-/*
* serial8250_register_8250_port and serial8250_unregister_port allows for
* 16x50 serial ports to be configured at run-time, to support PCMCIA
* modems and PCI multiport cards.
Index: linux-stable/include/linux/serial_core.h
===================================================================
--- linux-stable.orig/include/linux/serial_core.h 2020-05-07 09:57:02.000000000 +0200
+++ linux-stable/include/linux/serial_core.h 2020-05-07 09:57:02.000000000 +0200
@@ -154,6 +154,7 @@ struct uart_port {
/* quirks must be updated while holding port mutex */
#define UPQ_NO_TXEN_TEST BIT(0)
+#define UPQ_DELAY_BEFORE_READ BIT(1)
unsigned int read_status_mask; /* driver specific */
unsigned int ignore_status_mask; /* driver specific */
