From patchwork Sun Jan 10 12:50:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 9789 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 71F4D8E87; Sun, 10 Jan 2016 13:51:15 +0100 (CET) Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by dpdk.org (Postfix) with ESMTP id 90DFD8E79 for ; Sun, 10 Jan 2016 13:51:13 +0100 (CET) Received: by mail-wm0-f52.google.com with SMTP id f206so183776429wmf.0 for ; Sun, 10 Jan 2016 04:51:13 -0800 (PST) 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=f4eoU1mpSICp0iBheFv9KINIqPk0q7qV3Wc4Cu71RGY=; b=KmQ72kIO5zrfgkl/hZU5R1z46DOFCkuQBPBztVMkOtaUBxq23rEfEq3EUQ6A57/SjX ImTcIXYD0UjPLCptTjW1aK9JlzEes4Af3NozZsPFYRSnIGsxIFw6HMEEnfT7c0aXAxtU wPmVcRJcePgk1xjLCX/5yk4PyF7Q+T2pFxtdLCb6czvdmAdXgw//MFhjEaYZmfhzvqpZ Tj23TN/0cTapLUwt1k7HSbJkau5BvkXa0V0XSY6/xDBcT1XwubALyVJ4ay0gzzJSFlHA N43uoaYyZJ0FNAGOXKx4EMehcOEFEZwp9etdkthgO+ruVykaeWdyDuyVl1t1vcW30ywK akCQ== 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=f4eoU1mpSICp0iBheFv9KINIqPk0q7qV3Wc4Cu71RGY=; b=XsR7IpQBq4uXogLtV8ee1AQNQpceYTSkmO7M7TeF9r6/FcXYHDe6DlQrglsKQeyDVJ lKsH9UBRz8aH3TD7gi563x3QDQCivxiq13Tzhk0G5NID1a30rIQaT13T9gKHC0Hp29jv YnnAtT5LWVbDjo6jfFwBgqZ4o7dXXnYJTkhZUgf8Ncvtfb4sMWvrtFYFuosZ5az7sphV E3cEVOaq7YSSlfjklRnGVEOCIBdnqR8xb4VLiy0nU+WPig11CNdVb86da0vvWozGU193 pAF06CHWJ9t6Nny0HZV8h98pq5SwjeHeHr9rNilrqGiz+cDA9NyQV0omb1p2crNas/4q Fsvg== X-Gm-Message-State: ALoCoQlb70mlnXb2iKbAGjaZ+n1bqHAa0vdtlBiKJxSIj5XdctK5p0pZNguRFFseiZF8yJLC6XBFE/fiIkYjxXipV47FoSVOLQ== X-Received: by 10.28.133.141 with SMTP id h135mr7932189wmd.70.1452430273469; Sun, 10 Jan 2016 04:51:13 -0800 (PST) Received: from gloops.dev.6wind.com (144.77.126.78.rev.sfr.net. [78.126.77.144]) by smtp.gmail.com with ESMTPSA id u12sm8088011wmu.10.2016.01.10.04.51.12 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 10 Jan 2016 04:51:12 -0800 (PST) From: David Marchand To: dev@dpdk.org Date: Sun, 10 Jan 2016 13:50:50 +0100 Message-Id: <1452430254-30390-8-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452430254-30390-1-git-send-email-david.marchand@6wind.com> References: <1452430254-30390-1-git-send-email-david.marchand@6wind.com> Cc: thomas.monjalon@dpdk.org, John Daley Subject: [dpdk-dev] [PATCH 07/11] 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Moved cisco vendor id since the driver had no such information. Signed-off-by: David Marchand --- drivers/net/enic/enic_ethdev.c | 12 ++++-------- lib/librte_eal/common/include/rte_pci_dev_ids.h | 17 ----------------- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c index 2a88043..e3bd8ec 100644 --- a/drivers/net/enic/enic_ethdev.c +++ b/drivers/net/enic/enic_ethdev.c @@ -57,15 +57,11 @@ /* * 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 */