Skip to content

Commit ab064f6

Browse files
ahduyckPaolo Abeni
authored andcommitted
fbnic: Improve responsiveness of fbnic_mbx_poll_tx_ready
There were a couple different issues found in fbnic_mbx_poll_tx_ready. Among them were the fact that we were sleeping much longer than we actually needed to as the actual FW could respond in under 20ms. The other issue was that we would just keep polling the mailbox even if the device itself had gone away. To address the responsiveness issues we can decrease the sleeps to 20ms and use a jiffies based timeout value rather than just counting the number of times we slept and then polled. To address the hardware going away we can move the check for the firmware BAR being present from where it was and place it inside the loop after the mailbox descriptor ring is initialized and before we sleep so that we just abort and return an error if the device went away during initialization. With these two changes we see a significant improvement in boot times for the driver. Fixes: da3cde0 ("eth: fbnic: Add FW communication mechanism") Signed-off-by: Alexander Duyck <alexanderduyck@fb.com> Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Link: https://patch.msgid.link/174654721224.499179.2698616208976624755.stgit@ahduyck-xeon-server.home.arpa Reviewed-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent cdbb2dc commit ab064f6

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

drivers/net/ethernet/meta/fbnic/fbnic_fw.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -905,27 +905,30 @@ void fbnic_mbx_poll(struct fbnic_dev *fbd)
905905

906906
int fbnic_mbx_poll_tx_ready(struct fbnic_dev *fbd)
907907
{
908+
unsigned long timeout = jiffies + 10 * HZ + 1;
908909
struct fbnic_fw_mbx *tx_mbx;
909-
int attempts = 50;
910-
911-
/* Immediate fail if BAR4 isn't there */
912-
if (!fbnic_fw_present(fbd))
913-
return -ENODEV;
914910

915911
tx_mbx = &fbd->mbx[FBNIC_IPC_MBX_TX_IDX];
916-
while (!tx_mbx->ready && --attempts) {
912+
while (!tx_mbx->ready) {
913+
if (!time_is_after_jiffies(timeout))
914+
return -ETIMEDOUT;
915+
917916
/* Force the firmware to trigger an interrupt response to
918917
* avoid the mailbox getting stuck closed if the interrupt
919918
* is reset.
920919
*/
921920
fbnic_mbx_reset_desc_ring(fbd, FBNIC_IPC_MBX_TX_IDX);
922921

923-
msleep(200);
922+
/* Immediate fail if BAR4 went away */
923+
if (!fbnic_fw_present(fbd))
924+
return -ENODEV;
925+
926+
msleep(20);
924927

925928
fbnic_mbx_poll(fbd);
926929
}
927930

928-
return attempts ? 0 : -ETIMEDOUT;
931+
return 0;
929932
}
930933

931934
static void __fbnic_fw_evict_cmpl(struct fbnic_fw_completion *cmpl_data)

0 commit comments

Comments
 (0)