Commit b1b4bad3 authored by wangsirong's avatar wangsirong Committed by Zheng Zengkai
Browse files

RDMA/hns: Delete unused members in the structure hns_roce_hw 

mainline inclusion
from mainline-v5.12-rc1
commit 7bd5d90d
category: feature
bugzilla: 174002
CVE:NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7bd5d90d8fc652148e7ce71b5543a7f6069d1e5d

----------------------------------------------------------------------

Some structure members in hns_roce_hw have never been used and need to be
deleted.

Fixes: 9a443537 ("IB/hns: Add driver files for hns RoCE driver")
Fixes: b156269d ("RDMA/hns: Add modify CQ support for hip08")
Fixes: c7bcb134 ("RDMA/hns: Add SRQ support for hip08 kernel mode")
Link: https://lore.kernel.org/r/1617354454-47840-6-git-send-email-liweihang@huawei.com


Signed-off-by: default avatarYangyang Li <liyangyang20@huawei.com>
Signed-off-by: default avatarWeihang Li <liweihang@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarwangsirong <wangsirong@huawei.com>

Reviewed-by: default avatarChunZhi Hu <huchunzhi@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 25970c22

drivers/infiniband/hw/hns/hns_roce_device.h

+0 −16
Original line number Diff line number Diff line
@@ -910,33 +910,17 @@ struct hns_roce_hw { 
	int (*clear_hem)(struct hns_roce_dev *hr_dev,

			 struct hns_roce_hem_table *table, int obj,

			 int step_idx);

	int (*query_qp)(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr,

			int qp_attr_mask, struct ib_qp_init_attr *qp_init_attr);

	int (*modify_qp)(struct ib_qp *ibqp, const struct ib_qp_attr *attr,

			 int attr_mask, enum ib_qp_state cur_state,

			 enum ib_qp_state new_state);

	int (*destroy_qp)(struct ib_qp *ibqp, struct ib_udata *udata);

	int (*qp_flow_control_init)(struct hns_roce_dev *hr_dev,

			 struct hns_roce_qp *hr_qp);

	int (*post_send)(struct ib_qp *ibqp, const struct ib_send_wr *wr,

			 const struct ib_send_wr **bad_wr);

	int (*post_recv)(struct ib_qp *qp, const struct ib_recv_wr *recv_wr,

			 const struct ib_recv_wr **bad_recv_wr);

	int (*req_notify_cq)(struct ib_cq *ibcq, enum ib_cq_notify_flags flags);

	int (*poll_cq)(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc);

	int (*dereg_mr)(struct hns_roce_dev *hr_dev, struct hns_roce_mr *mr,

			struct ib_udata *udata);

	int (*destroy_cq)(struct ib_cq *ibcq, struct ib_udata *udata);

	int (*modify_cq)(struct ib_cq *cq, u16 cq_count, u16 cq_period);

	int (*init_eq)(struct hns_roce_dev *hr_dev);

	void (*cleanup_eq)(struct hns_roce_dev *hr_dev);

	int (*write_srqc)(struct hns_roce_srq *srq, void *mb_buf);

	int (*modify_srq)(struct ib_srq *ibsrq, struct ib_srq_attr *srq_attr,

		       enum ib_srq_attr_mask srq_attr_mask,

		       struct ib_udata *udata);

	int (*query_srq)(struct ib_srq *ibsrq, struct ib_srq_attr *attr);

	int (*post_srq_recv)(struct ib_srq *ibsrq, const struct ib_recv_wr *wr,

			     const struct ib_recv_wr **bad_wr);

	const struct ib_device_ops *hns_roce_dev_ops;

	const struct ib_device_ops *hns_roce_dev_srq_ops;

};

drivers/infiniband/hw/hns/hns_roce_hw_v1.c

+0 −7
Original line number Diff line number Diff line
@@ -4359,15 +4359,8 @@ static const struct hns_roce_hw hns_roce_hw_v1 = { 
	.set_mtu = hns_roce_v1_set_mtu,

	.write_mtpt = hns_roce_v1_write_mtpt,

	.write_cqc = hns_roce_v1_write_cqc,

	.modify_cq = hns_roce_v1_modify_cq,

	.clear_hem = hns_roce_v1_clear_hem,

	.modify_qp = hns_roce_v1_modify_qp,

	.query_qp = hns_roce_v1_query_qp,

	.destroy_qp = hns_roce_v1_destroy_qp,

	.post_send = hns_roce_v1_post_send,

	.post_recv = hns_roce_v1_post_recv,

	.req_notify_cq = hns_roce_v1_req_notify_cq,

	.poll_cq = hns_roce_v1_poll_cq,

	.dereg_mr = hns_roce_v1_dereg_mr,

	.destroy_cq = hns_roce_v1_destroy_cq,

	.init_eq = hns_roce_v1_init_eq_table,

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+0 −10
Original line number Diff line number Diff line
@@ -6518,20 +6518,10 @@ static const struct hns_roce_hw hns_roce_hw_v2 = { 
	.set_hem = hns_roce_v2_set_hem,

	.clear_hem = hns_roce_v2_clear_hem,

	.modify_qp = hns_roce_v2_modify_qp,

	.query_qp = hns_roce_v2_query_qp,

	.destroy_qp = hns_roce_v2_destroy_qp,

	.qp_flow_control_init = hns_roce_v2_qp_flow_control_init,

	.modify_cq = hns_roce_v2_modify_cq,

	.post_send = hns_roce_v2_post_send,

	.post_recv = hns_roce_v2_post_recv,

	.req_notify_cq = hns_roce_v2_req_notify_cq,

	.poll_cq = hns_roce_v2_poll_cq,

	.init_eq = hns_roce_v2_init_eq_table,

	.cleanup_eq = hns_roce_v2_cleanup_eq_table,

	.write_srqc = hns_roce_v2_write_srqc,

	.modify_srq = hns_roce_v2_modify_srq,

	.query_srq = hns_roce_v2_query_srq,

	.post_srq_recv = hns_roce_v2_post_srq_recv,

	.hns_roce_dev_ops = &hns_roce_v2_dev_ops,

	.hns_roce_dev_srq_ops = &hns_roce_v2_dev_srq_ops,

};