diff options
| author | Lucas Kannebley Tavares <lucaskt@linux.vnet.ibm.com> | 2012-01-09 10:58:06 -0200 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-02-09 15:58:48 -0800 |
| commit | 2feeef6dbb2417bf762bf31316189a7c6202e8ed (patch) | |
| tree | 4188fcd5390a8a27b8b27b1f147577143bd50b7c /drivers/tty | |
| parent | 4fd4736b175435110c5f2a3382a3b9a4be83d6dd (diff) | |
jsm: Fixed EEH recovery error
commit 26aa38cafae0dbef3b2fe75ea487c83313c36d45 upstream.
There was an error on the jsm driver that would cause it to be unable to
recover after a second error is detected.
At the first error, the device recovers properly:
[72521.485691] EEH: Detected PCI bus error on device 0003:02:00.0
[72521.485695] EEH: This PCI device has failed 1 times in the last hour:
...
[72532.035693] ttyn3 at MMIO 0x0 (irq = 49) is a jsm
[72532.105689] jsm: Port 3 added
However, at the second error, it cascades until EEH disables the device:
[72631.229549] Call Trace:
...
[72641.725687] jsm: Port 3 added
[72641.725695] EEH: Detected PCI bus error on device 0003:02:00.0
[72641.725698] EEH: This PCI device has failed 3 times in the last hour:
It was caused because the PCI state was not being saved after the first
restore. Therefore, at the second recovery the PCI state would not be
restored.
Signed-off-by: Lucas Kannebley Tavares <lucaskt@linux.vnet.ibm.com>
Signed-off-by: Breno Leitao <brenohl@br.ibm.com>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Change-Id: I17d5be5ce4b8acc1c881290d19933405b3e476b9
Reviewed-on: http://git-master/r/79677
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/jsm/jsm_driver.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c index 2aaafa9c58a2..6c12d94e6d3f 100644 --- a/drivers/tty/serial/jsm/jsm_driver.c +++ b/drivers/tty/serial/jsm/jsm_driver.c @@ -269,6 +269,7 @@ static void jsm_io_resume(struct pci_dev *pdev) struct jsm_board *brd = pci_get_drvdata(pdev); pci_restore_state(pdev); + pci_save_state(pdev); jsm_uart_port_init(brd); } |