octeontx2-af: Fix PKIND overlap between LBK and LMAC interfaces
Geetha sowjanya
maintainerPATCH 1/1 octeontx2-af: Fix PKIND overlap between LBK and LMAC interfaces
Currently PKINDs are not assigned to LBK channels.
The default value of LBK_CHX_PKIND (channel to PKIND mapping) register is zero, which is resulting in a overlap of pkind between LBK and CGX LMACs. When KPU1 parser config is modified when PTP timestamping is enabled on the CGX LMAC interface it is impacting traffic on LBK interfaces as well.
This patch fixes the issue by reserving the PKIND#0 for LBK devices. CGX mapped PF pkind starts from 1 and also fixes the max pkind available.
--- drivers/net/ethernet/marvell/octeontx2/af/npc.h | 3 +++ drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 1 + drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 11 +++++++---- 3 files changed, 11 insertions(+), 4 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/npc.h +3 -0
@@ -151,7 +151,10 @@ enum npc_kpu_lh_ltype {* Software assigns pkind for each incoming port such as CGX * Ethernet interfaces, LBK interfaces, etc. */ +#define NPC_UNRESERVED_PKIND_COUNT NPC_RX_VLAN_EXDSA_PKIND +enum npc_pkind_type { +NPC_RX_LBK_PKIND =0ULL ,NPC_RX_VLAN_EXDSA_PKIND =56ULL ,NPC_RX_CHLEN24B_PKIND =57ULL ,NPC_RX_CPT_HDR_PKIND ,
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +1 -0
@@ -298,6 +298,7 @@ static int nix_interface_init(struct rvu *rvu, u16 pcifunc, int type, int nixlf)rvu_nix_chan_lbk (rvu, lbkid, vf +1 ); pfvf->rx_chan_cnt =1 ; pfvf->tx_chan_cnt =1 ; +rvu_npc_set_pkind (rvu,NPC_RX_LBK_PKIND , pfvf);rvu_npc_install_promisc_entry (rvu, pcifunc, nixlf, pfvf->rx_chan_base, pfvf->rx_chan_cnt);
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c +7 -4
@@ -1721,7 +1721,6 @@ static void npc_parser_profile_init(struct rvu *rvu, int blkaddr) {struct rvu_hwinfo *hw = rvu->hw;int num_pkinds, num_kpus, idx; -struct npc_pkind *pkind;/* Disable all KPUs and their entries */ for (idx =0 ; idx < hw->npc_kpus; idx++) {
@@ -1739,9 +1738,8 @@ static void npc_parser_profile_init(struct rvu *rvu, int blkaddr)* Check HW max count to avoid configuring junk or * writing to unsupported CSR addresses. */ - pkind = &hw->pkind; num_pkinds = rvu->kpu.pkinds; - num_pkinds =min_t (int, pkind->rsrc.max, num_pkinds); + num_pkinds =min_t (int, hw->npc_pkinds, num_pkinds);for (idx =0 ; idx < num_pkinds; idx++)npc_config_kpuaction (rvu, blkaddr, &rvu->kpu.ikpu[idx],0 , idx, true);
@@ -1891,7 +1889,8 @@ static void rvu_npc_hw_init(struct rvu *rvu, int blkaddr)if (npc_const1 &BIT_ULL (63 )) npc_const2 =rvu_read64 (rvu, blkaddr,NPC_AF_CONST2 ); - pkind->rsrc.max = (npc_const1 >>12 ) &0xFFULL ; + pkind->rsrc.max =NPC_UNRESERVED_PKIND_COUNT ; + hw->npc_pkinds = (npc_const1 >>12 ) &0xFFULL ; hw->npc_kpu_entries = npc_const1 &0xFFFULL ; hw->npc_kpus = (npc_const >>8 ) &0x1FULL ; hw->npc_intfs = npc_const &0xFULL ;
@@ -2002,6 +2001,10 @@ int rvu_npc_init(struct rvu *rvu) err =rvu_alloc_bitmap (&pkind->rsrc);if (err)return err; +/* Reserve PKIND#0 for LBKs. Power reset value of LBK_CH_PKIND is '0', +* no need to configure PKIND for all LBKs separately. +*/ +rvu_alloc_rsrc (&pkind->rsrc);/* Allocate mem for pkind to PF and channel mapping info */ pkind->pfchan_map = devm_kcalloc(rvu->dev, pkind->rsrc.max,
Signature · 1 line
2.17.1
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 8 lines · On Sun, 25 Jul 2021 13:28:24 +0530 you wrote:
Currently PKINDs are not assigned to LBK channels.
The default value ofLBK_CHX_PKIND(channel to PKIND mapping) register is zero, which is resulting in a overlap of pkind between LBK and CGX LMACs. When KPU1 parser config is modified when PTP timestamping is enabled on the CGX LMAC interface it is impacting traffic on LBK interfaces as well.[...]
Here is the summary with links:
- [net] octeontx2-af: Fix PKIND overlap between LBK and LMAC interfaces
https://git.kernel.org/netdev/net/c/ac059d16442f
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html