| From ffbf3e63486b989d931b537169387f590d18e863 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 29 Sep 2020 11:28:14 +0200 |
| Subject: octeontx2-af: fix LD CUSTOM LTYPE aliasing |
| |
| From: Stanislaw Kardach <skardach@marvell.com> |
| |
| [ Upstream commit 450f0b978870c384dd81d1176088536555f3170e ] |
| |
| Since LD contains LTYPE definitions tweaked toward efficient |
| NIX_AF_RX_FLOW_KEY_ALG(0..31)_FIELD(0..4) usage, the original location |
| of NPC_LT_LD_CUSTOM0/1 was aliased with MPLS_IN_* definitions. |
| Moving custom frame to value 6 and 7 removes the aliasing at the cost of |
| custom frames being also considered when TCP/UDP RSS algo is configured. |
| |
| However since the goal of CUSTOM frames is to classify them to a |
| separate set of RQs, this cost is acceptable. |
| |
| Signed-off-by: Stanislaw Kardach <skardach@marvell.com> |
| Acked-by: Sunil Goutham <sgoutham@marvell.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/marvell/octeontx2/af/npc.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/marvell/octeontx2/af/npc.h b/drivers/net/ethernet/marvell/octeontx2/af/npc.h |
| index 3803af9231c68..c0ff5f70aa431 100644 |
| --- a/drivers/net/ethernet/marvell/octeontx2/af/npc.h |
| +++ b/drivers/net/ethernet/marvell/octeontx2/af/npc.h |
| @@ -77,6 +77,8 @@ enum npc_kpu_ld_ltype { |
| NPC_LT_LD_ICMP, |
| NPC_LT_LD_SCTP, |
| NPC_LT_LD_ICMP6, |
| + NPC_LT_LD_CUSTOM0, |
| + NPC_LT_LD_CUSTOM1, |
| NPC_LT_LD_IGMP = 8, |
| NPC_LT_LD_ESP, |
| NPC_LT_LD_AH, |
| @@ -85,8 +87,6 @@ enum npc_kpu_ld_ltype { |
| NPC_LT_LD_NSH, |
| NPC_LT_LD_TU_MPLS_IN_NSH, |
| NPC_LT_LD_TU_MPLS_IN_IP, |
| - NPC_LT_LD_CUSTOM0 = 0xE, |
| - NPC_LT_LD_CUSTOM1 = 0xF, |
| }; |
| |
| enum npc_kpu_le_ltype { |
| -- |
| 2.27.0 |
| |
