bnxt: Change fw_cap to u64 to accommodate more capability bits
authorPavan Chebbi <pavan.chebbi@broadcom.com>
Tue, 21 Mar 2023 14:44:47 +0000 (07:44 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 23 Mar 2023 03:43:05 +0000 (20:43 -0700)
The current fw_cap field (u32) has run out of bits to save any
new capability.

Change the field to u64.

Signed-off-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
Reviewed-by: Edwin Peer <edwin.peer@broadcom.com>
Reviewed-by: Michael Chan <michael.chan@broadcom.com>
Acked-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/broadcom/bnxt/bnxt.h

index c0628ac1b798afb7bd4bc5c32983887a1df05a81..d7eb0d244f42f884d78921ec34a825abf3daa3cc 100644 (file)
@@ -1968,34 +1968,34 @@ struct bnxt {
 
        u32                     msg_enable;
 
-       u32                     fw_cap;
-       #define BNXT_FW_CAP_SHORT_CMD                   0x00000001
-       #define BNXT_FW_CAP_LLDP_AGENT                  0x00000002
-       #define BNXT_FW_CAP_DCBX_AGENT                  0x00000004
-       #define BNXT_FW_CAP_NEW_RM                      0x00000008
-       #define BNXT_FW_CAP_IF_CHANGE                   0x00000010
-       #define BNXT_FW_CAP_KONG_MB_CHNL                0x00000080
-       #define BNXT_FW_CAP_OVS_64BIT_HANDLE            0x00000400
-       #define BNXT_FW_CAP_TRUSTED_VF                  0x00000800
-       #define BNXT_FW_CAP_ERROR_RECOVERY              0x00002000
-       #define BNXT_FW_CAP_PKG_VER                     0x00004000
-       #define BNXT_FW_CAP_CFA_ADV_FLOW                0x00008000
-       #define BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX_V2     0x00010000
-       #define BNXT_FW_CAP_PCIE_STATS_SUPPORTED        0x00020000
-       #define BNXT_FW_CAP_EXT_STATS_SUPPORTED         0x00040000
-       #define BNXT_FW_CAP_RSS_HASH_TYPE_DELTA         0x00080000
-       #define BNXT_FW_CAP_ERR_RECOVER_RELOAD          0x00100000
-       #define BNXT_FW_CAP_HOT_RESET                   0x00200000
-       #define BNXT_FW_CAP_PTP_RTC                     0x00400000
-       #define BNXT_FW_CAP_RX_ALL_PKT_TS               0x00800000
-       #define BNXT_FW_CAP_VLAN_RX_STRIP               0x01000000
-       #define BNXT_FW_CAP_VLAN_TX_INSERT              0x02000000
-       #define BNXT_FW_CAP_EXT_HW_STATS_SUPPORTED      0x04000000
-       #define BNXT_FW_CAP_LIVEPATCH                   0x08000000
-       #define BNXT_FW_CAP_PTP_PPS                     0x10000000
-       #define BNXT_FW_CAP_HOT_RESET_IF                0x20000000
-       #define BNXT_FW_CAP_RING_MONITOR                0x40000000
-       #define BNXT_FW_CAP_DBG_QCAPS                   0x80000000
+       u64                     fw_cap;
+       #define BNXT_FW_CAP_SHORT_CMD                   BIT_ULL(0)
+       #define BNXT_FW_CAP_LLDP_AGENT                  BIT_ULL(1)
+       #define BNXT_FW_CAP_DCBX_AGENT                  BIT_ULL(2)
+       #define BNXT_FW_CAP_NEW_RM                      BIT_ULL(3)
+       #define BNXT_FW_CAP_IF_CHANGE                   BIT_ULL(4)
+       #define BNXT_FW_CAP_KONG_MB_CHNL                BIT_ULL(7)
+       #define BNXT_FW_CAP_OVS_64BIT_HANDLE            BIT_ULL(10)
+       #define BNXT_FW_CAP_TRUSTED_VF                  BIT_ULL(11)
+       #define BNXT_FW_CAP_ERROR_RECOVERY              BIT_ULL(13)
+       #define BNXT_FW_CAP_PKG_VER                     BIT_ULL(14)
+       #define BNXT_FW_CAP_CFA_ADV_FLOW                BIT_ULL(15)
+       #define BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX_V2     BIT_ULL(16)
+       #define BNXT_FW_CAP_PCIE_STATS_SUPPORTED        BIT_ULL(17)
+       #define BNXT_FW_CAP_EXT_STATS_SUPPORTED         BIT_ULL(18)
+       #define BNXT_FW_CAP_RSS_HASH_TYPE_DELTA         BIT_ULL(19)
+       #define BNXT_FW_CAP_ERR_RECOVER_RELOAD          BIT_ULL(20)
+       #define BNXT_FW_CAP_HOT_RESET                   BIT_ULL(21)
+       #define BNXT_FW_CAP_PTP_RTC                     BIT_ULL(22)
+       #define BNXT_FW_CAP_RX_ALL_PKT_TS               BIT_ULL(23)
+       #define BNXT_FW_CAP_VLAN_RX_STRIP               BIT_ULL(24)
+       #define BNXT_FW_CAP_VLAN_TX_INSERT              BIT_ULL(25)
+       #define BNXT_FW_CAP_EXT_HW_STATS_SUPPORTED      BIT_ULL(26)
+       #define BNXT_FW_CAP_LIVEPATCH                   BIT_ULL(27)
+       #define BNXT_FW_CAP_PTP_PPS                     BIT_ULL(28)
+       #define BNXT_FW_CAP_HOT_RESET_IF                BIT_ULL(29)
+       #define BNXT_FW_CAP_RING_MONITOR                BIT_ULL(30)
+       #define BNXT_FW_CAP_DBG_QCAPS                   BIT_ULL(31)
 
        u32                     fw_dbg_cap;