Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2679023pxj; Mon, 31 May 2021 08:05:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxp+eafNF6C6qe1WfeT0bDJHwgvS69pJ6upwUz1SgfrX6ysIIclFCmg4Ks2f8q1+Pu7GjGo X-Received: by 2002:a92:c564:: with SMTP id b4mr17779076ilj.257.1622473529391; Mon, 31 May 2021 08:05:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622473529; cv=none; d=google.com; s=arc-20160816; b=acY5tSnP+FwkrerCJnTPtaDQqv1Ako27qCEbXVxWrQHGkilXSNX1MDduf1ojxLZ6dP RMAa4oqGDychgataGo7Bw1PwkXfPv6ajbizjlP8kRjSkJqcVM4Pl126+ZCI/p8xPPAtq XnkoZn2aUDmkbnWu7Pe7VaMT5gKnERhClCi15qeW2WByM5eg2Sq+BwD4qmaecBBy2CAG BlF+o/g4Lu53usMIjnYekaO3POzhcpoBHTZaOB/S7w2A1KX/BS7yFxFRQ6vWlW8LigOp tsEn+DyXe/Q0qCW+2CLh41OjtaJrp8Pap5sbaTwgkc1WNrDJMLBeC05+G/UHfxbZT4Rl UIrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9Nf0i6a1ABYE921HS3wRwVOCwApQD9vUWngUCTvzlPA=; b=nl53sT8ovBmchx/LfX8QCOw66vbIEJHta/7u+UhPW7uc4v4rZOauXHJdAcqUNGjRN5 kyg81106M2eVjzUiEtki9Wk7EAgXPgxKI7xcSQ3pIMemyFE27OugCrB7Aw9L7lE/wUie 6X5ktQ36xoEYGQeNUHv92b9t2CNZqtPtA+B2zMzpJPLFIFwBhIv96sltYNNC9Pzwd9lY krHEKtxlG5i6JbYioqeEzJxIEaMtac5QZq+hkm+JKFVk1ORwy0sjcexfKFWQBiB6GwD7 WB2jUI8p05o2qdIU8aLX85eowY0r658t4WY8ju9jK5akGqPe9kUQcuKMyLyWNYPNE+sc KX6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=glmlu7OW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i14si13925020ilu.19.2021.05.31.08.05.15; Mon, 31 May 2021 08:05:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=glmlu7OW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233133AbhEaPEF (ORCPT + 99 others); Mon, 31 May 2021 11:04:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:40182 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231610AbhEaOHY (ORCPT ); Mon, 31 May 2021 10:07:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BC0EC61452; Mon, 31 May 2021 13:39:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1622468356; bh=TnT+fP6GtvsPoXUtUAtO2vjAMKV4Hgg9EQS4ZAGobCE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=glmlu7OWwMDz/U+ZQUqFM/zg4HZC+EXBUnWVH0kzX+aHLOLZ8Rj4RUJRNZreKur1y +wCgEdBZ88xmAWupALkfyc7lquY6ZtqVLuwxPrY0FHIHwC5eeCP7P2DBoGlqAqKXkf MDPeq4XD9Ecwcfq4U5tZ7BcuiCKixCQs+8Apdbis= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Edwin Peer , Andy Gospodarek , Michael Chan , "David S. Miller" , Sasha Levin Subject: [PATCH 5.10 212/252] bnxt_en: Include new P5 HV definition in VF check. Date: Mon, 31 May 2021 15:14:37 +0200 Message-Id: <20210531130705.218942704@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531130657.971257589@linuxfoundation.org> References: <20210531130657.971257589@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andy Gospodarek [ Upstream commit ab21494be9dc7d62736c5fcd06be65d49df713ee ] Otherwise, some of the recently added HyperV VF IDs would not be recognized as VF devices and they would not initialize properly. Fixes: 7fbf359bb2c1 ("bnxt_en: Add PCI IDs for Hyper-V VF devices.") Reviewed-by: Edwin Peer Signed-off-by: Andy Gospodarek Signed-off-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 4385b42a2b63..ff86324c7fb8 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -280,7 +280,8 @@ static bool bnxt_vf_pciid(enum board_idx idx) { return (idx == NETXTREME_C_VF || idx == NETXTREME_E_VF || idx == NETXTREME_S_VF || idx == NETXTREME_C_VF_HV || - idx == NETXTREME_E_VF_HV || idx == NETXTREME_E_P5_VF); + idx == NETXTREME_E_VF_HV || idx == NETXTREME_E_P5_VF || + idx == NETXTREME_E_P5_VF_HV); } #define DB_CP_REARM_FLAGS (DB_KEY_CP | DB_IDX_VALID) -- 2.30.2