[PATCH net v2] net/qed: allow old cards not supporting "num_images" to work

[PATCH net v2] net/qed: allow old cards not supporting "num_images" to work

[Louis Leseur]

Commit 43645ce03e00 ("qed: Populate nvm image attribute shadow.")
added support for populating flash image attributes, notably
"num_images". However, some cards were not able to return this
information. In such cases, the driver would return EINVAL, causing the
driver to exit.

Add check to return EOPNOTSUPP instead of EINVAL when the card is not
able to return these information. The caller function already handles
EOPNOTSUPP without error.

Fixes: 43645ce03e00 ("qed: Populate nvm image attribute shadow.")
Co-developed-by: Florian Forestier <florian@forestier.re>
Signed-off-by: Florian Forestier <florian@forestier.re>
Signed-off-by: Louis Leseur <louis.leseur@gmail.com>
---
Changes in v2:
- Fix commit message (reference to 43645ce03e00, add Fixes tag, change
  phrasing)
- Link to v1: https://lore.kernel.org/r/20241121172821.24003-1-louis.leseur@gmail.com
---
 drivers/net/ethernet/qlogic/qed/qed_mcp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.c b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
index 16e6bd466143..6218d9c26855 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
@@ -3314,7 +3314,9 @@ int qed_mcp_bist_nvm_get_num_images(struct qed_hwfn *p_hwfn,
 	if (rc)
 		return rc;
 
-	if (((rsp & FW_MSG_CODE_MASK) != FW_MSG_CODE_OK))
+	if (((rsp & FW_MSG_CODE_MASK) == FW_MSG_CODE_UNSUPPORTED))
+		rc = -EOPNOTSUPP;
+	else if (((rsp & FW_MSG_CODE_MASK) != FW_MSG_CODE_OK))
 		rc = -EINVAL;
 
 	return rc;
-- 
2.45.2

Re: [PATCH net v2] net/qed: allow old cards not supporting "num_images" to work

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (main)
by Paolo Abeni <pabeni@redhat.com>:

On Thu, 28 Nov 2024 09:33:58 +0100 you wrote:
> Commit 43645ce03e00 ("qed: Populate nvm image attribute shadow.")
> added support for populating flash image attributes, notably
> "num_images". However, some cards were not able to return this
> information. In such cases, the driver would return EINVAL, causing the
> driver to exit.
> 
> Add check to return EOPNOTSUPP instead of EINVAL when the card is not
> able to return these information. The caller function already handles
> EOPNOTSUPP without error.
> 
> [...]

Here is the summary with links:
  - [net,v2] net/qed: allow old cards not supporting "num_images" to work
    https://git.kernel.org/netdev/net/c/7a0ea70da56e

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html