From: Elad Nachman <[email protected]>
Increase firmware restart timeout, as current timeout value of 5 seconds
was too small, in actual life it can take up to 30 seconds for firmware
to shutdown and for the firmware loader to shift to the ready to receive
firmware code state.
Reported-by: Köry Maincent <[email protected]>
Closes: https://lore.kernel.org/netdev/20240208101005.29e8c7f3@kmaincent-XPS-13-7390/T/
Fixes: 4c2703dfd7fa ("net: marvell: prestera: Add PCI interface support")
Tested-by: Kory Maincent <[email protected]>
Signed-off-by: Elad Nachman <[email protected]>
---
drivers/net/ethernet/marvell/prestera/prestera_pci.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_pci.c b/drivers/net/ethernet/marvell/prestera/prestera_pci.c
index 35857dc19542..2caa33d195ab 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_pci.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_pci.c
@@ -24,6 +24,11 @@
#define PRESTERA_FW_ARM64_PATH_FMT "mrvl/prestera/mvsw_prestera_fw_arm64-v%u.%u.img"
#define PRESTERA_FW_HDR_MAGIC 0x351D9D06
+/* Timeout waiting for firmware CPU to reboot and restart
+ * the firmware loading software layer, hence becoming
+ * ready for the next firmware downloading phase:
+ */
+#define PRESTERA_FW_READY_TIMEOUT_MS 30000
#define PRESTERA_FW_DL_TIMEOUT_MS 50000
#define PRESTERA_FW_BLK_SZ 1024
@@ -765,7 +770,7 @@ static int prestera_fw_load(struct prestera_fw *fw)
err = prestera_ldr_wait_reg32(fw, PRESTERA_LDR_READY_REG,
PRESTERA_LDR_READY_MAGIC,
- 5 * MSEC_PER_SEC);
+ PRESTERA_FW_READY_TIMEOUT_MS);
if (err) {
dev_err(fw->dev.dev, "waiting for FW loader is timed out");
return err;
--
2.25.1
On Wed, Mar 20, 2024 at 07:20:05PM +0200, Elad Nachman wrote:
> From: Elad Nachman <[email protected]>
>
> Increase firmware restart timeout, as current timeout value of 5 seconds
> was too small, in actual life it can take up to 30 seconds for firmware
> to shutdown and for the firmware loader to shift to the ready to receive
> firmware code state.
So this means the probe can be waiting 30 seconds?
This seems like a really good reason not to reset the hardware during
-EPROBE_DEFER.
Andrew
> -----Original Message-----
> From: Andrew Lunn <[email protected]>
> Sent: Thursday, March 21, 2024 2:10 AM
> To: Elad Nachman <[email protected]>
> Cc: Taras Chornyi <[email protected]>; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected]; [email protected]
> Subject: [EXTERNAL] Re: [PATCH v2 2/5] net: marvell: prestera: enlarge fw
> restart time
>
> Prioritize security for external emails: Confirm sender and content safety
> before clicking links or opening attachments
>
> ----------------------------------------------------------------------
> On Wed, Mar 20, 2024 at 07:20:05PM +0200, Elad Nachman wrote:
> > From: Elad Nachman <[email protected]>
> >
> > Increase firmware restart timeout, as current timeout value of 5
> > seconds was too small, in actual life it can take up to 30 seconds for
> > firmware to shutdown and for the firmware loader to shift to the ready
> > to receive firmware code state.
>
> So this means the probe can be waiting 30 seconds?
>
> This seems like a really good reason not to reset the hardware during -
> EPROBE_DEFER.
>
> Andrew
Unfortunately that's how the firmware loader on the firmware cpu state machine works.
The so called HW reset will force exit of the current firmware and will move the state machine
To the state that it can receive the next firmware.
Unfortunately, there is no ABI interface to verify which firmware is already loaded, and then supporting
Warm boot reading of the values back to the kernel.
Since many of these firmware binaries are secure-boot protected, upgrading is very tricky.
Elad.