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.
---
drivers/serial/jsm/jsm_driver.c +40 -0
@@ -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;
drivers/serial/jsm/jsm_tty.c +1 -1
@@ -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;
Kilau, Scott
Acked-by Scott KilauRE: Adding EEH handlers
Quoted 88 lines
-----Original Message-----
From: Breno Leitao [mailto:[email protected]]
Sent: Friday, September 11, 2009 10:36 AM
To: Wen Xiong; Kilau, Scott
Cc: [email protected]; Linux Kernel Mailing List
Subject: jsm: Adding EEH handlersAdding 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 <[email protected]>---
drivers/serial/jsm/jsm_driver.c +12
-0@@ -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:drivers/serial/jsm/jsm_driver.c +28
-0@@ -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;drivers/serial/jsm/jsm_tty.c +0
-0
drivers/serial/jsm/jsm_tty.c int __devinit jsm_tty_init(struct jsm_board *brd) · line 438
Quoted 8 lines
drivers/serial/jsm/jsm_tty.c +1
-1@@ -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!
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�