mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-18 02:04:05 +08:00
Merge branch 'ionic-add-sriov-support'
Shannon Nelson says: ==================== ionic: add sriov support Set up the basic support for enabling SR-IOV devices in the ionic driver. Since most of the management work happens in the NIC firmware, the driver becomes mostly a pass-through for the network stack commands that want to control and configure the VFs. v4: changed "vf too big" checks to use pci_num_vf() changed from vf[] array of pointers of individually allocated vf structs to single allocated vfs[] array of vf structs added clean up of vfs[] on probe fail added setup for vf stats dma v3: added check in probe for pre-existing VFs split out the alloc and dealloc of vf structs to better deal with pre-existing VFs (left enabled on remove) restored the checks for vf too big because of a potential case where VFs are already enabled but driver failed to alloc the vf structs v2: use pci_num_vf() and kcalloc() remove checks for vf too big add locking for the VF operations disable VFs in ionic_remove() if they are still running ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
aea6a1eba5
@ -12,7 +12,7 @@ struct ionic_lif;
|
||||
|
||||
#define IONIC_DRV_NAME "ionic"
|
||||
#define IONIC_DRV_DESCRIPTION "Pensando Ethernet NIC Driver"
|
||||
#define IONIC_DRV_VERSION "0.18.0-k"
|
||||
#define IONIC_DRV_VERSION "0.20.0-k"
|
||||
|
||||
#define PCI_VENDOR_ID_PENSANDO 0x1dd8
|
||||
|
||||
@ -25,6 +25,18 @@ struct ionic_lif;
|
||||
|
||||
#define DEVCMD_TIMEOUT 10
|
||||
|
||||
struct ionic_vf {
|
||||
u16 index;
|
||||
u8 macaddr[6];
|
||||
__le32 maxrate;
|
||||
__le16 vlanid;
|
||||
u8 spoofchk;
|
||||
u8 trusted;
|
||||
u8 linkstate;
|
||||
dma_addr_t stats_pa;
|
||||
struct ionic_lif_stats stats;
|
||||
};
|
||||
|
||||
struct ionic {
|
||||
struct pci_dev *pdev;
|
||||
struct device *dev;
|
||||
@ -46,6 +58,9 @@ struct ionic {
|
||||
DECLARE_BITMAP(intrs, IONIC_INTR_CTRL_REGS_MAX);
|
||||
struct work_struct nb_work;
|
||||
struct notifier_block nb;
|
||||
struct rw_semaphore vf_op_lock; /* lock for VF operations */
|
||||
struct ionic_vf *vfs;
|
||||
int num_vfs;
|
||||
struct timer_list watchdog_timer;
|
||||
int watchdog_period;
|
||||
};
|
||||
|
@ -104,10 +104,112 @@ void ionic_bus_unmap_dbpage(struct ionic *ionic, void __iomem *page)
|
||||
iounmap(page);
|
||||
}
|
||||
|
||||
static void ionic_vf_dealloc_locked(struct ionic *ionic)
|
||||
{
|
||||
struct ionic_vf *v;
|
||||
dma_addr_t dma = 0;
|
||||
int i;
|
||||
|
||||
if (!ionic->vfs)
|
||||
return;
|
||||
|
||||
for (i = ionic->num_vfs - 1; i >= 0; i--) {
|
||||
v = &ionic->vfs[i];
|
||||
|
||||
if (v->stats_pa) {
|
||||
(void)ionic_set_vf_config(ionic, i,
|
||||
IONIC_VF_ATTR_STATSADDR,
|
||||
(u8 *)&dma);
|
||||
dma_unmap_single(ionic->dev, v->stats_pa,
|
||||
sizeof(v->stats), DMA_FROM_DEVICE);
|
||||
v->stats_pa = 0;
|
||||
}
|
||||
}
|
||||
|
||||
kfree(ionic->vfs);
|
||||
ionic->vfs = NULL;
|
||||
ionic->num_vfs = 0;
|
||||
}
|
||||
|
||||
static void ionic_vf_dealloc(struct ionic *ionic)
|
||||
{
|
||||
down_write(&ionic->vf_op_lock);
|
||||
ionic_vf_dealloc_locked(ionic);
|
||||
up_write(&ionic->vf_op_lock);
|
||||
}
|
||||
|
||||
static int ionic_vf_alloc(struct ionic *ionic, int num_vfs)
|
||||
{
|
||||
struct ionic_vf *v;
|
||||
int err = 0;
|
||||
int i;
|
||||
|
||||
down_write(&ionic->vf_op_lock);
|
||||
|
||||
ionic->vfs = kcalloc(num_vfs, sizeof(struct ionic_vf), GFP_KERNEL);
|
||||
if (!ionic->vfs) {
|
||||
err = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
|
||||
for (i = 0; i < num_vfs; i++) {
|
||||
v = &ionic->vfs[i];
|
||||
v->stats_pa = dma_map_single(ionic->dev, &v->stats,
|
||||
sizeof(v->stats), DMA_FROM_DEVICE);
|
||||
if (dma_mapping_error(ionic->dev, v->stats_pa)) {
|
||||
v->stats_pa = 0;
|
||||
err = -ENODEV;
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* ignore failures from older FW, we just won't get stats */
|
||||
(void)ionic_set_vf_config(ionic, i, IONIC_VF_ATTR_STATSADDR,
|
||||
(u8 *)&v->stats_pa);
|
||||
ionic->num_vfs++;
|
||||
}
|
||||
|
||||
out:
|
||||
if (err)
|
||||
ionic_vf_dealloc_locked(ionic);
|
||||
up_write(&ionic->vf_op_lock);
|
||||
return err;
|
||||
}
|
||||
|
||||
static int ionic_sriov_configure(struct pci_dev *pdev, int num_vfs)
|
||||
{
|
||||
struct ionic *ionic = pci_get_drvdata(pdev);
|
||||
struct device *dev = ionic->dev;
|
||||
int ret = 0;
|
||||
|
||||
if (num_vfs > 0) {
|
||||
ret = pci_enable_sriov(pdev, num_vfs);
|
||||
if (ret) {
|
||||
dev_err(dev, "Cannot enable SRIOV: %d\n", ret);
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = ionic_vf_alloc(ionic, num_vfs);
|
||||
if (ret) {
|
||||
dev_err(dev, "Cannot alloc VFs: %d\n", ret);
|
||||
pci_disable_sriov(pdev);
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = num_vfs;
|
||||
} else {
|
||||
pci_disable_sriov(pdev);
|
||||
ionic_vf_dealloc(ionic);
|
||||
}
|
||||
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct ionic *ionic;
|
||||
int num_vfs;
|
||||
int err;
|
||||
|
||||
ionic = ionic_devlink_alloc(dev);
|
||||
@ -206,6 +308,15 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
goto err_out_free_lifs;
|
||||
}
|
||||
|
||||
init_rwsem(&ionic->vf_op_lock);
|
||||
num_vfs = pci_num_vf(pdev);
|
||||
if (num_vfs) {
|
||||
dev_info(dev, "%d VFs found already enabled\n", num_vfs);
|
||||
err = ionic_vf_alloc(ionic, num_vfs);
|
||||
if (err)
|
||||
dev_err(dev, "Cannot enable existing VFs: %d\n", err);
|
||||
}
|
||||
|
||||
err = ionic_lifs_register(ionic);
|
||||
if (err) {
|
||||
dev_err(dev, "Cannot register LIFs: %d, aborting\n", err);
|
||||
@ -223,6 +334,7 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
err_out_deregister_lifs:
|
||||
ionic_lifs_unregister(ionic);
|
||||
err_out_deinit_lifs:
|
||||
ionic_vf_dealloc(ionic);
|
||||
ionic_lifs_deinit(ionic);
|
||||
err_out_free_lifs:
|
||||
ionic_lifs_free(ionic);
|
||||
@ -279,6 +391,7 @@ static struct pci_driver ionic_driver = {
|
||||
.id_table = ionic_id_table,
|
||||
.probe = ionic_probe,
|
||||
.remove = ionic_remove,
|
||||
.sriov_configure = ionic_sriov_configure,
|
||||
};
|
||||
|
||||
int ionic_bus_register_driver(void)
|
||||
|
@ -286,6 +286,64 @@ void ionic_dev_cmd_port_pause(struct ionic_dev *idev, u8 pause_type)
|
||||
ionic_dev_cmd_go(idev, &cmd);
|
||||
}
|
||||
|
||||
/* VF commands */
|
||||
int ionic_set_vf_config(struct ionic *ionic, int vf, u8 attr, u8 *data)
|
||||
{
|
||||
union ionic_dev_cmd cmd = {
|
||||
.vf_setattr.opcode = IONIC_CMD_VF_SETATTR,
|
||||
.vf_setattr.attr = attr,
|
||||
.vf_setattr.vf_index = vf,
|
||||
};
|
||||
int err;
|
||||
|
||||
switch (attr) {
|
||||
case IONIC_VF_ATTR_SPOOFCHK:
|
||||
cmd.vf_setattr.spoofchk = *data;
|
||||
dev_dbg(ionic->dev, "%s: vf %d spoof %d\n",
|
||||
__func__, vf, *data);
|
||||
break;
|
||||
case IONIC_VF_ATTR_TRUST:
|
||||
cmd.vf_setattr.trust = *data;
|
||||
dev_dbg(ionic->dev, "%s: vf %d trust %d\n",
|
||||
__func__, vf, *data);
|
||||
break;
|
||||
case IONIC_VF_ATTR_LINKSTATE:
|
||||
cmd.vf_setattr.linkstate = *data;
|
||||
dev_dbg(ionic->dev, "%s: vf %d linkstate %d\n",
|
||||
__func__, vf, *data);
|
||||
break;
|
||||
case IONIC_VF_ATTR_MAC:
|
||||
ether_addr_copy(cmd.vf_setattr.macaddr, data);
|
||||
dev_dbg(ionic->dev, "%s: vf %d macaddr %pM\n",
|
||||
__func__, vf, data);
|
||||
break;
|
||||
case IONIC_VF_ATTR_VLAN:
|
||||
cmd.vf_setattr.vlanid = cpu_to_le16(*(u16 *)data);
|
||||
dev_dbg(ionic->dev, "%s: vf %d vlan %d\n",
|
||||
__func__, vf, *(u16 *)data);
|
||||
break;
|
||||
case IONIC_VF_ATTR_RATE:
|
||||
cmd.vf_setattr.maxrate = cpu_to_le32(*(u32 *)data);
|
||||
dev_dbg(ionic->dev, "%s: vf %d maxrate %d\n",
|
||||
__func__, vf, *(u32 *)data);
|
||||
break;
|
||||
case IONIC_VF_ATTR_STATSADDR:
|
||||
cmd.vf_setattr.stats_pa = cpu_to_le64(*(u64 *)data);
|
||||
dev_dbg(ionic->dev, "%s: vf %d stats_pa 0x%08llx\n",
|
||||
__func__, vf, *(u64 *)data);
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
mutex_lock(&ionic->dev_cmd_lock);
|
||||
ionic_dev_cmd_go(&ionic->idev, &cmd);
|
||||
err = ionic_dev_cmd_wait(ionic, DEVCMD_TIMEOUT);
|
||||
mutex_unlock(&ionic->dev_cmd_lock);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
/* LIF commands */
|
||||
void ionic_dev_cmd_lif_identify(struct ionic_dev *idev, u8 type, u8 ver)
|
||||
{
|
||||
|
@ -113,6 +113,12 @@ static_assert(sizeof(struct ionic_rxq_desc) == 16);
|
||||
static_assert(sizeof(struct ionic_rxq_sg_desc) == 128);
|
||||
static_assert(sizeof(struct ionic_rxq_comp) == 16);
|
||||
|
||||
/* SR/IOV */
|
||||
static_assert(sizeof(struct ionic_vf_setattr_cmd) == 64);
|
||||
static_assert(sizeof(struct ionic_vf_setattr_comp) == 16);
|
||||
static_assert(sizeof(struct ionic_vf_getattr_cmd) == 64);
|
||||
static_assert(sizeof(struct ionic_vf_getattr_comp) == 16);
|
||||
|
||||
struct ionic_devinfo {
|
||||
u8 asic_type;
|
||||
u8 asic_rev;
|
||||
@ -275,6 +281,7 @@ void ionic_dev_cmd_port_autoneg(struct ionic_dev *idev, u8 an_enable);
|
||||
void ionic_dev_cmd_port_fec(struct ionic_dev *idev, u8 fec_type);
|
||||
void ionic_dev_cmd_port_pause(struct ionic_dev *idev, u8 pause_type);
|
||||
|
||||
int ionic_set_vf_config(struct ionic *ionic, int vf, u8 attr, u8 *data);
|
||||
void ionic_dev_cmd_lif_identify(struct ionic_dev *idev, u8 type, u8 ver);
|
||||
void ionic_dev_cmd_lif_init(struct ionic_dev *idev, u16 lif_index,
|
||||
dma_addr_t addr);
|
||||
|
@ -51,6 +51,10 @@ enum ionic_cmd_opcode {
|
||||
IONIC_CMD_RDMA_CREATE_CQ = 52,
|
||||
IONIC_CMD_RDMA_CREATE_ADMINQ = 53,
|
||||
|
||||
/* SR/IOV commands */
|
||||
IONIC_CMD_VF_GETATTR = 60,
|
||||
IONIC_CMD_VF_SETATTR = 61,
|
||||
|
||||
/* QoS commands */
|
||||
IONIC_CMD_QOS_CLASS_IDENTIFY = 240,
|
||||
IONIC_CMD_QOS_CLASS_INIT = 241,
|
||||
@ -1639,6 +1643,93 @@ enum ionic_qos_sched_type {
|
||||
IONIC_QOS_SCHED_TYPE_DWRR = 1, /* Deficit weighted round-robin */
|
||||
};
|
||||
|
||||
enum ionic_vf_attr {
|
||||
IONIC_VF_ATTR_SPOOFCHK = 1,
|
||||
IONIC_VF_ATTR_TRUST = 2,
|
||||
IONIC_VF_ATTR_MAC = 3,
|
||||
IONIC_VF_ATTR_LINKSTATE = 4,
|
||||
IONIC_VF_ATTR_VLAN = 5,
|
||||
IONIC_VF_ATTR_RATE = 6,
|
||||
IONIC_VF_ATTR_STATSADDR = 7,
|
||||
};
|
||||
|
||||
/**
|
||||
* VF link status
|
||||
*/
|
||||
enum ionic_vf_link_status {
|
||||
IONIC_VF_LINK_STATUS_AUTO = 0, /* link state of the uplink */
|
||||
IONIC_VF_LINK_STATUS_UP = 1, /* link is always up */
|
||||
IONIC_VF_LINK_STATUS_DOWN = 2, /* link is always down */
|
||||
};
|
||||
|
||||
/**
|
||||
* struct ionic_vf_setattr_cmd - Set VF attributes on the NIC
|
||||
* @opcode: Opcode
|
||||
* @index: VF index
|
||||
* @attr: Attribute type (enum ionic_vf_attr)
|
||||
* macaddr mac address
|
||||
* vlanid vlan ID
|
||||
* maxrate max Tx rate in Mbps
|
||||
* spoofchk enable address spoof checking
|
||||
* trust enable VF trust
|
||||
* linkstate set link up or down
|
||||
* stats_pa set DMA address for VF stats
|
||||
*/
|
||||
struct ionic_vf_setattr_cmd {
|
||||
u8 opcode;
|
||||
u8 attr;
|
||||
__le16 vf_index;
|
||||
union {
|
||||
u8 macaddr[6];
|
||||
__le16 vlanid;
|
||||
__le32 maxrate;
|
||||
u8 spoofchk;
|
||||
u8 trust;
|
||||
u8 linkstate;
|
||||
__le64 stats_pa;
|
||||
u8 pad[60];
|
||||
};
|
||||
};
|
||||
|
||||
struct ionic_vf_setattr_comp {
|
||||
u8 status;
|
||||
u8 attr;
|
||||
__le16 vf_index;
|
||||
__le16 comp_index;
|
||||
u8 rsvd[9];
|
||||
u8 color;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct ionic_vf_getattr_cmd - Get VF attributes from the NIC
|
||||
* @opcode: Opcode
|
||||
* @index: VF index
|
||||
* @attr: Attribute type (enum ionic_vf_attr)
|
||||
*/
|
||||
struct ionic_vf_getattr_cmd {
|
||||
u8 opcode;
|
||||
u8 attr;
|
||||
__le16 vf_index;
|
||||
u8 rsvd[60];
|
||||
};
|
||||
|
||||
struct ionic_vf_getattr_comp {
|
||||
u8 status;
|
||||
u8 attr;
|
||||
__le16 vf_index;
|
||||
union {
|
||||
u8 macaddr[6];
|
||||
__le16 vlanid;
|
||||
__le32 maxrate;
|
||||
u8 spoofchk;
|
||||
u8 trust;
|
||||
u8 linkstate;
|
||||
__le64 stats_pa;
|
||||
u8 pad[11];
|
||||
};
|
||||
u8 color;
|
||||
};
|
||||
|
||||
/**
|
||||
* union ionic_qos_config - Qos configuration structure
|
||||
* @flags: Configuration flags
|
||||
@ -2289,6 +2380,9 @@ union ionic_dev_cmd {
|
||||
struct ionic_port_getattr_cmd port_getattr;
|
||||
struct ionic_port_setattr_cmd port_setattr;
|
||||
|
||||
struct ionic_vf_setattr_cmd vf_setattr;
|
||||
struct ionic_vf_getattr_cmd vf_getattr;
|
||||
|
||||
struct ionic_lif_identify_cmd lif_identify;
|
||||
struct ionic_lif_init_cmd lif_init;
|
||||
struct ionic_lif_reset_cmd lif_reset;
|
||||
@ -2318,6 +2412,9 @@ union ionic_dev_cmd_comp {
|
||||
struct ionic_port_getattr_comp port_getattr;
|
||||
struct ionic_port_setattr_comp port_setattr;
|
||||
|
||||
struct ionic_vf_setattr_comp vf_setattr;
|
||||
struct ionic_vf_getattr_comp vf_getattr;
|
||||
|
||||
struct ionic_lif_identify_comp lif_identify;
|
||||
struct ionic_lif_init_comp lif_init;
|
||||
ionic_lif_reset_comp lif_reset;
|
||||
|
@ -1619,6 +1619,227 @@ int ionic_stop(struct net_device *netdev)
|
||||
return err;
|
||||
}
|
||||
|
||||
static int ionic_get_vf_config(struct net_device *netdev,
|
||||
int vf, struct ifla_vf_info *ivf)
|
||||
{
|
||||
struct ionic_lif *lif = netdev_priv(netdev);
|
||||
struct ionic *ionic = lif->ionic;
|
||||
int ret = 0;
|
||||
|
||||
down_read(&ionic->vf_op_lock);
|
||||
|
||||
if (vf >= pci_num_vf(ionic->pdev) || !ionic->vfs) {
|
||||
ret = -EINVAL;
|
||||
} else {
|
||||
ivf->vf = vf;
|
||||
ivf->vlan = ionic->vfs[vf].vlanid;
|
||||
ivf->qos = 0;
|
||||
ivf->spoofchk = ionic->vfs[vf].spoofchk;
|
||||
ivf->linkstate = ionic->vfs[vf].linkstate;
|
||||
ivf->max_tx_rate = ionic->vfs[vf].maxrate;
|
||||
ivf->trusted = ionic->vfs[vf].trusted;
|
||||
ether_addr_copy(ivf->mac, ionic->vfs[vf].macaddr);
|
||||
}
|
||||
|
||||
up_read(&ionic->vf_op_lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ionic_get_vf_stats(struct net_device *netdev, int vf,
|
||||
struct ifla_vf_stats *vf_stats)
|
||||
{
|
||||
struct ionic_lif *lif = netdev_priv(netdev);
|
||||
struct ionic *ionic = lif->ionic;
|
||||
struct ionic_lif_stats *vs;
|
||||
int ret = 0;
|
||||
|
||||
down_read(&ionic->vf_op_lock);
|
||||
|
||||
if (vf >= pci_num_vf(ionic->pdev) || !ionic->vfs) {
|
||||
ret = -EINVAL;
|
||||
} else {
|
||||
memset(vf_stats, 0, sizeof(*vf_stats));
|
||||
vs = &ionic->vfs[vf].stats;
|
||||
|
||||
vf_stats->rx_packets = le64_to_cpu(vs->rx_ucast_packets);
|
||||
vf_stats->tx_packets = le64_to_cpu(vs->tx_ucast_packets);
|
||||
vf_stats->rx_bytes = le64_to_cpu(vs->rx_ucast_bytes);
|
||||
vf_stats->tx_bytes = le64_to_cpu(vs->tx_ucast_bytes);
|
||||
vf_stats->broadcast = le64_to_cpu(vs->rx_bcast_packets);
|
||||
vf_stats->multicast = le64_to_cpu(vs->rx_mcast_packets);
|
||||
vf_stats->rx_dropped = le64_to_cpu(vs->rx_ucast_drop_packets) +
|
||||
le64_to_cpu(vs->rx_mcast_drop_packets) +
|
||||
le64_to_cpu(vs->rx_bcast_drop_packets);
|
||||
vf_stats->tx_dropped = le64_to_cpu(vs->tx_ucast_drop_packets) +
|
||||
le64_to_cpu(vs->tx_mcast_drop_packets) +
|
||||
le64_to_cpu(vs->tx_bcast_drop_packets);
|
||||
}
|
||||
|
||||
up_read(&ionic->vf_op_lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ionic_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
|
||||
{
|
||||
struct ionic_lif *lif = netdev_priv(netdev);
|
||||
struct ionic *ionic = lif->ionic;
|
||||
int ret;
|
||||
|
||||
if (!(is_zero_ether_addr(mac) || is_valid_ether_addr(mac)))
|
||||
return -EINVAL;
|
||||
|
||||
down_read(&ionic->vf_op_lock);
|
||||
|
||||
if (vf >= pci_num_vf(ionic->pdev) || !ionic->vfs) {
|
||||
ret = -EINVAL;
|
||||
} else {
|
||||
ret = ionic_set_vf_config(ionic, vf, IONIC_VF_ATTR_MAC, mac);
|
||||
if (!ret)
|
||||
ether_addr_copy(ionic->vfs[vf].macaddr, mac);
|
||||
}
|
||||
|
||||
up_read(&ionic->vf_op_lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ionic_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan,
|
||||
u8 qos, __be16 proto)
|
||||
{
|
||||
struct ionic_lif *lif = netdev_priv(netdev);
|
||||
struct ionic *ionic = lif->ionic;
|
||||
int ret;
|
||||
|
||||
/* until someday when we support qos */
|
||||
if (qos)
|
||||
return -EINVAL;
|
||||
|
||||
if (vlan > 4095)
|
||||
return -EINVAL;
|
||||
|
||||
if (proto != htons(ETH_P_8021Q))
|
||||
return -EPROTONOSUPPORT;
|
||||
|
||||
down_read(&ionic->vf_op_lock);
|
||||
|
||||
if (vf >= pci_num_vf(ionic->pdev) || !ionic->vfs) {
|
||||
ret = -EINVAL;
|
||||
} else {
|
||||
ret = ionic_set_vf_config(ionic, vf,
|
||||
IONIC_VF_ATTR_VLAN, (u8 *)&vlan);
|
||||
if (!ret)
|
||||
ionic->vfs[vf].vlanid = vlan;
|
||||
}
|
||||
|
||||
up_read(&ionic->vf_op_lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ionic_set_vf_rate(struct net_device *netdev, int vf,
|
||||
int tx_min, int tx_max)
|
||||
{
|
||||
struct ionic_lif *lif = netdev_priv(netdev);
|
||||
struct ionic *ionic = lif->ionic;
|
||||
int ret;
|
||||
|
||||
/* setting the min just seems silly */
|
||||
if (tx_min)
|
||||
return -EINVAL;
|
||||
|
||||
down_write(&ionic->vf_op_lock);
|
||||
|
||||
if (vf >= pci_num_vf(ionic->pdev) || !ionic->vfs) {
|
||||
ret = -EINVAL;
|
||||
} else {
|
||||
ret = ionic_set_vf_config(ionic, vf,
|
||||
IONIC_VF_ATTR_RATE, (u8 *)&tx_max);
|
||||
if (!ret)
|
||||
lif->ionic->vfs[vf].maxrate = tx_max;
|
||||
}
|
||||
|
||||
up_write(&ionic->vf_op_lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ionic_set_vf_spoofchk(struct net_device *netdev, int vf, bool set)
|
||||
{
|
||||
struct ionic_lif *lif = netdev_priv(netdev);
|
||||
struct ionic *ionic = lif->ionic;
|
||||
u8 data = set; /* convert to u8 for config */
|
||||
int ret;
|
||||
|
||||
down_write(&ionic->vf_op_lock);
|
||||
|
||||
if (vf >= pci_num_vf(ionic->pdev) || !ionic->vfs) {
|
||||
ret = -EINVAL;
|
||||
} else {
|
||||
ret = ionic_set_vf_config(ionic, vf,
|
||||
IONIC_VF_ATTR_SPOOFCHK, &data);
|
||||
if (!ret)
|
||||
ionic->vfs[vf].spoofchk = data;
|
||||
}
|
||||
|
||||
up_write(&ionic->vf_op_lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ionic_set_vf_trust(struct net_device *netdev, int vf, bool set)
|
||||
{
|
||||
struct ionic_lif *lif = netdev_priv(netdev);
|
||||
struct ionic *ionic = lif->ionic;
|
||||
u8 data = set; /* convert to u8 for config */
|
||||
int ret;
|
||||
|
||||
down_write(&ionic->vf_op_lock);
|
||||
|
||||
if (vf >= pci_num_vf(ionic->pdev) || !ionic->vfs) {
|
||||
ret = -EINVAL;
|
||||
} else {
|
||||
ret = ionic_set_vf_config(ionic, vf,
|
||||
IONIC_VF_ATTR_TRUST, &data);
|
||||
if (!ret)
|
||||
ionic->vfs[vf].trusted = data;
|
||||
}
|
||||
|
||||
up_write(&ionic->vf_op_lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ionic_set_vf_link_state(struct net_device *netdev, int vf, int set)
|
||||
{
|
||||
struct ionic_lif *lif = netdev_priv(netdev);
|
||||
struct ionic *ionic = lif->ionic;
|
||||
u8 data;
|
||||
int ret;
|
||||
|
||||
switch (set) {
|
||||
case IFLA_VF_LINK_STATE_ENABLE:
|
||||
data = IONIC_VF_LINK_STATUS_UP;
|
||||
break;
|
||||
case IFLA_VF_LINK_STATE_DISABLE:
|
||||
data = IONIC_VF_LINK_STATUS_DOWN;
|
||||
break;
|
||||
case IFLA_VF_LINK_STATE_AUTO:
|
||||
data = IONIC_VF_LINK_STATUS_AUTO;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
down_write(&ionic->vf_op_lock);
|
||||
|
||||
if (vf >= pci_num_vf(ionic->pdev) || !ionic->vfs) {
|
||||
ret = -EINVAL;
|
||||
} else {
|
||||
ret = ionic_set_vf_config(ionic, vf,
|
||||
IONIC_VF_ATTR_LINKSTATE, &data);
|
||||
if (!ret)
|
||||
ionic->vfs[vf].linkstate = set;
|
||||
}
|
||||
|
||||
up_write(&ionic->vf_op_lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static const struct net_device_ops ionic_netdev_ops = {
|
||||
.ndo_open = ionic_open,
|
||||
.ndo_stop = ionic_stop,
|
||||
@ -1632,6 +1853,14 @@ static const struct net_device_ops ionic_netdev_ops = {
|
||||
.ndo_change_mtu = ionic_change_mtu,
|
||||
.ndo_vlan_rx_add_vid = ionic_vlan_rx_add_vid,
|
||||
.ndo_vlan_rx_kill_vid = ionic_vlan_rx_kill_vid,
|
||||
.ndo_set_vf_vlan = ionic_set_vf_vlan,
|
||||
.ndo_set_vf_trust = ionic_set_vf_trust,
|
||||
.ndo_set_vf_mac = ionic_set_vf_mac,
|
||||
.ndo_set_vf_rate = ionic_set_vf_rate,
|
||||
.ndo_set_vf_spoofchk = ionic_set_vf_spoofchk,
|
||||
.ndo_get_vf_config = ionic_get_vf_config,
|
||||
.ndo_set_vf_link_state = ionic_set_vf_link_state,
|
||||
.ndo_get_vf_stats = ionic_get_vf_stats,
|
||||
};
|
||||
|
||||
int ionic_reset_queues(struct ionic_lif *lif)
|
||||
@ -1965,18 +2194,22 @@ static int ionic_station_set(struct ionic_lif *lif)
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
if (is_zero_ether_addr(ctx.comp.lif_getattr.mac))
|
||||
return 0;
|
||||
|
||||
memcpy(addr.sa_data, ctx.comp.lif_getattr.mac, netdev->addr_len);
|
||||
addr.sa_family = AF_INET;
|
||||
err = eth_prepare_mac_addr_change(netdev, &addr);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
if (!is_zero_ether_addr(netdev->dev_addr)) {
|
||||
netdev_dbg(lif->netdev, "deleting station MAC addr %pM\n",
|
||||
netdev->dev_addr);
|
||||
ionic_lif_addr(lif, netdev->dev_addr, false);
|
||||
if (err) {
|
||||
netdev_warn(lif->netdev, "ignoring bad MAC addr from NIC %pM\n",
|
||||
addr.sa_data);
|
||||
return 0;
|
||||
}
|
||||
|
||||
netdev_dbg(lif->netdev, "deleting station MAC addr %pM\n",
|
||||
netdev->dev_addr);
|
||||
ionic_lif_addr(lif, netdev->dev_addr, false);
|
||||
|
||||
eth_commit_mac_addr_change(netdev, &addr);
|
||||
netdev_dbg(lif->netdev, "adding station MAC addr %pM\n",
|
||||
netdev->dev_addr);
|
||||
|
@ -165,6 +165,10 @@ static const char *ionic_opcode_to_str(enum ionic_cmd_opcode opcode)
|
||||
return "IONIC_CMD_FW_DOWNLOAD";
|
||||
case IONIC_CMD_FW_CONTROL:
|
||||
return "IONIC_CMD_FW_CONTROL";
|
||||
case IONIC_CMD_VF_GETATTR:
|
||||
return "IONIC_CMD_VF_GETATTR";
|
||||
case IONIC_CMD_VF_SETATTR:
|
||||
return "IONIC_CMD_VF_SETATTR";
|
||||
default:
|
||||
return "DEVCMD_UNKNOWN";
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user