d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/ngbe: support timesync

Browse Source 
Add to support IEEE1588/802.1AS timestamping, and IEEE1588 timestamp
offload on Tx.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
This commit is contained in:
Jiawen Wu 2021-10-21 17:50:20 +08:00 committed by Ferruh Yigit
parent 71aec12796
commit 24cd85f7e5
6 changed files with 260 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/guides/nics/features/ngbe.ini
View File

@ -30,6 +30,7 @@ L4 checksum offload = Y
Inner L3 checksum = Y
Inner L4 checksum = Y
Packet type parsing = Y
Timesync = Y
Basic stats = Y
Extended stats = Y
Stats per queue = Y

1
doc/guides/nics/ngbe.rst
View File

@ -25,6 +25,7 @@ Features
- Link state information
- Link flow control
- Scattered and gather for TX and RX
- IEEE 1588
- FW version

1
doc/guides/rel_notes/release_21_11.rst
View File

@ -223,6 +223,7 @@ New Features
* Added multi-queue and RSS.
* Added SRIOV.
* Added flow control.
* Added IEEE 1588.
* **Updated Marvell cnxk crypto PMD.**

216
drivers/net/ngbe/ngbe_ethdev.c
View File

@ -2730,6 +2730,215 @@ ngbe_dev_set_mc_addr_list(struct rte_eth_dev *dev,
ngbe_dev_addr_list_itr, TRUE);
}
static uint64_t
ngbe_read_systime_cyclecounter(struct rte_eth_dev *dev)
{
struct ngbe_hw *hw = ngbe_dev_hw(dev);
uint64_t systime_cycles;
systime_cycles = (uint64_t)rd32(hw, NGBE_TSTIMEL);
systime_cycles |= (uint64_t)rd32(hw, NGBE_TSTIMEH) << 32;
return systime_cycles;
}
static uint64_t
ngbe_read_rx_tstamp_cyclecounter(struct rte_eth_dev *dev)
{
struct ngbe_hw *hw = ngbe_dev_hw(dev);
uint64_t rx_tstamp_cycles;
/* TSRXSTMPL stores ns and TSRXSTMPH stores seconds. */
rx_tstamp_cycles = (uint64_t)rd32(hw, NGBE_TSRXSTMPL);
rx_tstamp_cycles |= (uint64_t)rd32(hw, NGBE_TSRXSTMPH) << 32;
return rx_tstamp_cycles;
}
static uint64_t
ngbe_read_tx_tstamp_cyclecounter(struct rte_eth_dev *dev)
{
struct ngbe_hw *hw = ngbe_dev_hw(dev);
uint64_t tx_tstamp_cycles;
/* TSTXSTMPL stores ns and TSTXSTMPH stores seconds. */
tx_tstamp_cycles = (uint64_t)rd32(hw, NGBE_TSTXSTMPL);
tx_tstamp_cycles |= (uint64_t)rd32(hw, NGBE_TSTXSTMPH) << 32;
return tx_tstamp_cycles;
}
static void
ngbe_start_timecounters(struct rte_eth_dev *dev)
{
struct ngbe_hw *hw = ngbe_dev_hw(dev);
struct ngbe_adapter *adapter = ngbe_dev_adapter(dev);
uint32_t incval = 0;
uint32_t shift = 0;
incval = NGBE_INCVAL_1GB;
shift = NGBE_INCVAL_SHIFT_1GB;
wr32(hw, NGBE_TSTIMEINC, NGBE_TSTIMEINC_IV(incval));
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 = NGBE_CYCLECOUNTER_MASK;
adapter->systime_tc.cc_shift = shift;
adapter->systime_tc.nsec_mask = (1ULL << shift) - 1;
adapter->rx_tstamp_tc.cc_mask = NGBE_CYCLECOUNTER_MASK;
adapter->rx_tstamp_tc.cc_shift = shift;
adapter->rx_tstamp_tc.nsec_mask = (1ULL << shift) - 1;
adapter->tx_tstamp_tc.cc_mask = NGBE_CYCLECOUNTER_MASK;
adapter->tx_tstamp_tc.cc_shift = shift;
adapter->tx_tstamp_tc.nsec_mask = (1ULL << shift) - 1;
}
static int
ngbe_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta)
{
struct ngbe_adapter *adapter = ngbe_dev_adapter(dev);
adapter->systime_tc.nsec += delta;
adapter->rx_tstamp_tc.nsec += delta;
adapter->tx_tstamp_tc.nsec += delta;
return 0;
}
static int
ngbe_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts)
{
uint64_t ns;
struct ngbe_adapter *adapter = ngbe_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
ngbe_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts)
{
uint64_t ns, systime_cycles;
struct ngbe_adapter *adapter = ngbe_dev_adapter(dev);
systime_cycles = ngbe_read_systime_cyclecounter(dev);
ns = rte_timecounter_update(&adapter->systime_tc, systime_cycles);
*ts = rte_ns_to_timespec(ns);
return 0;
}
static int
ngbe_timesync_enable(struct rte_eth_dev *dev)
{
struct ngbe_hw *hw = ngbe_dev_hw(dev);
uint32_t tsync_ctl;
/* Stop the timesync system time. */
wr32(hw, NGBE_TSTIMEINC, 0x0);
/* Reset the timesync system time value. */
wr32(hw, NGBE_TSTIMEL, 0x0);
wr32(hw, NGBE_TSTIMEH, 0x0);
ngbe_start_timecounters(dev);
/* Enable L2 filtering of IEEE1588/802.1AS Ethernet frame types. */
wr32(hw, NGBE_ETFLT(NGBE_ETF_ID_1588),
RTE_ETHER_TYPE_1588 | NGBE_ETFLT_ENA | NGBE_ETFLT_1588);
/* Enable timestamping of received PTP packets. */
tsync_ctl = rd32(hw, NGBE_TSRXCTL);
tsync_ctl |= NGBE_TSRXCTL_ENA;
wr32(hw, NGBE_TSRXCTL, tsync_ctl);
/* Enable timestamping of transmitted PTP packets. */
tsync_ctl = rd32(hw, NGBE_TSTXCTL);
tsync_ctl |= NGBE_TSTXCTL_ENA;
wr32(hw, NGBE_TSTXCTL, tsync_ctl);
ngbe_flush(hw);
return 0;
}
static int
ngbe_timesync_disable(struct rte_eth_dev *dev)
{
struct ngbe_hw *hw = ngbe_dev_hw(dev);
uint32_t tsync_ctl;
/* Disable timestamping of transmitted PTP packets. */
tsync_ctl = rd32(hw, NGBE_TSTXCTL);
tsync_ctl &= ~NGBE_TSTXCTL_ENA;
wr32(hw, NGBE_TSTXCTL, tsync_ctl);
/* Disable timestamping of received PTP packets. */
tsync_ctl = rd32(hw, NGBE_TSRXCTL);
tsync_ctl &= ~NGBE_TSRXCTL_ENA;
wr32(hw, NGBE_TSRXCTL, tsync_ctl);
/* Disable L2 filtering of IEEE1588/802.1AS Ethernet frame types. */
wr32(hw, NGBE_ETFLT(NGBE_ETF_ID_1588), 0);
/* Stop incrementating the System Time registers. */
wr32(hw, NGBE_TSTIMEINC, 0);
return 0;
}
static int
ngbe_timesync_read_rx_timestamp(struct rte_eth_dev *dev,
struct timespec *timestamp,
uint32_t flags __rte_unused)
{
struct ngbe_hw *hw = ngbe_dev_hw(dev);
struct ngbe_adapter *adapter = ngbe_dev_adapter(dev);
uint32_t tsync_rxctl;
uint64_t rx_tstamp_cycles;
uint64_t ns;
tsync_rxctl = rd32(hw, NGBE_TSRXCTL);
if ((tsync_rxctl & NGBE_TSRXCTL_VLD) == 0)
return -EINVAL;
rx_tstamp_cycles = ngbe_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
ngbe_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
struct timespec *timestamp)
{
struct ngbe_hw *hw = ngbe_dev_hw(dev);
struct ngbe_adapter *adapter = ngbe_dev_adapter(dev);
uint32_t tsync_txctl;
uint64_t tx_tstamp_cycles;
uint64_t ns;
tsync_txctl = rd32(hw, NGBE_TSTXCTL);
if ((tsync_txctl & NGBE_TSTXCTL_VLD) == 0)
return -EINVAL;
tx_tstamp_cycles = ngbe_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
ngbe_get_reg_length(struct rte_eth_dev *dev __rte_unused)
{
@ -2873,12 +3082,19 @@ static const struct eth_dev_ops ngbe_eth_dev_ops = {
.rss_hash_update = ngbe_dev_rss_hash_update,
.rss_hash_conf_get = ngbe_dev_rss_hash_conf_get,
.set_mc_addr_list = ngbe_dev_set_mc_addr_list,
.timesync_enable = ngbe_timesync_enable,
.timesync_disable = ngbe_timesync_disable,
.timesync_read_rx_timestamp = ngbe_timesync_read_rx_timestamp,
.timesync_read_tx_timestamp = ngbe_timesync_read_tx_timestamp,
.get_reg = ngbe_get_regs,
.rx_burst_mode_get = ngbe_rx_burst_mode_get,
.tx_burst_mode_get = ngbe_tx_burst_mode_get,
.get_eeprom_length = ngbe_get_eeprom_length,
.get_eeprom = ngbe_get_eeprom,
.set_eeprom = ngbe_set_eeprom,
.timesync_adjust_time = ngbe_timesync_adjust_time,
.timesync_read_time = ngbe_timesync_read_time,
.timesync_write_time = ngbe_timesync_write_time,
};
RTE_PMD_REGISTER_PCI(net_ngbe, rte_ngbe_pmd);

10
drivers/net/ngbe/ngbe_ethdev.h
View File

@ -7,6 +7,7 @@
#define _NGBE_ETHDEV_H_
#include "ngbe_ptypes.h"
#include <rte_time.h>
#include <rte_ethdev.h>
#include <rte_ethdev_core.h>
@ -129,6 +130,9 @@ struct ngbe_adapter {
struct ngbe_vf_info *vfdata;
struct ngbe_uta_info uta_info;
bool rx_bulk_alloc_allowed;
struct rte_timecounter systime_tc;
struct rte_timecounter rx_tstamp_tc;
struct rte_timecounter tx_tstamp_tc;
/* For RSS reta table update */
uint8_t rss_reta_updated;
@ -301,6 +305,12 @@ int ngbe_pf_host_configure(struct rte_eth_dev *eth_dev);
#define NGBE_DEFAULT_TX_HTHRESH 0
#define NGBE_DEFAULT_TX_WTHRESH 0
/* Additional timesync values. */
#define NGBE_INCVAL_1GB 0x2000000 /* all speed is same in Emerald */
#define NGBE_INCVAL_SHIFT_1GB 22 /* all speed is same in Emerald */
#define NGBE_CYCLECOUNTER_MASK 0xffffffffffffffffULL
/* store statistics names and its offset in stats structure */
struct rte_ngbe_xstats_name_off {
char name[RTE_ETH_XSTATS_NAME_SIZE];

32
drivers/net/ngbe/ngbe_rxtx.c
View File

@ -16,6 +16,12 @@
#include "ngbe_ethdev.h"
#include "ngbe_rxtx.h"
#ifdef RTE_LIBRTE_IEEE1588
#define NGBE_TX_IEEE1588_TMST PKT_TX_IEEE1588_TMST
#else
#define NGBE_TX_IEEE1588_TMST 0
#endif
/* Bit Mask to indicate what bits required for building Tx context */
static const u64 NGBE_TX_OFFLOAD_MASK = (RTE_MBUF_F_TX_IP_CKSUM |
RTE_MBUF_F_TX_OUTER_IPV6 |
@ -26,7 +32,9 @@ static const u64 NGBE_TX_OFFLOAD_MASK = (RTE_MBUF_F_TX_IP_CKSUM |
RTE_MBUF_F_TX_L4_MASK |
RTE_MBUF_F_TX_TCP_SEG |
RTE_MBUF_F_TX_TUNNEL_MASK |
RTE_MBUF_F_TX_OUTER_IP_CKSUM);
RTE_MBUF_F_TX_OUTER_IP_CKSUM |
NGBE_TX_IEEE1588_TMST);
#define NGBE_TX_OFFLOAD_NOTSUP_MASK \
(RTE_MBUF_F_TX_OFFLOAD_MASK ^ NGBE_TX_OFFLOAD_MASK)
@ -731,6 +739,11 @@ ngbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
*/
cmd_type_len = NGBE_TXD_FCS;
#ifdef RTE_LIBRTE_IEEE1588
if (ol_flags & PKT_TX_IEEE1588_TMST)
cmd_type_len |= NGBE_TXD_1588;
#endif
olinfo_status = 0;
if (tx_ol_req) {
if (ol_flags & RTE_MBUF_F_TX_TCP_SEG) {
@ -907,7 +920,20 @@ ngbe_rxd_pkt_info_to_pkt_flags(uint32_t pkt_info)
RTE_MBUF_F_RX_RSS_HASH, 0, 0, 0,
0, 0, 0, RTE_MBUF_F_RX_FDIR,
};
#ifdef RTE_LIBRTE_IEEE1588
static uint64_t ip_pkt_etqf_map[8] = {
0, 0, 0, PKT_RX_IEEE1588_PTP,
0, 0, 0, 0,
};
int etfid = ngbe_etflt_id(NGBE_RXD_PTID(pkt_info));
if (likely(-1 != etfid))
return ip_pkt_etqf_map[etfid] |
ip_rss_types_map[NGBE_RXD_RSSTYPE(pkt_info)];
else
return ip_rss_types_map[NGBE_RXD_RSSTYPE(pkt_info)];
#else
return ip_rss_types_map[NGBE_RXD_RSSTYPE(pkt_info)];
#endif
}
static inline uint64_t
@ -924,6 +950,10 @@ rx_desc_status_to_pkt_flags(uint32_t rx_status, uint64_t vlan_flags)
vlan_flags & RTE_MBUF_F_RX_VLAN_STRIPPED)
? vlan_flags : 0;
#ifdef RTE_LIBRTE_IEEE1588
if (rx_status & NGBE_RXD_STAT_1588)
pkt_flags = pkt_flags | PKT_RX_IEEE1588_TMST;
#endif
return pkt_flags;
}