Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp377286pxj; Tue, 18 May 2021 05:33:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwd4x7m8456E87ARkfrzPs37cLU150hpIiP31n8Mxgdnp5jeL9Oxqut9QjZVN31BX3AAAC1 X-Received: by 2002:a17:906:a0a:: with SMTP id w10mr5782224ejf.416.1621341203145; Tue, 18 May 2021 05:33:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621341203; cv=none; d=google.com; s=arc-20160816; b=Ky+JzANQEc+M5im7I6c8SVcTTrdbAegE1G5ZmTmtfLUAHMfem2CfeDIksYgL8XtEOC K0/uG5ZYOWGdA56jx9yfmJTTslT/sm6rAfqpr2YIcvKZGP68PFkX2PnYco6UmW9qHqZb e7vs8TQyhyUPw5cUFVp6/1p3frfPkHAMJIj2PXOjD0y8cboxPrCmUS0MebMKM09kAIMn 4BdNBgZVa+pyzwc+4tNQ1eYQq0iHJ4zkr/uiCUia+uugx7NsDXglHOe+UnZxjIN1MfIB h/vbMyqE+UUfUZtiEoz0R9cxF93AcAVklC3PQfwy+hdQkILpU8lSQNB6QwlJLhEGG+rF gZSg== 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=n/5UqbQqLyCWndfMbZ1FL+ENaZG9AG0yvGORH0qoU/4=; b=EbsW/NP3eyr8DeWycLH1JsdCXnWUm+zdfdy219xRC5KASk9IYXiw6lGD2AAH0hBRZs YSSmRYk2Vl3f6w5LLcWlsXFL+04V9T1AmEd5Q/WkiqRArpwb96xWjZKNOZvwmlpUJGWS JvmN5NZr6N3/Mp0UZ76GjYJhiczIcWdPGdU5MFjeI3ieZMLgnusZ7c4IlCICYzhiAJ3N 5v6qPJ8U0otNYR6J3fwEZymPgS0/BbR+1osLDKOTM+zAm7dll7cUhiqCJvuOhs5lMlrD IBKyhxTDr6A1VPK/EEcbOs75xjtrsVFx+cZppGad/yo7n4MOtgPVGuhXaF8wB9GVoUPn 1Yvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nnJh3qv2; 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 i17si1647888edt.91.2021.05.18.05.32.59; Tue, 18 May 2021 05:33:23 -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=nnJh3qv2; 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 S245466AbhEQP3d (ORCPT + 99 others); Mon, 17 May 2021 11:29:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:37256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243717AbhEQPOg (ORCPT ); Mon, 17 May 2021 11:14:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BF73061C62; Mon, 17 May 2021 14:32:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621261934; bh=hYBGSCR4QMGxIzz3NB1ub0TJOYYm6RGLvpKxIxb+IBg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nnJh3qv2NoGQeIdJP3LEpyU1yhrmFf63ra3JA8oPCAcUA9JukhtMcs8qP0aUfm1Ex V5zhXmMdWkd6qQOzS1DBg1fgBaEwF0EEYAfzIUqmFzjX1Fpb2l4JXhxFezYJV9oF27 ZV+SguRE5djP6EiQg2hpBZm4aYm8oQ2nm6ZZC/Ng= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vasundhara Volam , Andy Gospodarek , Edwin Peer , Michael Chan , "David S. Miller" , Sasha Levin Subject: [PATCH 5.10 087/289] bnxt_en: Add PCI IDs for Hyper-V VF devices. Date: Mon, 17 May 2021 16:00:12 +0200 Message-Id: <20210517140308.111598822@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517140305.140529752@linuxfoundation.org> References: <20210517140305.140529752@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: Michael Chan [ Upstream commit 7fbf359bb2c19c824cbb1954020680824f6ee5a5 ] Support VF device IDs used by the Hyper-V hypervisor. Reviewed-by: Vasundhara Volam Reviewed-by: Andy Gospodarek Signed-off-by: Edwin Peer Signed-off-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 7ddc2e2e4976..4385b42a2b63 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -122,7 +122,10 @@ enum board_idx { NETXTREME_E_VF, NETXTREME_C_VF, NETXTREME_S_VF, + NETXTREME_C_VF_HV, + NETXTREME_E_VF_HV, NETXTREME_E_P5_VF, + NETXTREME_E_P5_VF_HV, }; /* indexed by enum above */ @@ -170,7 +173,10 @@ static const struct { [NETXTREME_E_VF] = { "Broadcom NetXtreme-E Ethernet Virtual Function" }, [NETXTREME_C_VF] = { "Broadcom NetXtreme-C Ethernet Virtual Function" }, [NETXTREME_S_VF] = { "Broadcom NetXtreme-S Ethernet Virtual Function" }, + [NETXTREME_C_VF_HV] = { "Broadcom NetXtreme-C Virtual Function for Hyper-V" }, + [NETXTREME_E_VF_HV] = { "Broadcom NetXtreme-E Virtual Function for Hyper-V" }, [NETXTREME_E_P5_VF] = { "Broadcom BCM5750X NetXtreme-E Ethernet Virtual Function" }, + [NETXTREME_E_P5_VF_HV] = { "Broadcom BCM5750X NetXtreme-E Virtual Function for Hyper-V" }, }; static const struct pci_device_id bnxt_pci_tbl[] = { @@ -222,15 +228,25 @@ static const struct pci_device_id bnxt_pci_tbl[] = { { PCI_VDEVICE(BROADCOM, 0xd804), .driver_data = BCM58804 }, #ifdef CONFIG_BNXT_SRIOV { PCI_VDEVICE(BROADCOM, 0x1606), .driver_data = NETXTREME_E_VF }, + { PCI_VDEVICE(BROADCOM, 0x1607), .driver_data = NETXTREME_E_VF_HV }, + { PCI_VDEVICE(BROADCOM, 0x1608), .driver_data = NETXTREME_E_VF_HV }, { PCI_VDEVICE(BROADCOM, 0x1609), .driver_data = NETXTREME_E_VF }, + { PCI_VDEVICE(BROADCOM, 0x16bd), .driver_data = NETXTREME_E_VF_HV }, { PCI_VDEVICE(BROADCOM, 0x16c1), .driver_data = NETXTREME_E_VF }, + { PCI_VDEVICE(BROADCOM, 0x16c2), .driver_data = NETXTREME_C_VF_HV }, + { PCI_VDEVICE(BROADCOM, 0x16c3), .driver_data = NETXTREME_C_VF_HV }, + { PCI_VDEVICE(BROADCOM, 0x16c4), .driver_data = NETXTREME_E_VF_HV }, + { PCI_VDEVICE(BROADCOM, 0x16c5), .driver_data = NETXTREME_E_VF_HV }, { PCI_VDEVICE(BROADCOM, 0x16cb), .driver_data = NETXTREME_C_VF }, { PCI_VDEVICE(BROADCOM, 0x16d3), .driver_data = NETXTREME_E_VF }, { PCI_VDEVICE(BROADCOM, 0x16dc), .driver_data = NETXTREME_E_VF }, { PCI_VDEVICE(BROADCOM, 0x16e1), .driver_data = NETXTREME_C_VF }, { PCI_VDEVICE(BROADCOM, 0x16e5), .driver_data = NETXTREME_C_VF }, + { PCI_VDEVICE(BROADCOM, 0x16e6), .driver_data = NETXTREME_C_VF_HV }, { PCI_VDEVICE(BROADCOM, 0x1806), .driver_data = NETXTREME_E_P5_VF }, { PCI_VDEVICE(BROADCOM, 0x1807), .driver_data = NETXTREME_E_P5_VF }, + { PCI_VDEVICE(BROADCOM, 0x1808), .driver_data = NETXTREME_E_P5_VF_HV }, + { PCI_VDEVICE(BROADCOM, 0x1809), .driver_data = NETXTREME_E_P5_VF_HV }, { PCI_VDEVICE(BROADCOM, 0xd800), .driver_data = NETXTREME_S_VF }, #endif { 0 } @@ -263,7 +279,8 @@ static struct workqueue_struct *bnxt_pf_wq; static bool bnxt_vf_pciid(enum board_idx idx) { return (idx == NETXTREME_C_VF || idx == NETXTREME_E_VF || - idx == NETXTREME_S_VF || idx == NETXTREME_E_P5_VF); + idx == NETXTREME_S_VF || idx == NETXTREME_C_VF_HV || + idx == NETXTREME_E_VF_HV || idx == NETXTREME_E_P5_VF); } #define DB_CP_REARM_FLAGS (DB_KEY_CP | DB_IDX_VALID) -- 2.30.2