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

Commit 9d5fd927 authored by Ganesh Goudar's avatar Ganesh Goudar Committed by David S. Miller
Browse files

cxgb4/cxgb4vf: add support for ndo_set_vf_vlan 



implement ndo_set_vf_vlan for mgmt netdevice to configure
the PCIe VF.

Original work by: Casey Leedom <leedom@chelsio.com>
Signed-off-by: default avatarGanesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 43df215d

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h

+3 −0
Original line number Diff line number Diff line
@@ -820,6 +820,7 @@ struct vf_info { 
	unsigned char vf_mac_addr[ETH_ALEN];

	unsigned int tx_rate;

	bool pf_set_mac;

	u16 vlan;

};



struct mbox_list {
@@ -1738,4 +1739,6 @@ void free_rspq_fl(struct adapter *adap, struct sge_rspq *rq, struct sge_fl *fl); 
void free_tx_desc(struct adapter *adap, struct sge_txq *q,

		  unsigned int n, bool unmap);

void free_txq(struct adapter *adap, struct sge_txq *q);

int t4_set_vlan_acl(struct adapter *adap, unsigned int mbox, unsigned int vf,

		    u16 vlan);

#endif /* __CXGB4_H__ */

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+25 −1
Original line number Diff line number Diff line
@@ -2783,7 +2783,30 @@ static int cxgb4_mgmt_set_vf_rate(struct net_device *dev, int vf, 
	return 0;

}



#endif

static int cxgb4_mgmt_set_vf_vlan(struct net_device *dev, int vf,

				  u16 vlan, u8 qos, __be16 vlan_proto)

{

	struct port_info *pi = netdev_priv(dev);

	struct adapter *adap = pi->adapter;

	int ret;



	if (vf >= adap->num_vfs || vlan > 4095 || qos > 7)

		return -EINVAL;



	if (vlan_proto != htons(ETH_P_8021Q) || qos != 0)

		return -EPROTONOSUPPORT;



	ret = t4_set_vlan_acl(adap, adap->mbox, vf + 1, vlan);

	if (!ret) {

		adap->vfinfo[vf].vlan = vlan;

		return 0;

	}



	dev_err(adap->pdev_dev, "Err %d %s VLAN ACL for PF/VF %d/%d\n",

		ret, (vlan ? "setting" : "clearing"), adap->pf, vf);

	return ret;

}

#endif /* CONFIG_PCI_IOV */



static int cxgb_set_mac_addr(struct net_device *dev, void *p)

{
@@ -3207,6 +3230,7 @@ static const struct net_device_ops cxgb4_mgmt_netdev_ops = { 
	.ndo_get_vf_config    = cxgb4_mgmt_get_vf_config,

	.ndo_set_vf_rate      = cxgb4_mgmt_set_vf_rate,

	.ndo_get_phys_port_id = cxgb4_mgmt_get_phys_port_id,

	.ndo_set_vf_vlan      = cxgb4_mgmt_set_vf_vlan,

};

#endif

drivers/net/ethernet/chelsio/cxgb4/t4_hw.c

+32 −0
Original line number Diff line number Diff line
@@ -9899,3 +9899,35 @@ int t4_i2c_rd(struct adapter *adap, unsigned int mbox, int port, 


	return ret;

}



/**

 *      t4_set_vlan_acl - Set a VLAN id for the specified VF

 *      @adapter: the adapter

 *      @mbox: mailbox to use for the FW command

 *      @vf: one of the VFs instantiated by the specified PF

 *      @vlan: The vlanid to be set

 */

int t4_set_vlan_acl(struct adapter *adap, unsigned int mbox, unsigned int vf,

		    u16 vlan)

{

	struct fw_acl_vlan_cmd vlan_cmd;

	unsigned int enable;



	enable = (vlan ? FW_ACL_VLAN_CMD_EN_F : 0);

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

	vlan_cmd.op_to_vfn = cpu_to_be32(FW_CMD_OP_V(FW_ACL_VLAN_CMD) |

					 FW_CMD_REQUEST_F |

					 FW_CMD_WRITE_F |

					 FW_CMD_EXEC_F |

					 FW_ACL_VLAN_CMD_PFN_V(adap->pf) |

					 FW_ACL_VLAN_CMD_VFN_V(vf));

	vlan_cmd.en_to_len16 = cpu_to_be32(enable | FW_LEN16(vlan_cmd));

	/* Drop all packets that donot match vlan id */

	vlan_cmd.dropnovlan_fm = FW_ACL_VLAN_CMD_FM_F;

	if (enable != 0) {

		vlan_cmd.nvlan = 1;

		vlan_cmd.vlanid[0] = cpu_to_be16(vlan);

	}



	return t4_wr_mbox(adap, adap->mbox, &vlan_cmd, sizeof(vlan_cmd), NULL);

}

drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h

+12 −4
Original line number Diff line number Diff line
@@ -2354,13 +2354,21 @@ struct fw_acl_vlan_cmd { 
#define FW_ACL_VLAN_CMD_VFN_V(x)	((x) << FW_ACL_VLAN_CMD_VFN_S)



#define FW_ACL_VLAN_CMD_EN_S		31

#define FW_ACL_VLAN_CMD_EN_M		0x1

#define FW_ACL_VLAN_CMD_EN_V(x)		((x) << FW_ACL_VLAN_CMD_EN_S)

#define FW_ACL_VLAN_CMD_EN_G(x)         \

	(((x) >> S_FW_ACL_VLAN_CMD_EN_S) & FW_ACL_VLAN_CMD_EN_M)

#define FW_ACL_VLAN_CMD_EN_F            FW_ACL_VLAN_CMD_EN_V(1U)



#define FW_ACL_VLAN_CMD_DROPNOVLAN_S	7

#define FW_ACL_VLAN_CMD_DROPNOVLAN_V(x)	((x) << FW_ACL_VLAN_CMD_DROPNOVLAN_S)



#define FW_ACL_VLAN_CMD_FM_S		6

#define FW_ACL_VLAN_CMD_FM_M		0x1

#define FW_ACL_VLAN_CMD_FM_V(x)         ((x) << FW_ACL_VLAN_CMD_FM_S)

#define FW_ACL_VLAN_CMD_FM_G(x)         \

	(((x) >> FW_ACL_VLAN_CMD_FM_S) & FW_ACL_VLAN_CMD_FM_M)

#define FW_ACL_VLAN_CMD_FM_F            FW_ACL_VLAN_CMD_FM_V(1U)



/* old 16-bit port capabilities bitmap (fw_port_cap16_t) */

enum fw_port_cap {

drivers/net/ethernet/chelsio/cxgb4vf/adapter.h

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ struct sge_rspq; 
 */

struct port_info {

	struct adapter *adapter;	/* our adapter */

	u32 vlan_id;			/* vlan id for VST */

	u16 viid;			/* virtual interface ID */

	s16 xact_addr_filt;		/* index of our MAC address filter */

	u16 rss_size;			/* size of VI's RSS table slice */