From patchwork Fri Dec 23 22:01:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 708531 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 3tlj845X5nz9t0G for ; Sat, 24 Dec 2016 09:03:32 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pcgOe8NR"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S942071AbcLWWDH (ORCPT ); Fri, 23 Dec 2016 17:03:07 -0500 Received: from mail-yw0-f195.google.com ([209.85.161.195]:36599 "EHLO mail-yw0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757291AbcLWWDF (ORCPT ); Fri, 23 Dec 2016 17:03:05 -0500 Received: by mail-yw0-f195.google.com with SMTP id r204so17536841ywb.3; Fri, 23 Dec 2016 14:03:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=OslYzRDCYDu8Ip0E4189D6Wy/okeGLnGvluZ8cfJSR4=; b=pcgOe8NRvC71FYqZ95pyUhXIg/wwS/zHEAHCLvu2wWFqylvfdqtjftkOfFKzWjtp+9 qa1u7gHmkSo6doAnsMvllI9QzM+Ri/4dSYh3u5uFZjPJbIpM+f69mnb3ge/e2wt7srB8 W5qZuhiKdN/558JiWuWBpJuMf045SRYkqGqX/b0C9SDFTTCTTO+YM6u0iYpN/GIXIptB CcrPnMKAcDAuCnOBG7l4zsZ1rf/rzgD/iH1/W4Sxe8rCsRj8CvOPBW6HQCm6emQqUbKC IS5eOT1i/quPi4oxGQKiz43AuyljMCm8z/wtiIyiyEk57okazXmCPvtf/J33CZJ3n0/I j4pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=OslYzRDCYDu8Ip0E4189D6Wy/okeGLnGvluZ8cfJSR4=; b=i1igx9wuAA+E9rvGJtaqCdspbIptc7b1zcOQofUsjyl0s8SyoXPmKnMgpIyMGQxeJm E2pJOQZmcP6fyiLAaNKXmsx7zOqifeZdN6aHfZwpVeaIi831Nb0fcVqCs148zncruiDo 0fmRbMKkMERY4gOASTSjVSHbzhjYJJ1/ECNq0HD6LQxqgyzHcDOFe0Rle/MqS4VFEyy/ YTnnLvX71tyXb68Qc8BY3jqUnMlPeBwS5xwIxedlpL4LLjRiJ/FxzLx+v+nHn/TiSwAC ohaZ74npEcX7LKYLn/znInIr7TL7ImEy3mhwmdajQ784hDdA3bnLcA1+4l/VbM5dTxhB 4kGw== X-Gm-Message-State: AIkVDXI6LdItvLuPD1YU+hdB1WbdnUgq2jluX488NgVKShc2wnxLv2EQWcWrSxkfMBplOw== X-Received: by 10.13.225.132 with SMTP id k126mr13360267ywe.40.1482530584481; Fri, 23 Dec 2016 14:03:04 -0800 (PST) Received: from f1.synalogic.ca ([173.46.78.145]) by smtp.gmail.com with ESMTPSA id a80sm3797357ywh.31.2016.12.23.14.03.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Dec 2016 14:03:03 -0800 (PST) From: Benjamin Poirier To: "Martin K. Petersen" Cc: Tim Ehlers , Rasesh Mody , Anil Gurumurthy , Sudarsana Kalluru , "James E.J. Bottomley" , linux-scsi@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] scsi: bfa: Increase requested firmware version to 3.2.5.1 Date: Fri, 23 Dec 2016 14:01:28 -0800 Message-Id: <20161223220128.1226-1-bpoirier@suse.com> X-Mailer: git-send-email 2.10.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org bna & bfa firmware version 3.2.5.1 was submitted to linux-firmware on Tue Feb 17 19:10:20 2015 -0500 in 0ab54ff1dc ("linux-firmware: Add QLogic BR Series Adapter Firmware"). bna was updated to use the newer firmware on Thu, 19 Feb 2015 16:02:32 -0500 in 3f307c3d70 ("bna: Update the Driver and Firmware Version") bfa was not updated. I presume this was an oversight but it broke support for bfa+bna cards such as the following 04:00.0 Fibre Channel [0c04]: Brocade Communications Systems, Inc. 1010/1020/1007/1741 10Gbps CNA [1657:0014] (rev 01) 04:00.1 Fibre Channel [0c04]: Brocade Communications Systems, Inc. 1010/1020/1007/1741 10Gbps CNA [1657:0014] (rev 01) 04:00.2 Ethernet controller [0200]: Brocade Communications Systems, Inc. 1010/1020/1007/1741 10Gbps CNA [1657:0014] (rev 01) 04:00.3 Ethernet controller [0200]: Brocade Communications Systems, Inc. 1010/1020/1007/1741 10Gbps CNA [1657:0014] (rev 01) Currently, if the bfa module is loaded first, bna fails to probe the respective devices with [ 215.026787] bna: QLogic BR-series 10G Ethernet driver - version: 3.2.25.1 [ 215.043707] bna 0000:04:00.2: bar0 mapped to ffffc90001fc0000, len 262144 [ 215.060656] bna 0000:04:00.2: initialization failed err=1 [ 215.073893] bna 0000:04:00.3: bar0 mapped to ffffc90002040000, len 262144 [ 215.090644] bna 0000:04:00.3: initialization failed err=1 Whereas if bna is loaded first, bfa fails with [ 249.592109] QLogic BR-series BFA FC/FCOE SCSI driver - version: 3.2.25.0 [ 249.610738] bfa 0000:04:00.0: Running firmware version is incompatible with the driver version [ 249.833513] bfa 0000:04:00.0: bfa init failed [ 249.833919] scsi host6: QLogic BR-series FC/FCOE Adapter, hwpath: 0000:04:00.0 driver: 3.2.25.0 [ 249.841446] bfa 0000:04:00.1: Running firmware version is incompatible with the driver version [ 250.045449] bfa 0000:04:00.1: bfa init failed [ 250.045962] scsi host7: QLogic BR-series FC/FCOE Adapter, hwpath: 0000:04:00.1 driver: 3.2.25.0 Increase bfa's requested firmware version. I only tested that all of the devices probe without error. Cc: Rasesh Mody Reported-by: Tim Ehlers Signed-off-by: Benjamin Poirier Acked-by: Rasesh Mody --- drivers/scsi/bfa/bfad.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c index 9d253cb..e70410b 100644 --- a/drivers/scsi/bfa/bfad.c +++ b/drivers/scsi/bfa/bfad.c @@ -64,9 +64,9 @@ int max_rport_logins = BFA_FCS_MAX_RPORT_LOGINS; u32 bfi_image_cb_size, bfi_image_ct_size, bfi_image_ct2_size; u32 *bfi_image_cb, *bfi_image_ct, *bfi_image_ct2; -#define BFAD_FW_FILE_CB "cbfw-3.2.3.0.bin" -#define BFAD_FW_FILE_CT "ctfw-3.2.3.0.bin" -#define BFAD_FW_FILE_CT2 "ct2fw-3.2.3.0.bin" +#define BFAD_FW_FILE_CB "cbfw-3.2.5.1.bin" +#define BFAD_FW_FILE_CT "ctfw-3.2.5.1.bin" +#define BFAD_FW_FILE_CT2 "ct2fw-3.2.5.1.bin" static u32 *bfad_load_fwimg(struct pci_dev *pdev); static void bfad_free_fwimg(void);