| Message ID | 20090731191340.5470.79342.send-patch@aqua |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 31 Jul 2009, Dean Nelson wrote: > PCI drivers that implement the struct pci_error_handlers' error_detected > callback should return PCI_ERS_RESULT_DISCONNECT if the state passed in is > pci_channel_io_perm_failure. This patch fixes the issue for ixgb. > > Signed-off-by: Dean Nelson <dnelson@redhat.com> > > --- > > This patch has not been tested, since I don't have the hardware to test it. > It is based on a few recent patches. See the following commits: > > http://git.kernel.org/linus/c93b5a76d58656158d195a7df507ebc660010969 > http://git.kernel.org/linus/eab633021c26025b34f36f79f0311d3d99f40ceb > http://git.kernel.org/linus/ef681ce1e8b3e63317cd724c200b2fd39286c005 > http://git.kernel.org/linus/59ed6eecff4aa00c5c5d18ffd180acac108d596e > http://git.kernel.org/linus/3044b8d1ff8c05237652a692fb572a34e4d70146 > > drivers/net/ixgb/ixgb_main.c | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c > index eb917f1..fad08ce 100644 > --- a/drivers/net/ixgb/ixgb_main.c > +++ b/drivers/net/ixgb/ixgb_main.c > @@ -2227,6 +2227,11 @@ static pci_ers_result_t ixgb_io_error_detected(struct pci_dev *pdev, > struct net_device *netdev = pci_get_drvdata(pdev); > struct ixgb_adapter *adapter = netdev_priv(netdev); > > + netif_device_detach(netdev); > + > + if (state == pci_channel_io_perm_failure) > + return PCI_ERS_RESULT_DISCONNECT; > + > if (netif_running(netdev)) > ixgb_down(adapter, true); Seems reasonable, especially since the same logic works fine on our other drivers. The hardware for this driver is somewhat difficult to get our hands on, but we'll definately give this a spot test once we can locate one of these NICs. Cheers, -PJ Waskiewicz -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index eb917f1..fad08ce 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c @@ -2227,6 +2227,11 @@ static pci_ers_result_t ixgb_io_error_detected(struct pci_dev *pdev, struct net_device *netdev = pci_get_drvdata(pdev); struct ixgb_adapter *adapter = netdev_priv(netdev); + netif_device_detach(netdev); + + if (state == pci_channel_io_perm_failure) + return PCI_ERS_RESULT_DISCONNECT; + if (netif_running(netdev)) ixgb_down(adapter, true);
PCI drivers that implement the struct pci_error_handlers' error_detected callback should return PCI_ERS_RESULT_DISCONNECT if the state passed in is pci_channel_io_perm_failure. This patch fixes the issue for ixgb. Signed-off-by: Dean Nelson <dnelson@redhat.com> --- This patch has not been tested, since I don't have the hardware to test it. It is based on a few recent patches. See the following commits: http://git.kernel.org/linus/c93b5a76d58656158d195a7df507ebc660010969 http://git.kernel.org/linus/eab633021c26025b34f36f79f0311d3d99f40ceb http://git.kernel.org/linus/ef681ce1e8b3e63317cd724c200b2fd39286c005 http://git.kernel.org/linus/59ed6eecff4aa00c5c5d18ffd180acac108d596e http://git.kernel.org/linus/3044b8d1ff8c05237652a692fb572a34e4d70146 drivers/net/ixgb/ixgb_main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html