static int ionic_dev_close(struct rte_eth_dev *dev);
static int ionic_dev_set_link_up(struct rte_eth_dev *dev);
static int ionic_dev_set_link_down(struct rte_eth_dev *dev);
-static int ionic_dev_link_update(struct rte_eth_dev *eth_dev,
- int wait_to_complete);
static int ionic_flow_ctrl_get(struct rte_eth_dev *eth_dev,
struct rte_eth_fc_conf *fc_conf);
static int ionic_flow_ctrl_set(struct rte_eth_dev *eth_dev,
ionic_dev_set_link_up(struct rte_eth_dev *eth_dev)
{
struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
- struct ionic_adapter *adapter = lif->adapter;
- struct ionic_dev *idev = &adapter->idev;
int err;
IONIC_PRINT_CALL();
- ionic_dev_cmd_port_state(idev, IONIC_PORT_ADMIN_STATE_UP);
+ err = ionic_lif_start(lif);
+ if (err)
+ IONIC_PRINT(ERR, "Could not start lif to set link up");
- err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT);
- if (err) {
- IONIC_PRINT(WARNING, "Failed to bring port UP");
- return err;
- }
+ ionic_dev_link_update(lif->eth_dev, 0);
- return 0;
+ return err;
}
/*
ionic_dev_set_link_down(struct rte_eth_dev *eth_dev)
{
struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
- struct ionic_adapter *adapter = lif->adapter;
- struct ionic_dev *idev = &adapter->idev;
- int err;
IONIC_PRINT_CALL();
- ionic_dev_cmd_port_state(idev, IONIC_PORT_ADMIN_STATE_DOWN);
+ ionic_lif_stop(lif);
- err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT);
- if (err) {
- IONIC_PRINT(WARNING, "Failed to bring port DOWN");
- return err;
- }
+ ionic_dev_link_update(lif->eth_dev, 0);
return 0;
}
-static int
+int
ionic_dev_link_update(struct rte_eth_dev *eth_dev,
int wait_to_complete __rte_unused)
{
memset(&link, 0, sizeof(link));
link.link_autoneg = ETH_LINK_AUTONEG;
- if (!adapter->link_up) {
+ if (!adapter->link_up ||
+ !(lif->state & IONIC_LIF_F_UP)) {
/* Interface is down */
link.link_status = ETH_LINK_DOWN;
link.link_duplex = ETH_LINK_HALF_DUPLEX;
ionic_dev_interrupt_handler(void *param)
{
struct ionic_adapter *adapter = (struct ionic_adapter *)param;
- uint32_t i;
IONIC_PRINT(DEBUG, "->");
- for (i = 0; i < adapter->nlifs; i++) {
- if (adapter->lifs[i])
- ionic_notifyq_handler(adapter->lifs[i], -1);
- }
+ if (adapter->lif)
+ ionic_notifyq_handler(adapter->lif, -1);
}
static int
if (reta_size != ident->lif.eth.rss_ind_tbl_sz) {
IONIC_PRINT(ERR, "The size of hash lookup table configured "
- "(%d) doesn't match the number hardware can supported "
+ "(%d) does not match the number hardware can support "
"(%d)",
reta_size, ident->lif.eth.rss_ind_tbl_sz);
return -EINVAL;
if (reta_size != ident->lif.eth.rss_ind_tbl_sz) {
IONIC_PRINT(ERR, "The size of hash lookup table configured "
- "(%d) doesn't match the number hardware can supported "
+ "(%d) does not match the number hardware can support "
"(%d)",
reta_size, ident->lif.eth.rss_ind_tbl_sz);
return -EINVAL;
return -EINVAL;
}
+ if (dev_conf->lpbk_mode)
+ IONIC_PRINT(WARNING, "Loopback mode not supported");
+
err = ionic_lif_start(lif);
if (err) {
IONIC_PRINT(ERR, "Cannot start LIF: %d", err);
ionic_dev_stop(struct rte_eth_dev *eth_dev)
{
struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
- int err;
IONIC_PRINT_CALL();
- err = ionic_lif_stop(lif);
- if (err)
- IONIC_PRINT(ERR, "Cannot stop LIF: %d", err);
+ ionic_lif_stop(lif);
- return err;
+ return 0;
}
+static void ionic_unconfigure_intr(struct ionic_adapter *adapter);
+
/*
* Reset and stop device.
*/
ionic_dev_close(struct rte_eth_dev *eth_dev)
{
struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
- int err;
+ struct ionic_adapter *adapter = lif->adapter;
IONIC_PRINT_CALL();
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
- err = ionic_lif_stop(lif);
- if (err) {
- IONIC_PRINT(ERR, "Cannot stop LIF: %d", err);
- return -1;
- }
+ ionic_lif_stop(lif);
- err = eth_ionic_dev_uninit(eth_dev);
- if (err) {
- IONIC_PRINT(ERR, "Cannot destroy LIF: %d", err);
- return -1;
- }
+ ionic_lif_free_queues(lif);
+
+ IONIC_PRINT(NOTICE, "Removing device %s", eth_dev->device->name);
+ ionic_unconfigure_intr(adapter);
+
+ rte_eth_dev_destroy(eth_dev, eth_ionic_dev_uninit);
+
+ ionic_port_reset(adapter);
+ ionic_reset(adapter);
+
+ rte_free(adapter);
return 0;
}
rte_eth_copy_pci_info(eth_dev, pci_dev);
eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
- lif->index = adapter->nlifs;
lif->eth_dev = eth_dev;
lif->adapter = adapter;
- adapter->lifs[adapter->nlifs] = lif;
+ adapter->lif = lif;
IONIC_PRINT(DEBUG, "Up to %u MAC addresses supported",
adapter->max_mac_addrs);
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
- adapter->lifs[lif->index] = NULL;
+ adapter->lif = NULL;
ionic_lif_deinit(lif);
ionic_lif_free(lif);
+ if (!(lif->state & IONIC_LIF_F_FW_RESET))
+ ionic_lif_reset(lif);
+
return 0;
}
adapter->max_mac_addrs = adapter->ident.lif.eth.max_ucast_filters;
- adapter->nlifs = 0;
- for (i = 0; i < adapter->ident.dev.nlifs; i++) {
- snprintf(name, sizeof(name), "net_%s_lif_%lu",
- pci_dev->device.name, i);
-
- err = rte_eth_dev_create(&pci_dev->device, name,
- sizeof(struct ionic_lif),
- NULL, NULL,
- eth_ionic_dev_init, adapter);
- if (err) {
- IONIC_PRINT(ERR, "Cannot create eth device for "
- "ionic lif %s", name);
- break;
- }
+ if (adapter->ident.dev.nlifs != 1) {
+ IONIC_PRINT(ERR, "Unexpected request for %d LIFs",
+ adapter->ident.dev.nlifs);
+ goto err_free_adapter;
+ }
- adapter->nlifs++;
+ snprintf(name, sizeof(name), "%s_lif", pci_dev->device.name);
+ err = rte_eth_dev_create(&pci_dev->device,
+ name, sizeof(struct ionic_lif),
+ NULL, NULL, eth_ionic_dev_init, adapter);
+ if (err) {
+ IONIC_PRINT(ERR, "Cannot create eth device for %s", name);
+ goto err_free_adapter;
}
err = ionic_configure_intr(adapter);
}
static int
-eth_ionic_pci_remove(struct rte_pci_device *pci_dev __rte_unused)
+eth_ionic_pci_remove(struct rte_pci_device *pci_dev)
{
char name[RTE_ETH_NAME_MAX_LEN];
- struct ionic_adapter *adapter = NULL;
struct rte_eth_dev *eth_dev;
- struct ionic_lif *lif;
- uint32_t i;
- /* Adapter lookup is using (the first) eth_dev name */
- snprintf(name, sizeof(name), "net_%s_lif_0",
- pci_dev->device.name);
+ /* Adapter lookup is using the eth_dev name */
+ snprintf(name, sizeof(name), "%s_lif", pci_dev->device.name);
eth_dev = rte_eth_dev_allocated(name);
- if (eth_dev) {
- lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
- adapter = lif->adapter;
- }
-
- if (adapter) {
- ionic_unconfigure_intr(adapter);
-
- for (i = 0; i < adapter->nlifs; i++) {
- lif = adapter->lifs[i];
- rte_eth_dev_destroy(lif->eth_dev, eth_ionic_dev_uninit);
- }
-
- rte_free(adapter);
- }
+ if (eth_dev)
+ ionic_dev_close(eth_dev);
+ else
+ IONIC_PRINT(DEBUG, "Cannot find device %s",
+ pci_dev->device.name);
return 0;
}
git.droids-corp.org / dpdk.git / blobdiff