From patchwork Tue Sep 29 11:01:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 291164 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23CECC4727F for ; Tue, 29 Sep 2020 11:26:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C6ABB23B70 for ; Tue, 29 Sep 2020 11:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378785; bh=x4DC/3mwkRv39c87u7gtEPrR05bVof9I3RrTVBVWpNs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LEyvYjNj2EjZPcuqgbiYvcOb1tizePampzc9hZ4kxkDjdRjlX0wVBya8NXRCPOvfX SYL865pwScwPNYYCan5pDbQ2qyxCpTFzbmX3rlh6CnoXiDZ70a1nNmA9erUocoiXoc KhLzZj5jUhJ5UAso0/85JQWpTpwOFfUMK3sa4MUQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728593AbgI2LXN (ORCPT ); Tue, 29 Sep 2020 07:23:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:37334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729112AbgI2LW4 (ORCPT ); Tue, 29 Sep 2020 07:22:56 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D0A4823A6C; Tue, 29 Sep 2020 11:20:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378408; bh=x4DC/3mwkRv39c87u7gtEPrR05bVof9I3RrTVBVWpNs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tk0Z0khx6WHJAUOdJ/nt9yJ+GWsSZ159SNH1MceHjPFSLZzwTtFTfg2zuBlOUMZJe 1g8v5X/Ruyh3mTXs1MWrq7WSGF0MY8yL6YNQIIAlhFoxDABZ/5mCjrDYrtJxOVYqZS v4emuSlULtLZX/JSVluHpOHvIJnzFizkzYunM3Vw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Igor Russkikh , Michal Kalderon , Dmitry Bogdanov , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 155/166] net: qed: RDMA personality shouldnt fail VF load Date: Tue, 29 Sep 2020 13:01:07 +0200 Message-Id: <20200929105942.927115284@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105935.184737111@linuxfoundation.org> References: <20200929105935.184737111@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dmitry Bogdanov [ Upstream commit ce1cf9e5025f4e2d2198728391f1847b3e168bc6 ] Fix the assert during VF driver installation when the personality is iWARP Fixes: 1fe614d10f45 ("qed: Relax VF firmware requirements") Signed-off-by: Igor Russkikh Signed-off-by: Michal Kalderon Signed-off-by: Dmitry Bogdanov Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- 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 65a53d409e773..bc9eec1bcbf18 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: