mlx4_core: Extend capability flags to 64 bits

The latest firmware adds a second dword containing more device flags,
so extend the device capabilities flags field from 32 to 64 bits.
Derived from patch by Eli Cohen <eli@mellanox.co.il>

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.co.il>
Signed-off-by: Roland Dreier <roland@purestorage.com>

1 files changed, 17 insertions, 17 deletions

diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 8985768e2c0d..f337e989b70f 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -58,22 +58,22 @@ enum {
 };
 
 enum {
-        MLX4_DEV_CAP_FLAG_RC            = 1 <<  0,
-        MLX4_DEV_CAP_FLAG_UC            = 1 <<  1,
-        MLX4_DEV_CAP_FLAG_UD            = 1 <<  2,
-        MLX4_DEV_CAP_FLAG_SRQ           = 1 <<  6,
-        MLX4_DEV_CAP_FLAG_IPOIB_CSUM    = 1 <<  7,
-        MLX4_DEV_CAP_FLAG_BAD_PKEY_CNTR = 1 <<  8,
-        MLX4_DEV_CAP_FLAG_BAD_QKEY_CNTR = 1 <<  9,
-        MLX4_DEV_CAP_FLAG_DPDP          = 1 << 12,
-        MLX4_DEV_CAP_FLAG_BLH           = 1 << 15,
-        MLX4_DEV_CAP_FLAG_MEM_WINDOW    = 1 << 16,
-        MLX4_DEV_CAP_FLAG_APM           = 1 << 17,
-        MLX4_DEV_CAP_FLAG_ATOMIC        = 1 << 18,
-        MLX4_DEV_CAP_FLAG_RAW_MCAST     = 1 << 19,
-        MLX4_DEV_CAP_FLAG_UD_AV_PORT    = 1 << 20,
-        MLX4_DEV_CAP_FLAG_UD_MCAST      = 1 << 21,
-        MLX4_DEV_CAP_FLAG_IBOE          = 1 << 30
+        MLX4_DEV_CAP_FLAG_RC            = 1LL <<  0,
+        MLX4_DEV_CAP_FLAG_UC            = 1LL <<  1,
+        MLX4_DEV_CAP_FLAG_UD            = 1LL <<  2,
+        MLX4_DEV_CAP_FLAG_SRQ           = 1LL <<  6,
+        MLX4_DEV_CAP_FLAG_IPOIB_CSUM    = 1LL <<  7,
+        MLX4_DEV_CAP_FLAG_BAD_PKEY_CNTR = 1LL <<  8,
+        MLX4_DEV_CAP_FLAG_BAD_QKEY_CNTR = 1LL <<  9,
+        MLX4_DEV_CAP_FLAG_DPDP          = 1LL << 12,
+        MLX4_DEV_CAP_FLAG_BLH           = 1LL << 15,
+        MLX4_DEV_CAP_FLAG_MEM_WINDOW    = 1LL << 16,
+        MLX4_DEV_CAP_FLAG_APM           = 1LL << 17,
+        MLX4_DEV_CAP_FLAG_ATOMIC        = 1LL << 18,
+        MLX4_DEV_CAP_FLAG_RAW_MCAST     = 1LL << 19,
+        MLX4_DEV_CAP_FLAG_UD_AV_PORT    = 1LL << 20,
+        MLX4_DEV_CAP_FLAG_UD_MCAST      = 1LL << 21,
+        MLX4_DEV_CAP_FLAG_IBOE          = 1LL << 30
 };
 
 enum {
@@ -253,7 +253,7 @@ struct mlx4_caps {
         int                     mtt_entry_sz;
         u32                     max_msg_sz;
         u32                     page_size_cap;
-        u32                     flags;
+        u64                     flags;
         u32                     bmme_flags;
         u32                     reserved_lkey;
         u16                     stat_rate_support;