RDMA/hns: Treat revision HIP08_A as a special case
Subsystems (2)
PATCH 1/1 RDMA/hns: Treat revision HIP08_A as a special case
From: Lang Cheng <[email protected]>
Set revisions that equal to or higher than HIP08_B as default to maintain backward compatibility.
Signed-off-by Lang Cheng <[email protected]>
Signed-off-by Weihang Li <[email protected]>
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +12 -14
@@ -1680,7 +1680,7 @@ static void set_default_caps(struct hns_roce_dev *hr_dev) caps->max_srq_wrs =HNS_ROCE_V2_MAX_SRQ_WR ; caps->max_srq_sges =HNS_ROCE_V2_MAX_SRQ_SGE ; -if (hr_dev->pci_dev->revision ==PCI_REVISION_ID_HIP08_B ) { +if (hr_dev->pci_dev->revision >=PCI_REVISION_ID_HIP08_B ) { caps->flags |=HNS_ROCE_CAP_FLAG_ATOMIC |HNS_ROCE_CAP_FLAG_MW |HNS_ROCE_CAP_FLAG_SRQ |HNS_ROCE_CAP_FLAG_FRMR |HNS_ROCE_CAP_FLAG_QP_FLOW_CTRL ;
@@ -1928,7 +1928,7 @@ static int hns_roce_query_pf_caps(struct hns_roce_dev *hr_dev) caps->srqc_bt_num, &caps->srqc_buf_pg_sz, &caps->srqc_ba_pg_sz, HEM_TYPE_SRQC); -if (hr_dev->pci_dev->revision ==PCI_REVISION_ID_HIP08_B ) { +if (hr_dev->pci_dev->revision >=PCI_REVISION_ID_HIP08_B ) { caps->sccc_hop_num = ctx_hop_num; caps->qpc_timer_hop_num =HNS_ROCE_HOP_NUM_0 ; caps->cqc_timer_hop_num =HNS_ROCE_HOP_NUM_0 ;
@@ -1988,7 +1988,7 @@ static int hns_roce_v2_profile(struct hns_roce_dev *hr_dev)return ret; } -if (hr_dev->pci_dev->revision ==PCI_REVISION_ID_HIP08_B ) { +if (hr_dev->pci_dev->revision >=PCI_REVISION_ID_HIP08_B ) { ret =hns_roce_query_pf_timer_resource (hr_dev);if (ret) { dev_err(hr_dev->dev,
@@ -1996,16 +1996,7 @@ static int hns_roce_v2_profile(struct hns_roce_dev *hr_dev) ret);return ret; } - } - - ret =hns_roce_alloc_vf_resource (hr_dev); -if (ret) { -dev_err (hr_dev->dev,"Allocate vf resource fail, ret = %d.\n" , - ret); -return ret; - } -if (hr_dev->pci_dev->revision ==PCI_REVISION_ID_HIP08_B ) { ret =hns_roce_set_vf_switch_param (hr_dev,0 );if (ret) { dev_err(hr_dev->dev,
@@ -2015,6 +2006,13 @@ static int hns_roce_v2_profile(struct hns_roce_dev *hr_dev) } } + ret =hns_roce_alloc_vf_resource (hr_dev); +if (ret) { +dev_err (hr_dev->dev,"Allocate vf resource fail, ret = %d.\n" , + ret); +return ret; + } + hr_dev->vendor_part_id = hr_dev->pci_dev->device; hr_dev->sys_image_guid =be64_to_cpu (hr_dev->ib_dev.node_guid);
@@ -2287,7 +2285,7 @@ static void hns_roce_v2_exit(struct hns_roce_dev *hr_dev) {struct hns_roce_v2_priv *priv = hr_dev->priv; -if (hr_dev->pci_dev->revision ==PCI_REVISION_ID_HIP08_B ) +if (hr_dev->pci_dev->revision >=PCI_REVISION_ID_HIP08_B )hns_roce_function_clear (hr_dev);hns_roce_free_link_table (hr_dev, &priv->tpq);
@@ -4472,7 +4470,7 @@ static int hns_roce_v2_set_path(struct ib_qp *ibqp,roce_set_field (qpc_mask->byte_24_mtu_tc,V2_QPC_BYTE_24_HOP_LIMIT_M ,V2_QPC_BYTE_24_HOP_LIMIT_S ,0 ); -if (hr_dev->pci_dev->revision ==PCI_REVISION_ID_HIP08_B && is_udp) +if (hr_dev->pci_dev->revision >=PCI_REVISION_ID_HIP08_B && is_udp)roce_set_field (context->byte_24_mtu_tc,V2_QPC_BYTE_24_TC_M ,V2_QPC_BYTE_24_TC_S , grh->traffic_class >>2 );else
Signature · 1 line
2.8.1
Jason Gunthorpe
AppliedQuoted 10 lines · Weihang Li
From: Lang Cheng <[email protected]>
Set revisions that equal to or higher than
HIP08_Bas default to maintain backward compatibility.Signed-off-by Lang Cheng <[email protected]>Signed-off-by Weihang Li <[email protected]>--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
Applied to for-next, thanks
Jason