Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9b22e35 authored by Ira Weiny's avatar Ira Weiny Committed by Doug Ledford
Browse files

IB/core: Convert core to use bitfield for caps 



Remove query_protocol callback

Use the new Core Capability bits for:

rdma_protocol_*
rdma_cap_ib_mad
rdma_cap_ib_smi
rdma_cap_ib_cm
rdma_cap_iw_cm
rdma_cap_ib_sa
rdma_cap_ib_mcast
rdma_cap_af_ib
rdma_cap_eth_ah

Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 7738613e

drivers/infiniband/core/device.c

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ static int ib_device_check_mandatory(struct ib_device *device) 
	} mandatory_table[] = {

		IB_MANDATORY_FUNC(query_device),

		IB_MANDATORY_FUNC(query_port),

		IB_MANDATORY_FUNC(query_protocol),

		IB_MANDATORY_FUNC(query_pkey),

		IB_MANDATORY_FUNC(query_gid),

		IB_MANDATORY_FUNC(alloc_pd),

drivers/infiniband/hw/amso1100/c2_provider.c

+1 −7
Original line number Diff line number Diff line
@@ -99,12 +99,6 @@ static int c2_query_port(struct ib_device *ibdev, 
	return 0;

}



static enum rdma_protocol_type

c2_query_protocol(struct ib_device *device, u8 port_num)

{

	return RDMA_PROTOCOL_IWARP;

}



static int c2_query_pkey(struct ib_device *ibdev,

			 u8 port, u16 index, u16 * pkey)

{
@@ -775,6 +769,7 @@ static int c2_port_immutable(struct ib_device *ibdev, u8 port_num, 


	immutable->pkey_tbl_len = attr.pkey_tbl_len;

	immutable->gid_tbl_len = attr.gid_tbl_len;

	immutable->core_cap_flags = RDMA_CORE_PORT_IWARP;



	return 0;

}
@@ -823,7 +818,6 @@ int c2_register_device(struct c2_dev *dev) 
	dev->ibdev.dma_device = &dev->pcidev->dev;

	dev->ibdev.query_device = c2_query_device;

	dev->ibdev.query_port = c2_query_port;

	dev->ibdev.query_protocol = c2_query_protocol;

	dev->ibdev.query_pkey = c2_query_pkey;

	dev->ibdev.query_gid = c2_query_gid;

	dev->ibdev.alloc_ucontext = c2_alloc_ucontext;

drivers/infiniband/hw/cxgb3/iwch_provider.c

+1 −7
Original line number Diff line number Diff line
@@ -1232,12 +1232,6 @@ static int iwch_query_port(struct ib_device *ibdev, 
	return 0;

}



static enum rdma_protocol_type

iwch_query_protocol(struct ib_device *device, u8 port_num)

{

	return RDMA_PROTOCOL_IWARP;

}



static ssize_t show_rev(struct device *dev, struct device_attribute *attr,

			char *buf)

{
@@ -1361,6 +1355,7 @@ static int iwch_port_immutable(struct ib_device *ibdev, u8 port_num, 


	immutable->pkey_tbl_len = attr.pkey_tbl_len;

	immutable->gid_tbl_len = attr.gid_tbl_len;

	immutable->core_cap_flags = RDMA_CORE_PORT_IWARP;



	return 0;

}
@@ -1407,7 +1402,6 @@ int iwch_register_device(struct iwch_dev *dev) 
	dev->ibdev.dma_device = &(dev->rdev.rnic_info.pdev->dev);

	dev->ibdev.query_device = iwch_query_device;

	dev->ibdev.query_port = iwch_query_port;

	dev->ibdev.query_protocol = iwch_query_protocol;

	dev->ibdev.query_pkey = iwch_query_pkey;

	dev->ibdev.query_gid = iwch_query_gid;

	dev->ibdev.alloc_ucontext = iwch_alloc_ucontext;

drivers/infiniband/hw/cxgb4/provider.c

+1 −7
Original line number Diff line number Diff line
@@ -390,12 +390,6 @@ static int c4iw_query_port(struct ib_device *ibdev, u8 port, 
	return 0;

}



static enum rdma_protocol_type

c4iw_query_protocol(struct ib_device *device, u8 port_num)

{

	return RDMA_PROTOCOL_IWARP;

}



static ssize_t show_rev(struct device *dev, struct device_attribute *attr,

			char *buf)

{
@@ -483,6 +477,7 @@ static int c4iw_port_immutable(struct ib_device *ibdev, u8 port_num, 


	immutable->pkey_tbl_len = attr.pkey_tbl_len;

	immutable->gid_tbl_len = attr.gid_tbl_len;

	immutable->core_cap_flags = RDMA_CORE_PORT_IWARP;



	return 0;

}
@@ -528,7 +523,6 @@ int c4iw_register_device(struct c4iw_dev *dev) 
	dev->ibdev.dma_device = &(dev->rdev.lldi.pdev->dev);

	dev->ibdev.query_device = c4iw_query_device;

	dev->ibdev.query_port = c4iw_query_port;

	dev->ibdev.query_protocol = c4iw_query_protocol;

	dev->ibdev.query_pkey = c4iw_query_pkey;

	dev->ibdev.query_gid = c4iw_query_gid;

	dev->ibdev.alloc_ucontext = c4iw_alloc_ucontext;

drivers/infiniband/hw/ehca/ehca_hca.c

+0 −6
Original line number Diff line number Diff line
@@ -242,12 +242,6 @@ int ehca_query_port(struct ib_device *ibdev, 
	return ret;

}



enum rdma_protocol_type

ehca_query_protocol(struct ib_device *device, u8 port_num)

{

	return RDMA_PROTOCOL_IB;

}



int ehca_query_sma_attr(struct ehca_shca *shca,

			u8 port, struct ehca_sma_attr *attr)

{