net/txgbe: add Tx done cleanup
[dpdk.git] / drivers / net / txgbe / txgbe_ethdev.c
index 8cf1f40..2c79b47 100644 (file)
@@ -480,6 +480,9 @@ eth_txgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
        PMD_INIT_FUNC_TRACE();
 
        eth_dev->dev_ops = &txgbe_eth_dev_ops;
+       eth_dev->rx_queue_count       = txgbe_dev_rx_queue_count;
+       eth_dev->rx_descriptor_status = txgbe_dev_rx_descriptor_status;
+       eth_dev->tx_descriptor_status = txgbe_dev_tx_descriptor_status;
        eth_dev->rx_pkt_burst = &txgbe_recv_pkts;
        eth_dev->tx_pkt_burst = &txgbe_xmit_pkts;
        eth_dev->tx_pkt_prepare = &txgbe_prep_pkts;
@@ -2841,6 +2844,24 @@ txgbe_dev_interrupt_handler(void *param)
        txgbe_dev_interrupt_action(dev, dev->intr_handle);
 }
 
+static int
+txgbe_dev_led_on(struct rte_eth_dev *dev)
+{
+       struct txgbe_hw *hw;
+
+       hw = TXGBE_DEV_HW(dev);
+       return txgbe_led_on(hw, 4) == 0 ? 0 : -ENOTSUP;
+}
+
+static int
+txgbe_dev_led_off(struct rte_eth_dev *dev)
+{
+       struct txgbe_hw *hw;
+
+       hw = TXGBE_DEV_HW(dev);
+       return txgbe_led_off(hw, 4) == 0 ? 0 : -ENOTSUP;
+}
+
 static int
 txgbe_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 {
@@ -3479,6 +3500,233 @@ txgbe_dev_set_mc_addr_list(struct rte_eth_dev *dev,
                                         txgbe_dev_addr_list_itr, TRUE);
 }
 
+static uint64_t
+txgbe_read_systime_cyclecounter(struct rte_eth_dev *dev)
+{
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+       uint64_t systime_cycles;
+
+       systime_cycles = (uint64_t)rd32(hw, TXGBE_TSTIMEL);
+       systime_cycles |= (uint64_t)rd32(hw, TXGBE_TSTIMEH) << 32;
+
+       return systime_cycles;
+}
+
+static uint64_t
+txgbe_read_rx_tstamp_cyclecounter(struct rte_eth_dev *dev)
+{
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+       uint64_t rx_tstamp_cycles;
+
+       /* TSRXSTMPL stores ns and TSRXSTMPH stores seconds. */
+       rx_tstamp_cycles = (uint64_t)rd32(hw, TXGBE_TSRXSTMPL);
+       rx_tstamp_cycles |= (uint64_t)rd32(hw, TXGBE_TSRXSTMPH) << 32;
+
+       return rx_tstamp_cycles;
+}
+
+static uint64_t
+txgbe_read_tx_tstamp_cyclecounter(struct rte_eth_dev *dev)
+{
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+       uint64_t tx_tstamp_cycles;
+
+       /* TSTXSTMPL stores ns and TSTXSTMPH stores seconds. */
+       tx_tstamp_cycles = (uint64_t)rd32(hw, TXGBE_TSTXSTMPL);
+       tx_tstamp_cycles |= (uint64_t)rd32(hw, TXGBE_TSTXSTMPH) << 32;
+
+       return tx_tstamp_cycles;
+}
+
+static void
+txgbe_start_timecounters(struct rte_eth_dev *dev)
+{
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+       struct txgbe_adapter *adapter = TXGBE_DEV_ADAPTER(dev);
+       struct rte_eth_link link;
+       uint32_t incval = 0;
+       uint32_t shift = 0;
+
+       /* Get current link speed. */
+       txgbe_dev_link_update(dev, 1);
+       rte_eth_linkstatus_get(dev, &link);
+
+       switch (link.link_speed) {
+       case ETH_SPEED_NUM_100M:
+               incval = TXGBE_INCVAL_100;
+               shift = TXGBE_INCVAL_SHIFT_100;
+               break;
+       case ETH_SPEED_NUM_1G:
+               incval = TXGBE_INCVAL_1GB;
+               shift = TXGBE_INCVAL_SHIFT_1GB;
+               break;
+       case ETH_SPEED_NUM_10G:
+       default:
+               incval = TXGBE_INCVAL_10GB;
+               shift = TXGBE_INCVAL_SHIFT_10GB;
+               break;
+       }
+
+       wr32(hw, TXGBE_TSTIMEINC, TXGBE_TSTIMEINC_VP(incval, 2));
+
+       memset(&adapter->systime_tc, 0, sizeof(struct rte_timecounter));
+       memset(&adapter->rx_tstamp_tc, 0, sizeof(struct rte_timecounter));
+       memset(&adapter->tx_tstamp_tc, 0, sizeof(struct rte_timecounter));
+
+       adapter->systime_tc.cc_mask = TXGBE_CYCLECOUNTER_MASK;
+       adapter->systime_tc.cc_shift = shift;
+       adapter->systime_tc.nsec_mask = (1ULL << shift) - 1;
+
+       adapter->rx_tstamp_tc.cc_mask = TXGBE_CYCLECOUNTER_MASK;
+       adapter->rx_tstamp_tc.cc_shift = shift;
+       adapter->rx_tstamp_tc.nsec_mask = (1ULL << shift) - 1;
+
+       adapter->tx_tstamp_tc.cc_mask = TXGBE_CYCLECOUNTER_MASK;
+       adapter->tx_tstamp_tc.cc_shift = shift;
+       adapter->tx_tstamp_tc.nsec_mask = (1ULL << shift) - 1;
+}
+
+static int
+txgbe_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta)
+{
+       struct txgbe_adapter *adapter = TXGBE_DEV_ADAPTER(dev);
+
+       adapter->systime_tc.nsec += delta;
+       adapter->rx_tstamp_tc.nsec += delta;
+       adapter->tx_tstamp_tc.nsec += delta;
+
+       return 0;
+}
+
+static int
+txgbe_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts)
+{
+       uint64_t ns;
+       struct txgbe_adapter *adapter = TXGBE_DEV_ADAPTER(dev);
+
+       ns = rte_timespec_to_ns(ts);
+       /* Set the timecounters to a new value. */
+       adapter->systime_tc.nsec = ns;
+       adapter->rx_tstamp_tc.nsec = ns;
+       adapter->tx_tstamp_tc.nsec = ns;
+
+       return 0;
+}
+
+static int
+txgbe_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts)
+{
+       uint64_t ns, systime_cycles;
+       struct txgbe_adapter *adapter = TXGBE_DEV_ADAPTER(dev);
+
+       systime_cycles = txgbe_read_systime_cyclecounter(dev);
+       ns = rte_timecounter_update(&adapter->systime_tc, systime_cycles);
+       *ts = rte_ns_to_timespec(ns);
+
+       return 0;
+}
+
+static int
+txgbe_timesync_enable(struct rte_eth_dev *dev)
+{
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+       uint32_t tsync_ctl;
+
+       /* Stop the timesync system time. */
+       wr32(hw, TXGBE_TSTIMEINC, 0x0);
+       /* Reset the timesync system time value. */
+       wr32(hw, TXGBE_TSTIMEL, 0x0);
+       wr32(hw, TXGBE_TSTIMEH, 0x0);
+
+       txgbe_start_timecounters(dev);
+
+       /* Enable L2 filtering of IEEE1588/802.1AS Ethernet frame types. */
+       wr32(hw, TXGBE_ETFLT(TXGBE_ETF_ID_1588),
+               RTE_ETHER_TYPE_1588 | TXGBE_ETFLT_ENA | TXGBE_ETFLT_1588);
+
+       /* Enable timestamping of received PTP packets. */
+       tsync_ctl = rd32(hw, TXGBE_TSRXCTL);
+       tsync_ctl |= TXGBE_TSRXCTL_ENA;
+       wr32(hw, TXGBE_TSRXCTL, tsync_ctl);
+
+       /* Enable timestamping of transmitted PTP packets. */
+       tsync_ctl = rd32(hw, TXGBE_TSTXCTL);
+       tsync_ctl |= TXGBE_TSTXCTL_ENA;
+       wr32(hw, TXGBE_TSTXCTL, tsync_ctl);
+
+       txgbe_flush(hw);
+
+       return 0;
+}
+
+static int
+txgbe_timesync_disable(struct rte_eth_dev *dev)
+{
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+       uint32_t tsync_ctl;
+
+       /* Disable timestamping of transmitted PTP packets. */
+       tsync_ctl = rd32(hw, TXGBE_TSTXCTL);
+       tsync_ctl &= ~TXGBE_TSTXCTL_ENA;
+       wr32(hw, TXGBE_TSTXCTL, tsync_ctl);
+
+       /* Disable timestamping of received PTP packets. */
+       tsync_ctl = rd32(hw, TXGBE_TSRXCTL);
+       tsync_ctl &= ~TXGBE_TSRXCTL_ENA;
+       wr32(hw, TXGBE_TSRXCTL, tsync_ctl);
+
+       /* Disable L2 filtering of IEEE1588/802.1AS Ethernet frame types. */
+       wr32(hw, TXGBE_ETFLT(TXGBE_ETF_ID_1588), 0);
+
+       /* Stop incrementating the System Time registers. */
+       wr32(hw, TXGBE_TSTIMEINC, 0);
+
+       return 0;
+}
+
+static int
+txgbe_timesync_read_rx_timestamp(struct rte_eth_dev *dev,
+                                struct timespec *timestamp,
+                                uint32_t flags __rte_unused)
+{
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+       struct txgbe_adapter *adapter = TXGBE_DEV_ADAPTER(dev);
+       uint32_t tsync_rxctl;
+       uint64_t rx_tstamp_cycles;
+       uint64_t ns;
+
+       tsync_rxctl = rd32(hw, TXGBE_TSRXCTL);
+       if ((tsync_rxctl & TXGBE_TSRXCTL_VLD) == 0)
+               return -EINVAL;
+
+       rx_tstamp_cycles = txgbe_read_rx_tstamp_cyclecounter(dev);
+       ns = rte_timecounter_update(&adapter->rx_tstamp_tc, rx_tstamp_cycles);
+       *timestamp = rte_ns_to_timespec(ns);
+
+       return  0;
+}
+
+static int
+txgbe_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
+                                struct timespec *timestamp)
+{
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+       struct txgbe_adapter *adapter = TXGBE_DEV_ADAPTER(dev);
+       uint32_t tsync_txctl;
+       uint64_t tx_tstamp_cycles;
+       uint64_t ns;
+
+       tsync_txctl = rd32(hw, TXGBE_TSTXCTL);
+       if ((tsync_txctl & TXGBE_TSTXCTL_VLD) == 0)
+               return -EINVAL;
+
+       tx_tstamp_cycles = txgbe_read_tx_tstamp_cyclecounter(dev);
+       ns = rte_timecounter_update(&adapter->tx_tstamp_tc, tx_tstamp_cycles);
+       *timestamp = rte_ns_to_timespec(ns);
+
+       return 0;
+}
+
 static int
 txgbe_get_reg_length(struct rte_eth_dev *dev __rte_unused)
 {
@@ -3657,6 +3905,96 @@ txgbe_rss_update_sp(enum txgbe_mac_type mac_type)
        }
 }
 
+static int
+txgbe_dev_get_dcb_info(struct rte_eth_dev *dev,
+                       struct rte_eth_dcb_info *dcb_info)
+{
+       struct txgbe_dcb_config *dcb_config = TXGBE_DEV_DCB_CONFIG(dev);
+       struct txgbe_dcb_tc_config *tc;
+       struct rte_eth_dcb_tc_queue_mapping *tc_queue;
+       uint8_t nb_tcs;
+       uint8_t i, j;
+
+       if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_DCB_FLAG)
+               dcb_info->nb_tcs = dcb_config->num_tcs.pg_tcs;
+       else
+               dcb_info->nb_tcs = 1;
+
+       tc_queue = &dcb_info->tc_queue;
+       nb_tcs = dcb_info->nb_tcs;
+
+       if (dcb_config->vt_mode) { /* vt is enabled */
+               struct rte_eth_vmdq_dcb_conf *vmdq_rx_conf =
+                               &dev->data->dev_conf.rx_adv_conf.vmdq_dcb_conf;
+               for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++)
+                       dcb_info->prio_tc[i] = vmdq_rx_conf->dcb_tc[i];
+               if (RTE_ETH_DEV_SRIOV(dev).active > 0) {
+                       for (j = 0; j < nb_tcs; j++) {
+                               tc_queue->tc_rxq[0][j].base = j;
+                               tc_queue->tc_rxq[0][j].nb_queue = 1;
+                               tc_queue->tc_txq[0][j].base = j;
+                               tc_queue->tc_txq[0][j].nb_queue = 1;
+                       }
+               } else {
+                       for (i = 0; i < vmdq_rx_conf->nb_queue_pools; i++) {
+                               for (j = 0; j < nb_tcs; j++) {
+                                       tc_queue->tc_rxq[i][j].base =
+                                               i * nb_tcs + j;
+                                       tc_queue->tc_rxq[i][j].nb_queue = 1;
+                                       tc_queue->tc_txq[i][j].base =
+                                               i * nb_tcs + j;
+                                       tc_queue->tc_txq[i][j].nb_queue = 1;
+                               }
+                       }
+               }
+       } else { /* vt is disabled */
+               struct rte_eth_dcb_rx_conf *rx_conf =
+                               &dev->data->dev_conf.rx_adv_conf.dcb_rx_conf;
+               for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++)
+                       dcb_info->prio_tc[i] = rx_conf->dcb_tc[i];
+               if (dcb_info->nb_tcs == ETH_4_TCS) {
+                       for (i = 0; i < dcb_info->nb_tcs; i++) {
+                               dcb_info->tc_queue.tc_rxq[0][i].base = i * 32;
+                               dcb_info->tc_queue.tc_rxq[0][i].nb_queue = 16;
+                       }
+                       dcb_info->tc_queue.tc_txq[0][0].base = 0;
+                       dcb_info->tc_queue.tc_txq[0][1].base = 64;
+                       dcb_info->tc_queue.tc_txq[0][2].base = 96;
+                       dcb_info->tc_queue.tc_txq[0][3].base = 112;
+                       dcb_info->tc_queue.tc_txq[0][0].nb_queue = 64;
+                       dcb_info->tc_queue.tc_txq[0][1].nb_queue = 32;
+                       dcb_info->tc_queue.tc_txq[0][2].nb_queue = 16;
+                       dcb_info->tc_queue.tc_txq[0][3].nb_queue = 16;
+               } else if (dcb_info->nb_tcs == ETH_8_TCS) {
+                       for (i = 0; i < dcb_info->nb_tcs; i++) {
+                               dcb_info->tc_queue.tc_rxq[0][i].base = i * 16;
+                               dcb_info->tc_queue.tc_rxq[0][i].nb_queue = 16;
+                       }
+                       dcb_info->tc_queue.tc_txq[0][0].base = 0;
+                       dcb_info->tc_queue.tc_txq[0][1].base = 32;
+                       dcb_info->tc_queue.tc_txq[0][2].base = 64;
+                       dcb_info->tc_queue.tc_txq[0][3].base = 80;
+                       dcb_info->tc_queue.tc_txq[0][4].base = 96;
+                       dcb_info->tc_queue.tc_txq[0][5].base = 104;
+                       dcb_info->tc_queue.tc_txq[0][6].base = 112;
+                       dcb_info->tc_queue.tc_txq[0][7].base = 120;
+                       dcb_info->tc_queue.tc_txq[0][0].nb_queue = 32;
+                       dcb_info->tc_queue.tc_txq[0][1].nb_queue = 32;
+                       dcb_info->tc_queue.tc_txq[0][2].nb_queue = 16;
+                       dcb_info->tc_queue.tc_txq[0][3].nb_queue = 16;
+                       dcb_info->tc_queue.tc_txq[0][4].nb_queue = 8;
+                       dcb_info->tc_queue.tc_txq[0][5].nb_queue = 8;
+                       dcb_info->tc_queue.tc_txq[0][6].nb_queue = 8;
+                       dcb_info->tc_queue.tc_txq[0][7].nb_queue = 8;
+               }
+       }
+       for (i = 0; i < dcb_info->nb_tcs; i++) {
+               tc = &dcb_config->tc_config[i];
+               dcb_info->tc_bws[i] = tc->path[TXGBE_DCB_TX_CONFIG].bwg_percent;
+       }
+       return 0;
+}
+
 static const struct eth_dev_ops txgbe_eth_dev_ops = {
        .dev_configure              = txgbe_dev_configure,
        .dev_infos_get              = txgbe_dev_info_get,
@@ -3696,6 +4034,8 @@ static const struct eth_dev_ops txgbe_eth_dev_ops = {
        .rx_queue_release           = txgbe_dev_rx_queue_release,
        .tx_queue_setup             = txgbe_dev_tx_queue_setup,
        .tx_queue_release           = txgbe_dev_tx_queue_release,
+       .dev_led_on                 = txgbe_dev_led_on,
+       .dev_led_off                = txgbe_dev_led_off,
        .flow_ctrl_get              = txgbe_flow_ctrl_get,
        .flow_ctrl_set              = txgbe_flow_ctrl_set,
        .priority_flow_ctrl_set     = txgbe_priority_flow_ctrl_set,
@@ -3712,12 +4052,21 @@ static const struct eth_dev_ops txgbe_eth_dev_ops = {
        .set_mc_addr_list           = txgbe_dev_set_mc_addr_list,
        .rxq_info_get               = txgbe_rxq_info_get,
        .txq_info_get               = txgbe_txq_info_get,
+       .timesync_enable            = txgbe_timesync_enable,
+       .timesync_disable           = txgbe_timesync_disable,
+       .timesync_read_rx_timestamp = txgbe_timesync_read_rx_timestamp,
+       .timesync_read_tx_timestamp = txgbe_timesync_read_tx_timestamp,
        .get_reg                    = txgbe_get_regs,
        .get_eeprom_length          = txgbe_get_eeprom_length,
        .get_eeprom                 = txgbe_get_eeprom,
        .set_eeprom                 = txgbe_set_eeprom,
        .get_module_info            = txgbe_get_module_info,
        .get_module_eeprom          = txgbe_get_module_eeprom,
+       .get_dcb_info               = txgbe_dev_get_dcb_info,
+       .timesync_adjust_time       = txgbe_timesync_adjust_time,
+       .timesync_read_time         = txgbe_timesync_read_time,
+       .timesync_write_time        = txgbe_timesync_write_time,
+       .tx_done_cleanup            = txgbe_dev_tx_done_cleanup,
 };
 
 RTE_PMD_REGISTER_PCI(net_txgbe, rte_txgbe_pmd);