X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Focteontx2%2Fotx2_ptp.c;h=ae5a2b7cd12660ebf26347f8c5317b1d9c954358;hb=5cbe184802aae6f3033617c7a281e9e33eaf41a1;hp=52e5456b5be4c03a07da376025eb2c8f0e3cc4bb;hpb=122135e73cd2feeffe0edf0ecedd7c629aec229f;p=dpdk.git diff --git a/drivers/net/octeontx2/otx2_ptp.c b/drivers/net/octeontx2/otx2_ptp.c index 52e5456b5b..ae5a2b7cd1 100644 --- a/drivers/net/octeontx2/otx2_ptp.c +++ b/drivers/net/octeontx2/otx2_ptp.c @@ -8,6 +8,38 @@ #define PTP_FREQ_ADJUST (1 << 9) +/* Function to enable ptp config for VFs */ +void +otx2_nix_ptp_enable_vf(struct rte_eth_dev *eth_dev) +{ + struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev); + + if (otx2_nix_recalc_mtu(eth_dev)) + otx2_err("Failed to set MTU size for ptp"); + + dev->scalar_ena = true; + dev->rx_offload_flags |= NIX_RX_OFFLOAD_TSTAMP_F; + + /* Setting up the function pointers as per new offload flags */ + otx2_eth_set_rx_function(eth_dev); + otx2_eth_set_tx_function(eth_dev); +} + +static uint16_t +nix_eth_ptp_vf_burst(void *queue, struct rte_mbuf **mbufs, uint16_t pkts) +{ + struct otx2_eth_rxq *rxq = queue; + struct rte_eth_dev *eth_dev; + + RTE_SET_USED(mbufs); + RTE_SET_USED(pkts); + + eth_dev = rxq->eth_dev; + otx2_nix_ptp_enable_vf(eth_dev); + + return 0; +} + static int nix_read_raw_clock(struct otx2_eth_dev *dev, uint64_t *clock, uint64_t *tsc, uint8_t is_pmu) @@ -102,9 +134,9 @@ nix_ptp_config(struct rte_eth_dev *eth_dev, int en) { struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev); struct otx2_mbox *mbox = dev->mbox; - uint8_t rc = 0; + uint8_t rc = -EINVAL; - if (otx2_dev_is_vf(dev)) + if (otx2_dev_is_vf_or_sdp(dev) || otx2_dev_is_lbk(dev)) return rc; if (en) { @@ -136,9 +168,16 @@ int otx2_eth_dev_ptp_info_update(struct otx2_dev *dev, bool ptp_en) { struct otx2_eth_dev *otx2_dev = (struct otx2_eth_dev *)dev; - struct rte_eth_dev *eth_dev = otx2_dev->eth_dev; + struct rte_eth_dev *eth_dev; int i; + if (!dev) + return -EINVAL; + + eth_dev = otx2_dev->eth_dev; + if (!eth_dev) + return -EINVAL; + otx2_dev->ptp_en = ptp_en; for (i = 0; i < eth_dev->data->nb_rx_queues; i++) { struct otx2_eth_rxq *rxq = eth_dev->data->rx_queues[i]; @@ -146,6 +185,17 @@ otx2_eth_dev_ptp_info_update(struct otx2_dev *dev, bool ptp_en) otx2_nix_rxq_mbuf_setup(otx2_dev, eth_dev->data->port_id); } + if (otx2_dev_is_vf(otx2_dev) && !(otx2_dev_is_sdp(otx2_dev)) && + !(otx2_dev_is_lbk(otx2_dev))) { + /* In case of VF, setting of MTU cant be done directly in this + * function as this is running as part of MBOX request(PF->VF) + * and MTU setting also requires MBOX message to be + * sent(VF->PF) + */ + eth_dev->rx_pkt_burst = nix_eth_ptp_vf_burst; + rte_mb(); + } + return 0; } @@ -155,27 +205,36 @@ otx2_nix_timesync_enable(struct rte_eth_dev *eth_dev) struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev); int i, rc = 0; - if (otx2_ethdev_is_ptp_en(dev)) { - otx2_info("PTP mode is already enabled "); + /* If we are VF/SDP/LBK, ptp cannot not be enabled */ + if (otx2_dev_is_vf_or_sdp(dev) || otx2_dev_is_lbk(dev)) { + otx2_info("PTP cannot be enabled in case of VF/SDP/LBK"); return -EINVAL; } - /* If we are VF, no further action can be taken */ - if (otx2_dev_is_vf(dev)) + if (otx2_ethdev_is_ptp_en(dev)) { + otx2_info("PTP mode is already enabled"); return -EINVAL; + } if (!(dev->rx_offload_flags & NIX_RX_OFFLOAD_PTYPE_F)) { otx2_err("Ptype offload is disabled, it should be enabled"); return -EINVAL; } + if (dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_HIGIG) { + otx2_err("Both PTP and switch header enabled"); + return -EINVAL; + } + /* Allocating a iova address for tx tstamp */ const struct rte_memzone *ts; ts = rte_eth_dma_zone_reserve(eth_dev, "otx2_ts", 0, OTX2_ALIGN, OTX2_ALIGN, dev->node); - if (ts == NULL) + if (ts == NULL) { otx2_err("Failed to allocate mem for tx tstamp addr"); + return -ENOMEM; + } dev->tstamp.tx_tstamp_iova = ts->iova; dev->tstamp.tx_tstamp = ts->addr; @@ -198,6 +257,11 @@ otx2_nix_timesync_enable(struct rte_eth_dev *eth_dev) otx2_eth_set_rx_function(eth_dev); otx2_eth_set_tx_function(eth_dev); } + + rc = otx2_nix_recalc_mtu(eth_dev); + if (rc) + otx2_err("Failed to set MTU size for ptp"); + return rc; } @@ -212,8 +276,7 @@ otx2_nix_timesync_disable(struct rte_eth_dev *eth_dev) return -EINVAL; } - /* If we are VF, nothing else can be done */ - if (otx2_dev_is_vf(dev)) + if (otx2_dev_is_vf_or_sdp(dev) || otx2_dev_is_lbk(dev)) return -EINVAL; dev->rx_offloads &= ~DEV_RX_OFFLOAD_TIMESTAMP; @@ -231,6 +294,11 @@ otx2_nix_timesync_disable(struct rte_eth_dev *eth_dev) otx2_eth_set_rx_function(eth_dev); otx2_eth_set_tx_function(eth_dev); } + + rc = otx2_nix_recalc_mtu(eth_dev); + if (rc) + otx2_err("Failed to set MTU size for ptp"); + return rc; } @@ -250,9 +318,9 @@ otx2_nix_timesync_read_rx_timestamp(struct rte_eth_dev *eth_dev, *timestamp = rte_ns_to_timespec(ns); tstamp->rx_ready = 0; - otx2_nix_dbg("rx timestamp: %llu sec: %lu nsec %lu", - (unsigned long long)tstamp->rx_tstamp, timestamp->tv_sec, - timestamp->tv_nsec); + otx2_nix_dbg("rx timestamp: %"PRIu64" sec: %"PRIu64" nsec %"PRIu64"", + (uint64_t)tstamp->rx_tstamp, (uint64_t)timestamp->tv_sec, + (uint64_t)timestamp->tv_nsec); return 0; } @@ -271,9 +339,9 @@ otx2_nix_timesync_read_tx_timestamp(struct rte_eth_dev *eth_dev, ns = rte_timecounter_update(&dev->tx_tstamp_tc, *tstamp->tx_tstamp); *timestamp = rte_ns_to_timespec(ns); - otx2_nix_dbg("tx timestamp: %llu sec: %lu nsec %lu", - *(unsigned long long *)tstamp->tx_tstamp, - timestamp->tv_sec, timestamp->tv_nsec); + otx2_nix_dbg("tx timestamp: %"PRIu64" sec: %"PRIu64" nsec %"PRIu64"", + *tstamp->tx_tstamp, (uint64_t)timestamp->tv_sec, + (uint64_t)timestamp->tv_nsec); *tstamp->tx_tstamp = 0; rte_wmb(); @@ -349,7 +417,8 @@ otx2_nix_timesync_read_time(struct rte_eth_dev *eth_dev, struct timespec *ts) ns = rte_timecounter_update(&dev->systime_tc, rsp->clk); *ts = rte_ns_to_timespec(ns); - otx2_nix_dbg("PTP time read: %ld.%09ld", ts->tv_sec, ts->tv_nsec); + otx2_nix_dbg("PTP time read: %"PRIu64" .%09"PRIu64"", + (uint64_t)ts->tv_sec, (uint64_t)ts->tv_nsec); return 0; }