fbnic: Do not consider mailbox "initialized" until we have verified fw version

In order for us to make use of the information in the PHY we need to verify
that the FW capabilities message has been processed. To do so we should
poll until the FW version in the capabilities message is at least at the
minimum level needed to verify that the FW can support the basic PHY config
messages.

As such this change adds logic so that we will poll the mailbox until such
time as the FW version can be populated with an acceptable value. If it
doesn't reach a sufficicient value the mailbox will be considered to have
timed out.

Signed-off-by: Alexander Duyck <alexanderduyck@fb.com>
Link: https://patch.msgid.link/175028444873.625704.10269838393153693403.stgit@ahduyck-xeon-server.home.arpa
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c b/drivers/net/ethernet/meta/fbnic/fbnic_fw.c
index 4521d0483d186a12ccaf02b1ecbff6076da0d430..01756aba29fbe2c6913b1efc73f00bed29953798 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_fw.c
@@ -95,6 +95,9 @@ void fbnic_mbx_init(struct fbnic_dev *fbd)
        /* Initialize lock to protect Tx ring */
        spin_lock_init(&fbd->fw_tx_lock);
 
+       /* Reset FW Capabilities */
+       memset(&fbd->fw_cap, 0, sizeof(fbd->fw_cap));
+
        /* Reinitialize mailbox memory */
        for (i = 0; i < FBNIC_IPC_MBX_INDICES; i++)
                memset(&fbd->mbx[i], 0, sizeof(struct fbnic_fw_mbx));
@@ -1117,6 +1120,7 @@ void fbnic_mbx_poll(struct fbnic_dev *fbd)
 
 int fbnic_mbx_poll_tx_ready(struct fbnic_dev *fbd)
 {
+       struct fbnic_fw_mbx *tx_mbx = &fbd->mbx[FBNIC_IPC_MBX_TX_IDX];
        unsigned long timeout = jiffies + 10 * HZ + 1;
        int err, i;
 
@@ -1149,8 +1153,23 @@ int fbnic_mbx_poll_tx_ready(struct fbnic_dev *fbd)
        if (err)
                goto clean_mbx;
 
-       /* Use "1" to indicate we entered the state waiting for a response */
-       fbd->fw_cap.running.mgmt.version = 1;
+       /* Poll until we get a current management firmware version, use "1"
+        * to indicate we entered the polling state waiting for a response
+        */
+       for (fbd->fw_cap.running.mgmt.version = 1;
+            fbd->fw_cap.running.mgmt.version < MIN_FW_VERSION_CODE;) {
+               if (!tx_mbx->ready)
+                       err = -ENODEV;
+               if (err)
+                       goto clean_mbx;
+
+               msleep(20);
+               fbnic_mbx_poll(fbd);
+
+               /* set err, but wait till mgmt.version check to report it */
+               if (!time_is_after_jiffies(timeout))
+                       err = -ETIMEDOUT;
+       }
 
        return 0;
 clean_mbx: