| Message ID | 1257878267-7489-1-git-send-email-leitao@linux.vnet.ibm.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: leitao@linux.vnet.ibm.com Date: Tue, 10 Nov 2009 13:37:47 -0500 > After commmit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff EEH breaks > after the second error, since it calls pci_restore_state() > but it returns 0, since pci->state_saved is false. > > So, this patch just call pci_save_state() after pci_restore_state(). > > Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com> Intel folks, are you integrating or looking at this patch? Thanks. -- 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
On Sun, 15 Nov 2009, David Miller wrote: > From: leitao@linux.vnet.ibm.com > Date: Tue, 10 Nov 2009 13:37:47 -0500 > > > After commmit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff EEH breaks > > after the second error, since it calls pci_restore_state() > > but it returns 0, since pci->state_saved is false. > > > > So, this patch just call pci_save_state() after pci_restore_state(). > > > > Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com> > > Intel folks, are you integrating or looking at this patch? This patch looks correct and makes sense to me. I'm going to ACK it now, but we'll still pull it in and test it. If we see any issues, we'll report them with possible fixes. But at this point, I think this patch is fine. Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> -- 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: "Waskiewicz Jr, Peter P" <peter.p.waskiewicz.jr@intel.com> Date: Mon, 16 Nov 2009 11:01:13 -0800 (Pacific Standard Time) > On Sun, 15 Nov 2009, David Miller wrote: > >> From: leitao@linux.vnet.ibm.com >> Date: Tue, 10 Nov 2009 13:37:47 -0500 >> >> > After commmit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff EEH breaks >> > after the second error, since it calls pci_restore_state() >> > but it returns 0, since pci->state_saved is false. >> > >> > So, this patch just call pci_save_state() after pci_restore_state(). >> > >> > Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com> >> >> Intel folks, are you integrating or looking at this patch? > > This patch looks correct and makes sense to me. I'm going to ACK it now, > but we'll still pull it in and test it. If we see any issues, we'll > report them with possible fixes. But at this point, I think this patch is > fine. > > Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Applied, thanks. -- 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/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 5bd9e6b..a5036f7 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -5994,6 +5994,7 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev) } else { pci_set_master(pdev); pci_restore_state(pdev); + pci_save_state(pdev); pci_wake_from_d3(pdev, false);
After commmit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff EEH breaks after the second error, since it calls pci_restore_state() but it returns 0, since pci->state_saved is false. So, this patch just call pci_save_state() after pci_restore_state(). Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com> --- drivers/net/ixgbe/ixgbe_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)