From: Lee Trager Date: Wed, 2 Jul 2025 19:12:07 +0000 (-0700) Subject: eth: fbnic: Fix incorrect minimum firmware version X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd62e960a755cc66bd57068a30ca881339a2957a;p=thirdparty%2Flinux.git eth: fbnic: Fix incorrect minimum firmware version The full minimum version is 0.10.6-0. The six is now correctly defined as patch and shifted appropriately. 0.10.6-0 is a preproduction version of firmware which was released over a year and a half ago. All production devices meet this requirement. Signed-off-by: Lee Trager Reviewed-by: Jacob Keller Link: https://patch.msgid.link/20250702192207.697368-2-lee@trager.us Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_csr.h b/drivers/net/ethernet/meta/fbnic/fbnic_csr.h index 9c89d53786680..e2b251eddbb3f 100644 --- a/drivers/net/ethernet/meta/fbnic/fbnic_csr.h +++ b/drivers/net/ethernet/meta/fbnic/fbnic_csr.h @@ -15,10 +15,10 @@ /* Defines the minimum firmware version required by the driver */ #define MIN_FW_MAJOR_VERSION 0 #define MIN_FW_MINOR_VERSION 10 -#define MIN_FW_BUILD_VERSION 6 +#define MIN_FW_PATCH_VERSION 6 #define MIN_FW_VERSION_CODE (MIN_FW_MAJOR_VERSION * (1u << 24) + \ MIN_FW_MINOR_VERSION * (1u << 16) + \ - MIN_FW_BUILD_VERSION) + MIN_FW_PATCH_VERSION * (1u << 8)) #define PCI_DEVICE_ID_META_FBNIC_ASIC 0x0013 diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c b/drivers/net/ethernet/meta/fbnic/fbnic_fw.c index 1d220d8369e73..cdc1e2938a647 100644 --- a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c +++ b/drivers/net/ethernet/meta/fbnic/fbnic_fw.c @@ -582,7 +582,7 @@ static int fbnic_fw_parse_cap_resp(void *opaque, struct fbnic_tlv_msg **results) running_ver, MIN_FW_MAJOR_VERSION, MIN_FW_MINOR_VERSION, - MIN_FW_BUILD_VERSION); + MIN_FW_PATCH_VERSION); /* Disable TX mailbox to prevent card use until firmware is * updated. */