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

Commit 58035fd9 authored by Daode Huang's avatar Daode Huang Committed by Doug Ledford
Browse files

net: hns: fix the bug of forwarding table 



As the sub queue id in the broadcast forwarding table is always
set to absolute queue 0 rather than the interface's relative queue 0,
this will cause the received broadcast packets loopback to rcb.
This patch sets the sub queue id to relative queue 0 of each port.

Signed-off-by: default avatarDaode Huang <huangdaode@hisilicon.com>
Reviewed-by: default avatarYisen Zhuang <yisen.zhuang@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent ea870bf9

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

+6 −2
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ static int hns_ae_set_multicast_one(struct hnae_handle *handle, void *addr) 
	int ret;

	char *mac_addr = (char *)addr;

	struct hns_mac_cb *mac_cb = hns_get_mac_cb(handle);

	u8 port_num;



	assert(mac_cb);
@@ -221,8 +222,11 @@ static int hns_ae_set_multicast_one(struct hnae_handle *handle, void *addr) 
		return ret;

	}



	ret = hns_mac_set_multi(mac_cb, DSAF_BASE_INNER_PORT_NUM,

				mac_addr, true);

	ret = hns_mac_get_inner_port_num(mac_cb, handle->vf_id, &port_num);

	if (ret)

		return ret;



	ret = hns_mac_set_multi(mac_cb, port_num, mac_addr, true);

	if (ret)

		dev_err(handle->owner_dev,

			"mac add mul_mac:%pM port%d  fail, ret = %#x!\n",

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

+10 −3
Original line number Diff line number Diff line
@@ -141,9 +141,10 @@ void hns_mac_adjust_link(struct hns_mac_cb *mac_cb, int speed, int duplex) 
 *@port_num:port number

 *

 */

static int hns_mac_get_inner_port_num(struct hns_mac_cb *mac_cb,

				      u8 vmid, u8 *port_num)

int hns_mac_get_inner_port_num(struct hns_mac_cb *mac_cb, u8 vmid, u8 *port_num)

{

	int q_num_per_vf, vf_num_per_port;

	int vm_queue_id;

	u8 tmp_port;



	if (mac_cb->dsaf_dev->dsaf_mode <= DSAF_MODE_ENABLE) {
@@ -174,6 +175,12 @@ static int hns_mac_get_inner_port_num(struct hns_mac_cb *mac_cb, 
		return -EINVAL;

	}



	q_num_per_vf = mac_cb->dsaf_dev->rcb_common[0]->max_q_per_vf;

	vf_num_per_port = mac_cb->dsaf_dev->rcb_common[0]->max_vfn;



	vm_queue_id = vmid * q_num_per_vf +

			vf_num_per_port * q_num_per_vf * mac_cb->mac_id;



	switch (mac_cb->dsaf_dev->dsaf_mode) {

	case DSAF_MODE_ENABLE_FIX:

		tmp_port = 0;
@@ -193,7 +200,7 @@ static int hns_mac_get_inner_port_num(struct hns_mac_cb *mac_cb, 
	case DSAF_MODE_DISABLE_6PORT_2VM:

	case DSAF_MODE_DISABLE_6PORT_4VM:

	case DSAF_MODE_DISABLE_6PORT_16VM:

		tmp_port = vmid;

		tmp_port = vm_queue_id;

		break;

	default:

		dev_err(mac_cb->dev, "dsaf mode invalid,%s mac%d!\n",

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

+2 −0
Original line number Diff line number Diff line
@@ -461,5 +461,7 @@ void hns_set_led_opt(struct hns_mac_cb *mac_cb); 
int hns_cpld_led_set_id(struct hns_mac_cb *mac_cb,

			enum hnae_led_state status);

void hns_mac_set_promisc(struct hns_mac_cb *mac_cb, u8 en);

int hns_mac_get_inner_port_num(struct hns_mac_cb *mac_cb,

			       u8 vmid, u8 *port_num);



#endif /* _HNS_DSAF_MAC_H */