[PATCH 1/2] 8250_pci Add EEH support to the 8250 driver for IBM/Digi PCIe 2-port Adapter

[PATCH 1/2] 8250_pci Add EEH support to the 8250 driver for IBM/Digi PCIe 2-port Adapter

[Michael Reed]

The purpose of the patch is to add EEH support to the 8250_PCI driver for the IBM/Digi PCIE 2port Async EIA-232 Adapter that uses a PLX chipset on the PPC platforrm.  Basic support for this adapter was recently added https://lkml.org/lkml/2011/5/11/341
This patch was created against  2.6.38.6

Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Breno Leitao <leitao@linux.vnet.ibm.com>
Cc: Scott Kilau <scottk@digi.com>
Signed-off-by:   Michael Reed <mreed@linux.vnet.ibm.com>
---
 drivers/tty/serial/8250_pci.c |   47 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
index 8b8930f..ef193a9 100644
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250_pci.c
@@ -2562,6 +2562,7 @@ pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
 	board = &pci_boards[ent->driver_data];
 
 	rc = pci_enable_device(dev);
+	pci_save_state(dev);
 	if (rc)
 		return rc;
 
@@ -3821,6 +3822,51 @@ static struct pci_device_id serial_pci_tbl[] = {
 	{ 0, }
 };
 
+static pci_ers_result_t serial8250_io_error_detected(struct pci_dev *dev,
+pci_channel_state_t state)
+{
+	struct serial_private *priv = pci_get_drvdata(dev);
+
+	if (state == pci_channel_io_perm_failure)
+		return PCI_ERS_RESULT_DISCONNECT;
+
+	if (priv)
+		pciserial_suspend_ports(priv);
+
+	pci_disable_device(dev);
+
+	return PCI_ERS_RESULT_NEED_RESET;
+}
+
+static pci_ers_result_t serial8250_io_slot_reset(struct pci_dev *dev)
+{
+	int rc;
+
+	rc = pci_enable_device(dev);
+
+	if (rc)
+		return PCI_ERS_RESULT_DISCONNECT;
+
+	pci_restore_state(dev);
+	pci_save_state(dev);
+
+	return PCI_ERS_RESULT_RECOVERED;
+}
+
+static void serial8250_io_resume(struct pci_dev *dev)
+{
+	struct serial_private *priv = pci_get_drvdata(dev);
+
+	if (priv)
+		pciserial_resume_ports(priv);
+}
+
+static struct pci_error_handlers serial8250_err_handler = {
+	.error_detected = serial8250_io_error_detected,
+	.slot_reset = serial8250_io_slot_reset,
+	.resume = serial8250_io_resume,
+};
+
 static struct pci_driver serial_pci_driver = {
 	.name		= "serial",
 	.probe		= pciserial_init_one,
@@ -3830,6 +3876,7 @@ static struct pci_driver serial_pci_driver = {
 	.resume		= pciserial_resume_one,
 #endif
 	.id_table	= serial_pci_tbl,
+	.err_handler = &serial8250_err_handler,
 };
 
 static int __init serial8250_pci_init(void)
-- 
1.7.1

Re: [PATCH 1/2] 8250_pci Add EEH support to the 8250 driver for IBM/Digi PCIe 2-port Adapter

[Greg KH]

On Thu, May 19, 2011 at 02:03:42PM -0500, Michael Reed wrote:
> The purpose of the patch is to add EEH support to the 8250_PCI driver for the IBM/Digi PCIE 2port Async EIA-232 Adapter that uses a PLX chipset on the PPC platforrm.  Basic support for this adapter was recently added https://lkml.org/lkml/2011/5/11/341

You don't linewrap your comments :(

Also, both of these patches have the identical Subject: lines, when that
really isn't true.

> This patch was created against  2.6.38.6

Can you please make it against 2.6.39 so it has a chance of applying?
Ideally you would create it against the linux-next tree.

> Cc: Greg Kroah-Hartman <gregkh@suse.de>
> Cc: Breno Leitao <leitao@linux.vnet.ibm.com>
> Cc: Scott Kilau <scottk@digi.com>
> Signed-off-by:   Michael Reed <mreed@linux.vnet.ibm.com>

What's with the extra whitespace before your name?


> ---
>  drivers/tty/serial/8250_pci.c |   47 +++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 47 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
> index 8b8930f..ef193a9 100644
> --- a/drivers/tty/serial/8250_pci.c
> +++ b/drivers/tty/serial/8250_pci.c
> @@ -2562,6 +2562,7 @@ pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
>  	board = &pci_boards[ent->driver_data];
>  
>  	rc = pci_enable_device(dev);
> +	pci_save_state(dev);
>  	if (rc)
>  		return rc;
>  
> @@ -3821,6 +3822,51 @@ static struct pci_device_id serial_pci_tbl[] = {
>  	{ 0, }
>  };
>  
> +static pci_ers_result_t serial8250_io_error_detected(struct pci_dev *dev,
> +pci_channel_state_t state)

Wierd linewrap.

> +{
> +	struct serial_private *priv = pci_get_drvdata(dev);
> +
> +	if (state == pci_channel_io_perm_failure)
> +		return PCI_ERS_RESULT_DISCONNECT;
> +
> +	if (priv)
> +		pciserial_suspend_ports(priv);
> +
> +	pci_disable_device(dev);
> +
> +	return PCI_ERS_RESULT_NEED_RESET;
> +}
> +
> +static pci_ers_result_t serial8250_io_slot_reset(struct pci_dev *dev)
> +{
> +	int rc;
> +
> +	rc = pci_enable_device(dev);
> +
> +	if (rc)
> +		return PCI_ERS_RESULT_DISCONNECT;
> +
> +	pci_restore_state(dev);
> +	pci_save_state(dev);
> +
> +	return PCI_ERS_RESULT_RECOVERED;
> +}
> +
> +static void serial8250_io_resume(struct pci_dev *dev)
> +{
> +	struct serial_private *priv = pci_get_drvdata(dev);
> +
> +	if (priv)
> +		pciserial_resume_ports(priv);
> +}
> +
> +static struct pci_error_handlers serial8250_err_handler = {
> +	.error_detected = serial8250_io_error_detected,
> +	.slot_reset = serial8250_io_slot_reset,
> +	.resume = serial8250_io_resume,
> +};
> +
>  static struct pci_driver serial_pci_driver = {
>  	.name		= "serial",
>  	.probe		= pciserial_init_one,
> @@ -3830,6 +3876,7 @@ static struct pci_driver serial_pci_driver = {
>  	.resume		= pciserial_resume_one,
>  #endif
>  	.id_table	= serial_pci_tbl,
> +	.err_handler = &serial8250_err_handler,

Please keep the alignment sane.

Care to try again?

thanks,

greg k-h