From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id D262558DA for ; Tue, 27 May 2014 04:38:52 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 26 May 2014 19:39:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.98,916,1392192000"; d="scan'208,217";a="537915399" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by fmsmga001.fm.intel.com with ESMTP; 26 May 2014 19:39:02 -0700 Received: from fmsmsx117.amr.corp.intel.com (10.18.116.17) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.3.123.3; Mon, 26 May 2014 19:39:02 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx117.amr.corp.intel.com (10.18.116.17) with Microsoft SMTP Server (TLS) id 14.3.123.3; Mon, 26 May 2014 19:39:02 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.7]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.23]) with mapi id 14.03.0123.003; Tue, 27 May 2014 10:39:00 +0800 From: "Xu, HuilongX" To: "dev@dpdk.org" , "Burakov, Anatoly" Thread-Topic: RE: [dpdk-dev] [PATCH v2 03/16] Rename RTE_PCI_DRV_NEED_IGB_UIO to RTE_PCI_DRV_NEED_MAPPING Thread-Index: Ac95VNBSmSpBbz2wS+m8VOuWmnj74w== Date: Tue, 27 May 2014 02:39:00 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [PATCH v2 03/16] Rename RTE_PCI_DRV_NEED_IGB_UIO to RTE_PCI_DRV_NEED_MAPPING 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: Tue, 27 May 2014 02:38:54 -0000 Rename the RTE_PCI_DRV_NEED_IGB_UIO to be more generic, retain old macro for backwards compatibility. Probably should be removed in one of the next releases. Signed-off-by: Anatoly Burakov Test-by: HuilongX Xu Compile pass >>Compile OS: FC20 x86_64 >>Kernel version: 3.13.6-200 >>GCC version: 4.8.2 >>Server: Crownpass --- app/test/test_pci.c | 4 ++-- lib/librte_eal/bsdapp/eal/eal_pci.c | 2 +- lib/librte_eal/common/include/rte_pci.h | 6 ++++-- lib/librte_pmd_e1000/em_ethdev.c | 2 +- lib/librte_pmd_e1000/igb_ethdev.c | 4 ++-- lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 4 ++-- lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/test/test_pci.c b/app/test/test_pci.c index 6908d04..fad118e 100644 --- a/app/test/test_pci.c +++ b/app/test/test_pci.c @@ -63,7 +63,7 @@ static int my_driver_init(struct rte_pci_driver *dr, struct rte_pci_device *dev= ); /* - * To test cases where RTE_PCI_DRV_NEED_IGB_UIO is set, and isn't set, two + * To test cases where RTE_PCI_DRV_NEED_MAPPING is set, and isn't set, two * drivers are created (one with IGB devices, the other with IXGBE devices= ). */ @@ -91,7 +91,7 @@ struct rte_pci_driver my_driver =3D { .name =3D "test_driver", .devinit =3D my_driver_init, .id_table =3D my_driver_id, - .drv_flags =3D RTE_PCI_DRV_NEED_IGB_UIO, + .drv_flags =3D RTE_PCI_DRV_NEED_MAPPING, }; struct rte_pci_driver my_driver2 =3D { diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/ea= l/eal_pci.c index 94ae461..eddbd2f 100644 --- a/lib/librte_eal/bsdapp/eal/eal_pci.c +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c @@ -474,7 +474,7 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr,= struct rte_pci_device *d return 0; } - if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO= ) { + if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING)= { /* map resources for devices= that use igb_uio */ if (pci_uio_map_resource(dev= ) < 0) return -1; diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/commo= n/include/rte_pci.h index c793773..84d7b42 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -190,12 +190,14 @@ struct rte_pci_driver { uint32_t drv_flags; /**< Flags contollin= g handling of device. */ }; -/** Device needs igb_uio kernel module */ -#define RTE_PCI_DRV_NEED_IGB_UIO 0x0001 +/** Device needs PCI BAR mapping (done with either IGB_UIO or VFIO) */ +#define RTE_PCI_DRV_NEED_MAPPING 0x0001 /** Device driver must be registered several times until failure */ #define RTE_PCI_DRV_MULTIPLE 0x0002 /** Device needs to be unbound even if no module is provided */ #define RTE_PCI_DRV_FORCE_UNBIND 0x0004 +/** Retain the old name for backwards-compatibility */ +#define RTE_PCI_DRV_NEED_IGB_UIO RTE_PCI_DRV_NEED_MAPPING /**< Internal use only - Macro used by pci addr parsing functions **/ #define GET_PCIADDR_FIELD(in, fd, lim, dlm) \ diff --git a/lib/librte_pmd_e1000/em_ethdev.c b/lib/librte_pmd_e1000/em_eth= dev.c index 755e474..f3575d5 100644 --- a/lib/librte_pmd_e1000/em_ethdev.c +++ b/lib/librte_pmd_e1000/em_ethdev.c @@ -279,7 +279,7 @@ static struct eth_driver rte_em_pmd =3D { { .name =3D "rte_em_pmd", .id_table =3D pci_id_em_map, - .drv_flags =3D RTE_PCI_DRV_NEED_IGB_UIO, + .drv_flags =3D RTE_PCI_DRV_NEED_MAPPING, }, .eth_dev_init =3D eth_em_dev_init, .dev_private_size =3D sizeof(struct e1000_adapter), diff --git a/lib/librte_pmd_e1000/igb_ethdev.c b/lib/librte_pmd_e1000/igb_e= thdev.c index c7b3926..b49db52 100644 --- a/lib/librte_pmd_e1000/igb_ethdev.c +++ b/lib/librte_pmd_e1000/igb_ethdev.c @@ -600,7 +600,7 @@ static struct eth_driver rte_igb_pmd =3D { { .name =3D "rte_igb_pmd", .id_table =3D pci_id_igb_map, - .drv_flags =3D RTE_PCI_DRV_NEED_IGB_UIO, + .drv_flags =3D RTE_PCI_DRV_NEED_MAPPING, }, .eth_dev_init =3D eth_igb_dev_init, .dev_private_size =3D sizeof(struct e1000_adapter), @@ -613,7 +613,7 @@ static struct eth_driver rte_igbvf_pmd =3D { { .name =3D "rte_igbvf_pmd", .id_table =3D pci_id_igbvf_map, - .drv_flags =3D RTE_PCI_DRV_NEED_IGB_UIO, + .drv_flags =3D RTE_PCI_DRV_NEED_MAPPING, }, .eth_dev_init =3D eth_igbvf_dev_init, .dev_private_size =3D sizeof(struct e1000_adapter), diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c b/lib/librte_pmd_ixgbe/ixg= be_ethdev.c index e78c208..5354a3f 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c +++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c @@ -931,7 +931,7 @@ static struct eth_driver rte_ixgbe_pmd =3D { { .name =3D "rte_ixgbe_pmd", .id_table =3D pci_id_ixgbe_map, - .drv_flags =3D RTE_PCI_DRV_NEED_IGB_UIO, + .drv_flags =3D RTE_PCI_DRV_NEED_MAPPING, }, .eth_dev_init =3D eth_ixgbe_dev_init, .dev_private_size =3D sizeof(struct ixgbe_adapter), @@ -944,7 +944,7 @@ static struct eth_driver rte_ixgbevf_pmd =3D { { .name =3D "rte_ixgbevf_pmd", .id_table =3D pci_id_ixgbevf_map, - .drv_flags =3D RTE_PCI_DRV_NEED_IGB_UIO, + .drv_flags =3D RTE_PCI_DRV_NEED_MAPPING, }, .eth_dev_init =3D eth_ixgbevf_dev_init, .dev_private_size =3D sizeof(struct ixgbe_adapter), diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c b/lib/librte_pmd_vmxne= t3/vmxnet3_ethdev.c index 8259cfe..a08c2bf 100644 --- a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c +++ b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c @@ -267,7 +267,7 @@ static struct eth_driver rte_vmxnet3_pmd =3D { { .name =3D "rte_vmxnet3_pmd", .id_table =3D pci_id_vmxnet3_map, - .drv_flags =3D RTE_PCI_DRV_NEED_IGB_UIO, + .drv_flags =3D RTE_PCI_DRV_NEED_MAPPING, }, .eth_dev_init =3D eth_vmxnet3_dev_init, .dev_private_size =3D sizeof(struct vmxnet3_adapter), -- 1.7.0.7