From patchwork Tue Nov 10 18:37:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 38085 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 136A4B7BC3 for ; Wed, 11 Nov 2009 09:05:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757615AbZKJSkm (ORCPT ); Tue, 10 Nov 2009 13:40:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757608AbZKJSkl (ORCPT ); Tue, 10 Nov 2009 13:40:41 -0500 Received: from e24smtp03.br.ibm.com ([32.104.18.24]:55950 "EHLO e24smtp03.br.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757584AbZKJSkk (ORCPT ); Tue, 10 Nov 2009 13:40:40 -0500 Received: from d24relay01.br.ibm.com (d24relay01.br.ibm.com [9.8.31.16]) by e24smtp03.br.ibm.com (8.14.3/8.13.1) with ESMTP id nAAHYuvA001189 for ; Tue, 10 Nov 2009 15:34:56 -0200 Received: from d24av03.br.ibm.com (d24av03.br.ibm.com [9.8.31.95]) by d24relay01.br.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id nAAIefll3567854 for ; Tue, 10 Nov 2009 15:40:41 -0300 Received: from d24av03.br.ibm.com (d24av03 [127.0.0.1]) by d24av03.br.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id nAAIefIM006553 for ; Tue, 10 Nov 2009 16:40:41 -0200 Received: from localhost.localdomain (devl4e-bull-lp1.austin.ibm.com [9.3.233.100]) by d24av03.br.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id nAAIeaVc006485; Tue, 10 Nov 2009 16:40:38 -0200 From: leitao@linux.vnet.ibm.com To: netdev@vger.kernel.org Cc: peter.p.waskiewicz.jr@intel.com, jeffrey.t.kirsher@intel.com, Breno Leitao Subject: [PATCH] ixgbe: Fixing EEH handler to handle more than one error Date: Tue, 10 Nov 2009 13:37:47 -0500 Message-Id: <1257878267-7489-1-git-send-email-leitao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.6.0.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Peter P Waskiewicz Jr --- drivers/net/ixgbe/ixgbe_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) 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);