IB mlx4: extend the number of device flags
PATCH 1/3 IB mlx4: extend the number of device flags
As there are more device flags in mlx4 that now occupy two dwords, extend cap->flags to 64 bits to contain them all.
Signed-off-by Eli Cohen <eli-VPRAkNaXOzVS1MOuV/[email protected]>
--- drivers/net/mlx4/fw.c | 10 +++++++--- drivers/net/mlx4/fw.h | 4 +++- include/linux/mlx4/device.h | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-)
drivers/net/mlx4/fw.c +7 -3
@@ -75,7 +75,7 @@ MODULE_PARM_DESC(enable_qos, "Enable Quality of Service support in the HCA (defa } \ }while (0 ) -static void dump_dev_cap_flags(struct mlx4_dev *dev, u32 flags) +static void dump_dev_cap_flags(struct mlx4_dev *dev, u64 flags) {static const char *fname[] = { [0 ] ="RC transport" ,
@@ -105,7 +105,7 @@ static void dump_dev_cap_flags(struct mlx4_dev *dev, u32 flags)mlx4_dbg (dev,"DEV_CAP flags:\n" );for (i =0 ; i <ARRAY_SIZE (fname); ++i) -if (fname[i] && (flags & (1 << i))) +if (fname[i] && (flags & (1LL << i)))mlx4_dbg (dev," %s\n" , fname[i]); }
@@ -147,6 +147,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)u16 stat_rate;int err;int i; +u32 tmp1, tmp2;#define QUERY_DEV_CAP_OUT_SIZE 0x100#define QUERY_DEV_CAP_MAX_SRQ_SZ_OFFSET 0x10
@@ -180,6 +181,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)#define QUERY_DEV_CAP_MAX_GID_OFFSET 0x3b#define QUERY_DEV_CAP_RATE_SUPPORT_OFFSET 0x3c#define QUERY_DEV_CAP_MAX_PKEY_OFFSET 0x3f +#define QUERY_DEV_CAP_EXT_FLAGS_OFFSET 0x40#define QUERY_DEV_CAP_UDP_RSS_OFFSET 0x42#define QUERY_DEV_CAP_ETH_UC_LOOPBACK_OFFSET 0x43#define QUERY_DEV_CAP_FLAGS_OFFSET 0x44
@@ -276,7 +278,9 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) dev_cap->udp_rss = field &0x1 ;MLX4_GET (field, outbox,QUERY_DEV_CAP_ETH_UC_LOOPBACK_OFFSET ); dev_cap->loopback_support = field &0x1 ; -MLX4_GET (dev_cap->flags, outbox,QUERY_DEV_CAP_FLAGS_OFFSET ); +MLX4_GET (tmp1, outbox,QUERY_DEV_CAP_EXT_FLAGS_OFFSET ); +MLX4_GET (tmp2, outbox,QUERY_DEV_CAP_FLAGS_OFFSET ); + dev_cap->flags = tmp2 | (u64 )tmp1 <<32 ;MLX4_GET (field, outbox,QUERY_DEV_CAP_RSVD_UAR_OFFSET ); dev_cap->reserved_uars = field >>4 ;MLX4_GET (field, outbox,QUERY_DEV_CAP_UAR_SZ_OFFSET );
drivers/net/mlx4/fw.h +3 -1
@@ -80,7 +80,7 @@ struct mlx4_dev_cap {u16 stat_rate_support;int udp_rss;int loopback_support; -u32 flags; +u64 flags;int reserved_uars;int uar_size;int min_page_sz;
@@ -113,6 +113,8 @@ struct mlx4_dev_cap {u8 supported_port_types[MLX4_MAX_PORTS +1 ];u8 log_max_macs[MLX4_MAX_PORTS +1 ];u8 log_max_vlans[MLX4_MAX_PORTS +1 ]; +u32 max_basic_counters; +u32 max_ext_counters; };struct mlx4_adapter {
include/linux/mlx4/device.h +1 -1
@@ -234,7 +234,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;
Signature · 6 lines
1.6.0.2 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html