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

Commit 7afddafa authored by Wei Hu(Xavier)'s avatar Wei Hu(Xavier) Committed by Doug Ledford
Browse files

RDMA/hns: Configure mac&gid and user access region for hip08 RoCE driver 



In hip08, the user access region(UAR) pfn is calculated
from pci device memory resource.

This patch mainly sets mac and gid table by configuring
the relevant registers and updates the uar pfn for hip08 SoC.

Signed-off-by: default avatarLijun Ou <oulijun@huawei.com>
Signed-off-by: default avatarShaobo Xu <xushaobo2@huawei.com>
Signed-off-by: default avatarWei Hu (Xavier) <xavier.huwei@huawei.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent ff795f71

drivers/infiniband/hw/hns/hns_roce_common.h

+9 −0
Original line number Diff line number Diff line
@@ -376,4 +376,13 @@ 
#define ROCEE_RX_CMQ_TAIL_REG			0x07024

#define ROCEE_RX_CMQ_HEAD_REG			0x07028



#define ROCEE_VF_SMAC_CFG0_REG			0x12000

#define ROCEE_VF_SMAC_CFG1_REG			0x12004



#define ROCEE_VF_SGID_CFG0_REG			0x10000

#define ROCEE_VF_SGID_CFG1_REG			0x10004

#define ROCEE_VF_SGID_CFG2_REG			0x10008

#define ROCEE_VF_SGID_CFG3_REG			0x1000c

#define ROCEE_VF_SGID_CFG4_REG			0x10010



#endif /* _HNS_ROCE_COMMON_H */

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+49 −0
Original line number Diff line number Diff line
@@ -718,6 +718,53 @@ static int hns_roce_v2_chk_mbox(struct hns_roce_dev *hr_dev, 
	return 0;

}



static void hns_roce_v2_set_gid(struct hns_roce_dev *hr_dev, u8 port,

				int gid_index, union ib_gid *gid)

{

	u32 *p;

	u32 val;



	p = (u32 *)&gid->raw[0];

	roce_raw_write(*p, hr_dev->reg_base + ROCEE_VF_SGID_CFG0_REG +

		       0x20 * gid_index);



	p = (u32 *)&gid->raw[4];

	roce_raw_write(*p, hr_dev->reg_base + ROCEE_VF_SGID_CFG1_REG +

		       0x20 * gid_index);



	p = (u32 *)&gid->raw[8];

	roce_raw_write(*p, hr_dev->reg_base + ROCEE_VF_SGID_CFG2_REG +

		       0x20 * gid_index);



	p = (u32 *)&gid->raw[0xc];

	roce_raw_write(*p, hr_dev->reg_base + ROCEE_VF_SGID_CFG3_REG +

		       0x20 * gid_index);



	val = roce_read(hr_dev, ROCEE_VF_SGID_CFG4_REG + 0x20 * gid_index);

	roce_set_field(val, ROCEE_VF_SGID_CFG4_SGID_TYPE_M,

		       ROCEE_VF_SGID_CFG4_SGID_TYPE_S, 0);



	roce_write(hr_dev, ROCEE_VF_SGID_CFG4_REG + 0x20 * gid_index, val);

}



static void hns_roce_v2_set_mac(struct hns_roce_dev *hr_dev, u8 phy_port,

				u8 *addr)

{

	u16 reg_smac_h;

	u32 reg_smac_l;

	u32 val;



	reg_smac_l = *(u32 *)(&addr[0]);

	roce_raw_write(reg_smac_l, hr_dev->reg_base + ROCEE_VF_SMAC_CFG0_REG +

		       0x08 * phy_port);

	val = roce_read(hr_dev, ROCEE_VF_SMAC_CFG1_REG + 0x08 * phy_port);



	reg_smac_h  = *(u16 *)(&addr[4]);

	roce_set_field(val, ROCEE_VF_SMAC_CFG1_VF_SMAC_H_M,

		       ROCEE_VF_SMAC_CFG1_VF_SMAC_H_S, reg_smac_h);

	roce_write(hr_dev, ROCEE_VF_SMAC_CFG1_REG + 0x08 * phy_port, val);

}



static int hns_roce_v2_set_hem(struct hns_roce_dev *hr_dev,

			       struct hns_roce_hem_table *table, int obj,

			       int step_idx)
@@ -857,6 +904,8 @@ static const struct hns_roce_hw hns_roce_hw_v2 = { 
	.hw_profile = hns_roce_v2_profile,

	.post_mbox = hns_roce_v2_post_mbox,

	.chk_mbox = hns_roce_v2_chk_mbox,

	.set_gid = hns_roce_v2_set_gid,

	.set_mac = hns_roce_v2_set_mac,

	.set_hem = hns_roce_v2_set_hem,

	.clear_hem = hns_roce_v2_clear_hem,

};

drivers/infiniband/hw/hns/hns_roce_hw_v2.h

+7 −0
Original line number Diff line number Diff line
@@ -246,6 +246,13 @@ struct hns_roce_vf_res_b { 
#define VF_RES_B_DATA_3_VF_SL_NUM_S 16

#define VF_RES_B_DATA_3_VF_SL_NUM_M GENMASK(19, 16)



/* Reg field definition */

#define ROCEE_VF_SMAC_CFG1_VF_SMAC_H_S 0

#define ROCEE_VF_SMAC_CFG1_VF_SMAC_H_M GENMASK(15, 0)



#define ROCEE_VF_SGID_CFG4_SGID_TYPE_S 0

#define ROCEE_VF_SGID_CFG4_SGID_TYPE_M GENMASK(1, 0)



struct hns_roce_cfg_bt_attr {

	u32 vf_qpc_cfg;

	u32 vf_srqc_cfg;

drivers/infiniband/hw/hns/hns_roce_pd.c

+11 −5
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
 */



#include <linux/platform_device.h>

#include <linux/pci.h>

#include "hns_roce_device.h"



static int hns_roce_pd_alloc(struct hns_roce_dev *hr_dev, unsigned long *pdn)
@@ -111,12 +112,17 @@ int hns_roce_uar_alloc(struct hns_roce_dev *hr_dev, struct hns_roce_uar *uar) 
		uar->index = (uar->index - 1) %

			     (hr_dev->caps.phy_num_uars - 1) + 1;



	if (!dev_is_pci(hr_dev->dev)) {

		res = platform_get_resource(hr_dev->pdev, IORESOURCE_MEM, 0);

		if (!res) {

			dev_err(&hr_dev->pdev->dev, "memory resource not found!\n");

			return -EINVAL;

		}

		uar->pfn = ((res->start) >> PAGE_SHIFT) + uar->index;

	} else {

		uar->pfn = ((pci_resource_start(hr_dev->pci_dev, 2))

			   >> PAGE_SHIFT);

	}



	return 0;

}