Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 533ef996 authored by Shai Malin's avatar Shai Malin Committed by Greg Kroah-Hartman
Browse files

qed: Handle management FW error 



commit 20e100f52730cd0db609e559799c1712b5f27582 upstream.

Handle MFW (management FW) error response in order to avoid a crash
during recovery flows.

Changes from v1:
- Add "Fixes tag".

Fixes: tag 5e7ba042 ("qed: Fix reading stale configuration information")
Signed-off-by: default avatarAriel Elior <aelior@marvell.com>
Signed-off-by: default avatarShai Malin <smalin@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dfefcc46

drivers/net/ethernet/qlogic/qed/qed_mcp.c

+5 −1
Original line number Diff line number Diff line
@@ -2841,6 +2841,7 @@ qed_mcp_get_nvm_image_att(struct qed_hwfn *p_hwfn, 
			  struct qed_nvm_image_att *p_image_att)

{

	enum nvm_image_type type;

	int rc;

	u32 i;



	/* Translate image_id into MFW definitions */
@@ -2866,7 +2867,10 @@ qed_mcp_get_nvm_image_att(struct qed_hwfn *p_hwfn, 
		return -EINVAL;

	}



	qed_mcp_nvm_info_populate(p_hwfn);

	rc = qed_mcp_nvm_info_populate(p_hwfn);

	if (rc)

		return rc;



	for (i = 0; i < p_hwfn->nvm_info.num_images; i++)

		if (type == p_hwfn->nvm_info.image_att[i].image_type)

			break;