From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F158F4AA03F for ; Fri, 11 Sep 2026 17:52:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789149146; cv=none; b=pZEYmiKhV77qHVCh3RcFILKVFmHxPec5kcTRCFYfcagpN9VHl2yTyHs0Um4U6EaEKlz/QyvXS0c1A8qwnaSt379/qvcwXPvy4/P05GDImUA2ElFZKibJ+ieS4NX2ZopXtFTJZxmDP43D79MSKQAZrJ0wje7xZ8s/wYhVaQPm96U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789149146; c=relaxed/simple; bh=/eBQuNxGAG3OOBF+Rb/dOI+UPlNlMhsONafcwZQy4QI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fhZrehSphe9U+kn9BRIDMKpCHq72JHv57LdK3OejmfNo8rO69hv/iOZHUlsEvAcnYS0iZXekgHbpWAkEA1PaAd+2w5jfhu+ojkzUFL+qU0f9PMO6yPaSN83XTfuSCwyt1BbvtSZk3XCQcnlA0KSlGXG5J1SQg9VAhknagbw+uSU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ldg5mzPN; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ldg5mzPN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 081F11F00893; Fri, 11 Sep 2026 17:52:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789149144; bh=yOYUr73WS4bBSH+A8jh002+o54j7ImD8zU0mmQbPdEA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Ldg5mzPNsZlsOqJNDA4RpBTk+NOogMRr5cPEdCBFouJBsRgGeITvzU1BiIE/VXwaJ j4HBjEOoRzD56Li7Cm0Jl3sySZywYZSBlI+oHHtpchayTYobLtY+SqgUiFEdjZv3gO QvAPP6dvQ8HTQz8epwHX3msX5C7YypE1SYV5cUIVL8vurOQorDAdq+jyEtk257MCOx hLqQTYFBF8iRdegs/c+QZoZMq7XluTtF8a9HgKA3CgvQ4FslFNYesfU+uVhINrV3q+ eXlGBrz1m91QWeuNQT6p79bc4gcVmgaTpapbqUv0kAa5leVlNj5tlQmlgFLRXOLCZK nBd1oaDfe3m3w== From: Sasha Levin To: stable@vger.kernel.org Cc: Nilesh Javali , Hannes Reinecke , "Martin K. Petersen (Oracle)" , Sasha Levin Subject: [PATCH 6.1.y] scsi: qla2xxx: Fix 64G link speed reporting in get_data_rate Date: Fri, 11 Sep 2026 13:52:22 -0400 Message-ID: <20260911175222.1277094-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026090959-mutate-gully-6c1e@gregkh> References: <2026090959-mutate-gully-6c1e@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Nilesh Javali [ Upstream commit 52fba32317ee631faa878725b2f7cd5c08acacd3 ] qla2x00_get_data_rate() skips updating ha->link_data_rate when the firmware returns mcp->mb[1] == 0x7. That value was a legacy sentinel from before 64G hardware existed, but PORT_SPEED_64GB is now defined as 0x07 and ha->link_data_rate is decoded with the PORT_SPEED_* encoding. On a 64G-capable adapter a genuine 64G link is therefore dropped, and the port speed is misreported (port_speed sysfs, fc_host speed, FDMI). Only 28xx and 29xx support 64G, so accept 0x07 on those adapters while keeping the legacy filter for older ones. Also drop the duplicate copy of the check at the end of the success branch; it repeated the first assignment with no intervening change. Fixes: ecc89f25e225 ("scsi: qla2xxx: Add Device ID for ISP28XX") Cc: stable@vger.kernel.org Signed-off-by: Nilesh Javali Reviewed-by: Hannes Reinecke Link: https://patch.msgid.link/20260723050413.3897522-46-njavali@marvell.com Signed-off-by: Martin K. Petersen (Oracle) [ Omitted IS_QLA29XX() checks because this branch lacks 29xx adapter support. ] Signed-off-by: Sasha Levin --- drivers/scsi/qla2xxx/qla_mbx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 33a499dea7adf..cb550ac85eea1 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -5649,7 +5649,7 @@ qla2x00_get_data_rate(scsi_qla_host_t *vha) ql_dbg(ql_dbg_mbx, vha, 0x1107, "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]); } else { - if (mcp->mb[1] != 0x7) + if (mcp->mb[1] != 0x7 || IS_QLA28XX(ha)) ha->link_data_rate = mcp->mb[1]; if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)) { @@ -5660,8 +5660,6 @@ qla2x00_get_data_rate(scsi_qla_host_t *vha) ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1108, "Done %s.\n", __func__); - if (mcp->mb[1] != 0x7) - ha->link_data_rate = mcp->mb[1]; } return rval; -- 2.53.0