From: Elad Nachman <enachman@marvell.com>
To: <taras.chornyi@plvision.eu>, <davem@davemloft.net>,
<edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
<andrew@lunn.ch>, <kory.maincent@bootlin.com>,
<thomas.petazzoni@bootlin.com>, <miquel.raynal@bootlin.com>,
<przemyslaw.kitszel@intel.com>, <dkirjanov@suse.de>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <enachman@marvell.com>
Subject: [PATCH v2 2/5] net: marvell: prestera: enlarge fw restart time
Date: Wed, 20 Mar 2024 19:20:05 +0200 [thread overview]
Message-ID: <20240320172008.2989693-3-enachman@marvell.com> (raw)
In-Reply-To: <20240320172008.2989693-1-enachman@marvell.com>
From: Elad Nachman <enachman@marvell.com>
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 <kory.maincent@bootlin.com>
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 <kory.maincent@bootlin.com>
Signed-off-by: Elad Nachman <enachman@marvell.com>
---
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
next prev parent reply other threads:[~2024-03-20 17:20 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-20 17:20 [PATCH v2 0/5] Fix prestera driver fail to probe twice Elad Nachman
2024-03-20 17:20 ` [PATCH v2 1/5] net: marvell: prestera: fix driver reload Elad Nachman
2024-03-20 22:58 ` Andrew Lunn
2024-03-21 17:22 ` [EXTERNAL] " Elad Nachman
2024-03-20 17:20 ` Elad Nachman [this message]
2024-03-21 0:10 ` [PATCH v2 2/5] net: marvell: prestera: enlarge fw restart time Andrew Lunn
2024-03-21 17:24 ` [EXTERNAL] " Elad Nachman
2024-03-20 17:20 ` [PATCH v2 3/5] net: marvell: prestera: fix memory use after free Elad Nachman
2024-03-21 0:14 ` Andrew Lunn
2024-03-20 17:20 ` [PATCH v2 4/5] net: marvell: prestera: force good base mac Elad Nachman
2024-03-21 0:13 ` Andrew Lunn
2024-03-20 17:20 ` [PATCH v2 5/5] net: marvell: prestera: unbind sfp port on exit Elad Nachman
2024-03-21 0:13 ` Andrew Lunn
2024-03-21 0:18 ` [PATCH v2 0/5] Fix prestera driver fail to probe twice Andrew Lunn
2024-03-21 17:33 ` [EXTERNAL] " Elad Nachman
2024-03-21 19:22 ` Andrew Lunn
2024-03-24 7:53 ` Elad Nachman
2024-03-24 15:25 ` Andrew Lunn
2024-03-25 12:45 ` Kory Maincent
2024-03-25 13:04 ` Andrew Lunn
2024-03-27 17:27 ` Elad Nachman
2024-03-21 9:06 ` Kory Maincent
2024-03-21 15:53 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240320172008.2989693-3-enachman@marvell.com \
--to=enachman@marvell.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=dkirjanov@suse.de \
--cc=edumazet@google.com \
--cc=kory.maincent@bootlin.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=przemyslaw.kitszel@intel.com \
--cc=taras.chornyi@plvision.eu \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.