From patchwork Mon Jul 11 14:40:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 14741 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 22920475E; Mon, 11 Jul 2016 16:41:11 +0200 (CEST) Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by dpdk.org (Postfix) with ESMTP id 6C3142C10 for ; Mon, 11 Jul 2016 16:41:09 +0200 (CEST) Received: by mail-wm0-f47.google.com with SMTP id f126so93310708wma.1 for ; Mon, 11 Jul 2016 07:41:09 -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=O7SbKT8N4CY9wPS2MGZ/QAh6H0pTzO+kFDHFnMcQwig=; b=R9pAl9EzVvzXpusTEtydMATFm5zeKu7WHy9W7YTE0dUP/Ft4vlxL9FMzJbS31V+Kty Qm6tbTJZZY5DukoxFbFY464qhbMwOR0hOGpHfqn90omajOEMKKSLzrRMWeERU6fHX6aR 38138NbIuhXu1vAm+L2ucCiGbuP2cs4z5ntdhxA+uj+FZLrNSfcINNP38ZbaSk98DlWA yPxGUqn5XLlcDDYpcjcY2C14Mlf11Muhs1emLJK0gFNVM3xgMSb5ih0q3I9ASjTe2RD0 LdPBDJYXpcB7Ly+Dqb/XNtKhCWBtgdWE1vEr812c3r4KuNwvPeMQ6S0WRfubFNvnaueb 314w== 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=O7SbKT8N4CY9wPS2MGZ/QAh6H0pTzO+kFDHFnMcQwig=; b=EUKVaa+d5C5n8q+TleuqdpFM96/CALQy6L4T708qhOSW9vWUAPJqsTGjbdfcT2tAs4 lGCaXbb/MDx8SEWTtyXK9kGl4+vyE7HziOohziZDIU2tLGOUohKqUFZeUZw8NC9eZ5km ePE2WTWyJOmO+RkKQb450XjucG3rKxrQxr8evOWX5FXgyvWe4RBTSpWwnmFARiOVfizW PkBx1YxdlX9ybnrNGBCnNZ4PRGypUDHOpyGSQPeASOuJymJj6TRxLKsNSDUIPlBPh/xF sT3OaI2hxGWsRxqwrYIcx4d2GAA/GxL9jRqUBioY1liDMkT0OUeaFCzpIc6RXYCZKg9w QuoA== X-Gm-Message-State: ALyK8tLRLplJHF6X508sokDqY3fIGbSpTR2Xlyzlkw5jts56jpMCPa1UzBBqPzO8BFa1VpmE X-Received: by 10.194.58.106 with SMTP id p10mr167489wjq.61.1468248069201; Mon, 11 Jul 2016 07:41:09 -0700 (PDT) Received: from gloops.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id h7sm158371wji.47.2016.07.11.07.41.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jul 2016 07:41:08 -0700 (PDT) From: David Marchand To: dev@dpdk.org Cc: bruce.richardson@intel.com, thomas.monjalon@6wind.com, nhorman@tuxdriver.com, pmatilai@redhat.com, christian.ehrhardt@canonical.com, stephen@networkplumber.com, Yong Wang Date: Mon, 11 Jul 2016 16:40:41 +0200 Message-Id: <1468248045-3495-7-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468248045-3495-1-git-send-email-david.marchand@6wind.com> References: <1461156236-25349-1-git-send-email-david.marchand@6wind.com> <1468248045-3495-1-git-send-email-david.marchand@6wind.com> Subject: [dpdk-dev] [PATCH v4 06/10] net/vmxnet3: move PCI device ids to the 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" Moved vmware device ids macro since the driver had no such information. Used RTE_PCI_DEVICE in place of RTE_PCI_DEV_ID_DECL* stuff. Signed-off-by: David Marchand --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 9 ++++----- lib/librte_eal/common/include/rte_pci_dev_ids.h | 16 ---------------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index 8da4449..5874215 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -100,12 +100,11 @@ static void vmxnet3_process_events(struct vmxnet3_hw *); /* * The set of PCI devices this driver supports */ +#define VMWARE_PCI_VENDOR_ID 0x15AD +#define VMWARE_DEV_ID_VMXNET3 0x07B0 static const struct rte_pci_id pci_id_vmxnet3_map[] = { - -#define RTE_PCI_DEV_ID_DECL_VMXNET3(vend, dev) {RTE_PCI_DEVICE(vend, dev)}, -#include "rte_pci_dev_ids.h" - -{ .vendor_id = 0, /* sentinel */ }, + { RTE_PCI_DEVICE(VMWARE_PCI_VENDOR_ID, VMWARE_DEV_ID_VMXNET3) }, + { .vendor_id = 0, /* sentinel */ }, }; static const struct eth_dev_ops vmxnet3_eth_dev_ops = { 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 1c66784..a4aba6d 100644 --- a/lib/librte_eal/common/include/rte_pci_dev_ids.h +++ b/lib/librte_eal/common/include/rte_pci_dev_ids.h @@ -73,10 +73,6 @@ #define RTE_PCI_DEV_ID_DECL_IXGBEVF(vend, dev) #endif -#ifndef RTE_PCI_DEV_ID_DECL_VMXNET3 -#define RTE_PCI_DEV_ID_DECL_VMXNET3(vend, dev) -#endif - #ifndef RTE_PCI_DEV_ID_DECL_ENIC #define RTE_PCI_DEV_ID_DECL_ENIC(vend, dev) #endif @@ -98,11 +94,6 @@ #define PCI_VENDOR_ID_INTEL 0x8086 #endif -#ifndef PCI_VENDOR_ID_VMWARE -/** Vendor ID used by VMware devices */ -#define PCI_VENDOR_ID_VMWARE 0x15AD -#endif - #ifndef PCI_VENDOR_ID_CISCO /** Vendor ID used by Cisco VIC devices */ #define PCI_VENDOR_ID_CISCO 0x1137 @@ -352,12 +343,6 @@ RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_A_VF_HV) RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_VF) RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_VF_HV) -/****************** VMware VMXNET3 devices ******************/ - -#define VMWARE_DEV_ID_VMXNET3 0x07B0 - -RTE_PCI_DEV_ID_DECL_VMXNET3(PCI_VENDOR_ID_VMWARE, VMWARE_DEV_ID_VMXNET3) - /****************** Cisco VIC devices ******************/ #define PCI_DEVICE_ID_CISCO_VIC_ENET 0x0043 /* ethernet vnic */ @@ -444,5 +429,4 @@ RTE_PCI_DEV_ID_DECL_BNXT(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57314) #undef RTE_PCI_DEV_ID_DECL_IGBVF #undef RTE_PCI_DEV_ID_DECL_IXGBE #undef RTE_PCI_DEV_ID_DECL_IXGBEVF -#undef RTE_PCI_DEV_ID_DECL_VMXNET3 #undef RTE_PCI_DEV_ID_DECL_BNXT