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

Commit 89a44093 authored by Yisen.Zhuang\(Zhuangyuzeng\)'s avatar Yisen.Zhuang\(Zhuangyuzeng\) Committed by David S. Miller
Browse files

net: hns: add a new dsaf mode for debug port 



This patch adds a new dsaf mode named "single-port" mode for debug port.
This mode only contains one debug port. This patch also changes the
method of distinguishing the port type.

Signed-off-by: default avatarDaode Huang <huangdaode@hisilicon.com>
Signed-off-by: default avatarYisen Zhuang <yisen.zhuang@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5a5f0792

drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static struct ring_pair_cb *hns_ae_get_base_ring_pair( 
	int q_num = rcb_comm->max_q_per_vf;

	int vf_num = rcb_comm->max_vfn;



	if (common_idx == HNS_DSAF_COMM_SERVICE_NW_IDX)

	if (!HNS_DSAF_IS_DEBUG(dsaf_dev))

		return &rcb_comm->ring_pair_cb[port * q_num * vf_num];

	else

		return &rcb_comm->ring_pair_cb[0];

drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c

+4 −4
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ int hns_mac_change_vf_addr(struct hns_mac_cb *mac_cb, 
	struct mac_entry_idx *old_entry;



	old_entry = &mac_cb->addr_entry_idx[vmid];

	if (dsaf_dev) {

	if (!HNS_DSAF_IS_DEBUG(dsaf_dev)) {

		memcpy(mac_entry.addr, addr, sizeof(mac_entry.addr));

		mac_entry.in_vlan_id = old_entry->vlan_id;

		mac_entry.in_port_num = mac_cb->mac_id;
@@ -289,7 +289,7 @@ int hns_mac_set_multi(struct hns_mac_cb *mac_cb, 
	struct dsaf_device *dsaf_dev = mac_cb->dsaf_dev;

	struct dsaf_drv_mac_single_dest_entry mac_entry;



	if (dsaf_dev && addr) {

	if (!HNS_DSAF_IS_DEBUG(dsaf_dev) && addr) {

		memcpy(mac_entry.addr, addr, sizeof(mac_entry.addr));

		mac_entry.in_vlan_id = 0;/*vlan_id;*/

		mac_entry.in_port_num = mac_cb->mac_id;
@@ -380,7 +380,7 @@ static int hns_mac_port_config_bc_en(struct hns_mac_cb *mac_cb, 
	if (mac_cb->mac_type == HNAE_PORT_DEBUG)

		return 0;



	if (dsaf_dev) {

	if (!HNS_DSAF_IS_DEBUG(dsaf_dev)) {

		memcpy(mac_entry.addr, addr, sizeof(mac_entry.addr));

		mac_entry.in_vlan_id = vlan_id;

		mac_entry.in_port_num = mac_cb->mac_id;
@@ -418,7 +418,7 @@ int hns_mac_vm_config_bc_en(struct hns_mac_cb *mac_cb, u32 vmid, bool enable) 


	uc_mac_entry = &mac_cb->addr_entry_idx[vmid];



	if (dsaf_dev)  {

	if (!HNS_DSAF_IS_DEBUG(dsaf_dev))  {

		memcpy(mac_entry.addr, addr, sizeof(mac_entry.addr));

		mac_entry.in_vlan_id = uc_mac_entry->vlan_id;

		mac_entry.in_port_num = mac_cb->mac_id;

drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c

+9 −7
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ const char *g_dsaf_mode_match[DSAF_MODE_MAX] = { 
	[DSAF_MODE_DISABLE_2PORT_64VM] = "2port-64vf",

	[DSAF_MODE_DISABLE_6PORT_0VM] = "6port-16rss",

	[DSAF_MODE_DISABLE_6PORT_16VM] = "6port-16vf",

	[DSAF_MODE_DISABLE_SP] = "single-port",

};



int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev)
@@ -217,9 +218,7 @@ static void hns_dsaf_mix_def_qid_cfg(struct dsaf_device *dsaf_dev) 
	u32 q_id, q_num_per_port;

	u32 i;



	hns_rcb_get_queue_mode(dsaf_dev->dsaf_mode,

			       HNS_DSAF_COMM_SERVICE_NW_IDX,

			       &max_vfn, &max_q_per_vf);

	hns_rcb_get_queue_mode(dsaf_dev->dsaf_mode, &max_vfn, &max_q_per_vf);

	q_num_per_port = max_vfn * max_q_per_vf;



	for (i = 0, q_id = 0; i < DSAF_SERVICE_NW_NUM; i++) {
@@ -239,9 +238,7 @@ static void hns_dsaf_inner_qid_cfg(struct dsaf_device *dsaf_dev) 
	if (AE_IS_VER1(dsaf_dev->dsaf_ver))

		return;



	hns_rcb_get_queue_mode(dsaf_dev->dsaf_mode,

			       HNS_DSAF_COMM_SERVICE_NW_IDX,

			       &max_vfn, &max_q_per_vf);

	hns_rcb_get_queue_mode(dsaf_dev->dsaf_mode, &max_vfn, &max_q_per_vf);

	q_num_per_port = max_vfn * max_q_per_vf;



	for (mac_id = 0, q_id = 0; mac_id < DSAF_SERVICE_NW_NUM; mac_id++) {
@@ -712,7 +709,9 @@ static void hns_dsaf_tbl_tcam_data_ucast_pul( 


void hns_dsaf_set_promisc_mode(struct dsaf_device *dsaf_dev, u32 en)

{

	dsaf_set_dev_bit(dsaf_dev, DSAF_CFG_0_REG, DSAF_CFG_MIX_MODE_S, !!en);

	if (!HNS_DSAF_IS_DEBUG(dsaf_dev))

		dsaf_set_dev_bit(dsaf_dev, DSAF_CFG_0_REG,

				 DSAF_CFG_MIX_MODE_S, !!en);

}



void hns_dsaf_set_inner_lb(struct dsaf_device *dsaf_dev, u32 mac_id, u32 en)
@@ -1307,6 +1306,9 @@ static int hns_dsaf_init(struct dsaf_device *dsaf_dev) 
	u32 i;

	int ret;



	if (HNS_DSAF_IS_DEBUG(dsaf_dev))

		return 0;



	ret = hns_dsaf_init_hw(dsaf_dev);

	if (ret)

		return ret;

drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ struct hns_mac_cb; 
#define DSAF_STATIC_NUM 28



#define DSAF_STATS_READ(p, offset) (*((u64 *)((u8 *)(p) + (offset))))

#define HNS_DSAF_IS_DEBUG(dev) (dev->dsaf_mode == DSAF_MODE_DISABLE_SP)



enum hal_dsaf_mode {

	HRD_DSAF_NO_DSAF_MODE	= 0x0,
@@ -117,6 +118,7 @@ enum dsaf_mode { 
	DSAF_MODE_ENABLE_32VM,	/**< en DSAF-mode, support 32 VM */

	DSAF_MODE_ENABLE_128VM,	/**< en DSAF-mode, support 128 VM */

	DSAF_MODE_ENABLE,		/**< before is enable DSAF mode*/

	DSAF_MODE_DISABLE_SP,	/* <non-dsaf, single port mode */

	DSAF_MODE_DISABLE_FIX,	/**< non-dasf, fixed to queue*/

	DSAF_MODE_DISABLE_2PORT_8VM,	/**< non-dasf, 2port 8VM */

	DSAF_MODE_DISABLE_2PORT_16VM,	/**< non-dasf, 2port 16VM */

drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ void hns_dsaf_ge_srst_by_port(struct dsaf_device *dsaf_dev, u32 port, u32 val) 
	if (port >= DSAF_GE_NUM)

		return;



	if (port < DSAF_SERVICE_NW_NUM) {

	if (!HNS_DSAF_IS_DEBUG(dsaf_dev)) {

		reg_val_1  = 0x1 << port;

		/* there is difference between V1 and V2 in register.*/

		if (AE_IS_VER1(dsaf_dev->dsaf_ver))
@@ -218,7 +218,7 @@ void hns_ppe_com_srst(struct ppe_common_cb *ppe_common, u32 val) 
	u32 reg_val;

	u32 reg_addr;



	if (comm_index == HNS_DSAF_COMM_SERVICE_NW_IDX) {

	if (!HNS_DSAF_IS_DEBUG(dsaf_dev)) {

		reg_val = RESET_REQ_OR_DREQ;

		if (val == 0)

			reg_addr = DSAF_SUB_SC_RCB_PPE_COM_RESET_REQ_REG;