From patchwork Thu Nov 26 17:31:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 39571 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 E32A61007D3 for ; Fri, 27 Nov 2009 04:32:36 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751654AbZKZRcZ (ORCPT ); Thu, 26 Nov 2009 12:32:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751012AbZKZRcY (ORCPT ); Thu, 26 Nov 2009 12:32:24 -0500 Received: from e24smtp02.br.ibm.com ([32.104.18.86]:40218 "EHLO e24smtp02.br.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751277AbZKZRcX (ORCPT ); Thu, 26 Nov 2009 12:32:23 -0500 Received: from mailhub1.br.ibm.com (mailhub1.br.ibm.com [9.18.232.109]) by e24smtp02.br.ibm.com (8.14.3/8.13.1) with ESMTP id nAQHruNQ029102 for ; Thu, 26 Nov 2009 15:53:56 -0200 Received: from d24av05.br.ibm.com (d24av05.br.ibm.com [9.18.232.44]) by mailhub1.br.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id nAQHXo9g1032394 for ; Thu, 26 Nov 2009 15:33:50 -0200 Received: from d24av05.br.ibm.com (loopback [127.0.0.1]) by d24av05.br.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id nAQHWRjF000797 for ; Thu, 26 Nov 2009 15:32:28 -0200 Received: from localhost.localdomain (js22-stormy-13.austin.ibm.com [9.3.232.117]) by d24av05.br.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id nAQHWPfE000734; Thu, 26 Nov 2009 15:32:26 -0200 From: leitao@linux.vnet.ibm.com To: mchan@broadcom.com Cc: netdev@vger.kernel.org, Breno Leitao Subject: [PATCH] bnx2: EEH is failing with timeout Date: Thu, 26 Nov 2009 11:31:49 -0600 Message-Id: <1259256709-6976-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 bnx2 is failing when a PCI error is detected. The error is the following: bnx2: Chip not in correct endian mode bnx2: fw sync timeout, reset code = 404001d This error was caused because the way pci_restore_state() is working after commit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff. Signed-off-by: Breno Leitao --- drivers/net/bnx2.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 08cddb6..7fa4048 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -8264,6 +8264,7 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev) } pci_set_master(pdev); pci_restore_state(pdev); + pci_save_state(pdev); if (netif_running(dev)) { bnx2_set_power_state(bp, PCI_D0);