]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
eth: fbnic: Allocate all pages for RX mailbox
authorMohsin Bashir <mohsin.bashr@gmail.com>
Thu, 15 Jan 2026 00:33:50 +0000 (16:33 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 21 Jan 2026 02:18:41 +0000 (18:18 -0800)
Now that memory is allocated with GFP_KERNEL, allocation failures
should be extremely rare. Ensure the FW communication ring is
always fully populated with free pages, and hard fail initialization
otherwise. This enables simplifications in next patches.

Signed-off-by: Mohsin Bashir <mohsin.bashr@gmail.com>
Link: https://patch.msgid.link/20260115003353.4150771-3-mohsin.bashr@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/meta/fbnic/fbnic_fw.c

index 3dfd3f2442ff097fad759102178f9a5a34d46eec..09252b3e03cac2f9a089bdfeb04e54dbe428d512 100644 (file)
@@ -415,7 +415,7 @@ static int fbnic_fw_xmit_simple_msg(struct fbnic_dev *fbd, u32 msg_type)
        return err;
 }
 
-static void fbnic_mbx_init_desc_ring(struct fbnic_dev *fbd, int mbx_idx)
+static int fbnic_mbx_init_desc_ring(struct fbnic_dev *fbd, int mbx_idx)
 {
        struct fbnic_fw_mbx *mbx = &fbd->mbx[mbx_idx];
 
@@ -428,14 +428,15 @@ static void fbnic_mbx_init_desc_ring(struct fbnic_dev *fbd, int mbx_idx)
                     FBNIC_PUL_OB_TLP_HDR_AW_CFG_BME);
 
                /* Make sure we have a page for the FW to write to */
-               fbnic_mbx_alloc_rx_msgs(fbd);
-               break;
+               return fbnic_mbx_alloc_rx_msgs(fbd);
        case FBNIC_IPC_MBX_TX_IDX:
                /* Enable DMA reads from the device */
                wr32(fbd, FBNIC_PUL_OB_TLP_HDR_AR_CFG,
                     FBNIC_PUL_OB_TLP_HDR_AR_CFG_BME);
                break;
        }
+
+       return 0;
 }
 
 static bool fbnic_mbx_event(struct fbnic_dev *fbd)
@@ -1683,8 +1684,11 @@ int fbnic_mbx_poll_tx_ready(struct fbnic_dev *fbd)
        } while (!fbnic_mbx_event(fbd));
 
        /* FW has shown signs of life. Enable DMA and start Tx/Rx */
-       for (i = 0; i < FBNIC_IPC_MBX_INDICES; i++)
-               fbnic_mbx_init_desc_ring(fbd, i);
+       for (i = 0; i < FBNIC_IPC_MBX_INDICES; i++) {
+               err = fbnic_mbx_init_desc_ring(fbd, i);
+               if (err)
+                       goto clean_mbx;
+       }
 
        /* Request an update from the firmware. This should overwrite
         * mgmt.version once we get the actual version from the firmware