Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2055460pxb; Fri, 5 Mar 2021 06:27:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5/dwSxZs4JLTC7koV3sC3P1kUW1Y+p02t5PtBsYD56bw6mXxZcH1Qba6i50Y85Le0D2Yh X-Received: by 2002:aa7:cf02:: with SMTP id a2mr9134467edy.59.1614954429910; Fri, 05 Mar 2021 06:27:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614954429; cv=none; d=google.com; s=arc-20160816; b=SZs9z4IVROHqZ3jAtJcKbQfORA22CdXFmYPNlIF/SLmX2KqiPjc8FiDdVeivAya74O GrPDkRKaCAAIxfAy1j/g41imyOdJfSzXJ1IulD3hEivvKx1LT9gQkQ5B7m40d/IbvtsE A6TZZGKYBbYshpT4Q5P4ODC5uzl4CZkh0IrKbe74VletgsAc104DvfP6iHuW9bVjEhx9 32Q8RrQ0fJJ+z9jLGkm992tfpXXmZ2nQjiZ7O4NlqycQbdH8bDl4RDK/0K+zvdaRo5tG nCu47Mj+S76dFXYiXD2yC7oA3Hn/yfoLpVyIwJzG/cjbOlfVjIXezbY2WqztHCPNV80k xcCQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=+guxQwdM3BzicqNzWx9ukw913yggb6vEiwQgVaXKjdM=; b=UjtMCHuZk2ZbykK65anrYIr4RFJQ7dJFuwO3V/N2C4OxpEXhtd3S+/QwOgcLCUl/IE gWsmfFbARJf/QdLVrpXuau2DCbGM3JF/9WSAoRX5Dkg7YLZ8JL814DJndIyibSvzz7/F YVAHo0y5uZNJg5h34Yy8d7o2Q8JbgF4GLlm0q9MU7evxT/nm+AUXPBAlk1atWdJJuGBc 8PLcUnqLwAvSAdgg0A8kxwIrXwE6C+0/T323nuwR5p4cz5OfkYFe9EyJW69ZhCnpxieg oFR0UdBD+6R/35/A3lExoHxhxkEFTCtgblau6yQwNkiMfDnILTDFEiqaXu0c2xtzpkyZ jcFw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h14si1360886ejt.198.2021.03.05.06.26.46; Fri, 05 Mar 2021 06:27:09 -0800 (PST) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231294AbhCEOZo (ORCPT + 99 others); Fri, 5 Mar 2021 09:25:44 -0500 Received: from mga17.intel.com ([192.55.52.151]:27033 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230424AbhCEOZd (ORCPT ); Fri, 5 Mar 2021 09:25:33 -0500 IronPort-SDR: y6VpTttk8X87TxgQ5uNYyNh8qGUMMUt5vigZl0QbJcZonriKu1kHJKGCGVYPuTtZ/dCCOZwHIA uipTu2jEedVA== X-IronPort-AV: E=McAfee;i="6000,8403,9914"; a="167555605" X-IronPort-AV: E=Sophos;i="5.81,225,1610438400"; d="scan'208";a="167555605" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2021 06:25:32 -0800 IronPort-SDR: rZXrLbp1RBDOEctapPF+rx/mn3ybLmOJu5au/rvumThP/roD1ccH7QajI+bZvGU+yOic8k3FCZ U3w7qCgVBWTg== X-IronPort-AV: E=Sophos;i="5.81,225,1610438400"; d="scan'208";a="408315662" Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.193.73]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2021 06:25:30 -0800 From: Zhu Lingshan To: jasowang@redhat.com, mst@redhat.com, lulu@redhat.com Cc: virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Zhu Lingshan Subject: [PATCH 2/3] vDPA/ifcvf: enable Intel C5000X-PL virtio-net for vDPA Date: Fri, 5 Mar 2021 22:19:59 +0800 Message-Id: <20210305142000.18521-3-lingshan.zhu@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210305142000.18521-1-lingshan.zhu@intel.com> References: <20210305142000.18521-1-lingshan.zhu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This commit enabled Intel FPGA SmartNIC C5000X-PL virtio-net for vDPA. C5000X-PL vendor id 0x1AF4, device id 0x1000, subvendor id 0x8086, sub device id 0x0001 To distinguish C5000X-PL from other ifcvf driven devices, the original ifcvf device is named "N3000". Signed-off-by: Zhu Lingshan --- drivers/vdpa/ifcvf/ifcvf_base.h | 13 +++++++++---- drivers/vdpa/ifcvf/ifcvf_main.c | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/vdpa/ifcvf/ifcvf_base.h b/drivers/vdpa/ifcvf/ifcvf_base.h index 64696d63fe07..794d1505d857 100644 --- a/drivers/vdpa/ifcvf/ifcvf_base.h +++ b/drivers/vdpa/ifcvf/ifcvf_base.h @@ -18,10 +18,15 @@ #include #include -#define IFCVF_VENDOR_ID 0x1AF4 -#define IFCVF_DEVICE_ID 0x1041 -#define IFCVF_SUBSYS_VENDOR_ID 0x8086 -#define IFCVF_SUBSYS_DEVICE_ID 0x001A +#define N3000_VENDOR_ID 0x1AF4 +#define N3000_DEVICE_ID 0x1041 +#define N3000_SUBSYS_VENDOR_ID 0x8086 +#define N3000_SUBSYS_DEVICE_ID 0x001A + +#define C5000X_PL_VENDOR_ID 0x1AF4 +#define C5000X_PL_DEVICE_ID 0x1000 +#define C5000X_PL_SUBSYS_VENDOR_ID 0x8086 +#define C5000X_PL_SUBSYS_DEVICE_ID 0x0001 #define IFCVF_SUPPORTED_FEATURES \ ((1ULL << VIRTIO_NET_F_MAC) | \ diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c index e501ee07de17..fd5befc5cbcc 100644 --- a/drivers/vdpa/ifcvf/ifcvf_main.c +++ b/drivers/vdpa/ifcvf/ifcvf_main.c @@ -480,10 +480,15 @@ static void ifcvf_remove(struct pci_dev *pdev) } static struct pci_device_id ifcvf_pci_ids[] = { - { PCI_DEVICE_SUB(IFCVF_VENDOR_ID, - IFCVF_DEVICE_ID, - IFCVF_SUBSYS_VENDOR_ID, - IFCVF_SUBSYS_DEVICE_ID) }, + { PCI_DEVICE_SUB(N3000_VENDOR_ID, + N3000_DEVICE_ID, + N3000_SUBSYS_VENDOR_ID, + N3000_SUBSYS_DEVICE_ID) }, + { PCI_DEVICE_SUB(C5000X_PL_VENDOR_ID, + C5000X_PL_DEVICE_ID, + C5000X_PL_SUBSYS_VENDOR_ID, + C5000X_PL_SUBSYS_DEVICE_ID) }, + { 0 }, }; MODULE_DEVICE_TABLE(pci, ifcvf_pci_ids); -- 2.27.0