From patchwork Wed Apr 20 12:43:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 12143 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 5862C558B; Wed, 20 Apr 2016 14:44:09 +0200 (CEST) Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by dpdk.org (Postfix) with ESMTP id 394954A63 for ; Wed, 20 Apr 2016 14:44:07 +0200 (CEST) Received: by mail-wm0-f54.google.com with SMTP id u206so79451796wme.1 for ; Wed, 20 Apr 2016 05:44:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Rb1fpHyW+ddAnWsTbgA7HXa4MFJXVDJ+Hm3zMLTppN0=; b=wdDQdMVhYu0kT2nBwGEH/Bjgnx5rZkKvLpkkhB6lHu1X8dJiLnfO4FRjYhFYTBA1Ud WFUGpXgnepWMfv705KZyGyyVlpqbKeYDfvIfjVqmcoS06AakudS623TyfetB0gu6xX/n 1M5nPFeQc7H2FrlvdvxZv/wmlcxm2d/FJovR8huwynB+aWHowroXemRsrpVRxcVT5oba j+hXWYPUa0/t1I5XgqfyvMTc/Jv83dxFn4qbyg2h08llSetDhvv6viSn8P/M7UouwPPj WbFJi2Aan7SttV0u6dLYj2kAv3qvGOZV00d8PYRrTxzVy6jd5qRacl4CU12n451H/Qgk cDbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Rb1fpHyW+ddAnWsTbgA7HXa4MFJXVDJ+Hm3zMLTppN0=; b=MJ5aiqXPuJ9tntKTNOJ9RQRm1eC3iBQBJwKrhE2zLJCvsMn+1ddBuDJMqla0ZSVOmb HIXuY4I3APn8x6YkH5jHB6aPS6HWfli0rvIoAgaTMEfrL4keRmQpVxbtFBHigC9FTSUK C9cYDvrT0c+EecfcO8iOWayp4xWBs4OUiu0f5BXIy6Fx4uiaAx4uHk559ESlE+sOy92R WWVfkPm2lgVi37SgEWTlLHQWqOmRvywR4cNvJAMkWLix+z2XG0cDT18clR7wzYfYSPOI bJLbIapjU/XXkA8y4vroILIgWwI28ZNiJ8PInMGDfYxP6I9Ku4ZCaJQsKFIr+AKYeHJD M2FQ== X-Gm-Message-State: AOPr4FXoKtgUuC06VoUBeiYe/hQE8x6T3RHNiCpPZpbQEQi+IexrqNTTubfkqb9IPHxEss16 X-Received: by 10.195.11.197 with SMTP id ek5mr8554791wjd.58.1461156247035; Wed, 20 Apr 2016 05:44:07 -0700 (PDT) Received: from gloops.dev.6wind.com (144.77.126.78.rev.sfr.net. [78.126.77.144]) by smtp.gmail.com with ESMTPSA id j10sm5428135wjb.46.2016.04.20.05.44.05 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Apr 2016 05:44:06 -0700 (PDT) From: David Marchand To: dev@dpdk.org Cc: thomas.monjalon@6wind.com, stephen@networkplumber.org, bruce.richardson@intel.com, nhorman@tuxdriver.com, pmatilai@redhat.com, christian.ehrhardt@canonical.com, Jing Chen Date: Wed, 20 Apr 2016 14:43:47 +0200 Message-Id: <1461156236-25349-5-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461156236-25349-1-git-send-email-david.marchand@6wind.com> References: <1453120248-28274-1-git-send-email-david.marchand@6wind.com> <1461156236-25349-1-git-send-email-david.marchand@6wind.com> Subject: [dpdk-dev] [PATCH v3 04/13] fm10k: move pci device ids to driver X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Since the base driver already defines all pci device ids, no need to redefine them, let's just drop the previous RTE_PCI_DEV_ID_DECL* stuff. Signed-off-by: David Marchand --- drivers/net/fm10k/fm10k_ethdev.c | 7 +++--- lib/librte_eal/common/include/rte_pci_dev_ids.h | 29 ------------------------- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index 146bc2a..40b57f9 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -3018,9 +3018,10 @@ eth_fm10k_dev_uninit(struct rte_eth_dev *dev) * and SRIOV-VF devices. */ static const struct rte_pci_id pci_id_fm10k_map[] = { -#define RTE_PCI_DEV_ID_DECL_FM10K(vend, dev) { RTE_PCI_DEVICE(vend, dev) }, -#define RTE_PCI_DEV_ID_DECL_FM10KVF(vend, dev) { RTE_PCI_DEVICE(vend, dev) }, -#include "rte_pci_dev_ids.h" + { RTE_PCI_DEVICE(FM10K_INTEL_VENDOR_ID, FM10K_DEV_ID_PF) }, + { RTE_PCI_DEVICE(FM10K_INTEL_VENDOR_ID, + FM10K_DEV_ID_SDI_FM10420_QDA2) }, + { RTE_PCI_DEVICE(FM10K_INTEL_VENDOR_ID, FM10K_DEV_ID_VF) }, { .vendor_id = 0, /* sentinel */ }, }; diff --git a/lib/librte_eal/common/include/rte_pci_dev_ids.h b/lib/librte_eal/common/include/rte_pci_dev_ids.h index f1f3e13..a19fdfa 100644 --- a/lib/librte_eal/common/include/rte_pci_dev_ids.h +++ b/lib/librte_eal/common/include/rte_pci_dev_ids.h @@ -97,14 +97,6 @@ #define RTE_PCI_DEV_ID_DECL_VMXNET3(vend, dev) #endif -#ifndef RTE_PCI_DEV_ID_DECL_FM10K -#define RTE_PCI_DEV_ID_DECL_FM10K(vend, dev) -#endif - -#ifndef RTE_PCI_DEV_ID_DECL_FM10KVF -#define RTE_PCI_DEV_ID_DECL_FM10KVF(vend, dev) -#endif - #ifndef RTE_PCI_DEV_ID_DECL_ENIC #define RTE_PCI_DEV_ID_DECL_ENIC(vend, dev) #endif @@ -117,11 +109,6 @@ #define RTE_PCI_DEV_ID_DECL_BNX2XVF(vend, dev) #endif -#ifndef PCI_VENDOR_ID_INTEL -/** Vendor ID used by Intel devices */ -#define PCI_VENDOR_ID_INTEL 0x8086 -#endif - #ifndef PCI_VENDOR_ID_QUMRANET /** Vendor ID used by virtio devices */ #define PCI_VENDOR_ID_QUMRANET 0x1AF4 @@ -142,14 +129,6 @@ #define PCI_VENDOR_ID_BROADCOM 0x14E4 #endif -/*************** Physical FM10K devices from fm10k_type.h ***************/ - -#define FM10K_DEV_ID_PF 0x15A4 -#define FM10K_DEV_ID_SDI_FM10420_QDA2 0x15D0 - -RTE_PCI_DEV_ID_DECL_FM10K(PCI_VENDOR_ID_INTEL, FM10K_DEV_ID_PF) -RTE_PCI_DEV_ID_DECL_FM10K(PCI_VENDOR_ID_INTEL, FM10K_DEV_ID_SDI_FM10420_QDA2) - /****************** Virtio devices from virtio.h ******************/ #define QUMRANET_DEV_ID_VIRTIO 0x1000 @@ -162,12 +141,6 @@ RTE_PCI_DEV_ID_DECL_VIRTIO(PCI_VENDOR_ID_QUMRANET, QUMRANET_DEV_ID_VIRTIO) RTE_PCI_DEV_ID_DECL_VMXNET3(PCI_VENDOR_ID_VMWARE, VMWARE_DEV_ID_VMXNET3) -/*************** Virtual FM10K devices from fm10k_type.h ***************/ - -#define FM10K_DEV_ID_VF 0x15A5 - -RTE_PCI_DEV_ID_DECL_FM10KVF(PCI_VENDOR_ID_INTEL, FM10K_DEV_ID_VF) - /****************** Cisco VIC devices ******************/ #define PCI_DEVICE_ID_CISCO_VIC_ENET 0x0043 /* ethernet vnic */ @@ -228,5 +201,3 @@ RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57840_MF) #undef RTE_PCI_DEV_ID_DECL_BNX2XVF #undef RTE_PCI_DEV_ID_DECL_VIRTIO #undef RTE_PCI_DEV_ID_DECL_VMXNET3 -#undef RTE_PCI_DEV_ID_DECL_FM10K -#undef RTE_PCI_DEV_ID_DECL_FM10KVF