Re: [PATCH 2/2 2.6.25-rc8] ixgbe: save and restore pcie/msi state to support EEH recovery

["Kok, Auke" <auke-jan.h.kok@intel.com>]

Wendy,

these two patches are not for davem's tree but go into Jeff Garzik's netdev-2.6
upstream tree. As I said would, I have already submitted them to Jeff. A little
more patience :)

Auke



wendy xiong wrote:
> Hi David,
> 
> These two patches got ack by Intel developer. Can you put them in your
> tree for 2.6.26 kernel?
> 
> Thanks,
> Wendy
> On Thu, 2008-04-10 at 13:48 -0700, Kok, Auke wrote:
>> wendy xiong wrote:
>>> Hi,
>>>
>>> To enable EEH support for pci-express network adapters, pcie/msi state
>>> needs to be saved and restored for that adapter.
>>>
>>> We have tested this EEH patch with Intel 10G pci-express ixgbe adapter.
>>>
>>> Signed-off-by: Wendy Xiong <wendyx@us.ibm.com>
>>
>> Thanks Wendy,
>>
>> I'll pull (both) these in my tree and make sure they get merged. thanks!
>>
>> Auke
>>
>>>
>>> diff -Nuarp linux-2.6.25-rc8.orig/drivers/net/ixgbe/ixgbe_main.c linux-2.6.25-rc8/drivers/net/ixgbe/ixgbe_main.c
>>> --- linux-2.6.25-rc8.orig/drivers/net/ixgbe/ixgbe_main.c        2008-04-07 19:18:08.000000000 -0500
>>> +++ linux-2.6.25-rc8/drivers/net/ixgbe/ixgbe_main.c     2008-04-10 12:54:17.000000000 -0500
>>> @@ -2654,6 +2654,7 @@ static int __devinit ixgbe_probe(struct
>>>         }
>>>
>>>         pci_set_master(pdev);
>>> +       pci_save_state(pdev);
>>>
>>>         netdev = alloc_etherdev(sizeof(struct ixgbe_adapter));
>>>         if (!netdev) {
>>> @@ -2910,6 +2911,7 @@ static pci_ers_result_t ixgbe_io_slot_re
>>>                 return PCI_ERS_RESULT_DISCONNECT;
>>>         }
>>>         pci_set_master(pdev);
>>> +       pci_restore_state(pdev);
>>>
>>>         pci_enable_wake(pdev, PCI_D3hot, 0);
>>>         pci_enable_wake(pdev, PCI_D3cold, 0);
>>>
>>>
>>>
>>>
>>> --
>>> 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
>> --
>> 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
>