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

net/octeontx2: fix PTP and HIGIG2 coexistence

Browse Source 
octeontx2 PMD does not support both PTP and HIGIG2 together.
Added a check to enforce this and updated the Rx offload capabilities when
Higig2 mode enabled.

Fixes: 602009ee2dfb ("net/octeontx2: support HIGIG2")
Cc: stable@dpdk.org

Signed-off-by: Kiran Kumar K <kirankumark@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
This commit is contained in:
Kiran Kumar K 2020-01-14 14:56:22 +05:30 committed by Ferruh Yigit
parent acbe92bdb2
commit 8dc4ff37fe
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/octeontx2/otx2_ethdev.c
View File

@ -18,7 +18,8 @@ nix_get_rx_offload_capa(struct otx2_eth_dev *dev)
{ {
uint64_t capa = NIX_RX_OFFLOAD_CAPA; uint64_t capa = NIX_RX_OFFLOAD_CAPA;
if (otx2_dev_is_vf(dev)) if (otx2_dev_is_vf(dev) ||
dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_HIGIG)
capa &= ~DEV_RX_OFFLOAD_TIMESTAMP; capa &= ~DEV_RX_OFFLOAD_TIMESTAMP;
return capa; return capa;
@ -1641,6 +1642,12 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
goto fail_offloads; goto fail_offloads;
} }
if (dev->ptp_en &&
dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_HIGIG) {
otx2_err("Both PTP and switch header enabled");
goto free_nix_lf;
}
rc = nix_lf_switch_header_type_enable(dev); rc = nix_lf_switch_header_type_enable(dev);
if (rc) { if (rc) {
otx2_err("Failed to enable switch type nix_lf rc=%d", rc); otx2_err("Failed to enable switch type nix_lf rc=%d", rc);

5
drivers/net/octeontx2/otx2_ptp.c
View File

@ -221,6 +221,11 @@ otx2_nix_timesync_enable(struct rte_eth_dev *eth_dev)
return -EINVAL; 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 */ /* Allocating a iova address for tx tstamp */
const struct rte_memzone *ts; const struct rte_memzone *ts;
ts = rte_eth_dma_zone_reserve(eth_dev, "otx2_ts", ts = rte_eth_dma_zone_reserve(eth_dev, "otx2_ts",