net/axgbe: support IEEE 1588 PTP

Add ethdev APIs to support PTP timestamping

Signed-off-by: Selwin Sebastian <selwin.sebastian@amd.com>
Acked-by: Amaranath Somalapuram <asomalap@amd.com>
This commit is contained in:
Selwin Sebastian 2020-06-09 20:43:43 +05:30 committed by Ferruh Yigit
parent 0dd95bc917
commit e04449488f
5 changed files with 375 additions and 1 deletions

View File

@ -46,6 +46,7 @@
#endif
#define AXGBE_HZ 250
#define NSEC_PER_SEC 1000000000L
/* DMA register offsets */
#define DMA_MR 0x3000
@ -492,6 +493,8 @@
#define MAC_TSCR_TSEVNTENA_WIDTH 1
#define MAC_TSCR_TSINIT_INDEX 2
#define MAC_TSCR_TSINIT_WIDTH 1
#define MAC_TSCR_TSUPDT_INDEX 3
#define MAC_TSCR_TSUPDT_WIDTH 1
#define MAC_TSCR_TSIPENA_INDEX 11
#define MAC_TSCR_TSIPENA_WIDTH 1
#define MAC_TSCR_TSIPV4ENA_INDEX 13
@ -506,6 +509,8 @@
#define MAC_TSCR_TXTSSTSM_WIDTH 1
#define MAC_TSSR_TXTSC_INDEX 15
#define MAC_TSSR_TXTSC_WIDTH 1
#define MAC_STNUR_ADDSUB_INDEX 31
#define MAC_STNUR_ADDSUB_WIDTH 1
#define MAC_TXSNR_TXTSSTSMIS_INDEX 31
#define MAC_TXSNR_TXTSSTSMIS_WIDTH 1
#define MAC_VLANHTR_VLHT_INDEX 0
@ -539,6 +544,7 @@
#define MAC_VR_USERVER_INDEX 16
#define MAC_VR_USERVER_WIDTH 8
/* MMC register offsets */
#define MMC_CR 0x0800
#define MMC_RISR 0x0804
@ -1171,6 +1177,8 @@
#define RX_CONTEXT_DESC3_TSA_WIDTH 1
#define RX_CONTEXT_DESC3_TSD_INDEX 6
#define RX_CONTEXT_DESC3_TSD_WIDTH 1
#define RX_CONTEXT_DESC3_PMT_INDEX 0
#define RX_CONTEXT_DESC3_PMT_WIDTH 4
#define TX_PACKET_ATTRIBUTES_CSUM_ENABLE_INDEX 0
#define TX_PACKET_ATTRIBUTES_CSUM_ENABLE_WIDTH 1

View File

@ -8,6 +8,7 @@
#include "axgbe_common.h"
#include "axgbe_phy.h"
#include "axgbe_regs.h"
#include "rte_time.h"
static int eth_axgbe_dev_init(struct rte_eth_dev *eth_dev);
static int eth_axgbe_dev_uninit(struct rte_eth_dev *eth_dev);
@ -85,6 +86,31 @@ static void axgbe_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
const uint32_t *axgbe_dev_supported_ptypes_get(struct rte_eth_dev *dev);
static int axgb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
static int
axgbe_timesync_enable(struct rte_eth_dev *dev);
static int
axgbe_timesync_disable(struct rte_eth_dev *dev);
static int
axgbe_timesync_read_rx_timestamp(struct rte_eth_dev *dev,
struct timespec *timestamp, uint32_t flags);
static int
axgbe_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
struct timespec *timestamp);
static int
axgbe_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta);
static int
axgbe_timesync_read_time(struct rte_eth_dev *dev,
struct timespec *timestamp);
static int
axgbe_timesync_write_time(struct rte_eth_dev *dev,
const struct timespec *timestamp);
static void
axgbe_set_tstamp_time(struct axgbe_port *pdata, unsigned int sec,
unsigned int nsec);
static void
axgbe_update_tstamp_addend(struct axgbe_port *pdata,
unsigned int addend);
struct axgbe_xstats {
char name[RTE_ETH_XSTATS_NAME_SIZE];
int offset;
@ -225,6 +251,13 @@ static const struct eth_dev_ops axgbe_eth_dev_ops = {
.txq_info_get = axgbe_txq_info_get,
.dev_supported_ptypes_get = axgbe_dev_supported_ptypes_get,
.mtu_set = axgb_mtu_set,
.timesync_enable = axgbe_timesync_enable,
.timesync_disable = axgbe_timesync_disable,
.timesync_read_rx_timestamp = axgbe_timesync_read_rx_timestamp,
.timesync_read_tx_timestamp = axgbe_timesync_read_tx_timestamp,
.timesync_adjust_time = axgbe_timesync_adjust_time,
.timesync_read_time = axgbe_timesync_read_time,
.timesync_write_time = axgbe_timesync_write_time,
};
static int axgbe_phy_reset(struct axgbe_port *pdata)
@ -1395,6 +1428,7 @@ axgbe_dev_supported_ptypes_get(struct rte_eth_dev *dev)
return ptypes;
return NULL;
}
static int axgb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
{
struct rte_eth_dev_info dev_info;
@ -1424,6 +1458,310 @@ static int axgb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
dev->data->dev_conf.rxmode.max_rx_pkt_len = frame_size;
return 0;
}
static void
axgbe_update_tstamp_time(struct axgbe_port *pdata,
unsigned int sec, unsigned int nsec, int addsub)
{
unsigned int count = 100;
uint32_t sub_val = 0;
uint32_t sub_val_sec = 0xFFFFFFFF;
uint32_t sub_val_nsec = 0x3B9ACA00;
if (addsub) {
if (sec)
sub_val = sub_val_sec - (sec - 1);
else
sub_val = sec;
AXGMAC_IOWRITE(pdata, MAC_STSUR, sub_val);
sub_val = sub_val_nsec - nsec;
AXGMAC_IOWRITE(pdata, MAC_STNUR, sub_val);
AXGMAC_IOWRITE_BITS(pdata, MAC_STNUR, ADDSUB, 1);
} else {
AXGMAC_IOWRITE(pdata, MAC_STSUR, sec);
AXGMAC_IOWRITE_BITS(pdata, MAC_STNUR, ADDSUB, 0);
AXGMAC_IOWRITE(pdata, MAC_STNUR, nsec);
}
AXGMAC_IOWRITE_BITS(pdata, MAC_TSCR, TSUPDT, 1);
/* Wait for time update to complete */
while (--count && AXGMAC_IOREAD_BITS(pdata, MAC_TSCR, TSUPDT))
rte_delay_ms(1);
}
static inline uint64_t
div_u64_rem(uint64_t dividend, uint32_t divisor, uint32_t *remainder)
{
*remainder = dividend % divisor;
return dividend / divisor;
}
static inline uint64_t
div_u64(uint64_t dividend, uint32_t divisor)
{
uint32_t remainder;
return div_u64_rem(dividend, divisor, &remainder);
}
static int
axgbe_adjfreq(struct axgbe_port *pdata, int64_t delta)
{
uint64_t adjust;
uint32_t addend, diff;
unsigned int neg_adjust = 0;
if (delta < 0) {
neg_adjust = 1;
delta = -delta;
}
adjust = (uint64_t)pdata->tstamp_addend;
adjust *= delta;
diff = (uint32_t)div_u64(adjust, 1000000000UL);
addend = (neg_adjust) ? pdata->tstamp_addend - diff :
pdata->tstamp_addend + diff;
pdata->tstamp_addend = addend;
axgbe_update_tstamp_addend(pdata, addend);
return 0;
}
static int
axgbe_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta)
{
struct axgbe_port *pdata = dev->data->dev_private;
struct timespec timestamp_delta;
axgbe_adjfreq(pdata, delta);
pdata->systime_tc.nsec += delta;
if (delta < 0) {
delta = -delta;
timestamp_delta = rte_ns_to_timespec(delta);
axgbe_update_tstamp_time(pdata, timestamp_delta.tv_sec,
timestamp_delta.tv_nsec, 1);
} else {
timestamp_delta = rte_ns_to_timespec(delta);
axgbe_update_tstamp_time(pdata, timestamp_delta.tv_sec,
timestamp_delta.tv_nsec, 0);
}
return 0;
}
static int
axgbe_timesync_read_time(struct rte_eth_dev *dev,
struct timespec *timestamp)
{
uint64_t nsec;
struct axgbe_port *pdata = dev->data->dev_private;
nsec = AXGMAC_IOREAD(pdata, MAC_STSR);
nsec *= NSEC_PER_SEC;
nsec += AXGMAC_IOREAD(pdata, MAC_STNR);
*timestamp = rte_ns_to_timespec(nsec);
return 0;
}
static int
axgbe_timesync_write_time(struct rte_eth_dev *dev,
const struct timespec *timestamp)
{
unsigned int count = 100;
struct axgbe_port *pdata = dev->data->dev_private;
AXGMAC_IOWRITE(pdata, MAC_STSUR, timestamp->tv_sec);
AXGMAC_IOWRITE(pdata, MAC_STNUR, timestamp->tv_nsec);
AXGMAC_IOWRITE_BITS(pdata, MAC_TSCR, TSUPDT, 1);
/* Wait for time update to complete */
while (--count && AXGMAC_IOREAD_BITS(pdata, MAC_TSCR, TSUPDT))
rte_delay_ms(1);
if (!count)
PMD_DRV_LOG(ERR, "Timed out update timestamp\n");
return 0;
}
static void
axgbe_update_tstamp_addend(struct axgbe_port *pdata,
uint32_t addend)
{
unsigned int count = 100;
AXGMAC_IOWRITE(pdata, MAC_TSAR, addend);
AXGMAC_IOWRITE_BITS(pdata, MAC_TSCR, TSADDREG, 1);
/* Wait for addend update to complete */
while (--count && AXGMAC_IOREAD_BITS(pdata, MAC_TSCR, TSADDREG))
rte_delay_ms(1);
if (!count)
PMD_DRV_LOG(ERR, "Timed out updating timestamp addend register\n");
}
static void
axgbe_set_tstamp_time(struct axgbe_port *pdata, unsigned int sec,
unsigned int nsec)
{
unsigned int count = 100;
/*System Time Sec Update*/
AXGMAC_IOWRITE(pdata, MAC_STSUR, sec);
/*System Time nanoSec Update*/
AXGMAC_IOWRITE(pdata, MAC_STNUR, nsec);
/*Initialize Timestamp*/
AXGMAC_IOWRITE_BITS(pdata, MAC_TSCR, TSINIT, 1);
/* Wait for time update to complete */
while (--count && AXGMAC_IOREAD_BITS(pdata, MAC_TSCR, TSINIT))
rte_delay_ms(1);
if (!count)
PMD_DRV_LOG(ERR, "Timed out initializing timestamp\n");
}
static int
axgbe_timesync_enable(struct rte_eth_dev *dev)
{
struct axgbe_port *pdata = dev->data->dev_private;
unsigned int mac_tscr = 0;
uint64_t dividend;
struct timespec timestamp;
uint64_t nsec;
/* Set one nano-second accuracy */
AXGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSCTRLSSR, 1);
/* Set fine timestamp update */
AXGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSCFUPDT, 1);
/* Overwrite earlier timestamps */
AXGMAC_SET_BITS(mac_tscr, MAC_TSCR, TXTSSTSM, 1);
AXGMAC_IOWRITE(pdata, MAC_TSCR, mac_tscr);
/* Enabling processing of ptp over eth pkt */
AXGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPENA, 1);
AXGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);
/* Enable timestamp for all pkts*/
AXGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENALL, 1);
/* enabling timestamp */
AXGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);
AXGMAC_IOWRITE(pdata, MAC_TSCR, mac_tscr);
/* Exit if timestamping is not enabled */
if (!AXGMAC_GET_BITS(mac_tscr, MAC_TSCR, TSENA)) {
PMD_DRV_LOG(ERR, "Exiting as timestamp is not enabled\n");
return 0;
}
/* Sub-second Increment Value*/
AXGMAC_IOWRITE_BITS(pdata, MAC_SSIR, SSINC, AXGBE_TSTAMP_SSINC);
/* Sub-nanosecond Increment Value */
AXGMAC_IOWRITE_BITS(pdata, MAC_SSIR, SNSINC, AXGBE_TSTAMP_SNSINC);
pdata->ptpclk_rate = AXGBE_V2_PTP_CLOCK_FREQ;
dividend = 50000000;
dividend <<= 32;
pdata->tstamp_addend = div_u64(dividend, pdata->ptpclk_rate);
axgbe_update_tstamp_addend(pdata, pdata->tstamp_addend);
axgbe_set_tstamp_time(pdata, 0, 0);
/* Initialize the timecounter */
memset(&pdata->systime_tc, 0, sizeof(struct rte_timecounter));
pdata->systime_tc.cc_mask = AXGBE_CYCLECOUNTER_MASK;
pdata->systime_tc.cc_shift = 0;
pdata->systime_tc.nsec_mask = 0;
PMD_DRV_LOG(DEBUG, "Initializing system time counter with realtime\n");
/* Updating the counter once with clock real time */
clock_gettime(CLOCK_REALTIME, &timestamp);
nsec = rte_timespec_to_ns(&timestamp);
nsec = rte_timecounter_update(&pdata->systime_tc, nsec);
axgbe_set_tstamp_time(pdata, timestamp.tv_sec, timestamp.tv_nsec);
return 0;
}
static int
axgbe_timesync_disable(struct rte_eth_dev *dev)
{
struct axgbe_port *pdata = dev->data->dev_private;
unsigned int mac_tscr = 0;
/*disable timestamp for all pkts*/
AXGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENALL, 0);
/*disable the addened register*/
AXGMAC_IOWRITE_BITS(pdata, MAC_TSCR, TSADDREG, 0);
/* disable timestamp update */
AXGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSCFUPDT, 0);
/*disable time stamp*/
AXGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 0);
return 0;
}
static int
axgbe_timesync_read_rx_timestamp(struct rte_eth_dev *dev,
struct timespec *timestamp, uint32_t flags)
{
uint64_t nsec = 0;
volatile union axgbe_rx_desc *desc;
uint16_t idx, pmt;
struct axgbe_rx_queue *rxq = *dev->data->rx_queues;
idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur);
desc = &rxq->desc[idx];
while (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, OWN))
rte_delay_ms(1);
if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, CTXT)) {
if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_CONTEXT_DESC3, TSA) &&
!AXGMAC_GET_BITS_LE(desc->write.desc3,
RX_CONTEXT_DESC3, TSD)) {
pmt = AXGMAC_GET_BITS_LE(desc->write.desc3,
RX_CONTEXT_DESC3, PMT);
nsec = rte_le_to_cpu_32(desc->write.desc1);
nsec *= NSEC_PER_SEC;
nsec += rte_le_to_cpu_32(desc->write.desc0);
if (nsec != 0xffffffffffffffffULL) {
if (pmt == 0x01)
*timestamp = rte_ns_to_timespec(nsec);
PMD_DRV_LOG(DEBUG,
"flags = 0x%x nsec = %"PRIu64"\n",
flags, nsec);
}
}
}
return 0;
}
static int
axgbe_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
struct timespec *timestamp)
{
uint64_t nsec;
struct axgbe_port *pdata = dev->data->dev_private;
unsigned int tx_snr, tx_ssr;
rte_delay_us(5);
if (pdata->vdata->tx_tstamp_workaround) {
tx_snr = AXGMAC_IOREAD(pdata, MAC_TXSNR);
tx_ssr = AXGMAC_IOREAD(pdata, MAC_TXSSR);
} else {
tx_ssr = AXGMAC_IOREAD(pdata, MAC_TXSSR);
tx_snr = AXGMAC_IOREAD(pdata, MAC_TXSNR);
}
if (AXGMAC_GET_BITS(tx_snr, MAC_TXSNR, TXTSSTSMIS)) {
PMD_DRV_LOG(DEBUG, "Waiting for TXTSSTSMIS\n");
return 0;
}
nsec = tx_ssr;
nsec *= NSEC_PER_SEC;
nsec += tx_snr;
PMD_DRV_LOG(DEBUG, "nsec = %"PRIu64" tx_ssr = %d tx_snr = %d\n",
nsec, tx_ssr, tx_snr);
*timestamp = rte_ns_to_timespec(nsec);
return 0;
}
static void axgbe_get_all_hw_features(struct axgbe_port *pdata)
{
unsigned int mac_hfr0, mac_hfr1, mac_hfr2;

View File

@ -9,6 +9,7 @@
#include <rte_mempool.h>
#include <rte_lcore.h>
#include "axgbe_common.h"
#include "rte_time.h"
#define IRQ 0xff
#define VLAN_HLEN 4
@ -63,6 +64,13 @@
#define AXGBE_V2_DMA_CLOCK_FREQ 500000000
#define AXGBE_V2_PTP_CLOCK_FREQ 125000000
/* Timestamp support - values based on 50MHz PTP clock
* 50MHz => 20 nsec
*/
#define AXGBE_TSTAMP_SSINC 20
#define AXGBE_TSTAMP_SNSINC 0
#define AXGBE_CYCLECOUNTER_MASK 0xffffffffffffffffULL
#define AXGMAC_FIFO_MIN_ALLOC 2048
#define AXGMAC_FIFO_UNIT 256
#define AXGMAC_FIFO_ALIGN(_x) \
@ -645,6 +653,12 @@ struct axgbe_port {
unsigned int hash_table_count;
unsigned int uc_hash_mac_addr;
unsigned int uc_hash_table[AXGBE_MAC_HASH_TABLE_SIZE];
/* For IEEE1588 PTP */
struct rte_timecounter systime_tc;
struct rte_timecounter tx_tstamp;
unsigned int tstamp_addend;
};
void axgbe_init_function_ptrs_dev(struct axgbe_hw_if *hw_if);

View File

@ -275,6 +275,10 @@ axgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
/* Get the RSS hash */
if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, RSV))
mbuf->hash.rss = rte_le_to_cpu_32(desc->write.desc1);
/* Indicate if a Context Descriptor is next */
if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, CDA))
mbuf->ol_flags |= PKT_RX_IEEE1588_PTP
| PKT_RX_IEEE1588_TMST;
pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3,
PL) - rxq->crc_len;
/* Mbuf populate */
@ -722,6 +726,10 @@ static int axgbe_xmit_hw(struct axgbe_tx_queue *txq,
/* Total msg length to transmit */
AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, FL,
mbuf->pkt_len);
/* Timestamp enablement check */
if (mbuf->ol_flags & PKT_TX_IEEE1588_TMST)
AXGMAC_SET_BITS_LE(desc->desc2, TX_NORMAL_DESC2, TTSE, 1);
rte_wmb();
/* Mark it as First and Last Descriptor */
AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, FD, 1);
AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, LD, 1);

View File

@ -13,6 +13,7 @@
/* Useful to avoid shifting for every descriptor prepration*/
#define TX_DESC_CTRL_FLAGS 0xb000000000000000
#define TX_DESC_CTRL_FLAG_TMST 0x40000000
#define TX_FREE_BULK 8
#define TX_FREE_BULK_CHECK (TX_FREE_BULK - 1)
@ -20,8 +21,13 @@ static inline void
axgbe_vec_tx(volatile struct axgbe_tx_desc *desc,
struct rte_mbuf *mbuf)
{
uint64_t tmst_en = 0;
/* Timestamp enablement check */
if (mbuf->ol_flags & PKT_TX_IEEE1588_TMST)
tmst_en = TX_DESC_CTRL_FLAG_TMST;
__m128i descriptor = _mm_set_epi64x((uint64_t)mbuf->pkt_len << 32 |
TX_DESC_CTRL_FLAGS | mbuf->data_len,
TX_DESC_CTRL_FLAGS | mbuf->data_len
| tmst_en,
mbuf->buf_iova
+ mbuf->data_off);
_mm_store_si128((__m128i *)desc, descriptor);