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

Commit 9f1607b8 authored by Kejian Yan's avatar Kejian Yan Committed by David S. Miller
Browse files

net: hns: Remove redundant mac table operations 



This patch removes redundant functions used only for debugging
purposes.

Reported-by: default avatarWeiwei Deng <dengweiwei@huawei.com>
Signed-off-by: default avatarKejian Yan <yankejian@huawei.com>
Reviewed-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 20f0d4f7

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

+0 −160
Original line number Diff line number Diff line
@@ -2008,166 +2008,6 @@ int hns_dsaf_clr_mac_mc_port(struct dsaf_device *dsaf_dev, u8 mac_id, 
	return ret;

}



/**

 * hns_dsaf_get_mac_uc_entry - get mac uc entry

 * @dsaf_dev: dsa fabric device struct pointer

 * @mac_entry: mac entry

 */

int hns_dsaf_get_mac_uc_entry(struct dsaf_device *dsaf_dev,

			      struct dsaf_drv_mac_single_dest_entry *mac_entry)

{

	u16 entry_index = DSAF_INVALID_ENTRY_IDX;

	struct dsaf_drv_tbl_tcam_key mac_key;



	struct dsaf_tbl_tcam_ucast_cfg mac_data;

	struct dsaf_tbl_tcam_data tcam_data;



	/* check macaddr */

	if (MAC_IS_ALL_ZEROS(mac_entry->addr) ||

	    MAC_IS_BROADCAST(mac_entry->addr)) {

		dev_err(dsaf_dev->dev, "get_entry failed,addr %pM\n",

			mac_entry->addr);

		return -EINVAL;

	}



	/*config key */

	hns_dsaf_set_mac_key(dsaf_dev, &mac_key, mac_entry->in_vlan_id,

			     mac_entry->in_port_num, mac_entry->addr);



	/*check exist? */

	entry_index = hns_dsaf_find_soft_mac_entry(dsaf_dev, &mac_key);

	if (entry_index == DSAF_INVALID_ENTRY_IDX) {

		/*find none, error */

		dev_err(dsaf_dev->dev,

			"get_uc_entry failed, %s Mac key(%#x:%#x)\n",

			dsaf_dev->ae_dev.name,

			mac_key.high.val, mac_key.low.val);

		return -EINVAL;

	}

	dev_dbg(dsaf_dev->dev,

		"get_uc_entry, %s Mac key(%#x:%#x) entry_index%d\n",

		dsaf_dev->ae_dev.name, mac_key.high.val,

		mac_key.low.val, entry_index);



	/* read entry */

	hns_dsaf_tcam_uc_get(dsaf_dev, entry_index, &tcam_data, &mac_data);



	mac_key.high.val = le32_to_cpu(tcam_data.tbl_tcam_data_high);

	mac_key.low.val = le32_to_cpu(tcam_data.tbl_tcam_data_low);



	mac_entry->port_num = mac_data.tbl_ucast_out_port;



	return 0;

}



/**

 * hns_dsaf_get_mac_mc_entry - get mac mc entry

 * @dsaf_dev: dsa fabric device struct pointer

 * @mac_entry: mac entry

 */

int hns_dsaf_get_mac_mc_entry(struct dsaf_device *dsaf_dev,

			      struct dsaf_drv_mac_multi_dest_entry *mac_entry)

{

	u16 entry_index = DSAF_INVALID_ENTRY_IDX;

	struct dsaf_drv_tbl_tcam_key mac_key;



	struct dsaf_tbl_tcam_mcast_cfg mac_data;

	struct dsaf_tbl_tcam_data tcam_data;



	/*check mac addr */

	if (MAC_IS_ALL_ZEROS(mac_entry->addr) ||

	    MAC_IS_BROADCAST(mac_entry->addr)) {

		dev_err(dsaf_dev->dev, "get_entry failed,addr %pM\n",

			mac_entry->addr);

		return -EINVAL;

	}



	/*config key */

	hns_dsaf_set_mac_key(dsaf_dev, &mac_key, mac_entry->in_vlan_id,

			     mac_entry->in_port_num, mac_entry->addr);



	/*check exist? */

	entry_index = hns_dsaf_find_soft_mac_entry(dsaf_dev, &mac_key);

	if (entry_index == DSAF_INVALID_ENTRY_IDX) {

		/* find none, error */

		dev_err(dsaf_dev->dev,

			"get_mac_uc_entry failed, %s Mac key(%#x:%#x)\n",

			dsaf_dev->ae_dev.name, mac_key.high.val,

			mac_key.low.val);

		return -EINVAL;

	}

	dev_dbg(dsaf_dev->dev,

		"get_mac_uc_entry, %s Mac key(%#x:%#x) entry_index%d\n",

		dsaf_dev->ae_dev.name, mac_key.high.val,

		mac_key.low.val, entry_index);



	/*read entry */

	hns_dsaf_tcam_mc_get(dsaf_dev, entry_index, &tcam_data, &mac_data);



	mac_key.high.val = le32_to_cpu(tcam_data.tbl_tcam_data_high);

	mac_key.low.val = le32_to_cpu(tcam_data.tbl_tcam_data_low);



	mac_entry->port_mask[0] = mac_data.tbl_mcast_port_msk[0] & 0x3F;

	return 0;

}



/**

 * hns_dsaf_get_mac_entry_by_index - get mac entry by tab index

 * @dsaf_dev: dsa fabric device struct pointer

 * @entry_index: tab entry index

 * @mac_entry: mac entry

 */

int hns_dsaf_get_mac_entry_by_index(

	struct dsaf_device *dsaf_dev,

	u16 entry_index, struct dsaf_drv_mac_multi_dest_entry *mac_entry)

{

	struct dsaf_drv_tbl_tcam_key mac_key;



	struct dsaf_tbl_tcam_mcast_cfg mac_data;

	struct dsaf_tbl_tcam_ucast_cfg mac_uc_data;

	struct dsaf_tbl_tcam_data tcam_data;

	char mac_addr[ETH_ALEN] = {0};



	if (entry_index >= dsaf_dev->tcam_max_num) {

		/* find none, del error */

		dev_err(dsaf_dev->dev, "get_uc_entry failed, %s\n",

			dsaf_dev->ae_dev.name);

		return -EINVAL;

	}



	/* mc entry, do read opt */

	hns_dsaf_tcam_mc_get(dsaf_dev, entry_index, &tcam_data, &mac_data);



	mac_key.high.val = le32_to_cpu(tcam_data.tbl_tcam_data_high);

	mac_key.low.val = le32_to_cpu(tcam_data.tbl_tcam_data_low);



	mac_entry->port_mask[0] = mac_data.tbl_mcast_port_msk[0] & 0x3F;



	/***get mac addr*/

	mac_addr[0] = mac_key.high.bits.mac_0;

	mac_addr[1] = mac_key.high.bits.mac_1;

	mac_addr[2] = mac_key.high.bits.mac_2;

	mac_addr[3] = mac_key.high.bits.mac_3;

	mac_addr[4] = mac_key.low.bits.mac_4;

	mac_addr[5] = mac_key.low.bits.mac_5;

	/**is mc or uc*/

	if (MAC_IS_MULTICAST((u8 *)mac_addr) ||

	    MAC_IS_L3_MULTICAST((u8 *)mac_addr)) {

		/**mc donot do*/

	} else {

		/*is not mc, just uc... */

		hns_dsaf_tcam_uc_get(dsaf_dev, entry_index, &tcam_data,

				     &mac_uc_data);



		mac_key.high.val = le32_to_cpu(tcam_data.tbl_tcam_data_high);

		mac_key.low.val = le32_to_cpu(tcam_data.tbl_tcam_data_low);



		mac_entry->port_mask[0] = (1 << mac_uc_data.tbl_ucast_out_port);

	}



	return 0;

}



static struct dsaf_device *hns_dsaf_alloc_dev(struct device *dev,

					      size_t sizeof_priv)

{

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

+0 −10
Original line number Diff line number Diff line
@@ -435,15 +435,6 @@ int hns_dsaf_del_mac_entry(struct dsaf_device *dsaf_dev, u16 vlan_id, 
			   u8 in_port_num, u8 *addr);

int hns_dsaf_del_mac_mc_port(struct dsaf_device *dsaf_dev,

			     struct dsaf_drv_mac_single_dest_entry *mac_entry);

int hns_dsaf_get_mac_uc_entry(struct dsaf_device *dsaf_dev,

			      struct dsaf_drv_mac_single_dest_entry *mac_entry);

int hns_dsaf_get_mac_mc_entry(struct dsaf_device *dsaf_dev,

			      struct dsaf_drv_mac_multi_dest_entry *mac_entry);

int hns_dsaf_get_mac_entry_by_index(

	struct dsaf_device *dsaf_dev,

	u16 entry_index,

	struct dsaf_drv_mac_multi_dest_entry *mac_entry);



void hns_dsaf_fix_mac_mode(struct hns_mac_cb *mac_cb);



int hns_dsaf_ae_init(struct dsaf_device *dsaf_dev);
@@ -473,5 +464,4 @@ int hns_dsaf_rm_mac_addr( 
int hns_dsaf_clr_mac_mc_port(struct dsaf_device *dsaf_dev,

			     u8 mac_id, u8 port_num);





#endif /* __HNS_DSAF_MAIN_H__ */