diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-07-07 03:32:01 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-07-07 03:43:55 +0200 |
| commit | 69d7d257cd35c9d36c93019f87de6c9f8b514119 (patch) | |
| tree | 59b2cb06105f52ab507dbe8838fe46e5a312ce3f /drivers/net/ethernet/marvell/octeontx2/af/npc.h | |
| parent | Merge branch 'hinic-dev_get_stats-fixes' (diff) | |
| download | linux-69d7d257cd35c9d36c93019f87de6c9f8b514119.tar.xz linux-69d7d257cd35c9d36c93019f87de6c9f8b514119.zip | |
Revert "Merge branch 'octeontx2-af-next'"
This reverts commit 2ef8e39f58f08589ab035223c2687830c0eba30f, reversing
changes made to e7ce9fc9ad38773b660ef663ae98df4f93cb6a37.
There are build warnings here which break the normal
build due to -Werror. Ratheesh was nice enough to quickly
follow up with fixes but didn't hit all the warnings I
see on GCC 12 so to unlock net-next from taking patches
let get this series out for now.
Link: https://lore.kernel.org/r/20220707013201.1372433-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/marvell/octeontx2/af/npc.h')
| -rw-r--r-- | drivers/net/ethernet/marvell/octeontx2/af/npc.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/npc.h b/drivers/net/ethernet/marvell/octeontx2/af/npc.h index f187293e3e08..9b6e587e78b4 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/npc.h +++ b/drivers/net/ethernet/marvell/octeontx2/af/npc.h @@ -10,14 +10,6 @@ #define NPC_KEX_CHAN_MASK 0xFFFULL -#define SET_KEX_LD(intf, lid, ltype, ld, cfg) \ - rvu_write64(rvu, blkaddr, \ - NPC_AF_INTFX_LIDX_LTX_LDX_CFG(intf, lid, ltype, ld), cfg) - -#define SET_KEX_LDFLAGS(intf, ld, flags, cfg) \ - rvu_write64(rvu, blkaddr, \ - NPC_AF_INTFX_LDATAX_FLAGSX_CFG(intf, ld, flags), cfg) - enum NPC_LID_E { NPC_LID_LA = 0, NPC_LID_LB, @@ -208,7 +200,6 @@ enum key_fields { NPC_ERRLEV, NPC_ERRCODE, NPC_LXMB, - NPC_EXACT_RESULT, NPC_LA, NPC_LB, NPC_LC, @@ -390,22 +381,6 @@ struct nix_rx_action { }; /* NPC_AF_INTFX_KEX_CFG field masks */ -#define NPC_EXACT_NIBBLE_START 40 -#define NPC_EXACT_NIBBLE_END 43 -#define NPC_EXACT_NIBBLE GENMASK_ULL(43, 40) - -/* NPC_EXACT_KEX_S nibble definitions for each field */ -#define NPC_EXACT_NIBBLE_HIT BIT_ULL(40) -#define NPC_EXACT_NIBBLE_OPC BIT_ULL(40) -#define NPC_EXACT_NIBBLE_WAY BIT_ULL(40) -#define NPC_EXACT_NIBBLE_INDEX GENMASK_ULL(43, 41) - -#define NPC_EXACT_RESULT_HIT BIT_ULL(0) -#define NPC_EXACT_RESULT_OPC GENMASK_ULL(2, 1) -#define NPC_EXACT_RESULT_WAY GENMASK_ULL(4, 3) -#define NPC_EXACT_RESULT_IDX GENMASK_ULL(15, 5) - -/* NPC_AF_INTFX_KEX_CFG field masks */ #define NPC_PARSE_NIBBLE GENMASK_ULL(30, 0) /* NPC_PARSE_KEX_S nibble definitions for each field */ |