From c4075aa54eecb42b16cc9a799b7effdd1b1ad383 Mon Sep 17 00:00:00 2001

From: Tom Rix <trix@redhat.com>

Date: Sat, 5 Mar 2022 07:06:42 -0800

Subject: [PATCH 3/8] qed: return status of qed_iov_get_link

Git-commit: d9dc0c84ad2d4cc911ba252c973d1bf18d5eb9cf

Patch-mainline: v5.17-rc8

References: git-fixes

Clang static analysis reports this issue

qed_sriov.c:4727:19: warning: Assigned value is

  garbage or undefined

  ivi->max_tx_rate = tx_rate ? tx_rate : link.speed;

                   ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

link is only sometimes set by the call to qed_iov_get_link()

qed_iov_get_link fails without setting link or returning

status.  So change the decl to return status.

Fixes: 73390ac9d82b ("qed*: support ndo_get_vf_config")

Signed-off-by: Tom Rix <trix@redhat.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>

---

 drivers/net/ethernet/qlogic/qed/qed_sriov.c | 18 +++++++++++-------

 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qed/qed_sriov.c b/drivers/net/ethernet/qlogic/qed/qed_sriov.c

index 7411e23481f2..4cc319a1e1e3 100644

--- a/drivers/net/ethernet/qlogic/qed/qed_sriov.c

+++ b/drivers/net/ethernet/qlogic/qed/qed_sriov.c

@@ -3801,11 +3801,11 @@ bool qed_iov_mark_vf_flr(struct qed_hwfn *p_hwfn, u32 *p_disabled_vfs)

 	return found;

 }

-static void qed_iov_get_link(struct qed_hwfn *p_hwfn,

-			     u16 vfid,

-			     struct qed_mcp_link_params *p_params,

-			     struct qed_mcp_link_state *p_link,

-			     struct qed_mcp_link_capabilities *p_caps)

+static int qed_iov_get_link(struct qed_hwfn *p_hwfn,

+			    u16 vfid,

+			    struct qed_mcp_link_params *p_params,

+			    struct qed_mcp_link_state *p_link,

+			    struct qed_mcp_link_capabilities *p_caps)

 {

 	struct qed_vf_info *p_vf = qed_iov_get_vf_info(p_hwfn,

 						       vfid,

@@ -3813,7 +3813,7 @@ static void qed_iov_get_link(struct qed_hwfn *p_hwfn,

 	struct qed_bulletin_content *p_bulletin;

 	if (!p_vf)

-		return;

+		return -EINVAL;

 	p_bulletin = p_vf->bulletin.p_virt;

@@ -3823,6 +3823,7 @@ static void qed_iov_get_link(struct qed_hwfn *p_hwfn,

 		__qed_vf_get_link_state(p_hwfn, p_link, p_bulletin);

 	if (p_caps)

 		__qed_vf_get_link_caps(p_hwfn, p_caps, p_bulletin);

+	return 0;

 }

 static int

@@ -4684,6 +4685,7 @@ static int qed_get_vf_config(struct qed_dev *cdev,

 	struct qed_public_vf_info *vf_info;

 	struct qed_mcp_link_state link;

 	u32 tx_rate;

+	int ret;

 	/* Sanitize request */

 	if (IS_VF(cdev))

@@ -4697,7 +4699,9 @@ static int qed_get_vf_config(struct qed_dev *cdev,

 	vf_info = qed_iov_get_public_vf_info(hwfn, vf_id, true);

-	qed_iov_get_link(hwfn, vf_id, NULL, &link, NULL);

+	ret = qed_iov_get_link(hwfn, vf_id, NULL, &link, NULL);

+	if (ret)

+		return ret;

 	/* Fill information about VF */

 	ivi->vf = vf_id;

-- 

2.16.4