From patchwork Mon Jan 18 12:30:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 9941 X-Patchwork-Delegate: bruce.richardson@intel.com 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 70CBE9198; Mon, 18 Jan 2016 13:31:07 +0100 (CET) Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by dpdk.org (Postfix) with ESMTP id C8EEB8E98 for ; Mon, 18 Jan 2016 13:31:02 +0100 (CET) Received: by mail-wm0-f54.google.com with SMTP id b14so120559320wmb.1 for ; Mon, 18 Jan 2016 04:31:02 -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=M1WU+9CSrUaw7VlNi10HQmeEi/O/sY3s+ib4fEEq5CQ=; b=HlCXAB0jiODKlIcSR+eu/WNVVvhLTumJxiu8w1/W4OwmxX/qjQunrnuI47yhsq4q9U TXLRPciNqov/OG64ErkcFtMpIzufr0aKMMme1Na/Jf3U4lu+GOvz7lMw7tsZnJYLND6+ 99babSI+y7CChIJouII5vKfv9GNDIlfnH49r6JbldXnHwn/auSp2g6nQCWmUinmm2i0/ A43yom3hlaB7dLmnC3nCW5t5SPtkxUjanepCQDlZaq/o/bbPg4ympDe10vi5Lm1m5ZyJ mrmtSyitQGjdOURPWunD5MvQkJKCGpwycRDIZAsJoB43KDLDXIHVCMYDXNNGufEZhmDU wL7Q== 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=M1WU+9CSrUaw7VlNi10HQmeEi/O/sY3s+ib4fEEq5CQ=; b=CuTdYmoSkDHgCwg7sZbYW7fEVBffq83yX+GlMh7xnv4q3UarBTLtXQZrakCcVBVChe RcWr04YYyQA8D9NK2GUJdq0K7prhoEV7H5+UI1XvYVk01n4eGbKu/3V2ms7I6sTxHC3a yoj2+37LywIOBtvL2dYh2wIQX2nv1UhOfFwgJcli27MJ/LgzSSsvuUnJj3XWZPWWuDrh 45lVhq9O4sjsQl/GbNZ7bs9GDnFKmlBiaHlVeN/SB4OLuh1j5e47/k6Qd+wPP6KhVmum S5GLZ911ymoCZ+EjClK+pkQvT9ZhPmeE6JnBiu5p47F0L7iWj+iAfah5/BOPIytLwJHT zjLw== X-Gm-Message-State: ALoCoQnagtPEfGEWKdc/xKqgliyuyWWZsuIYlmGfLs34WPNz78KN+MvRaCfzXcAzsVqeOA8i3C51ezpl0nzeMr+3WRhgo8KQnQ== X-Received: by 10.194.77.137 with SMTP id s9mr23151163wjw.171.1453120262670; Mon, 18 Jan 2016 04:31:02 -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 u191sm15606572wmd.4.2016.01.18.04.31.01 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 18 Jan 2016 04:31:01 -0800 (PST) From: David Marchand To: dev@dpdk.org Date: Mon, 18 Jan 2016 13:30:45 +0100 Message-Id: <1453120248-28274-8-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453120248-28274-1-git-send-email-david.marchand@6wind.com> References: <1452430254-30390-1-git-send-email-david.marchand@6wind.com> <1453120248-28274-1-git-send-email-david.marchand@6wind.com> Cc: John Daley Subject: [dpdk-dev] [PATCH v2 07/10] 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 --- Changes since v1: - indent fix 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..a70c364 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 */