eth: fbnic: reprogram TCAMs after FW crash

FW may mess with the TCAM after it boots, to try to restore
the traffic flow to the BMC (it may not be aware that the host
is already up). Make sure that we reprogram the TCAMs after
detecting a crash.

Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Link: https://patch.msgid.link/20250916231420.1693955-5-kuba@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic.h b/drivers/net/ethernet/meta/fbnic/fbnic.h
index 09058d847729980029e3a9a10ea7b9c87d5fcc46..b364c2f0724b277eb65614dd332ecc7fb001591b 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic.h
+++ b/drivers/net/ethernet/meta/fbnic/fbnic.h
@@ -191,6 +191,8 @@ void fbnic_dbg_fbd_exit(struct fbnic_dev *fbd);
 void fbnic_dbg_init(void);
 void fbnic_dbg_exit(void);
 
+void fbnic_rpc_reset_valid_entries(struct fbnic_dev *fbd);
+
 void fbnic_csr_get_regs(struct fbnic_dev *fbd, u32 *data, u32 *regs_version);
 int fbnic_csr_regs_len(struct fbnic_dev *fbd);
 

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_pci.c b/drivers/net/ethernet/meta/fbnic/fbnic_pci.c
index 9fdc8f4f36cc69a38545c37579e31368e00010c9..7d9b93f8ebd85108bb3fe38c6da8bb29b0c85306 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_pci.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_pci.c
@@ -167,6 +167,20 @@ void fbnic_down(struct fbnic_net *fbn)
        fbnic_flush(fbn);
 }
 
+static int fbnic_fw_config_after_crash(struct fbnic_dev *fbd)
+{
+       if (fbnic_fw_xmit_ownership_msg(fbd, true)) {
+               dev_err(fbd->dev, "NIC failed to take ownership\n");
+
+               return -1;
+       }
+
+       fbnic_rpc_reset_valid_entries(fbd);
+       __fbnic_set_rx_mode(fbd);
+
+       return 0;
+}
+
 static void fbnic_health_check(struct fbnic_dev *fbd)
 {
        struct fbnic_fw_mbx *tx_mbx = &fbd->mbx[FBNIC_IPC_MBX_TX_IDX];
@@ -182,13 +196,8 @@ static void fbnic_health_check(struct fbnic_dev *fbd)
        if (tx_mbx->head != tx_mbx->tail)
                return;
 
-       /* TBD: Need to add a more thorough recovery here.
-        *      Specifically I need to verify what all the firmware will have
-        *      changed since we had setup and it rebooted. May just need to
-        *      perform a down/up. For now we will just reclaim ownership so
-        *      the heartbeat can catch the next fault.
-        */
-       fbnic_fw_xmit_ownership_msg(fbd, true);
+       if (fbnic_fw_config_after_crash(fbd))
+               dev_err(fbd->dev, "Firmware recovery failed after crash\n");
 }
 
 static void fbnic_service_task(struct work_struct *work)

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_rpc.c b/drivers/net/ethernet/meta/fbnic/fbnic_rpc.c
index d944d0fdd3b7096f2658e2141f55d4a15fc87c19..7f31e890031c06b5d61ff79f8bf7f777741d5e0c 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_rpc.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_rpc.c
@@ -596,6 +596,21 @@ static void fbnic_clear_macda(struct fbnic_dev *fbd)
        }
 }
 
+static void fbnic_clear_valid_macda(struct fbnic_dev *fbd)
+{
+       int idx;
+
+       for (idx = ARRAY_SIZE(fbd->mac_addr); idx--;) {
+               struct fbnic_mac_addr *mac_addr = &fbd->mac_addr[idx];
+
+               if (mac_addr->state == FBNIC_TCAM_S_VALID) {
+                       fbnic_clear_macda_entry(fbd, idx);
+
+                       mac_addr->state = FBNIC_TCAM_S_UPDATE;
+               }
+       }
+}
+
 static void fbnic_write_macda_entry(struct fbnic_dev *fbd, unsigned int idx,
                                    struct fbnic_mac_addr *mac_addr)
 {
@@ -1223,3 +1238,9 @@ void fbnic_write_rules(struct fbnic_dev *fbd)
                        fbnic_update_act_tcam(fbd, i);
        }
 }
+
+void fbnic_rpc_reset_valid_entries(struct fbnic_dev *fbd)
+{
+       fbnic_clear_valid_act_tcam(fbd);
+       fbnic_clear_valid_macda(fbd);
+}