* [PATCH 2/2 2.6.25-rc8] ixgbe: save and restore pcie/msi state to support EEH recovery
@ 2008-04-10 19:40 wendy xiong
2008-04-10 20:48 ` Kok, Auke
0 siblings, 1 reply; 6+ messages in thread
From: wendy xiong @ 2008-04-10 19:40 UTC (permalink / raw)
To: netdev, jeff, auke-jan.h.kok, jesse.brandeburg, e1000-devel
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>
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);
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2 2.6.25-rc8] ixgbe: save and restore pcie/msi state to support EEH recovery
2008-04-10 19:40 [PATCH 2/2 2.6.25-rc8] ixgbe: save and restore pcie/msi state to support EEH recovery wendy xiong
@ 2008-04-10 20:48 ` Kok, Auke
2008-04-24 15:50 ` wendy xiong
0 siblings, 1 reply; 6+ messages in thread
From: Kok, Auke @ 2008-04-10 20:48 UTC (permalink / raw)
To: wendy xiong; +Cc: netdev, jeff, auke-jan.h.kok, jesse.brandeburg, e1000-devel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2 2.6.25-rc8] ixgbe: save and restore pcie/msi state to support EEH recovery
2008-04-10 20:48 ` Kok, Auke
@ 2008-04-24 15:50 ` wendy xiong
2008-04-24 15:54 ` Kok, Auke
2008-04-24 15:56 ` David Miller
0 siblings, 2 replies; 6+ messages in thread
From: wendy xiong @ 2008-04-24 15:50 UTC (permalink / raw)
To: Kok, Auke, David Miller; +Cc: netdev, jeff, jesse.brandeburg, e1000-devel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2 2.6.25-rc8] ixgbe: save and restore pcie/msi state to support EEH recovery
2008-04-24 15:50 ` wendy xiong
@ 2008-04-24 15:54 ` Kok, Auke
2008-04-24 16:21 ` Jeff Garzik
2008-04-24 15:56 ` David Miller
1 sibling, 1 reply; 6+ messages in thread
From: Kok, Auke @ 2008-04-24 15:54 UTC (permalink / raw)
To: wendy xiong; +Cc: David Miller, netdev, jeff, jesse.brandeburg, e1000-devel
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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2 2.6.25-rc8] ixgbe: save and restore pcie/msi state to support EEH recovery
2008-04-24 15:50 ` wendy xiong
2008-04-24 15:54 ` Kok, Auke
@ 2008-04-24 15:56 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: David Miller @ 2008-04-24 15:56 UTC (permalink / raw)
To: wendyx; +Cc: auke-jan.h.kok, netdev, jeff, jesse.brandeburg, e1000-devel
From: wendy xiong <wendyx@us.ibm.com>
Date: Thu, 24 Apr 2008 10:50:06 -0500
> Hi David,
>
> These two patches got ack by Intel developer. Can you put them in your
> tree for 2.6.26 kernel?
I don't take network driver patches, Jeff Garzik does.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2 2.6.25-rc8] ixgbe: save and restore pcie/msi state to support EEH recovery
2008-04-24 15:54 ` Kok, Auke
@ 2008-04-24 16:21 ` Jeff Garzik
0 siblings, 0 replies; 6+ messages in thread
From: Jeff Garzik @ 2008-04-24 16:21 UTC (permalink / raw)
To: Kok, Auke
Cc: wendy xiong, David Miller, netdev, jesse.brandeburg, e1000-devel
Kok, Auke wrote:
> 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 :)
Yep, they are in the stack going to davem today.
Jeff
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-04-24 16:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-10 19:40 [PATCH 2/2 2.6.25-rc8] ixgbe: save and restore pcie/msi state to support EEH recovery wendy xiong
2008-04-10 20:48 ` Kok, Auke
2008-04-24 15:50 ` wendy xiong
2008-04-24 15:54 ` Kok, Auke
2008-04-24 16:21 ` Jeff Garzik
2008-04-24 15:56 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).