From patchwork Thu Aug 21 11:39:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 381927 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id B359A14009C; Thu, 21 Aug 2014 21:44:54 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XKQnR-00069y-6u; Thu, 21 Aug 2014 11:44:49 +0000 Received: from mail-wg0-f43.google.com ([74.125.82.43]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XKQnN-00069r-3C for kernel-team@lists.ubuntu.com; Thu, 21 Aug 2014 11:44:45 +0000 Received: by mail-wg0-f43.google.com with SMTP id l18so8946990wgh.2 for ; Thu, 21 Aug 2014 04:44:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DXe/i9VLmInyvrx0xyrRCVQxjm9N1gRBCSuW7WMIC9M=; b=AHgk2Ai6UM4pDMPhg1AmvU+8GiL6QtFr8xwNTUh0CLQFQRVSqGUWx93Le+VkPLdqqf BaTos4vRwkjsMOygCb93YLYaiIdgjY78OlIKCYu5LmjW9gZFinNYW+g3hXK8AtdTzXr2 M+EngPeHv0v5fMreLSlGjpEmZi8uC5Fwp0EoihMbFoRdkrq9cOAmUD2A2NFmL2I54SRT 0SpbHq2hmcwUCEP3RnKqf0/M135vzOK5xz6iOar70DAwXoE462NNBmAgC0RuLpRLHYXj qMmFfrQ8iUJHI4PnsXMqYIC8/eJvZVVtfBM9fbitbMNP6bmpuLoLeAW8EypJzlD/KnSw vobA== X-Gm-Message-State: ALoCoQnLUFsJ9Pyfsbcq2K92jwSphP781nYXh8SJP4VPBQfFxpcwPnzUNtWzSlbiwOw+i2sQNK/c X-Received: by 10.194.95.234 with SMTP id dn10mr68006683wjb.73.1408621484877; Thu, 21 Aug 2014 04:44:44 -0700 (PDT) Received: from localhost (host109-156-141-79.range109-156.btcentralplus.com. [109.156.141.79]) by mx.google.com with ESMTPSA id w1sm19227497wiz.14.2014.08.21.04.44.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Aug 2014 04:44:44 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [trusty 2/2] bnx2x: Adapter not recovery from EEH error injection Date: Thu, 21 Aug 2014 12:39:31 +0100 Message-Id: <1408621171-20164-3-git-send-email-apw@canonical.com> X-Mailer: git-send-email 2.1.0.rc1 In-Reply-To: <1408621171-20164-1-git-send-email-apw@canonical.com> References: <1408621171-20164-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: "wenxiong@linux.vnet.ibm.com" When injecting EEH error to bnx2x adapter, adapter couldn't be recovery and caused recursive EEH errors. The patch fixes the issue. Signed-off-by: Wen Xiong Signed-off-by: David S. Miller (cherry picked from commit 0c0e63410a393aae4b615849625f539db775d586) BugLink: http://bugs.launchpad.net/bugs/1353105 Signed-off-by: Andy Whitcroft --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 0067b97..71d3f0c 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -12998,8 +12998,8 @@ static int bnx2x_eeh_nic_unload(struct bnx2x *bp) netdev_reset_tc(bp->dev); del_timer_sync(&bp->timer); - cancel_delayed_work(&bp->sp_task); - cancel_delayed_work(&bp->period_task); + cancel_delayed_work_sync(&bp->sp_task); + cancel_delayed_work_sync(&bp->period_task); spin_lock_bh(&bp->stats_lock); bp->stats_state = STATS_STATE_DISABLED;