diff mbox series

[rdma-next] RDMA/rxe: Remove useless rxe_init_device_param assignments

Message ID 20191020055724.7410-1-leon@kernel.org (mailing list archive)
State Mainlined
Commit dc2f7edcc01219fbbb517c1245dac46d30edaf93
Delegated to: Jason Gunthorpe
Headers show
Series [rdma-next] RDMA/rxe: Remove useless rxe_init_device_param assignments | expand

Commit Message

Leon Romanovsky Oct. 20, 2019, 5:57 a.m. UTC 
From: Leon Romanovsky <leonro@mellanox.com>

IB devices are allocated with kzalloc and don't need explicit zero
assignments for their parameters. It can be removed safely.

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
 drivers/infiniband/sw/rxe/rxe.c       | 13 -------------
 drivers/infiniband/sw/rxe/rxe_param.h | 13 -------------
 2 files changed, 26 deletions(-)

Comments

Yuval Shaia Oct. 20, 2019, 6:42 a.m. UTC | #1 
On Sun, Oct 20, 2019 at 08:57:24AM +0300, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@mellanox.com>
> 
> IB devices are allocated with kzalloc and don't need explicit zero
> assignments for their parameters. It can be removed safely.
> 
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> ---
>  drivers/infiniband/sw/rxe/rxe.c       | 13 -------------
>  drivers/infiniband/sw/rxe/rxe_param.h | 13 -------------
>  2 files changed, 26 deletions(-)
> 
> diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c
> index a8c11b5e1e94..0946a301a5c5 100644
> --- a/drivers/infiniband/sw/rxe/rxe.c
> +++ b/drivers/infiniband/sw/rxe/rxe.c
> @@ -77,12 +77,8 @@ static void rxe_init_device_param(struct rxe_dev *rxe)
>  {
>  	rxe->max_inline_data			= RXE_MAX_INLINE_DATA;
>  
> -	rxe->attr.fw_ver			= RXE_FW_VER;
>  	rxe->attr.max_mr_size			= RXE_MAX_MR_SIZE;
>  	rxe->attr.page_size_cap			= RXE_PAGE_SIZE_CAP;
> -	rxe->attr.vendor_id			= RXE_VENDOR_ID;

So RXE_VENDOR_ID definition is no longer needed, right? we can remove it
too.

> -	rxe->attr.vendor_part_id		= RXE_VENDOR_PART_ID;
> -	rxe->attr.hw_ver			= RXE_HW_VER;

Ditto.

>  	rxe->attr.max_qp			= RXE_MAX_QP;
>  	rxe->attr.max_qp_wr			= RXE_MAX_QP_WR;
>  	rxe->attr.device_cap_flags		= RXE_DEVICE_CAP_FLAGS;
> @@ -94,22 +90,13 @@ static void rxe_init_device_param(struct rxe_dev *rxe)
>  	rxe->attr.max_mr			= RXE_MAX_MR;
>  	rxe->attr.max_pd			= RXE_MAX_PD;
>  	rxe->attr.max_qp_rd_atom		= RXE_MAX_QP_RD_ATOM;
> -	rxe->attr.max_ee_rd_atom		= RXE_MAX_EE_RD_ATOM;

Also here.
Didn't checked the rest but it might be worth.

>  	rxe->attr.max_res_rd_atom		= RXE_MAX_RES_RD_ATOM;
>  	rxe->attr.max_qp_init_rd_atom		= RXE_MAX_QP_INIT_RD_ATOM;
> -	rxe->attr.max_ee_init_rd_atom		= RXE_MAX_EE_INIT_RD_ATOM;
>  	rxe->attr.atomic_cap			= IB_ATOMIC_HCA;
> -	rxe->attr.max_ee			= RXE_MAX_EE;
> -	rxe->attr.max_rdd			= RXE_MAX_RDD;
> -	rxe->attr.max_mw			= RXE_MAX_MW;
> -	rxe->attr.max_raw_ipv6_qp		= RXE_MAX_RAW_IPV6_QP;
> -	rxe->attr.max_raw_ethy_qp		= RXE_MAX_RAW_ETHY_QP;
>  	rxe->attr.max_mcast_grp			= RXE_MAX_MCAST_GRP;
>  	rxe->attr.max_mcast_qp_attach		= RXE_MAX_MCAST_QP_ATTACH;
>  	rxe->attr.max_total_mcast_qp_attach	= RXE_MAX_TOT_MCAST_QP_ATTACH;
>  	rxe->attr.max_ah			= RXE_MAX_AH;
> -	rxe->attr.max_fmr			= RXE_MAX_FMR;
> -	rxe->attr.max_map_per_fmr		= RXE_MAX_MAP_PER_FMR;
>  	rxe->attr.max_srq			= RXE_MAX_SRQ;
>  	rxe->attr.max_srq_wr			= RXE_MAX_SRQ_WR;
>  	rxe->attr.max_srq_sge			= RXE_MAX_SRQ_SGE;
> diff --git a/drivers/infiniband/sw/rxe/rxe_param.h b/drivers/infiniband/sw/rxe/rxe_param.h
> index fe5207386700..353c6668249e 100644
> --- a/drivers/infiniband/sw/rxe/rxe_param.h
> +++ b/drivers/infiniband/sw/rxe/rxe_param.h
> @@ -60,12 +60,8 @@ static inline enum ib_mtu eth_mtu_int_to_enum(int mtu)
>  
>  /* default/initial rxe device parameter settings */
>  enum rxe_device_param {
> -	RXE_FW_VER			= 0,
>  	RXE_MAX_MR_SIZE			= -1ull,
>  	RXE_PAGE_SIZE_CAP		= 0xfffff000,
> -	RXE_VENDOR_ID			= 0,
> -	RXE_VENDOR_PART_ID		= 0,
> -	RXE_HW_VER			= 0,
>  	RXE_MAX_QP			= 0x10000,
>  	RXE_MAX_QP_WR			= 0x4000,
>  	RXE_MAX_INLINE_DATA		= 400,
> @@ -87,21 +83,12 @@ enum rxe_device_param {
>  	RXE_MAX_MR			= 256 * 1024,
>  	RXE_MAX_PD			= 0x7ffc,
>  	RXE_MAX_QP_RD_ATOM		= 128,
> -	RXE_MAX_EE_RD_ATOM		= 0,
>  	RXE_MAX_RES_RD_ATOM		= 0x3f000,
>  	RXE_MAX_QP_INIT_RD_ATOM		= 128,
> -	RXE_MAX_EE_INIT_RD_ATOM		= 0,
> -	RXE_MAX_EE			= 0,
> -	RXE_MAX_RDD			= 0,
> -	RXE_MAX_MW			= 0,
> -	RXE_MAX_RAW_IPV6_QP		= 0,
> -	RXE_MAX_RAW_ETHY_QP		= 0,
>  	RXE_MAX_MCAST_GRP		= 8192,
>  	RXE_MAX_MCAST_QP_ATTACH		= 56,
>  	RXE_MAX_TOT_MCAST_QP_ATTACH	= 0x70000,
>  	RXE_MAX_AH			= 100,
> -	RXE_MAX_FMR			= 0,
> -	RXE_MAX_MAP_PER_FMR		= 0,
>  	RXE_MAX_SRQ			= 960,
>  	RXE_MAX_SRQ_WR			= 0x4000,
>  	RXE_MIN_SRQ_WR			= 1,
> -- 
> 2.20.1
>
Leon Romanovsky Oct. 20, 2019, 7:44 a.m. UTC | #2 
On Sun, Oct 20, 2019 at 09:42:46AM +0300, Yuval Shaia wrote:
> On Sun, Oct 20, 2019 at 08:57:24AM +0300, Leon Romanovsky wrote:
> > From: Leon Romanovsky <leonro@mellanox.com>
> >
> > IB devices are allocated with kzalloc and don't need explicit zero
> > assignments for their parameters. It can be removed safely.
> >
> > Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> > ---
> >  drivers/infiniband/sw/rxe/rxe.c       | 13 -------------
> >  drivers/infiniband/sw/rxe/rxe_param.h | 13 -------------
> >  2 files changed, 26 deletions(-)
> >
> > diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c
> > index a8c11b5e1e94..0946a301a5c5 100644
> > --- a/drivers/infiniband/sw/rxe/rxe.c
> > +++ b/drivers/infiniband/sw/rxe/rxe.c
> > @@ -77,12 +77,8 @@ static void rxe_init_device_param(struct rxe_dev *rxe)
> >  {
> >  	rxe->max_inline_data			= RXE_MAX_INLINE_DATA;
> >
> > -	rxe->attr.fw_ver			= RXE_FW_VER;
> >  	rxe->attr.max_mr_size			= RXE_MAX_MR_SIZE;
> >  	rxe->attr.page_size_cap			= RXE_PAGE_SIZE_CAP;
> > -	rxe->attr.vendor_id			= RXE_VENDOR_ID;
>
> So RXE_VENDOR_ID definition is no longer needed, right? we can remove it
> too.
>
> > -	rxe->attr.vendor_part_id		= RXE_VENDOR_PART_ID;
> > -	rxe->attr.hw_ver			= RXE_HW_VER;
>
> Ditto.
>
> >  	rxe->attr.max_qp			= RXE_MAX_QP;
> >  	rxe->attr.max_qp_wr			= RXE_MAX_QP_WR;
> >  	rxe->attr.device_cap_flags		= RXE_DEVICE_CAP_FLAGS;
> > @@ -94,22 +90,13 @@ static void rxe_init_device_param(struct rxe_dev *rxe)
> >  	rxe->attr.max_mr			= RXE_MAX_MR;
> >  	rxe->attr.max_pd			= RXE_MAX_PD;
> >  	rxe->attr.max_qp_rd_atom		= RXE_MAX_QP_RD_ATOM;
> > -	rxe->attr.max_ee_rd_atom		= RXE_MAX_EE_RD_ATOM;
>
> Also here.
> Didn't checked the rest but it might be worth.
>
> >  	rxe->attr.max_res_rd_atom		= RXE_MAX_RES_RD_ATOM;
> >  	rxe->attr.max_qp_init_rd_atom		= RXE_MAX_QP_INIT_RD_ATOM;
> > -	rxe->attr.max_ee_init_rd_atom		= RXE_MAX_EE_INIT_RD_ATOM;
> >  	rxe->attr.atomic_cap			= IB_ATOMIC_HCA;
> > -	rxe->attr.max_ee			= RXE_MAX_EE;
> > -	rxe->attr.max_rdd			= RXE_MAX_RDD;
> > -	rxe->attr.max_mw			= RXE_MAX_MW;
> > -	rxe->attr.max_raw_ipv6_qp		= RXE_MAX_RAW_IPV6_QP;
> > -	rxe->attr.max_raw_ethy_qp		= RXE_MAX_RAW_ETHY_QP;
> >  	rxe->attr.max_mcast_grp			= RXE_MAX_MCAST_GRP;
> >  	rxe->attr.max_mcast_qp_attach		= RXE_MAX_MCAST_QP_ATTACH;
> >  	rxe->attr.max_total_mcast_qp_attach	= RXE_MAX_TOT_MCAST_QP_ATTACH;
> >  	rxe->attr.max_ah			= RXE_MAX_AH;
> > -	rxe->attr.max_fmr			= RXE_MAX_FMR;
> > -	rxe->attr.max_map_per_fmr		= RXE_MAX_MAP_PER_FMR;
> >  	rxe->attr.max_srq			= RXE_MAX_SRQ;
> >  	rxe->attr.max_srq_wr			= RXE_MAX_SRQ_WR;
> >  	rxe->attr.max_srq_sge			= RXE_MAX_SRQ_SGE;
> > diff --git a/drivers/infiniband/sw/rxe/rxe_param.h b/drivers/infiniband/sw/rxe/rxe_param.h
> > index fe5207386700..353c6668249e 100644
> > --- a/drivers/infiniband/sw/rxe/rxe_param.h
> > +++ b/drivers/infiniband/sw/rxe/rxe_param.h
> > @@ -60,12 +60,8 @@ static inline enum ib_mtu eth_mtu_int_to_enum(int mtu)
> >
> >  /* default/initial rxe device parameter settings */
> >  enum rxe_device_param {
> > -	RXE_FW_VER			= 0,
> >  	RXE_MAX_MR_SIZE			= -1ull,
> >  	RXE_PAGE_SIZE_CAP		= 0xfffff000,
> > -	RXE_VENDOR_ID			= 0,
> > -	RXE_VENDOR_PART_ID		= 0,
> > -	RXE_HW_VER			= 0,

I removed those defines. Did I miss any?

Thanks

> >  	RXE_MAX_QP			= 0x10000,
> >  	RXE_MAX_QP_WR			= 0x4000,
> >  	RXE_MAX_INLINE_DATA		= 400,
> > @@ -87,21 +83,12 @@ enum rxe_device_param {
> >  	RXE_MAX_MR			= 256 * 1024,
> >  	RXE_MAX_PD			= 0x7ffc,
> >  	RXE_MAX_QP_RD_ATOM		= 128,
> > -	RXE_MAX_EE_RD_ATOM		= 0,
> >  	RXE_MAX_RES_RD_ATOM		= 0x3f000,
> >  	RXE_MAX_QP_INIT_RD_ATOM		= 128,
> > -	RXE_MAX_EE_INIT_RD_ATOM		= 0,
> > -	RXE_MAX_EE			= 0,
> > -	RXE_MAX_RDD			= 0,
> > -	RXE_MAX_MW			= 0,
> > -	RXE_MAX_RAW_IPV6_QP		= 0,
> > -	RXE_MAX_RAW_ETHY_QP		= 0,
> >  	RXE_MAX_MCAST_GRP		= 8192,
> >  	RXE_MAX_MCAST_QP_ATTACH		= 56,
> >  	RXE_MAX_TOT_MCAST_QP_ATTACH	= 0x70000,
> >  	RXE_MAX_AH			= 100,
> > -	RXE_MAX_FMR			= 0,
> > -	RXE_MAX_MAP_PER_FMR		= 0,
> >  	RXE_MAX_SRQ			= 960,
> >  	RXE_MAX_SRQ_WR			= 0x4000,
> >  	RXE_MIN_SRQ_WR			= 1,
> > --
> > 2.20.1
> >
Yuval Shaia Oct. 23, 2019, 2:47 p.m. UTC | #3 
On Sun, Oct 20, 2019 at 10:44:09AM +0300, Leon Romanovsky wrote:
> On Sun, Oct 20, 2019 at 09:42:46AM +0300, Yuval Shaia wrote:
> > On Sun, Oct 20, 2019 at 08:57:24AM +0300, Leon Romanovsky wrote:
> > > From: Leon Romanovsky <leonro@mellanox.com>
> > >
> > > IB devices are allocated with kzalloc and don't need explicit zero
> > > assignments for their parameters. It can be removed safely.
> > >
> > > Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> > > ---
> > >  drivers/infiniband/sw/rxe/rxe.c       | 13 -------------
> > >  drivers/infiniband/sw/rxe/rxe_param.h | 13 -------------
> > >  2 files changed, 26 deletions(-)
> > >
> > > diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c
> > > index a8c11b5e1e94..0946a301a5c5 100644
> > > --- a/drivers/infiniband/sw/rxe/rxe.c
> > > +++ b/drivers/infiniband/sw/rxe/rxe.c
> > > @@ -77,12 +77,8 @@ static void rxe_init_device_param(struct rxe_dev *rxe)
> > >  {
> > >  	rxe->max_inline_data			= RXE_MAX_INLINE_DATA;
> > >
> > > -	rxe->attr.fw_ver			= RXE_FW_VER;
> > >  	rxe->attr.max_mr_size			= RXE_MAX_MR_SIZE;
> > >  	rxe->attr.page_size_cap			= RXE_PAGE_SIZE_CAP;
> > > -	rxe->attr.vendor_id			= RXE_VENDOR_ID;
> >
> > So RXE_VENDOR_ID definition is no longer needed, right? we can remove it
> > too.
> >
> > > -	rxe->attr.vendor_part_id		= RXE_VENDOR_PART_ID;
> > > -	rxe->attr.hw_ver			= RXE_HW_VER;
> >
> > Ditto.
> >
> > >  	rxe->attr.max_qp			= RXE_MAX_QP;
> > >  	rxe->attr.max_qp_wr			= RXE_MAX_QP_WR;
> > >  	rxe->attr.device_cap_flags		= RXE_DEVICE_CAP_FLAGS;
> > > @@ -94,22 +90,13 @@ static void rxe_init_device_param(struct rxe_dev *rxe)
> > >  	rxe->attr.max_mr			= RXE_MAX_MR;
> > >  	rxe->attr.max_pd			= RXE_MAX_PD;
> > >  	rxe->attr.max_qp_rd_atom		= RXE_MAX_QP_RD_ATOM;
> > > -	rxe->attr.max_ee_rd_atom		= RXE_MAX_EE_RD_ATOM;
> >
> > Also here.
> > Didn't checked the rest but it might be worth.
> >
> > >  	rxe->attr.max_res_rd_atom		= RXE_MAX_RES_RD_ATOM;
> > >  	rxe->attr.max_qp_init_rd_atom		= RXE_MAX_QP_INIT_RD_ATOM;
> > > -	rxe->attr.max_ee_init_rd_atom		= RXE_MAX_EE_INIT_RD_ATOM;
> > >  	rxe->attr.atomic_cap			= IB_ATOMIC_HCA;
> > > -	rxe->attr.max_ee			= RXE_MAX_EE;
> > > -	rxe->attr.max_rdd			= RXE_MAX_RDD;
> > > -	rxe->attr.max_mw			= RXE_MAX_MW;
> > > -	rxe->attr.max_raw_ipv6_qp		= RXE_MAX_RAW_IPV6_QP;
> > > -	rxe->attr.max_raw_ethy_qp		= RXE_MAX_RAW_ETHY_QP;
> > >  	rxe->attr.max_mcast_grp			= RXE_MAX_MCAST_GRP;
> > >  	rxe->attr.max_mcast_qp_attach		= RXE_MAX_MCAST_QP_ATTACH;
> > >  	rxe->attr.max_total_mcast_qp_attach	= RXE_MAX_TOT_MCAST_QP_ATTACH;
> > >  	rxe->attr.max_ah			= RXE_MAX_AH;
> > > -	rxe->attr.max_fmr			= RXE_MAX_FMR;
> > > -	rxe->attr.max_map_per_fmr		= RXE_MAX_MAP_PER_FMR;
> > >  	rxe->attr.max_srq			= RXE_MAX_SRQ;
> > >  	rxe->attr.max_srq_wr			= RXE_MAX_SRQ_WR;
> > >  	rxe->attr.max_srq_sge			= RXE_MAX_SRQ_SGE;
> > > diff --git a/drivers/infiniband/sw/rxe/rxe_param.h b/drivers/infiniband/sw/rxe/rxe_param.h
> > > index fe5207386700..353c6668249e 100644
> > > --- a/drivers/infiniband/sw/rxe/rxe_param.h
> > > +++ b/drivers/infiniband/sw/rxe/rxe_param.h
> > > @@ -60,12 +60,8 @@ static inline enum ib_mtu eth_mtu_int_to_enum(int mtu)
> > >
> > >  /* default/initial rxe device parameter settings */
> > >  enum rxe_device_param {
> > > -	RXE_FW_VER			= 0,
> > >  	RXE_MAX_MR_SIZE			= -1ull,
> > >  	RXE_PAGE_SIZE_CAP		= 0xfffff000,
> > > -	RXE_VENDOR_ID			= 0,
> > > -	RXE_VENDOR_PART_ID		= 0,
> > > -	RXE_HW_VER			= 0,
> 
> I removed those defines. Did I miss any?
> 
> Thanks

Oops, my bad, missed that part.

> 
> > >  	RXE_MAX_QP			= 0x10000,
> > >  	RXE_MAX_QP_WR			= 0x4000,
> > >  	RXE_MAX_INLINE_DATA		= 400,
> > > @@ -87,21 +83,12 @@ enum rxe_device_param {
> > >  	RXE_MAX_MR			= 256 * 1024,
> > >  	RXE_MAX_PD			= 0x7ffc,
> > >  	RXE_MAX_QP_RD_ATOM		= 128,
> > > -	RXE_MAX_EE_RD_ATOM		= 0,
> > >  	RXE_MAX_RES_RD_ATOM		= 0x3f000,
> > >  	RXE_MAX_QP_INIT_RD_ATOM		= 128,
> > > -	RXE_MAX_EE_INIT_RD_ATOM		= 0,
> > > -	RXE_MAX_EE			= 0,
> > > -	RXE_MAX_RDD			= 0,
> > > -	RXE_MAX_MW			= 0,
> > > -	RXE_MAX_RAW_IPV6_QP		= 0,
> > > -	RXE_MAX_RAW_ETHY_QP		= 0,
> > >  	RXE_MAX_MCAST_GRP		= 8192,
> > >  	RXE_MAX_MCAST_QP_ATTACH		= 56,
> > >  	RXE_MAX_TOT_MCAST_QP_ATTACH	= 0x70000,
> > >  	RXE_MAX_AH			= 100,
> > > -	RXE_MAX_FMR			= 0,
> > > -	RXE_MAX_MAP_PER_FMR		= 0,
> > >  	RXE_MAX_SRQ			= 960,
> > >  	RXE_MAX_SRQ_WR			= 0x4000,
> > >  	RXE_MIN_SRQ_WR			= 1,
> > > --
> > > 2.20.1
> > >
Jason Gunthorpe Oct. 24, 2019, 6:16 p.m. UTC | #4 
On Sun, Oct 20, 2019 at 08:57:24AM +0300, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@mellanox.com>
> 
> IB devices are allocated with kzalloc and don't need explicit zero
> assignments for their parameters. It can be removed safely.
> 
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> ---
>  drivers/infiniband/sw/rxe/rxe.c       | 13 -------------
>  drivers/infiniband/sw/rxe/rxe_param.h | 13 -------------
>  2 files changed, 26 deletions(-)

Applied to for-next, thanks

Jason
diff mbox series

Patch

diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c
index a8c11b5e1e94..0946a301a5c5 100644
--- a/drivers/infiniband/sw/rxe/rxe.c
+++ b/drivers/infiniband/sw/rxe/rxe.c
@@ -77,12 +77,8 @@  static void rxe_init_device_param(struct rxe_dev *rxe)
 {
 	rxe->max_inline_data			= RXE_MAX_INLINE_DATA;
 
-	rxe->attr.fw_ver			= RXE_FW_VER;
 	rxe->attr.max_mr_size			= RXE_MAX_MR_SIZE;
 	rxe->attr.page_size_cap			= RXE_PAGE_SIZE_CAP;
-	rxe->attr.vendor_id			= RXE_VENDOR_ID;
-	rxe->attr.vendor_part_id		= RXE_VENDOR_PART_ID;
-	rxe->attr.hw_ver			= RXE_HW_VER;
 	rxe->attr.max_qp			= RXE_MAX_QP;
 	rxe->attr.max_qp_wr			= RXE_MAX_QP_WR;
 	rxe->attr.device_cap_flags		= RXE_DEVICE_CAP_FLAGS;
@@ -94,22 +90,13 @@  static void rxe_init_device_param(struct rxe_dev *rxe)
 	rxe->attr.max_mr			= RXE_MAX_MR;
 	rxe->attr.max_pd			= RXE_MAX_PD;
 	rxe->attr.max_qp_rd_atom		= RXE_MAX_QP_RD_ATOM;
-	rxe->attr.max_ee_rd_atom		= RXE_MAX_EE_RD_ATOM;
 	rxe->attr.max_res_rd_atom		= RXE_MAX_RES_RD_ATOM;
 	rxe->attr.max_qp_init_rd_atom		= RXE_MAX_QP_INIT_RD_ATOM;
-	rxe->attr.max_ee_init_rd_atom		= RXE_MAX_EE_INIT_RD_ATOM;
 	rxe->attr.atomic_cap			= IB_ATOMIC_HCA;
-	rxe->attr.max_ee			= RXE_MAX_EE;
-	rxe->attr.max_rdd			= RXE_MAX_RDD;
-	rxe->attr.max_mw			= RXE_MAX_MW;
-	rxe->attr.max_raw_ipv6_qp		= RXE_MAX_RAW_IPV6_QP;
-	rxe->attr.max_raw_ethy_qp		= RXE_MAX_RAW_ETHY_QP;
 	rxe->attr.max_mcast_grp			= RXE_MAX_MCAST_GRP;
 	rxe->attr.max_mcast_qp_attach		= RXE_MAX_MCAST_QP_ATTACH;
 	rxe->attr.max_total_mcast_qp_attach	= RXE_MAX_TOT_MCAST_QP_ATTACH;
 	rxe->attr.max_ah			= RXE_MAX_AH;
-	rxe->attr.max_fmr			= RXE_MAX_FMR;
-	rxe->attr.max_map_per_fmr		= RXE_MAX_MAP_PER_FMR;
 	rxe->attr.max_srq			= RXE_MAX_SRQ;
 	rxe->attr.max_srq_wr			= RXE_MAX_SRQ_WR;
 	rxe->attr.max_srq_sge			= RXE_MAX_SRQ_SGE;
diff --git a/drivers/infiniband/sw/rxe/rxe_param.h b/drivers/infiniband/sw/rxe/rxe_param.h
index fe5207386700..353c6668249e 100644
--- a/drivers/infiniband/sw/rxe/rxe_param.h
+++ b/drivers/infiniband/sw/rxe/rxe_param.h
@@ -60,12 +60,8 @@  static inline enum ib_mtu eth_mtu_int_to_enum(int mtu)
 
 /* default/initial rxe device parameter settings */
 enum rxe_device_param {
-	RXE_FW_VER			= 0,
 	RXE_MAX_MR_SIZE			= -1ull,
 	RXE_PAGE_SIZE_CAP		= 0xfffff000,
-	RXE_VENDOR_ID			= 0,
-	RXE_VENDOR_PART_ID		= 0,
-	RXE_HW_VER			= 0,
 	RXE_MAX_QP			= 0x10000,
 	RXE_MAX_QP_WR			= 0x4000,
 	RXE_MAX_INLINE_DATA		= 400,
@@ -87,21 +83,12 @@  enum rxe_device_param {
 	RXE_MAX_MR			= 256 * 1024,
 	RXE_MAX_PD			= 0x7ffc,
 	RXE_MAX_QP_RD_ATOM		= 128,
-	RXE_MAX_EE_RD_ATOM		= 0,
 	RXE_MAX_RES_RD_ATOM		= 0x3f000,
 	RXE_MAX_QP_INIT_RD_ATOM		= 128,
-	RXE_MAX_EE_INIT_RD_ATOM		= 0,
-	RXE_MAX_EE			= 0,
-	RXE_MAX_RDD			= 0,
-	RXE_MAX_MW			= 0,
-	RXE_MAX_RAW_IPV6_QP		= 0,
-	RXE_MAX_RAW_ETHY_QP		= 0,
 	RXE_MAX_MCAST_GRP		= 8192,
 	RXE_MAX_MCAST_QP_ATTACH		= 56,
 	RXE_MAX_TOT_MCAST_QP_ATTACH	= 0x70000,
 	RXE_MAX_AH			= 100,
-	RXE_MAX_FMR			= 0,
-	RXE_MAX_MAP_PER_FMR		= 0,
 	RXE_MAX_SRQ			= 960,
 	RXE_MAX_SRQ_WR			= 0x4000,
 	RXE_MIN_SRQ_WR			= 1,