PCI Error Recovery: e100 network device driver
Subsystems (2)
PATCH 1/1 PCI Error Recovery: e100 network device driver
Please apply and forward upstream.
--linas
[PATCH] PCI Error Recovery: e100 network device driver
Various PCI bus errors can be signaled by newer PCI controllers. This patch adds the PCI error recovery callbacks to the intel ethernet e100 device driver. The patch has been tested, and appears to work well.
----
drivers/net/e100.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+)
drivers/net/e100.c +65 -0
@@ -2781,6 +2781,70 @@ static void e100_shutdown(struct pci_dev } +/* ------------------ PCI Error Recovery infrastructure -------------- */ +/** e100_io_error_detected() is called when PCI error is detected */ +static pci_ers_result_t e100_io_error_detected (struct pci_dev *pdev,pci_channel_state_t state) +{ +struct net_device *netdev =pci_get_drvdata (pdev); + +/* Same as calling e100_down(netdev_priv(netdev)), but generic */ + netdev->stop (netdev); + +/* Detach; put netif into state similar to hotplug unplug */ +netif_poll_enable (netdev); +netif_device_detach (netdev); + +/* Request a slot reset. */ +return PCI_ERS_RESULT_NEED_RESET ; +} + +/** e100_io_slot_reset is called after the pci bus has been reset. +* Restart the card from scratch. */ +static pci_ers_result_t e100_io_slot_reset (struct pci_dev *pdev) +{ +struct net_device *netdev =pci_get_drvdata (pdev); +struct nic *nic =netdev_priv (netdev); + +if (pci_enable_device (pdev)) { +printk (KERN_ERR "e100: Cannot re-enable PCI device after reset.\n" ); +return PCI_ERS_RESULT_DISCONNECT ; + } +pci_set_master (pdev); + +/* Only one device per card can do a reset */ +if (0 !=PCI_FUNC (pdev->devfn)) +return PCI_ERS_RESULT_RECOVERED ; +e100_hw_reset (nic); +e100_phy_init (nic); + +return PCI_ERS_RESULT_RECOVERED ; +} + +/** e100_io_resume is called when the error recovery driver +* tells us that its OK to resume normal operation. +*/ +static void e100_io_resume (struct pci_dev *pdev) +{ +struct net_device *netdev =pci_get_drvdata (pdev); +struct nic *nic =netdev_priv (netdev); + +/* ack any pending wake events, disable PME */ +pci_enable_wake (pdev,0 ,0 ); + +netif_device_attach (netdev); +if (netif_running (netdev)) { +e100_open (netdev); +mod_timer (&nic->watchdog, jiffies); + } +} + +static struct pci_error_handlers e100_err_handler = { + .error_detected = e100_io_error_detected, + .slot_reset = e100_io_slot_reset, + .resume = e100_io_resume, +}; + +static struct pci_driver e100_driver = { .name =DRV_NAME , .id_table = e100_id_table,
@@ -2791,6 +2855,7 @@ static struct pci_driver e100_driver = { .resume = e100_resume, #endif .shutdown = e100_shutdown, + .err_handler = &e100_err_handler, };static int __init e100_init_module (void )
drivers/net/e100.c static void e100_shutdown(struct pci_dev · line 2808
Quoted 1 line · Linas Vepstas
drivers/net/e100.c +1
-0+if (pci_enable_device (pdev)) {
Add a space after "if" and before "(" please.
You do this in a few different places.
thanks,
greg k-h
Linas Vepstas
Acked-by Jesse BrandeburgQuoted 4 lines · Greg KH
Review
Quoted 1 line · Linas Vepstas
(quoted diff) +1
-0+ if(pci_enable_device(pdev)) {Add a space after "if" and before "(" please.
I guess I'm immune to learning from experience. :-/
Here's a new improved patch.
--linas
[PATCH] PCI Error Recovery: e100 network device driver
Various PCI bus errors can be signaled by newer PCI controllers. This patch adds the PCI error recovery callbacks to the intel ethernet e100 device driver. The patch has been tested, and appears to work well.
----
drivers/net/e100.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+)
drivers/net/e100.c +75 -0
@@ -2780,6 +2780,80 @@ static void e100_shutdown(struct pci_devDPRINTK (PROBE ,ERR ,"Error enabling wake\n" ); } +/* ------------------ PCI Error Recovery infrastructure -------------- */ +/** +* e100_io_error_detected - called when PCI error is detected. +* @pdev: Pointer to PCI device +* @state: The current pci conneection state +*/ +static pci_ers_result_t e100_io_error_detected (struct pci_dev *pdev,pci_channel_state_t state) +{ +struct net_device *netdev =pci_get_drvdata (pdev); + +/* Similar to calling e100_down(), but avoids adpater I/O. */ + netdev->stop (netdev); + +/* Detach; put netif into state similar to hotplug unplug. */ +netif_poll_enable (netdev); +netif_device_detach (netdev); + +/* Request a slot reset. */ +return PCI_ERS_RESULT_NEED_RESET ; +} + +/** +* e100_io_slot_reset - called after the pci bus has been reset. +* @pdev: Pointer to PCI device +* +* Restart the card from scratch. +*/ +static pci_ers_result_t e100_io_slot_reset (struct pci_dev *pdev) +{ +struct net_device *netdev =pci_get_drvdata (pdev); +struct nic *nic =netdev_priv (netdev); + +if (pci_enable_device (pdev)) { +printk (KERN_ERR "e100: Cannot re-enable PCI device after reset.\n" ); +return PCI_ERS_RESULT_DISCONNECT ; + } +pci_set_master (pdev); + +/* Only one device per card can do a reset */ +if (0 !=PCI_FUNC (pdev->devfn)) +return PCI_ERS_RESULT_RECOVERED ; +e100_hw_reset (nic); +e100_phy_init (nic); + +return PCI_ERS_RESULT_RECOVERED ; +} + +/** +* e100_io_resume - resume normal operations +* @pdev: Pointer to PCI device +* +* Resume normal operations after an error recovery +* sequence has been completed. +*/ +static void e100_io_resume (struct pci_dev *pdev) +{ +struct net_device *netdev =pci_get_drvdata (pdev); +struct nic *nic =netdev_priv (netdev); + +/* ack any pending wake events, disable PME */ +pci_enable_wake (pdev,0 ,0 ); + +netif_device_attach (netdev); +if (netif_running (netdev)) { +e100_open (netdev); +mod_timer (&nic->watchdog, jiffies); + } +} + +static struct pci_error_handlers e100_err_handler = { + .error_detected = e100_io_error_detected, + .slot_reset = e100_io_slot_reset, + .resume = e100_io_resume, +};static struct pci_driver e100_driver = { .name =DRV_NAME ,
@@ -2791,6 +2865,7 @@ static struct pci_driver e100_driver = { .resume = e100_resume, #endif .shutdown = e100_shutdown, + .err_handler = &e100_err_handler, };static int __init e100_init_module (void )
drivers/net/e100.c static void e100_shutdown(struct pci_dev · line 2787
Quoted 4 lines · Linas Vepstas
drivers/net/e100.c +1
-0+* @state: The current pci conneection state
connection
drivers/net/e100.c static void e100_shutdown(struct pci_dev · line 2793
Quoted 5 lines
drivers/net/e100.c +5
-0+static pci_ers_result_t e100_io_error_detected (struct pci_dev *pdev,pci_channel_state_t state) +{ +struct net_device *netdev =pci_get_drvdata (pdev); + +/* Similar to calling e100_down(), but avoids adpater I/O. */
adapter
drivers/net/e100.c static void e100_shutdown(struct pci_dev · line 2822
Quoted 13 lines
drivers/net/e100.c +13
-0+static pci_ers_result_t e100_io_slot_reset (struct pci_dev *pdev) +{ +struct net_device *netdev =pci_get_drvdata (pdev); +struct nic *nic =netdev_priv (netdev); + +if (pci_enable_device (pdev)) { +printk (KERN_ERR "e100: Cannot re-enable PCI device after reset.\n" ); +return PCI_ERS_RESULT_DISCONNECT ; + } +pci_set_master (pdev); + +/* Only one device per card can do a reset */ +if (0 !=PCI_FUNC (pdev->devfn))
Wrong order.
Linas Vepstas <[email protected]> :
Quoted 4 lines
Index:
linux-2.6.17-rc1/drivers/net/e100.c
===================================================================drivers/net/e100.c +0
-0
[...]
Quoted 1 line
+static
pci_ers_result_te100_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
80 cols limit.
[...]
drivers/net/e100.c static void e100_shutdown(struct pci_dev · line 2816
Quoted 7 lines
drivers/net/e100.c +7
-0+static pci_ers_result_t e100_io_slot_reset (struct pci_dev *pdev) +{ +struct net_device *netdev =pci_get_drvdata (pdev); +struct nic *nic =netdev_priv (netdev); + +if (pci_enable_device (pdev)) { +printk (KERN_ERR "e100: Cannot re-enable PCI device after reset.\n" );
- The driver supports {get/set}_msglevel. Please consider using netif_msg_xxx (see include/linux/netdevice.h).
- s/e100/DRV_NAME/ (or netdev->name, or pci_name(...) depending on the context).
[...]
drivers/net/e100.c static void e100_shutdown(struct pci_dev · line 2856
Quoted 5 lines
drivers/net/e100.c +5
-0+static struct pci_error_handlers e100_err_handler = { + .error_detected = e100_io_error_detected, + .slot_reset = e100_io_slot_reset, + .resume = e100_io_resume, +};
Nit: I'd rather follow the style in the declaration of e100_driver.
Signature · 1 line
Ueimor
Quoted 4 lines · Linas Vepstas
Please apply and forward upstream.
--linas
Quoted 8 lines
[PATCH] PCI Error Recovery: e100 network device driver
Various PCI bus errors can be signaled by newer PCI controllers. This patch adds the PCI error recovery callbacks to the intel ethernet e100 device driver. The patch has been tested, and appears to work well.
Signed-off-by Linas Vepstas <[email protected]>Acked-by Jesse Brandeburg <[email protected]>
I am enabling PCI-Express AER (Advanced Error Reporting) in kernel and glad to see many drivers to support pci error handling.
Quoted 12 lines
----
drivers/net/e100.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+)Index:
linux-2.6.17-rc1/drivers/net/e100.c
===================================================================drivers/net/e100.c +0
-0@@ -2781,6 +2781,70 @@ static void e100_shutdown(struct pci_dev }
drivers/net/e100.c static void e100_shutdown(struct pci_dev · line 2791
Quoted 10 lines
drivers/net/e100.c +8
-0+/* ------------------ PCI Error Recovery infrastructure -------------- */ +/** e100_io_error_detected() is called when PCI error is detected */ +static pci_ers_result_t e100_io_error_detected (struct pci_dev *pdev,pci_channel_state_t state) +{ +struct net_device *netdev =pci_get_drvdata (pdev); + +/* Same as calling e100_down(netdev_priv(netdev)), but generic */ + netdev->stop (netdev);
e100 stop method e100_close calls e100_down which would do IO. Does it violate the rule defined in Documentation/pci-error-recovery.txt that error_detected shouldn't do any IO?
Suggest to create a new function, such like e100_close_noreset.
Quoted 17 lines
drivers/net/e100.c +17
-0+ +/* Detach; put netif into state similar to hotplug unplug */ +netif_poll_enable (netdev); +netif_device_detach (netdev); + +/* Request a slot reset. */ +return PCI_ERS_RESULT_NEED_RESET ; +} + +/** e100_io_slot_reset is called after the pci bus has been reset. +* Restart the card from scratch. */ +static pci_ers_result_t e100_io_slot_reset (struct pci_dev *pdev) +{ +struct net_device *netdev =pci_get_drvdata (pdev); +struct nic *nic =netdev_priv (netdev); + +if (pci_enable_device (pdev)) {
drivers/net/e100.c static void e100_shutdown(struct pci_dev · line 2818
Quoted 10 lines
drivers/net/e100.c +10
-0+printk (KERN_ERR "e100: Cannot re-enable PCI device after reset.\n" ); +return PCI_ERS_RESULT_DISCONNECT ; + } +pci_set_master (pdev); + +/* Only one device per card can do a reset */ +if (0 !=PCI_FUNC (pdev->devfn)) +return PCI_ERS_RESULT_RECOVERED ; +e100_hw_reset (nic); +e100_phy_init (nic);
Should pci_set_master be called after e100_hw_reset like in function e100_probe?
Quoted 9 lines
drivers/net/e100.c +9
-0+ +return PCI_ERS_RESULT_RECOVERED ; +} + +/** e100_io_resume is called when the error recovery driver +* tells us that its OK to resume normal operation. +*/ +static void e100_io_resume (struct pci_dev *pdev) +{
drivers/net/e100.c static void e100_shutdown(struct pci_dev · line 2837
Quoted 10 lines
drivers/net/e100.c +10
-0+struct net_device *netdev =pci_get_drvdata (pdev); +struct nic *nic =netdev_priv (netdev); + +/* ack any pending wake events, disable PME */ +pci_enable_wake (pdev,0 ,0 ); + +netif_device_attach (netdev); +if (netif_running (netdev)) { +e100_open (netdev); +mod_timer (&nic->watchdog, jiffies);
e100_open calls e100_up which already sets watchdog timer. Why to set it again?
Quoted 3 lines
drivers/net/e100.c +3
-0+ } +} +