diff options
author | Jakub Kicinski <kuba@kernel.org> | 2022-07-07 04:32:01 +0300 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-07-07 04:43:55 +0300 |
commit | 69d7d257cd35c9d36c93019f87de6c9f8b514119 (patch) | |
tree | 59b2cb06105f52ab507dbe8838fe46e5a312ce3f /drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c | |
parent | cd355d0bc60df51266d228c0f69570cdcfa1e6ba (diff) | |
download | linux-69d7d257cd35c9d36c93019f87de6c9f8b514119.tar.xz |
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/rvu_debugfs.c')
-rw-r--r-- | drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c | 179 |
1 files changed, 0 insertions, 179 deletions
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c index f42a09f04b25..2ad73b180276 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c @@ -18,7 +18,6 @@ #include "cgx.h" #include "lmac_common.h" #include "npc.h" -#include "rvu_npc_hash.h" #define DEBUGFS_DIR_NAME "octeontx2" @@ -2601,170 +2600,6 @@ static int rvu_dbg_npc_mcam_show_rules(struct seq_file *s, void *unused) RVU_DEBUG_SEQ_FOPS(npc_mcam_rules, npc_mcam_show_rules, NULL); -static int rvu_dbg_npc_exact_show_entries(struct seq_file *s, void *unused) -{ - struct npc_exact_table_entry *mem_entry[NPC_EXACT_TBL_MAX_WAYS] = { 0 }; - struct npc_exact_table_entry *cam_entry; - struct npc_exact_table *table; - struct rvu *rvu = s->private; - int i, j; - - u8 bitmap = 0; - - table = rvu->hw->table; - - mutex_lock(&table->lock); - - /* Check if there is at least one entry in mem table */ - if (!table->mem_tbl_entry_cnt) - goto dump_cam_table; - - /* Print table headers */ - seq_puts(s, "\n\tExact Match MEM Table\n"); - seq_puts(s, "Index\t"); - - for (i = 0; i < table->mem_table.ways; i++) { - mem_entry[i] = list_first_entry_or_null(&table->lhead_mem_tbl_entry[i], - struct npc_exact_table_entry, list); - - seq_printf(s, "Way-%d\t\t\t\t\t", i); - } - - seq_puts(s, "\n"); - for (i = 0; i < table->mem_table.ways; i++) - seq_puts(s, "\tChan MAC \t"); - - seq_puts(s, "\n\n"); - - /* Print mem table entries */ - for (i = 0; i < table->mem_table.depth; i++) { - bitmap = 0; - for (j = 0; j < table->mem_table.ways; j++) { - if (!mem_entry[j]) - continue; - - if (mem_entry[j]->index != i) - continue; - - bitmap |= BIT(j); - } - - /* No valid entries */ - if (!bitmap) - continue; - - seq_printf(s, "%d\t", i); - for (j = 0; j < table->mem_table.ways; j++) { - if (!(bitmap & BIT(j))) { - seq_puts(s, "nil\t\t\t\t\t"); - continue; - } - - seq_printf(s, "0x%x %pM\t\t\t", mem_entry[j]->chan, - mem_entry[j]->mac); - mem_entry[j] = list_next_entry(mem_entry[j], list); - } - seq_puts(s, "\n"); - } - -dump_cam_table: - - if (!table->cam_tbl_entry_cnt) - goto done; - - seq_puts(s, "\n\tExact Match CAM Table\n"); - seq_puts(s, "index\tchan\tMAC\n"); - - /* Traverse cam table entries */ - list_for_each_entry(cam_entry, &table->lhead_cam_tbl_entry, list) { - seq_printf(s, "%d\t0x%x\t%pM\n", cam_entry->index, cam_entry->chan, - cam_entry->mac); - } - -done: - mutex_unlock(&table->lock); - return 0; -} - -RVU_DEBUG_SEQ_FOPS(npc_exact_entries, npc_exact_show_entries, NULL); - -static int rvu_dbg_npc_exact_show_info(struct seq_file *s, void *unused) -{ - struct npc_exact_table *table; - struct rvu *rvu = s->private; - int i; - - table = rvu->hw->table; - - seq_puts(s, "\n\tExact Table Info\n"); - seq_printf(s, "Exact Match Feature : %s\n", - rvu->hw->cap.npc_exact_match_enabled ? "enabled" : "disable"); - if (!rvu->hw->cap.npc_exact_match_enabled) - return 0; - - seq_puts(s, "\nMCAM Index\tMAC Filter Rules Count\n"); - for (i = 0; i < table->num_drop_rules; i++) - seq_printf(s, "%d\t\t%d\n", i, table->cnt_cmd_rules[i]); - - seq_puts(s, "\nMcam Index\tPromisc Mode Status\n"); - for (i = 0; i < table->num_drop_rules; i++) - seq_printf(s, "%d\t\t%s\n", i, table->promisc_mode[i] ? "on" : "off"); - - seq_puts(s, "\n\tMEM Table Info\n"); - seq_printf(s, "Ways : %d\n", table->mem_table.ways); - seq_printf(s, "Depth : %d\n", table->mem_table.depth); - seq_printf(s, "Mask : 0x%llx\n", table->mem_table.mask); - seq_printf(s, "Hash Mask : 0x%x\n", table->mem_table.hash_mask); - seq_printf(s, "Hash Offset : 0x%x\n", table->mem_table.hash_offset); - - seq_puts(s, "\n\tCAM Table Info\n"); - seq_printf(s, "Depth : %d\n", table->cam_table.depth); - - return 0; -} - -RVU_DEBUG_SEQ_FOPS(npc_exact_info, npc_exact_show_info, NULL); - -static int rvu_dbg_npc_exact_drop_cnt(struct seq_file *s, void *unused) -{ - struct npc_exact_table *table; - struct rvu *rvu = s->private; - struct npc_key_field *field; - u16 chan, pcifunc; - int blkaddr, i; - u64 cfg, cam1; - char *str; - - blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_NPC, 0); - table = rvu->hw->table; - - field = &rvu->hw->mcam.rx_key_fields[NPC_CHAN]; - - seq_puts(s, "\n\t Exact Hit on drop status\n"); - seq_puts(s, "\npcifunc\tmcam_idx\tHits\tchan\tstatus\n"); - - for (i = 0; i < table->num_drop_rules; i++) { - pcifunc = rvu_npc_exact_drop_rule_to_pcifunc(rvu, i); - cfg = rvu_read64(rvu, blkaddr, NPC_AF_MCAMEX_BANKX_CFG(i, 0)); - - /* channel will be always in keyword 0 */ - cam1 = rvu_read64(rvu, blkaddr, - NPC_AF_MCAMEX_BANKX_CAMX_W0(i, 0, 1)); - chan = field->kw_mask[0] & cam1; - - str = (cfg & 1) ? "enabled" : "disabled"; - - seq_printf(s, "0x%x\t%d\t\t%llu\t0x%x\t%s\n", pcifunc, i, - rvu_read64(rvu, blkaddr, - NPC_AF_MATCH_STATX(table->counter_idx[i])), - chan, str); - } - - return 0; -} - -RVU_DEBUG_SEQ_FOPS(npc_exact_drop_cnt, npc_exact_drop_cnt, NULL); - static void rvu_dbg_npc_init(struct rvu *rvu) { rvu->rvu_dbg.npc = debugfs_create_dir("npc", rvu->rvu_dbg.root); @@ -2773,22 +2608,8 @@ static void rvu_dbg_npc_init(struct rvu *rvu) &rvu_dbg_npc_mcam_info_fops); debugfs_create_file("mcam_rules", 0444, rvu->rvu_dbg.npc, rvu, &rvu_dbg_npc_mcam_rules_fops); - debugfs_create_file("rx_miss_act_stats", 0444, rvu->rvu_dbg.npc, rvu, &rvu_dbg_npc_rx_miss_act_fops); - - if (!rvu->hw->cap.npc_exact_match_enabled) - return; - - debugfs_create_file("exact_entries", 0444, rvu->rvu_dbg.npc, rvu, - &rvu_dbg_npc_exact_entries_fops); - - debugfs_create_file("exact_info", 0444, rvu->rvu_dbg.npc, rvu, - &rvu_dbg_npc_exact_info_fops); - - debugfs_create_file("exact_drop_cnt", 0444, rvu->rvu_dbg.npc, rvu, - &rvu_dbg_npc_exact_drop_cnt_fops); - } static int cpt_eng_sts_display(struct seq_file *filp, u8 eng_type) |