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

Commit 3175d8c2 authored by Sathya Perla's avatar Sathya Perla Committed by David S. Miller
Browse files

be2net: use SET/GET_MAC_LIST for SH-R 



On SH-R and Lancer-R, GET_MAC_LIST cmd is better supported
(instead of NTWK_MAC_QUERY cmd) to query provisioned MAC addresses.
Similiarly, (on SH-R and Lancer-R) SET_MAC_LIST must be used by the PF to
provision a permanent MAC addresses to the VF.

Signed-off-by: default avatarSathya Perla <sathya.perla@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 95046b92

drivers/net/ethernet/emulex/benet/be_cmds.c

+34 −15
Original line number Original line Diff line number Diff line
@@ -2740,19 +2740,15 @@ int be_cmd_get_mac_from_list(struct be_adapter *adapter, u8 *mac, 




int be_cmd_get_active_mac(struct be_adapter *adapter, u32 curr_pmac_id, u8 *mac)

int be_cmd_get_active_mac(struct be_adapter *adapter, u32 curr_pmac_id, u8 *mac)

{

{

	int status;

	bool active = true;

	bool active = true;





	/* When SH FW is ready, SH should use Lancer path too */

	if (BEx_chip(adapter))

	if (lancer_chip(adapter)) {

		/* Fetch the MAC address using pmac_id */

		status = be_cmd_get_mac_from_list(adapter, mac, &active,

						  &curr_pmac_id, 0);

		return status;

	} else {

		return be_cmd_mac_addr_query(adapter, mac, false,

		return be_cmd_mac_addr_query(adapter, mac, false,

					     adapter->if_handle, curr_pmac_id);

					     adapter->if_handle, curr_pmac_id);

	}

	else

		/* Fetch the MAC address using pmac_id */

		return be_cmd_get_mac_from_list(adapter, mac, &active,

						&curr_pmac_id, 0);

}

}





int be_cmd_get_perm_mac(struct be_adapter *adapter, u8 *mac)

int be_cmd_get_perm_mac(struct be_adapter *adapter, u8 *mac)
@@ -2762,14 +2758,18 @@ int be_cmd_get_perm_mac(struct be_adapter *adapter, u8 *mac) 




	memset(mac, 0, ETH_ALEN);

	memset(mac, 0, ETH_ALEN);





	if (lancer_chip(adapter))

	if (BEx_chip(adapter)) {

		status = be_cmd_get_mac_from_list(adapter, mac, &pmac_valid,

		if (be_physfn(adapter))

						  NULL, 0);

			status = be_cmd_mac_addr_query(adapter, mac, true, 0,

	else if (be_physfn(adapter))

						       0);

		status = be_cmd_mac_addr_query(adapter, mac, true, 0, 0);

		else

		else

			status = be_cmd_mac_addr_query(adapter, mac, false,

			status = be_cmd_mac_addr_query(adapter, mac, false,

						       adapter->if_handle, 0);

						       adapter->if_handle, 0);

	} else {

		status = be_cmd_get_mac_from_list(adapter, mac, &pmac_valid,

						  NULL, 0);

	}



	return status;

	return status;

}

}
@@ -2816,6 +2816,25 @@ int be_cmd_set_mac_list(struct be_adapter *adapter, u8 *mac_array, 
	return status;

	return status;

}

}





/* Wrapper to delete any active MACs and provision the new mac.

 * Changes to MAC_LIST are allowed iff none of the MAC addresses in the

 * current list are active.

 */

int be_cmd_set_mac(struct be_adapter *adapter, u8 *mac, int if_id, u32 dom)

{

	bool active_mac = false;

	u8 old_mac[ETH_ALEN];

	u32 pmac_id;

	int status;



	status = be_cmd_get_mac_from_list(adapter, old_mac, &active_mac,

					  &pmac_id, dom);

	if (!status && active_mac)

		be_cmd_pmac_del(adapter, if_id, pmac_id, dom);



	return be_cmd_set_mac_list(adapter, mac, mac ? 1 : 0, dom);

}



int be_cmd_set_hsw_config(struct be_adapter *adapter, u16 pvid,

int be_cmd_set_hsw_config(struct be_adapter *adapter, u16 pvid,

			u32 domain, u16 intf_id)

			u32 domain, u16 intf_id)

{

{

drivers/net/ethernet/emulex/benet/be_cmds.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -1937,6 +1937,8 @@ extern int be_cmd_get_active_mac(struct be_adapter *adapter, u32 pmac_id, 
extern int be_cmd_get_perm_mac(struct be_adapter *adapter, u8 *mac);

extern int be_cmd_get_perm_mac(struct be_adapter *adapter, u8 *mac);

extern int be_cmd_set_mac_list(struct be_adapter *adapter, u8 *mac_array,

extern int be_cmd_set_mac_list(struct be_adapter *adapter, u8 *mac_array,

						u8 mac_count, u32 domain);

						u8 mac_count, u32 domain);

extern int be_cmd_set_mac(struct be_adapter *adapter, u8 *mac, int if_id,

			  u32 dom);

extern int be_cmd_set_hsw_config(struct be_adapter *adapter, u16 pvid,

extern int be_cmd_set_hsw_config(struct be_adapter *adapter, u16 pvid,

			u32 domain, u16 intf_id);

			u32 domain, u16 intf_id);

extern int be_cmd_get_hsw_config(struct be_adapter *adapter, u16 *pvid,

extern int be_cmd_get_hsw_config(struct be_adapter *adapter, u16 *pvid,

drivers/net/ethernet/emulex/benet/be_main.c

+14 −21
Original line number Original line Diff line number Diff line
@@ -1146,9 +1146,6 @@ static int be_set_vf_mac(struct net_device *netdev, int vf, u8 *mac) 
	struct be_adapter *adapter = netdev_priv(netdev);

	struct be_adapter *adapter = netdev_priv(netdev);

	struct be_vf_cfg *vf_cfg = &adapter->vf_cfg[vf];

	struct be_vf_cfg *vf_cfg = &adapter->vf_cfg[vf];

	int status;

	int status;

	bool active_mac = false;

	u32 pmac_id;

	u8 old_mac[ETH_ALEN];





	if (!sriov_enabled(adapter))

	if (!sriov_enabled(adapter))

		return -EPERM;

		return -EPERM;
@@ -1156,20 +1153,15 @@ static int be_set_vf_mac(struct net_device *netdev, int vf, u8 *mac) 
	if (!is_valid_ether_addr(mac) || vf >= adapter->num_vfs)

	if (!is_valid_ether_addr(mac) || vf >= adapter->num_vfs)

		return -EINVAL;

		return -EINVAL;





	if (lancer_chip(adapter)) {

	if (BEx_chip(adapter)) {

		status = be_cmd_get_mac_from_list(adapter, old_mac, &active_mac,

		be_cmd_pmac_del(adapter, vf_cfg->if_handle, vf_cfg->pmac_id,

						  &pmac_id, vf + 1);

				vf + 1);

		if (!status && active_mac)

			be_cmd_pmac_del(adapter, vf_cfg->if_handle,

					pmac_id, vf + 1);



		status = be_cmd_set_mac_list(adapter,  mac, 1, vf + 1);

	} else {

		status = be_cmd_pmac_del(adapter, vf_cfg->if_handle,

					 vf_cfg->pmac_id, vf + 1);





		status = be_cmd_pmac_add(adapter, mac, vf_cfg->if_handle,

		status = be_cmd_pmac_add(adapter, mac, vf_cfg->if_handle,

					 &vf_cfg->pmac_id, vf + 1);

					 &vf_cfg->pmac_id, vf + 1);

	} else {

		status = be_cmd_set_mac(adapter, mac, vf_cfg->if_handle,

					vf + 1);

	}

	}





	if (status)

	if (status)
@@ -2735,13 +2727,13 @@ static int be_vf_eth_addr_config(struct be_adapter *adapter) 
	be_vf_eth_addr_generate(adapter, mac);

	be_vf_eth_addr_generate(adapter, mac);





	for_all_vfs(adapter, vf_cfg, vf) {

	for_all_vfs(adapter, vf_cfg, vf) {

		if (lancer_chip(adapter)) {

		if (BEx_chip(adapter))

			status = be_cmd_set_mac_list(adapter,  mac, 1, vf + 1);

		} else {

			status = be_cmd_pmac_add(adapter, mac,

			status = be_cmd_pmac_add(adapter, mac,

						 vf_cfg->if_handle,

						 vf_cfg->if_handle,

						 &vf_cfg->pmac_id, vf + 1);

						 &vf_cfg->pmac_id, vf + 1);

		}

		else

			status = be_cmd_set_mac(adapter, mac, vf_cfg->if_handle,

						vf + 1);





		if (status)

		if (status)

			dev_err(&adapter->pdev->dev,

			dev_err(&adapter->pdev->dev,
@@ -2788,11 +2780,12 @@ static void be_vf_clear(struct be_adapter *adapter) 
	pci_disable_sriov(adapter->pdev);

	pci_disable_sriov(adapter->pdev);





	for_all_vfs(adapter, vf_cfg, vf) {

	for_all_vfs(adapter, vf_cfg, vf) {

		if (lancer_chip(adapter))

		if (BEx_chip(adapter))

			be_cmd_set_mac_list(adapter, NULL, 0, vf + 1);

		else

			be_cmd_pmac_del(adapter, vf_cfg->if_handle,

			be_cmd_pmac_del(adapter, vf_cfg->if_handle,

					vf_cfg->pmac_id, vf + 1);

					vf_cfg->pmac_id, vf + 1);

		else

			be_cmd_set_mac(adapter, NULL, vf_cfg->if_handle,

				       vf + 1);





		be_cmd_if_destroy(adapter, vf_cfg->if_handle, vf + 1);

		be_cmd_if_destroy(adapter, vf_cfg->if_handle, vf + 1);

	}

	}