From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0BA3515E8B; Mon, 30 Dec 2024 15:58:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735574280; cv=none; b=STAThTpTX5fNc/W4Heg6/fZ/3o1aCrhFOoygM6gI3SQHvPfZcdQ9J/Pa20fhxPPEeaQFej+g5fcA3nuOLXjj2N3Si74tpeVq4Em0eh+g1ka1bd2bWF7rTA2B15pM2yFMPs/Kf6PplbNbVdMAcHMXHHX3VSXydn8GGUtR37EmvOU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735574280; c=relaxed/simple; bh=rdcBR4818dthyo0KhnDi6ZZRhSaFhHahUz6+7ZW5TOc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RaxL9bn/3vkFQvWiRp4jUgn46dsREYHnbb3KAyUu883Dd8bZPzEky274smlo+l9oMsSTJi3PnQOY2zdbvoI+hg4NkZ1pM0wv93yLO/+g7IAH1rNKhjL2MC0URe0t00ljuoLtRoY2ikOaMq7tomRFcsYUD6s7rYhK3ymDxstmOww= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AwLnoRx0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="AwLnoRx0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7ECD1C4CED0; Mon, 30 Dec 2024 15:57:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1735574279; bh=rdcBR4818dthyo0KhnDi6ZZRhSaFhHahUz6+7ZW5TOc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AwLnoRx0dO2PPQGrp4og//2MVrhFX58ceypw7pDhfxJ0TYJQrEw22q5DY6iYgdvJk tueqjUfp8UxdXO8c86yIYr81Aw6563gEBJMPZ3dYMlQBm4Ek8+DBgqjVWZcywjNj6P jahrPu/otzgaIvlEbRPHTUB8iPyKdYm0TBjkfBtk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Magnus Lindholm , Christoph Hellwig , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 6.12 050/114] scsi: qla1280: Fix hw revision numbering for ISP1020/1040 Date: Mon, 30 Dec 2024 16:42:47 +0100 Message-ID: <20241230154219.984029435@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241230154218.044787220@linuxfoundation.org> References: <20241230154218.044787220@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Magnus Lindholm [ Upstream commit c064de86d2a3909222d5996c5047f64c7a8f791b ] Fix the hardware revision numbering for Qlogic ISP1020/1040 boards. HWMASK suggests that the revision number only needs four bits, this is consistent with how NetBSD does things in their ISP driver. Verified on a IPS1040B which is seen as rev 5 not as BIT_4. Signed-off-by: Magnus Lindholm Link: https://lore.kernel.org/r/20241113225636.2276-1-linmag7@gmail.com Reviewed-by: Christoph Hellwig Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/qla1280.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/qla1280.h b/drivers/scsi/qla1280.h index d309e2ca14de..dea2290b37d4 100644 --- a/drivers/scsi/qla1280.h +++ b/drivers/scsi/qla1280.h @@ -116,12 +116,12 @@ struct device_reg { uint16_t id_h; /* ID high */ uint16_t cfg_0; /* Configuration 0 */ #define ISP_CFG0_HWMSK 0x000f /* Hardware revision mask */ -#define ISP_CFG0_1020 BIT_0 /* ISP1020 */ -#define ISP_CFG0_1020A BIT_1 /* ISP1020A */ -#define ISP_CFG0_1040 BIT_2 /* ISP1040 */ -#define ISP_CFG0_1040A BIT_3 /* ISP1040A */ -#define ISP_CFG0_1040B BIT_4 /* ISP1040B */ -#define ISP_CFG0_1040C BIT_5 /* ISP1040C */ +#define ISP_CFG0_1020 1 /* ISP1020 */ +#define ISP_CFG0_1020A 2 /* ISP1020A */ +#define ISP_CFG0_1040 3 /* ISP1040 */ +#define ISP_CFG0_1040A 4 /* ISP1040A */ +#define ISP_CFG0_1040B 5 /* ISP1040B */ +#define ISP_CFG0_1040C 6 /* ISP1040C */ uint16_t cfg_1; /* Configuration 1 */ #define ISP_CFG1_F128 BIT_6 /* 128-byte FIFO threshold */ #define ISP_CFG1_F64 BIT_4|BIT_5 /* 128-byte FIFO threshold */ -- 2.39.5