Message ID | 1259256709-6976-1-git-send-email-leitao@linux.vnet.ibm.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
leitao@linux.vnet.ibm.com wrote: > bnx2 is failing when a PCI error is detected. The error is the > following: > > bnx2: Chip not in correct endian mode > bnx2: fw sync timeout, reset code = 404001d > > This error was caused because the way pci_restore_state() is working > after commit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff. > > Signed-off-by: Breno Leitao<leitao@linux.vnet.ibm.com> Thanks Breno. Acked by: Michael Chan <mchan@broadcom.com> > --- > drivers/net/bnx2.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c > index 08cddb6..7fa4048 100644 > --- a/drivers/net/bnx2.c > +++ b/drivers/net/bnx2.c > @@ -8264,6 +8264,7 @@ static pci_ers_result_t > bnx2_io_slot_reset(struct pci_dev *pdev) > } > pci_set_master(pdev); > pci_restore_state(pdev); > + pci_save_state(pdev); > > if (netif_running(dev)) { > bnx2_set_power_state(bp, PCI_D0); > -- > 1.6.0.2 > > > -- 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
From: "Michael Chan" <mchan@broadcom.com> Date: Mon, 30 Nov 2009 01:40:58 -0800 > leitao@linux.vnet.ibm.com wrote: > >> bnx2 is failing when a PCI error is detected. The error is the >> following: >> >> bnx2: Chip not in correct endian mode >> bnx2: fw sync timeout, reset code = 404001d >> >> This error was caused because the way pci_restore_state() is working >> after commit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff. >> >> Signed-off-by: Breno Leitao<leitao@linux.vnet.ibm.com> > > Thanks Breno. > > Acked by: Michael Chan <mchan@broadcom.com> Applied, thanks everyone. (Michael: Need to have a "-" there in the "Acked-by" otherwise automated tools won't pick up your ACK. I know the tools should be more robust, and I fixed it up for you when applying Breno's patch. It's just FYI...) -- 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/bnx2.c b/drivers/net/bnx2.c index 08cddb6..7fa4048 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -8264,6 +8264,7 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev) } pci_set_master(pdev); pci_restore_state(pdev); + pci_save_state(pdev); if (netif_running(dev)) { bnx2_set_power_state(bp, PCI_D0);
bnx2 is failing when a PCI error is detected. The error is the following: bnx2: Chip not in correct endian mode bnx2: fw sync timeout, reset code = 404001d This error was caused because the way pci_restore_state() is working after commit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff. Signed-off-by: Breno Leitao<leitao@linux.vnet.ibm.com> --- drivers/net/bnx2.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)