[added,to,the,4.1,stable,tree] serial: 8250_pci: Detach low-level driver during PCI error recovery

Message ID 20180118205908.3220-82-alexander.levin@microsoft.com
State New
Headers show
  • [added,to,the,4.1,stable,tree] serial: 8250_pci: Detach low-level driver during PCI error recovery
Related show

Commit Message

Sasha Levin Jan. 18, 2018, 9 p.m.
From: Sumit Semwal <sumit.semwal@linaro.org>

This patch has been added to the  stable tree. If you have any
objections, please let us know.




[ Upstream commit f209fa03fc9d131b3108c2e4936181eabab87416 ]

During a PCI error recovery, like the ones provoked by EEH in the ppc64
platform, all IO to the device must be blocked while the recovery is
completed.  Current 8250_pci implementation only suspends the port
instead of detaching it, which doesn't prevent incoming accesses like
TIOCMGET and TIOCMSET calls from reaching the device.  Those end up
racing with the EEH recovery, crashing it.  Similar races were also
observed when opening the device and when shutting it down during

This patch implements a more robust IO blockage for the 8250_pci
recovery by unregistering the port at the beginning of the procedure and
re-adding it afterwards.  Since the port is detached from the uart
layer, we can be sure that no request will make through to the device
during recovery.  This is similar to the solution used by the JSM serial

I thank Peter Hurley <peter@hurleysoftware.com> for valuable input on
this one over one year ago.

Signed-off-by: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
 drivers/tty/serial/8250/8250_pci.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 83a145f61f1f..bfd5e2afaeaf 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -58,6 +58,7 @@  struct serial_private {
 	unsigned int		nr;
 	void __iomem		*remapped_bar[PCI_NUM_BAR_RESOURCES];
 	struct pci_serial_quirk	*quirk;
+	const struct pciserial_board *board;
 	int			line[0];
@@ -4155,6 +4156,7 @@  pciserial_init_ports(struct pci_dev *dev, const struct pciserial_board *board)
 	priv->nr = i;
+	priv->board = board;
 	return priv;
@@ -4165,7 +4167,7 @@  pciserial_init_ports(struct pci_dev *dev, const struct pciserial_board *board)
-void pciserial_remove_ports(struct serial_private *priv)
+void pciserial_detach_ports(struct serial_private *priv)
 	struct pci_serial_quirk *quirk;
 	int i;
@@ -4185,7 +4187,11 @@  void pciserial_remove_ports(struct serial_private *priv)
 	quirk = find_quirk(priv->dev);
 	if (quirk->exit)
+void pciserial_remove_ports(struct serial_private *priv)
+	pciserial_detach_ports(priv);
@@ -5936,7 +5942,7 @@  static pci_ers_result_t serial8250_io_error_detected(struct pci_dev *dev,
 	if (priv)
-		pciserial_suspend_ports(priv);
+		pciserial_detach_ports(priv);
@@ -5961,9 +5967,18 @@  static pci_ers_result_t serial8250_io_slot_reset(struct pci_dev *dev)
 static void serial8250_io_resume(struct pci_dev *dev)
 	struct serial_private *priv = pci_get_drvdata(dev);
+	const struct pciserial_board *board;
-	if (priv)
-		pciserial_resume_ports(priv);
+	if (!priv)
+		return;
+	board = priv->board;
+	kfree(priv);
+	priv = pciserial_init_ports(dev, board);
+	if (!IS_ERR(priv)) {
+		pci_set_drvdata(dev, priv);
+	}
 static const struct pci_error_handlers serial8250_err_handler = {