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

Commit eff16960 authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

qed*: Support forced MAC 



Allows the PF to enforce the VF's mac.
i.e., by using `ip link ... vf <x> mac <value>'.

While a MAC is forced, PF would prevent the VF from configuring any other
MAC.

Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 08feecd7

drivers/net/ethernet/qlogic/qed/qed_l2.c

+9 −0
Original line number Diff line number Diff line
@@ -1701,6 +1701,14 @@ static void qed_register_eth_ops(struct qed_dev *cdev, 
		qed_vf_start_iov_wq(cdev);

}



static bool qed_check_mac(struct qed_dev *cdev, u8 *mac)

{

	if (IS_PF(cdev))

		return true;



	return qed_vf_check_mac(&cdev->hwfns[0], mac);

}



static int qed_start_vport(struct qed_dev *cdev,

			   struct qed_start_vport_params *params)

{
@@ -2149,6 +2157,7 @@ static const struct qed_eth_ops qed_eth_ops_pass = { 
#endif

	.fill_dev_info = &qed_fill_eth_dev_info,

	.register_ops = &qed_register_eth_ops,

	.check_mac = &qed_check_mac,

	.vport_start = &qed_start_vport,

	.vport_stop = &qed_stop_vport,

	.vport_update = &qed_update_vport,

drivers/net/ethernet/qlogic/qed/qed_sriov.c

+120 −0
Original line number Diff line number Diff line
@@ -1295,6 +1295,29 @@ static int qed_iov_configure_vport_forced(struct qed_hwfn *p_hwfn, 
	if (!p_vf->vport_instance)

		return -EINVAL;



	if (events & (1 << MAC_ADDR_FORCED)) {

		/* Since there's no way [currently] of removing the MAC,

		 * we can always assume this means we need to force it.

		 */

		memset(&filter, 0, sizeof(filter));

		filter.type = QED_FILTER_MAC;

		filter.opcode = QED_FILTER_REPLACE;

		filter.is_rx_filter = 1;

		filter.is_tx_filter = 1;

		filter.vport_to_add_to = p_vf->vport_id;

		ether_addr_copy(filter.mac, p_vf->bulletin.p_virt->mac);



		rc = qed_sp_eth_filter_ucast(p_hwfn, p_vf->opaque_fid,

					     &filter, QED_SPQ_MODE_CB, NULL);

		if (rc) {

			DP_NOTICE(p_hwfn,

				  "PF failed to configure MAC for VF\n");

			return rc;

		}



		p_vf->configured_features |= 1 << MAC_ADDR_FORCED;

	}



	if (events & (1 << VLAN_ADDR_FORCED)) {

		struct qed_sp_vport_update_params vport_update;

		u8 removal;
@@ -2199,6 +2222,16 @@ static void qed_iov_vf_mbx_ucast_filter(struct qed_hwfn *p_hwfn, 
		goto out;

	}



	if ((p_bulletin->valid_bitmap & (1 << MAC_ADDR_FORCED)) &&

	    (params.type == QED_FILTER_MAC ||

	     params.type == QED_FILTER_MAC_VLAN)) {

		if (!ether_addr_equal(p_bulletin->mac, params.mac) ||

		    (params.opcode != QED_FILTER_ADD &&

		     params.opcode != QED_FILTER_REPLACE))

			status = PFVF_STATUS_FORCED;

		goto out;

	}



	rc = qed_iov_chk_ucast(p_hwfn, vf->relative_vf_id, &params);

	if (rc) {

		status = PFVF_STATUS_FAILURE;
@@ -2702,6 +2735,30 @@ static int qed_iov_copy_vf_msg(struct qed_hwfn *p_hwfn, struct qed_ptt *ptt, 
	return 0;

}



static void qed_iov_bulletin_set_forced_mac(struct qed_hwfn *p_hwfn,

					    u8 *mac, int vfid)

{

	struct qed_vf_info *vf_info;

	u64 feature;



	vf_info = qed_iov_get_vf_info(p_hwfn, (u16)vfid, true);

	if (!vf_info) {

		DP_NOTICE(p_hwfn->cdev,

			  "Can not set forced MAC, invalid vfid [%d]\n", vfid);

		return;

	}



	feature = 1 << MAC_ADDR_FORCED;

	memcpy(vf_info->bulletin.p_virt->mac, mac, ETH_ALEN);



	vf_info->bulletin.p_virt->valid_bitmap |= feature;

	/* Forced MAC will disable MAC_ADDR */

	vf_info->bulletin.p_virt->valid_bitmap &=

				~(1 << VFPF_BULLETIN_MAC_ADDR);



	qed_iov_configure_vport_forced(p_hwfn, vf_info, feature);

}



void qed_iov_bulletin_set_forced_vlan(struct qed_hwfn *p_hwfn,

				      u16 pvid, int vfid)

{
@@ -2736,6 +2793,21 @@ bool qed_iov_is_vf_stopped(struct qed_hwfn *p_hwfn, int vfid) 
	return p_vf_info->state == VF_STOPPED;

}



static u8 *qed_iov_bulletin_get_forced_mac(struct qed_hwfn *p_hwfn,

					   u16 rel_vf_id)

{

	struct qed_vf_info *p_vf;



	p_vf = qed_iov_get_vf_info(p_hwfn, rel_vf_id, true);

	if (!p_vf || !p_vf->bulletin.p_virt)

		return NULL;



	if (!(p_vf->bulletin.p_virt->valid_bitmap & (1 << MAC_ADDR_FORCED)))

		return NULL;



	return p_vf->bulletin.p_virt->mac;

}



u16 qed_iov_bulletin_get_forced_vlan(struct qed_hwfn *p_hwfn, u16 rel_vf_id)

{

	struct qed_vf_info *p_vf;
@@ -2899,6 +2971,38 @@ static int qed_sriov_configure(struct qed_dev *cdev, int num_vfs_param) 
		return qed_sriov_disable(cdev, true);

}



static int qed_sriov_pf_set_mac(struct qed_dev *cdev, u8 *mac, int vfid)

{

	int i;



	if (!IS_QED_SRIOV(cdev) || !IS_PF_SRIOV_ALLOC(&cdev->hwfns[0])) {

		DP_VERBOSE(cdev, QED_MSG_IOV,

			   "Cannot set a VF MAC; Sriov is not enabled\n");

		return -EINVAL;

	}



	if (!qed_iov_is_valid_vfid(&cdev->hwfns[0], vfid, true)) {

		DP_VERBOSE(cdev, QED_MSG_IOV,

			   "Cannot set VF[%d] MAC (VF is not active)\n", vfid);

		return -EINVAL;

	}



	for_each_hwfn(cdev, i) {

		struct qed_hwfn *hwfn = &cdev->hwfns[i];

		struct qed_public_vf_info *vf_info;



		vf_info = qed_iov_get_public_vf_info(hwfn, vfid, true);

		if (!vf_info)

			continue;



		/* Set the forced MAC, and schedule the IOV task */

		ether_addr_copy(vf_info->forced_mac, mac);

		qed_schedule_iov(hwfn, QED_IOV_WQ_SET_UNICAST_FILTER_FLAG);

	}



	return 0;

}



static int qed_sriov_pf_set_vlan(struct qed_dev *cdev, u16 vid, int vfid)

{

	int i;
@@ -3000,12 +3104,27 @@ static void qed_handle_pf_set_vf_unicast(struct qed_hwfn *hwfn) 
	qed_for_each_vf(hwfn, i) {

		struct qed_public_vf_info *info;

		bool update = false;

		u8 *mac;



		info = qed_iov_get_public_vf_info(hwfn, i, true);

		if (!info)

			continue;



		/* Update data on bulletin board */

		mac = qed_iov_bulletin_get_forced_mac(hwfn, i);

		if (is_valid_ether_addr(info->forced_mac) &&

		    (!mac || !ether_addr_equal(mac, info->forced_mac))) {

			DP_VERBOSE(hwfn,

				   QED_MSG_IOV,

				   "Handling PF setting of VF MAC to VF 0x%02x [Abs 0x%02x]\n",

				   i,

				   hwfn->cdev->p_iov_info->first_vf_in_pf + i);



			/* Update bulletin board with forced MAC */

			qed_iov_bulletin_set_forced_mac(hwfn,

							info->forced_mac, i);

			update = true;

		}



		if (qed_iov_bulletin_get_forced_vlan(hwfn, i) ^

		    info->forced_vlan) {
@@ -3133,5 +3252,6 @@ int qed_iov_wq_start(struct qed_dev *cdev) 


const struct qed_iov_hv_ops qed_iov_ops_pass = {

	.configure = &qed_sriov_configure,

	.set_mac = &qed_sriov_pf_set_mac,

	.set_vlan = &qed_sriov_pf_set_vlan,

};

drivers/net/ethernet/qlogic/qed/qed_sriov.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ struct qed_public_vf_info { 
	/* These copies will later be reflected in the bulletin board,

	 * but this copy should be newer.

	 */

	u8 forced_mac[ETH_ALEN];

	u16 forced_vlan;

	u8 mac[ETH_ALEN];

};

drivers/net/ethernet/qlogic/qed/qed_vf.c

+47 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



#include <linux/crc32.h>

#include <linux/etherdevice.h>

#include "qed.h"

#include "qed_sriov.h"

#include "qed_vf.h"
@@ -1004,6 +1005,43 @@ void qed_vf_get_num_vlan_filters(struct qed_hwfn *p_hwfn, u8 *num_vlan_filters) 
	*num_vlan_filters = p_vf->acquire_resp.resc.num_vlan_filters;

}



bool qed_vf_check_mac(struct qed_hwfn *p_hwfn, u8 *mac)

{

	struct qed_bulletin_content *bulletin;



	bulletin = &p_hwfn->vf_iov_info->bulletin_shadow;

	if (!(bulletin->valid_bitmap & (1 << MAC_ADDR_FORCED)))

		return true;



	/* Forbid VF from changing a MAC enforced by PF */

	if (ether_addr_equal(bulletin->mac, mac))

		return false;



	return false;

}



bool qed_vf_bulletin_get_forced_mac(struct qed_hwfn *hwfn,

				    u8 *dst_mac, u8 *p_is_forced)

{

	struct qed_bulletin_content *bulletin;



	bulletin = &hwfn->vf_iov_info->bulletin_shadow;



	if (bulletin->valid_bitmap & (1 << MAC_ADDR_FORCED)) {

		if (p_is_forced)

			*p_is_forced = 1;

	} else if (bulletin->valid_bitmap & (1 << VFPF_BULLETIN_MAC_ADDR)) {

		if (p_is_forced)

			*p_is_forced = 0;

	} else {

		return false;

	}



	ether_addr_copy(dst_mac, bulletin->mac);



	return true;

}



void qed_vf_get_fw_version(struct qed_hwfn *p_hwfn,

			   u16 *fw_major, u16 *fw_minor,

			   u16 *fw_rev, u16 *fw_eng)
@@ -1020,6 +1058,15 @@ void qed_vf_get_fw_version(struct qed_hwfn *p_hwfn, 


static void qed_handle_bulletin_change(struct qed_hwfn *hwfn)

{

	struct qed_eth_cb_ops *ops = hwfn->cdev->protocol_ops.eth;

	u8 mac[ETH_ALEN], is_mac_exist, is_mac_forced;

	void *cookie = hwfn->cdev->ops_cookie;



	is_mac_exist = qed_vf_bulletin_get_forced_mac(hwfn, mac,

						      &is_mac_forced);

	if (is_mac_exist && is_mac_forced && cookie)

		ops->force_mac(cookie, mac);



	/* Always update link configuration according to bulletin */

	qed_link_update(hwfn);

}

drivers/net/ethernet/qlogic/qed/qed_vf.h

+21 −0
Original line number Diff line number Diff line
@@ -418,6 +418,8 @@ union pfvf_tlvs { 
};



enum qed_bulletin_bit {

	/* Alert the VF that a forced MAC was set by the PF */

	MAC_ADDR_FORCED = 0,

	/* Alert the VF that a forced VLAN was set by the PF */

	VLAN_ADDR_FORCED = 2,
@@ -425,6 +427,10 @@ enum qed_bulletin_bit { 
	VFPF_BULLETIN_UNTAGGED_DEFAULT = 3,

	VFPF_BULLETIN_UNTAGGED_DEFAULT_FORCED = 4,



	/* Alert the VF that suggested mac was sent by the PF.

	 * MAC_ADDR will be disabled in case MAC_ADDR_FORCED is set.

	 */

	VFPF_BULLETIN_MAC_ADDR = 5

};



struct qed_bulletin_content {
@@ -601,6 +607,16 @@ void qed_vf_get_port_mac(struct qed_hwfn *p_hwfn, u8 *port_mac); 
void qed_vf_get_num_vlan_filters(struct qed_hwfn *p_hwfn,

				 u8 *num_vlan_filters);



/**

 * @brief Check if VF can set a MAC address

 *

 * @param p_hwfn

 * @param mac

 *

 * @return bool

 */

bool qed_vf_check_mac(struct qed_hwfn *p_hwfn, u8 *mac);



/**

 * @brief Set firmware version information in dev_info from VFs acquire response tlv

 *
@@ -841,6 +857,11 @@ static inline void qed_vf_get_num_vlan_filters(struct qed_hwfn *p_hwfn, 
{

}



static inline bool qed_vf_check_mac(struct qed_hwfn *p_hwfn, u8 *mac)

{

	return false;

}



static inline void qed_vf_get_fw_version(struct qed_hwfn *p_hwfn,

					 u16 *fw_major, u16 *fw_minor,

					 u16 *fw_rev, u16 *fw_eng)