From patchwork Tue Aug 6 22:50:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 265259 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.180.67]) by ozlabs.org (Postfix) with ESMTP id F07DD2C00AA for ; Wed, 7 Aug 2013 08:28:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756757Ab3HFW2M (ORCPT ); Tue, 6 Aug 2013 18:28:12 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:4005 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756625Ab3HFW2J (ORCPT ); Tue, 6 Aug 2013 18:28:09 -0400 Received: from [10.9.208.53] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Tue, 06 Aug 2013 15:24:11 -0700 X-Server-Uuid: 06151B78-6688-425E-9DE2-57CB27892261 Received: from IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) by IRVEXCHCAS06.corp.ad.broadcom.com (10.9.208.53) with Microsoft SMTP Server (TLS) id 14.1.438.0; Tue, 6 Aug 2013 15:28:01 -0700 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) with Microsoft SMTP Server id 14.1.438.0; Tue, 6 Aug 2013 15:28:01 -0700 Received: from dell (dhcp-10-12-136-105.irv.broadcom.com [10.12.136.105]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 2561AF2D75; Tue, 6 Aug 2013 15:28:01 -0700 (PDT) From: "Michael Chan" To: davem@davemloft.net cc: netdev@vger.kernel.org Subject: [PATCH 1/6 net-next] bnx2: Handle error condition in ->slot_reset() Date: Tue, 6 Aug 2013 15:50:07 -0700 Message-ID: <1375829412-26425-2-git-send-email-mchan@broadcom.com> X-Mailer: git-send-email 1.5.5.GIT In-Reply-To: <1375829412-26425-1-git-send-email-mchan@broadcom.com> References: <1375829412-26425-1-git-send-email-mchan@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 7E1FA80131W81482239-01-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org by closing the device if necessary. Otherwise, since NAPI state is already disabled, a subsequent close will hang the system. Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnx2.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index 6a2de1d..3baf8b5 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -8694,14 +8694,13 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev); struct bnx2 *bp = netdev_priv(dev); - pci_ers_result_t result; - int err; + pci_ers_result_t result = PCI_ERS_RESULT_DISCONNECT; + int err = 0; rtnl_lock(); if (pci_enable_device(pdev)) { dev_err(&pdev->dev, "Cannot re-enable PCI device after reset\n"); - result = PCI_ERS_RESULT_DISCONNECT; } else { pci_set_master(pdev); pci_restore_state(pdev); @@ -8709,9 +8708,15 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev) if (netif_running(dev)) { bnx2_set_power_state(bp, PCI_D0); - bnx2_init_nic(bp, 1); + err = bnx2_init_nic(bp, 1); } - result = PCI_ERS_RESULT_RECOVERED; + if (!err) + result = PCI_ERS_RESULT_RECOVERED; + } + + if (result != PCI_ERS_RESULT_RECOVERED && netif_running(dev)) { + bnx2_napi_enable(bp); + dev_close(dev); } rtnl_unlock();