From patchwork Wed Mar 4 14:09:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian King X-Patchwork-Id: 446254 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 46E801401DE for ; Thu, 5 Mar 2015 01:10:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754279AbbCDOKu (ORCPT ); Wed, 4 Mar 2015 09:10:50 -0500 Received: from e37.co.us.ibm.com ([32.97.110.158]:48403 "EHLO e37.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755706AbbCDOKs (ORCPT ); Wed, 4 Mar 2015 09:10:48 -0500 Received: from /spool/local by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 4 Mar 2015 07:10:48 -0700 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 4 Mar 2015 07:10:45 -0700 Received: from b03cxnp08028.gho.boulder.ibm.com (b03cxnp08028.gho.boulder.ibm.com [9.17.130.20]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 2F5E019D8026; Wed, 4 Mar 2015 07:01:53 -0700 (MST) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t24EAYPB26017826; Wed, 4 Mar 2015 07:10:42 -0700 Received: from d03av03.boulder.ibm.com (localhost [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t24EACIU007588; Wed, 4 Mar 2015 07:10:12 -0700 Received: from localhost.localdomain (sig-9-76-152-55.ibm.com [9.76.152.55]) by d03av03.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t24EAAix006027; Wed, 4 Mar 2015 07:10:11 -0700 Message-Id: <201503041410.t24EAAix006027@d03av03.boulder.ibm.com> Subject: [PATCH 1/1] bnx2x: Force fundamental reset for EEH recovery To: ariel.elior@qlogic.com Cc: netdev@vger.kernel.org, cascardo@linux.vnet.ibm.com, brking@linux.vnet.ibm.com, stable@vger.kernel.org From: Brian King Date: Wed, 04 Mar 2015 08:09:44 -0600 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15030414-0025-0000-0000-000009072704 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org EEH recovery for bnx2x based adapters is not reliable on all Power systems using the default hot reset, which can result in an unrecoverable EEH error. Forcing the use of fundamental reset during EEH recovery fixes this. Cc: stable Signed-off-by: Brian King --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 +++ 1 file changed, 3 insertions(+) diff -puN drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c~bnx2x_needs_freset drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c --- linux/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c~bnx2x_needs_freset 2015-03-03 08:46:09.281961703 -0600 +++ linux-bjking1/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 2015-03-03 08:46:09.287961639 -0600 @@ -12722,6 +12722,9 @@ static int bnx2x_init_dev(struct bnx2x * pci_write_config_dword(bp->pdev, PCICFG_GRC_ADDRESS, PCICFG_VENDOR_ID_OFFSET); + /* Set PCIe reset type to fundamental for EEH recovery */ + pdev->needs_freset = 1; + /* AER (Advanced Error reporting) configuration */ rc = pci_enable_pcie_error_reporting(pdev); if (!rc)