From patchwork Sat Dec 24 04:40:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 708602 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 3tlsz55qlWz9syB for ; Sat, 24 Dec 2016 15:41:19 +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="OhhcW6oY"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758771AbcLXEk7 (ORCPT ); Fri, 23 Dec 2016 23:40:59 -0500 Received: from mail-yb0-f195.google.com ([209.85.213.195]:36288 "EHLO mail-yb0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752448AbcLXEk5 (ORCPT ); Fri, 23 Dec 2016 23:40:57 -0500 Received: by mail-yb0-f195.google.com with SMTP id l23so72037ybj.3; Fri, 23 Dec 2016 20:40:57 -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:in-reply-to:references; bh=FvUBqv2wQwYJJKT/RWNxn4kOs882sGREqfpcnTdYbxk=; b=OhhcW6oYuwsecvo6Y0+b7qXqTV6wI1629jiP6eB7PZljQpa+fBJLrIwocctr9NLH+C PBotstx3MMxxwN5sGe3pUU/XFVJGqwEy+uMgrYuyyUQCKdB3/WCx9WFhNRpv5MXfy53P kMklOFH94BejpB8Ih5Vy+7kFh5Qx+Bu3BSjHwIKMY55awYkUJgnhydr5SCFN+y8wWmS9 aO5KWrRp4FBYyVoESt+JKbQYm+NQbxssJAxfCloo31eRYBk7WDq/7a0mf8Vsebir6gL7 1ov2KexXuZPwnaicYIdhsTidlIrX0JD5o+uRJzF7UbJmKzBXlhszubnZavSF2GBkzqCK MthQ== 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 :in-reply-to:references; bh=FvUBqv2wQwYJJKT/RWNxn4kOs882sGREqfpcnTdYbxk=; b=I5ll4wr8NcmGelTfLb0/QKkDd66Et0hY9cHGKiCEKLnLQzhNcrzlgX6PbOM+c8qwcj +n9RPQT4jG7X9F0ziGtLurA+G5/FdQ77iJP5fzZUAdUuSW3+ZndsHmzZMg9Dn2lOjb4v OAuyENd7UeDtcHzYps7zlLDeV9dDnWN9ow1WGW1BKfy1T5EDofHJrGZqHS0/MyvqXF+4 VfznlSfOK4ZTXKIwRe9KmftGhwSCL80Pjo5Y/YSrwaR8TW9qS0DGD47aDeABj+l7xkSV 4bMFhAKphr+8Pdyf2jY5AnmYlvfc8RPV+pqH945s5XtPtmHQMkTOp0R5mYhaegiiJLXF O/GQ== X-Gm-Message-State: AIkVDXKdvW73jELCdgq5iEaMHDfwb4LbQb6UsCROnCBGl+3mlKp3pfA37VumBrOBkQPiJQ== X-Received: by 10.37.53.198 with SMTP id c189mr12114792yba.113.1482554456775; Fri, 23 Dec 2016 20:40:56 -0800 (PST) Received: from f1.synalogic.ca ([205.197.242.171]) by smtp.gmail.com with ESMTPSA id m66sm14372505ywc.41.2016.12.23.20.40.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Dec 2016 20:40:56 -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 v2] scsi: bfa: Increase requested firmware version to 3.2.5.1 Date: Fri, 23 Dec 2016 20:40:19 -0800 Message-Id: <20161224044019.13797-1-bpoirier@suse.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: References: 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 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 Feb 19 16:02:32 2015 -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. Also increase the driver version. I only tested that all of the devices probe without error. Reported-by: Tim Ehlers Signed-off-by: Benjamin Poirier Acked-by: Rasesh Mody --- drivers/scsi/bfa/bfad.c | 6 +++--- drivers/scsi/bfa/bfad_drv.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) Changes v1-v2: Also increase the driver version 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); diff --git a/drivers/scsi/bfa/bfad_drv.h b/drivers/scsi/bfa/bfad_drv.h index f9e8620..cfcfff4 100644 --- a/drivers/scsi/bfa/bfad_drv.h +++ b/drivers/scsi/bfa/bfad_drv.h @@ -58,7 +58,7 @@ #ifdef BFA_DRIVER_VERSION #define BFAD_DRIVER_VERSION BFA_DRIVER_VERSION #else -#define BFAD_DRIVER_VERSION "3.2.25.0" +#define BFAD_DRIVER_VERSION "3.2.25.1" #endif #define BFAD_PROTO_NAME FCPI_NAME