From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by dpdk.org (Postfix) with ESMTP id F342D567F for ; Wed, 20 Apr 2016 14:44:10 +0200 (CEST) Received: by mail-wm0-f43.google.com with SMTP id v188so201914899wme.1 for ; Wed, 20 Apr 2016 05:44:10 -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=BKvY69kEdf/iL91RvmuhEgUxqeO9nauvL7oHdTRD6XM=; b=P9OVDkPydQqDO9kmFY+sGTgY3iT1FiO1Sso1NZlsg5UomMOk7TOwupMksZXioLeu9H ZXhX5k2Two6UtvhshZkMPoxQxxw3bRBY3dyU5lGxsoP0lH/jeoHkWvPcVELBIEqozLV6 1BRtv1ZyXzaekcgUCCNzESO77+j+XZQBTCMeBHJVypnQViXx9YwakY7bJtJRA2D8UmxD n64wBR4ALKFbYk0PvhdMncWuPHvi+nFrRRSbPgGeDifGBV7Tngf9o4G2YUDQx7Wf5dWH BtAXrZ20T8L44H6urOgBsybYmJOXi7qp0dzjcW9xkR6LS0Lu7S4Cbx5YJKCgBs1AciC2 pLyQ== 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=BKvY69kEdf/iL91RvmuhEgUxqeO9nauvL7oHdTRD6XM=; b=hp2yTIKtJaTsr8AB6Dy9OKanPFWMghnXA2y46mNW6bY/hrAJwkaN1niAlPg3HEhgS6 qIDzAsKB3G7UGA/DRNuS3nZ6sHvF2/RJ3QoLduTPbIfc/DOZdArPTB1AUZ/zQwnIGXo+ D0XTT/KkTHrdmUXY4PJn8SJMZSQaQ4jDXKkidnsMYmaPdkovrTue0w2opgotNAJzSzcP vk3RsVyj1E1buyBMwAgBgY8tmz6LUPbf2zkpmv2d5Yg24zkcuzRxYHGBPLgeRK5ph6nI QqxfkjtzA1a4K7N/LjvgQ1HWgkLVHYMUDwKNQ2GRmJ0EONmPn0H7aZY8wYt7+RblxW0z X1ZA== X-Gm-Message-State: AOPr4FXzpjDRwK6XuFD+AkVPAQ+iI6D4G1gS/eVvonCA/rk/9nCTp8pG/nJHh2m/v8NbgQbn X-Received: by 10.28.145.67 with SMTP id t64mr9639037wmd.56.1461156250833; Wed, 20 Apr 2016 05:44:10 -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.09 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Apr 2016 05:44:09 -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, John Daley , Nelson Escobar Date: Wed, 20 Apr 2016 14:43:50 +0200 Message-Id: <1461156236-25349-8-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 07/13] enic: 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: , X-List-Received-Date: Wed, 20 Apr 2016 12:44:11 -0000 Moved cisco vendor id since the driver had no such information. Signed-off-by: David Marchand --- drivers/net/enic/enic_ethdev.c | 13 +++++-------- lib/librte_eal/common/include/rte_pci_dev_ids.h | 17 ----------------- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c index 7539811..0e26aa9 100644 --- a/drivers/net/enic/enic_ethdev.c +++ b/drivers/net/enic/enic_ethdev.c @@ -57,15 +57,12 @@ /* * The set of PCI devices this driver supports */ +#define PCI_VENDOR_ID_CISCO 0x1137 static const struct rte_pci_id pci_id_enic_map[] = { -#define RTE_PCI_DEV_ID_DECL_ENIC(vend, dev) {RTE_PCI_DEVICE(vend, dev)}, -#ifndef PCI_VENDOR_ID_CISCO -#define PCI_VENDOR_ID_CISCO 0x1137 -#endif -#include "rte_pci_dev_ids.h" -RTE_PCI_DEV_ID_DECL_ENIC(PCI_VENDOR_ID_CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET) -RTE_PCI_DEV_ID_DECL_ENIC(PCI_VENDOR_ID_CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET_VF) -{.vendor_id = 0, /* Sentinal */}, + { RTE_PCI_DEVICE(PCI_VENDOR_ID_CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET) }, + { RTE_PCI_DEVICE(PCI_VENDOR_ID_CISCO, + PCI_DEVICE_ID_CISCO_VIC_ENET_VF) }, + {.vendor_id = 0, /* sentinel */}, }; static int 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 0ecff3c..1c22c04 100644 --- a/lib/librte_eal/common/include/rte_pci_dev_ids.h +++ b/lib/librte_eal/common/include/rte_pci_dev_ids.h @@ -88,10 +88,6 @@ * Note that this file can be included multiple times within the same file. */ -#ifndef RTE_PCI_DEV_ID_DECL_ENIC -#define RTE_PCI_DEV_ID_DECL_ENIC(vend, dev) -#endif - #ifndef RTE_PCI_DEV_ID_DECL_BNX2X #define RTE_PCI_DEV_ID_DECL_BNX2X(vend, dev) #endif @@ -100,24 +96,11 @@ #define RTE_PCI_DEV_ID_DECL_BNX2XVF(vend, dev) #endif -#ifndef PCI_VENDOR_ID_CISCO -/** Vendor ID used by Cisco VIC devices */ -#define PCI_VENDOR_ID_CISCO 0x1137 -#endif - #ifndef PCI_VENDOR_ID_BROADCOM /** Vendor ID used by Broadcom devices */ #define PCI_VENDOR_ID_BROADCOM 0x14E4 #endif -/****************** Cisco VIC devices ******************/ - -#define PCI_DEVICE_ID_CISCO_VIC_ENET 0x0043 /* ethernet vnic */ -#define PCI_DEVICE_ID_CISCO_VIC_ENET_VF 0x0071 /* enet SRIOV VF */ - -RTE_PCI_DEV_ID_DECL_ENIC(PCI_VENDOR_ID_CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET) -RTE_PCI_DEV_ID_DECL_ENIC(PCI_VENDOR_ID_CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET_VF) - /****************** QLogic devices ******************/ /* Broadcom/QLogic BNX2X */ -- 1.9.1