From 0d4346963cc191b010840b19b431f8676ebe61e0 Mon Sep 17 00:00:00 2001

From: Dmitry Bogdanov <dbogdanov@marvell.com>

Date: Wed, 9 Sep 2020 20:43:10 +0300

Subject: [PATCH 2/3] net: qed: RDMA personality shouldn't fail VF load

Git-commit: ce1cf9e5025f4e2d2198728391f1847b3e168bc6

Patch-mainline: v5.9-rc7

References: git-fixes

Fix the assert during VF driver installation when the personality is iWARP

Fixes: 1fe614d10f45 ("qed: Relax VF firmware requirements")

Signed-off-by: Igor Russkikh <irusskikh@marvell.com>

Signed-off-by: Michal Kalderon <michal.kalderon@marvell.com>

Signed-off-by: Dmitry Bogdanov <dbogdanov@marvell.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 | 1 +

 1 file changed, 1 insertion(+)

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

index 78f77b712b10..7411e23481f2 100644

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

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

@@ -96,6 +96,7 @@ static int qed_sp_vf_start(struct qed_hwfn *p_hwfn, struct qed_vf_info *p_vf)

 		p_ramrod->personality = PERSONALITY_ETH;

 		break;

 	case QED_PCI_ETH_ROCE:

+	case QED_PCI_ETH_IWARP:

 		p_ramrod->personality = PERSONALITY_RDMA_AND_ETH;

 		break;

 	default:

-- 

2.16.4