X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fionic%2Fionic_lif.c;h=f3d55c0fa67081967b09dab472da7f9794993a30;hb=df96fd0d73955bdc7ca3909e772ff2ad903249c6;hp=c1a95ca7c25876ae6a19d2d212214abba16b5342;hpb=be63459e0bdd00fcb679999dc171e50a1486b91f;p=dpdk.git diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index c1a95ca7c2..f3d55c0fa6 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -3,7 +3,7 @@ */ #include -#include +#include #include "ionic.h" #include "ionic_logs.h" @@ -66,9 +66,23 @@ ionic_qcq_disable(struct ionic_qcq *qcq) void ionic_lif_stop(struct ionic_lif *lif) { + uint32_t i; + IONIC_PRINT_CALL(); lif->state &= ~IONIC_LIF_F_UP; + + for (i = 0; i < lif->nrxqcqs; i++) { + struct ionic_qcq *rxq = lif->rxqcqs[i]; + if (rxq->flags & IONIC_QCQ_F_INITED) + (void)ionic_dev_rx_queue_stop(lif->eth_dev, i); + } + + for (i = 0; i < lif->ntxqcqs; i++) { + struct ionic_qcq *txq = lif->txqcqs[i]; + if (txq->flags & IONIC_QCQ_F_INITED) + (void)ionic_dev_tx_queue_stop(lif->eth_dev, i); + } } void @@ -1357,7 +1371,7 @@ ionic_lif_txq_init(struct ionic_qcq *qcq) .opcode = IONIC_CMD_Q_INIT, .type = q->type, .index = q->index, - .flags = IONIC_QINIT_F_SG, + .flags = IONIC_QINIT_F_SG | IONIC_QINIT_F_ENA, .intr_index = cq->bound_intr->index, .ring_size = rte_log2_u32(q->num_descs), .ring_base = q->base_pa, @@ -1403,7 +1417,7 @@ ionic_lif_rxq_init(struct ionic_qcq *qcq) .opcode = IONIC_CMD_Q_INIT, .type = q->type, .index = q->index, - .flags = IONIC_QINIT_F_SG, + .flags = IONIC_QINIT_F_SG | IONIC_QINIT_F_ENA, .intr_index = cq->bound_intr->index, .ring_size = rte_log2_u32(q->num_descs), .ring_base = q->base_pa, @@ -1455,24 +1469,8 @@ ionic_station_set(struct ionic_lif *lif) if (err) return err; - if (!rte_is_zero_ether_addr((struct rte_ether_addr *) - lif->mac_addr)) { - IONIC_PRINT(INFO, "deleting station MAC addr"); - - ionic_lif_addr_del(lif, lif->mac_addr); - } - memcpy(lif->mac_addr, ctx.comp.lif_getattr.mac, RTE_ETHER_ADDR_LEN); - if (rte_is_zero_ether_addr((struct rte_ether_addr *)lif->mac_addr)) { - IONIC_PRINT(NOTICE, "empty MAC addr (VF?)"); - return 0; - } - - IONIC_PRINT(DEBUG, "adding station MAC addr"); - - ionic_lif_addr_add(lif, lif->mac_addr); - return 0; } @@ -1518,18 +1516,11 @@ ionic_lif_init(struct ionic_lif *lif) if (err) goto err_out_adminq_deinit; - lif->features = - IONIC_ETH_HW_VLAN_TX_TAG - | IONIC_ETH_HW_VLAN_RX_STRIP - | IONIC_ETH_HW_VLAN_RX_FILTER - | IONIC_ETH_HW_RX_HASH - | IONIC_ETH_HW_TX_SG - | IONIC_ETH_HW_RX_SG - | IONIC_ETH_HW_TX_CSUM - | IONIC_ETH_HW_RX_CSUM - | IONIC_ETH_HW_TSO - | IONIC_ETH_HW_TSO_IPV6 - | IONIC_ETH_HW_TSO_ECN; + /* + * Configure initial feature set + * This will be updated later by the dev_configure() step + */ + lif->features = IONIC_ETH_HW_RX_HASH | IONIC_ETH_HW_VLAN_RX_FILTER; err = ionic_lif_set_features(lif); if (err) @@ -1575,9 +1566,31 @@ ionic_lif_deinit(struct ionic_lif *lif) lif->state &= ~IONIC_LIF_F_INITED; } -int +void +ionic_lif_configure_vlan_offload(struct ionic_lif *lif, int mask) +{ + struct rte_eth_dev *eth_dev = lif->eth_dev; + struct rte_eth_rxmode *rxmode = ð_dev->data->dev_conf.rxmode; + + /* + * IONIC_ETH_HW_VLAN_RX_FILTER cannot be turned off, so + * set DEV_RX_OFFLOAD_VLAN_FILTER and ignore ETH_VLAN_FILTER_MASK + */ + rxmode->offloads |= DEV_RX_OFFLOAD_VLAN_FILTER; + + if (mask & ETH_VLAN_STRIP_MASK) { + if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP) + lif->features |= IONIC_ETH_HW_VLAN_RX_STRIP; + else + lif->features &= ~IONIC_ETH_HW_VLAN_RX_STRIP; + } +} + +void ionic_lif_configure(struct ionic_lif *lif) { + struct rte_eth_rxmode *rxmode = &lif->eth_dev->data->dev_conf.rxmode; + struct rte_eth_txmode *txmode = &lif->eth_dev->data->dev_conf.txmode; struct ionic_identity *ident = &lif->adapter->ident; uint32_t ntxqs_per_lif = ident->lif.eth.config.queue_count[IONIC_QTYPE_TXQ]; @@ -1600,7 +1613,64 @@ ionic_lif_configure(struct ionic_lif *lif) lif->nrxqcqs = nrxqs_per_lif; lif->ntxqcqs = ntxqs_per_lif; - return 0; + /* Update the LIF configuration based on the eth_dev */ + + /* + * NB: While it is true that RSS_HASH is always enabled on ionic, + * setting this flag unconditionally causes problems in DTS. + * rxmode->offloads |= DEV_RX_OFFLOAD_RSS_HASH; + */ + + /* RX per-port */ + + if (rxmode->offloads & DEV_RX_OFFLOAD_IPV4_CKSUM || + rxmode->offloads & DEV_RX_OFFLOAD_UDP_CKSUM || + rxmode->offloads & DEV_RX_OFFLOAD_TCP_CKSUM) + lif->features |= IONIC_ETH_HW_RX_CSUM; + else + lif->features &= ~IONIC_ETH_HW_RX_CSUM; + + if (rxmode->offloads & DEV_RX_OFFLOAD_SCATTER) { + lif->features |= IONIC_ETH_HW_RX_SG; + lif->eth_dev->data->scattered_rx = 1; + } else { + lif->features &= ~IONIC_ETH_HW_RX_SG; + lif->eth_dev->data->scattered_rx = 0; + } + + /* Covers VLAN_STRIP */ + ionic_lif_configure_vlan_offload(lif, ETH_VLAN_STRIP_MASK); + + /* TX per-port */ + + if (txmode->offloads & DEV_TX_OFFLOAD_IPV4_CKSUM || + txmode->offloads & DEV_TX_OFFLOAD_UDP_CKSUM || + txmode->offloads & DEV_TX_OFFLOAD_TCP_CKSUM || + txmode->offloads & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM || + txmode->offloads & DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) + lif->features |= IONIC_ETH_HW_TX_CSUM; + else + lif->features &= ~IONIC_ETH_HW_TX_CSUM; + + if (txmode->offloads & DEV_TX_OFFLOAD_VLAN_INSERT) + lif->features |= IONIC_ETH_HW_VLAN_TX_TAG; + else + lif->features &= ~IONIC_ETH_HW_VLAN_TX_TAG; + + if (txmode->offloads & DEV_TX_OFFLOAD_MULTI_SEGS) + lif->features |= IONIC_ETH_HW_TX_SG; + else + lif->features &= ~IONIC_ETH_HW_TX_SG; + + if (txmode->offloads & DEV_TX_OFFLOAD_TCP_TSO) { + lif->features |= IONIC_ETH_HW_TSO; + lif->features |= IONIC_ETH_HW_TSO_IPV6; + lif->features |= IONIC_ETH_HW_TSO_ECN; + } else { + lif->features &= ~IONIC_ETH_HW_TSO; + lif->features &= ~IONIC_ETH_HW_TSO_IPV6; + lif->features &= ~IONIC_ETH_HW_TSO_ECN; + } } int