jsm: Adding EEH handlers

jsm: Adding EEH handlers

[Breno Leitao]

Adding EEH handlers for the serial jsm driver. This patch adds
the PCI error handlers and also register them to be called when 
a error is detected.

Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
---
diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/serial/jsm/jsm_driver.c
index b3604aa..b37d2e2 100644
--- a/drivers/serial/jsm/jsm_driver.c
+++ b/drivers/serial/jsm/jsm_driver.c
@@ -48,6 +48,20 @@ struct uart_driver jsm_uart_driver = {
 	.nr		= NR_PORTS,
 };
 
+static pci_ers_result_t jsm_io_error_detected(struct pci_dev *pdev,
+					pci_channel_state_t state);
+static pci_ers_result_t jsm_io_slot_reset(struct pci_dev *pdev);
+static void jsm_io_resume(struct pci_dev *pdev);
+
+static struct pci_error_handlers jsm_err_handler = {
+	.error_detected = jsm_io_error_detected,
+	.slot_reset = jsm_io_slot_reset,
+	.resume = jsm_io_resume,
+};
+
 int jsm_debug;
 module_param(jsm_debug, int, 0);
 MODULE_PARM_DESC(jsm_debug, "Driver debugging level");
@@ -164,6 +178,7 @@ static int __devinit jsm_probe_one(struct pci_dev *pdev, const struct pci_device
 	}
 
 	pci_set_drvdata(pdev, brd);
+	pci_save_state(pdev);
 
 	return 0;
  out_free_irq:
@@ -222,8 +237,39 @@ static struct pci_driver jsm_driver = {
 	.id_table	= jsm_pci_tbl,
 	.probe		= jsm_probe_one,
 	.remove		= __devexit_p(jsm_remove_one),
+	.err_handler	= &jsm_err_handler,
 };
 
+static pci_ers_result_t jsm_io_error_detected(struct pci_dev *pdev,
+					pci_channel_state_t state)
+{
+	struct jsm_board *brd = pci_get_drvdata(pdev);
+
+	jsm_remove_uart_port(brd);
+
+	return PCI_ERS_RESULT_NEED_RESET;
+}
+
+static pci_ers_result_t jsm_io_slot_reset(struct pci_dev *pdev)
+{
+	pci_enable_device(pdev);
+	pci_set_master(pdev);
+
+	return PCI_ERS_RESULT_RECOVERED;
+}
+
+static void jsm_io_resume(struct pci_dev *pdev)
+{
+	struct jsm_board *brd = pci_get_drvdata(pdev);
+
+	pci_restore_state(pdev);
+
+	jsm_uart_port_init(brd);
+}
+
 static int __init jsm_init_module(void)
 {
 	int rc;
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c
index 00f4577..e70f2c1 100644
--- a/drivers/serial/jsm/jsm_tty.c
+++ b/drivers/serial/jsm/jsm_tty.c
@@ -432,7 +432,7 @@ int __devinit jsm_tty_init(struct jsm_board *brd)
 	return 0;
 }
 
-int __devinit jsm_uart_port_init(struct jsm_board *brd)
+int jsm_uart_port_init(struct jsm_board *brd)
 {
 	int i;
 	unsigned int line;

RE: Adding EEH handlers

[Kilau, Scott]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 3022 bytes --]

> -----Original Message-----
> From: Breno Leitao [mailto:leitao@linux.vnet.ibm.com]
> Sent: Friday, September 11, 2009 10:36 AM
> To: Wen Xiong; Kilau, Scott
> Cc: alan@lxorguk.ukuu.org.uk; Linux Kernel Mailing List
> Subject: jsm: Adding EEH handlers
> 
> Adding EEH handlers for the serial jsm driver. This patch adds
> the PCI error handlers and also register them to be called when
> a error is detected.
> 
> Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
> ---
> diff --git a/drivers/serial/jsm/jsm_driver.c
> b/drivers/serial/jsm/jsm_driver.c
> index b3604aa..b37d2e2 100644
> --- a/drivers/serial/jsm/jsm_driver.c
> +++ b/drivers/serial/jsm/jsm_driver.c
> @@ -48,6 +48,20 @@ struct uart_driver jsm_uart_driver = {
>  	.nr		= NR_PORTS,
>  };
> 
> +static pci_ers_result_t jsm_io_error_detected(struct pci_dev *pdev,
> +					pci_channel_state_t state);
> +static pci_ers_result_t jsm_io_slot_reset(struct pci_dev *pdev);
> +static void jsm_io_resume(struct pci_dev *pdev);
> +
> +static struct pci_error_handlers jsm_err_handler = {
> +	.error_detected = jsm_io_error_detected,
> +	.slot_reset = jsm_io_slot_reset,
> +	.resume = jsm_io_resume,
> +};
> +
>  int jsm_debug;
>  module_param(jsm_debug, int, 0);
>  MODULE_PARM_DESC(jsm_debug, "Driver debugging level");
> @@ -164,6 +178,7 @@ static int __devinit jsm_probe_one(struct pci_dev
> *pdev, const struct pci_device
>  	}
> 
>  	pci_set_drvdata(pdev, brd);
> +	pci_save_state(pdev);
> 
>  	return 0;
>   out_free_irq:
> @@ -222,8 +237,39 @@ static struct pci_driver jsm_driver = {
>  	.id_table	= jsm_pci_tbl,
>  	.probe		= jsm_probe_one,
>  	.remove		= __devexit_p(jsm_remove_one),
> +	.err_handler	= &jsm_err_handler,
>  };
> 
> +static pci_ers_result_t jsm_io_error_detected(struct pci_dev *pdev,
> +					pci_channel_state_t state)
> +{
> +	struct jsm_board *brd = pci_get_drvdata(pdev);
> +
> +	jsm_remove_uart_port(brd);
> +
> +	return PCI_ERS_RESULT_NEED_RESET;
> +}
> +
> +static pci_ers_result_t jsm_io_slot_reset(struct pci_dev *pdev)
> +{
> +	pci_enable_device(pdev);
> +	pci_set_master(pdev);
> +
> +	return PCI_ERS_RESULT_RECOVERED;
> +}
> +
> +static void jsm_io_resume(struct pci_dev *pdev)
> +{
> +	struct jsm_board *brd = pci_get_drvdata(pdev);
> +
> +	pci_restore_state(pdev);
> +
> +	jsm_uart_port_init(brd);
> +}
> +
>  static int __init jsm_init_module(void)
>  {
>  	int rc;
> diff --git a/drivers/serial/jsm/jsm_tty.c
> b/drivers/serial/jsm/jsm_tty.c
> index 00f4577..e70f2c1 100644
> --- a/drivers/serial/jsm/jsm_tty.c
> +++ b/drivers/serial/jsm/jsm_tty.c
> @@ -432,7 +432,7 @@ int __devinit jsm_tty_init(struct jsm_board *brd)
>  	return 0;
>  }
> 
> -int __devinit jsm_uart_port_init(struct jsm_board *brd)
> +int jsm_uart_port_init(struct jsm_board *brd)
>  {
>  	int i;
>  	unsigned int line;


Looks good, thanks Breno!
Acked-by: Scott Kilau <scottk@digi.com>



ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥