[PATCH 1/3] ixgbe: fix EEH recovery during reset on PPC

[PATCH 1/3] ixgbe: fix EEH recovery during reset on PPC

[Jeff Kirsher]

From: Paul Larson <pl@us.ibm.com>

EEh is not recovering in a resonable amount of time on PPC during
ixgbe_down().

Signed-off-by: Paul Larson <pl@us.ibm.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---

 drivers/net/ixgbe/ixgbe_main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 7b39394..5774377 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1969,7 +1969,8 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
 	netif_carrier_off(netdev);
 	netif_stop_queue(netdev);
 
-	ixgbe_reset(adapter);
+	if (!pci_channel_offline(adapter->pdev))
+		ixgbe_reset(adapter);
 	ixgbe_clean_all_tx_rings(adapter);
 	ixgbe_clean_all_rx_rings(adapter);
 

[PATCH 2/3] igb: fix EEH recovery during reset on PPC

[Jeff Kirsher]

EEH is not recovering in a reasonable amount of time on PPC during
igb_down().

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
---

 drivers/net/igb/igb_main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 7b6b780..6f1ad53 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -718,7 +718,8 @@ void igb_down(struct igb_adapter *adapter)
 	adapter->link_speed = 0;
 	adapter->link_duplex = 0;
 
-	igb_reset(adapter);
+	if (!pci_channel_offline(adapter->pdev))
+		igb_reset(adapter);
 	igb_clean_all_tx_rings(adapter);
 	igb_clean_all_rx_rings(adapter);
 }

[PATCH 3/3] e1000e: fix EEH recovery during reset on PPC

[Jeff Kirsher]

EEH is not recovering in a reasonable amount of time on PPC during
e1000e_down().

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
---

 drivers/net/e1000e/netdev.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index ccb8ca2..0320925 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -2535,7 +2535,8 @@ void e1000e_down(struct e1000_adapter *adapter)
 	adapter->link_speed = 0;
 	adapter->link_duplex = 0;
 
-	e1000e_reset(adapter);
+	if (!pci_channel_offline(adapter->pdev))
+		e1000e_reset(adapter);
 	e1000_clean_tx_ring(adapter);
 	e1000_clean_rx_ring(adapter);
 

Re: [PATCH 3/3] e1000e: fix EEH recovery during reset on PPC

[Jeff Garzik]

Jeff Kirsher wrote:
> EEH is not recovering in a reasonable amount of time on PPC during
> e1000e_down().
> 
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> ---
> 
>  drivers/net/e1000e/netdev.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
> index ccb8ca2..0320925 100644
> --- a/drivers/net/e1000e/netdev.c
> +++ b/drivers/net/e1000e/netdev.c
> @@ -2535,7 +2535,8 @@ void e1000e_down(struct e1000_adapter *adapter)
>  	adapter->link_speed = 0;
>  	adapter->link_duplex = 0;
>  
> -	e1000e_reset(adapter);
> +	if (!pci_channel_offline(adapter->pdev))
> +		e1000e_reset(adapter);
>  	e1000_clean_tx_ring(adapter);
>  	e1000_clean_rx_ring(adapter);

IMO for this type of change, you should consider putting all these 
changes into a single patch.

It's exactly the same logical change, so no need to split it up into 
three patches.

Re: [PATCH 1/3] ixgbe: fix EEH recovery during reset on PPC

[Jeff Garzik]

Jeff Kirsher wrote:
> From: Paul Larson <pl@us.ibm.com>
> 
> EEh is not recovering in a resonable amount of time on PPC during
> ixgbe_down().
> 
> Signed-off-by: Paul Larson <pl@us.ibm.com>
> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
> 
>  drivers/net/ixgbe/ixgbe_main.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
> index 7b39394..5774377 100644
> --- a/drivers/net/ixgbe/ixgbe_main.c
> +++ b/drivers/net/ixgbe/ixgbe_main.c
> @@ -1969,7 +1969,8 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
>  	netif_carrier_off(netdev);
>  	netif_stop_queue(netdev);
>  
> -	ixgbe_reset(adapter);
> +	if (!pci_channel_offline(adapter->pdev))
> +		ixgbe_reset(adapter);
>  	ixgbe_clean_all_tx_rings(adapter);

applied 1-3

Re: [PATCH 3/3] e1000e: fix EEH recovery during reset on PPC

[Jeff Kirsher]

On Thu, Jun 26, 2008 at 9:56 PM, Jeff Garzik <jeff@garzik.org> wrote:
> Jeff Kirsher wrote:
>>
>> EEH is not recovering in a reasonable amount of time on PPC during
>> e1000e_down().
>>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
>> ---
>>
>>  drivers/net/e1000e/netdev.c |    3 ++-
>>  1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
>> index ccb8ca2..0320925 100644
>> --- a/drivers/net/e1000e/netdev.c
>> +++ b/drivers/net/e1000e/netdev.c
>> @@ -2535,7 +2535,8 @@ void e1000e_down(struct e1000_adapter *adapter)
>>        adapter->link_speed = 0;
>>        adapter->link_duplex = 0;
>>  -       e1000e_reset(adapter);
>> +       if (!pci_channel_offline(adapter->pdev))
>> +               e1000e_reset(adapter);
>>        e1000_clean_tx_ring(adapter);
>>        e1000_clean_rx_ring(adapter);
>
> IMO for this type of change, you should consider putting all these changes
> into a single patch.
>
> It's exactly the same logical change, so no need to split it up into three
> patches.
>

Ok, thank.  I will keep that in mind for future patches.

-- 
Cheers,
Jeff