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 3665B58DD for ; Tue, 27 May 2014 04:43:59 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 26 May 2014 19:44:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.98,916,1392192000"; d="scan'208,217";a="537916775" Received: from fmsmsx106.amr.corp.intel.com ([10.19.9.37]) by fmsmga001.fm.intel.com with ESMTP; 26 May 2014 19:44:09 -0700 Received: from fmsmsx118.amr.corp.intel.com (10.18.116.18) by FMSMSX106.amr.corp.intel.com (10.19.9.37) with Microsoft SMTP Server (TLS) id 14.3.123.3; Mon, 26 May 2014 19:44:08 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx118.amr.corp.intel.com (10.18.116.18) with Microsoft SMTP Server (TLS) id 14.3.123.3; Mon, 26 May 2014 19:44:08 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.7]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.34]) with mapi id 14.03.0123.003; Tue, 27 May 2014 10:43:59 +0800 From: "Xu, HuilongX" To: "dev@dpdk.org" , "Burakov, Anatoly" Thread-Topic: RE: [dpdk-dev] [PATCH v2 04/16] Make igb_uio compilation optional Thread-Index: Ac95VYKhIIs/6nsXSZWZwk8MD4ZMLg== Date: Tue, 27 May 2014 02:43:59 +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 04/16] Make igb_uio compilation optional 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:44:00 -0000 Currently, igb_uio is always compiled. Some Linux distribution may not want to include igb_uio by default, so we need to make sure that igb_uio compilation can be optional. 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 --- config/defconfig_i686-default-linuxapp-gcc | 1 + config/defconfig_i686-default-linuxapp-icc | 1 + config/defconfig_x86_64-default-linuxapp-gcc | 1 + config/defconfig_x86_64-default-linuxapp-icc | 1 + lib/librte_eal/linuxapp/Makefile | 2 ++ lib/librte_eal/linuxapp/eal/eal_pci.c | 2 +- 6 files changed, 7 insertions(+), 1 deletions(-) diff --git a/config/defconfig_i686-default-linuxapp-gcc b/config/defconfig_= i686-default-linuxapp-gcc index 14bd3d1..ea90f12 100644 --- a/config/defconfig_i686-default-linuxapp-gcc +++ b/config/defconfig_i686-default-linuxapp-gcc @@ -123,6 +123,7 @@ CONFIG_RTE_LOG_HISTORY=3D256 CONFIG_RTE_LIBEAL_USE_HPET=3Dn CONFIG_RTE_EAL_ALLOW_INV_SOCKET_ID=3Dn CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=3Dn +CONFIG_RTE_EAL_IGB_UIO=3Dy # # Compile Environment Abstraction Layer for linux diff --git a/config/defconfig_i686-default-linuxapp-icc b/config/defconfig_= i686-default-linuxapp-icc index ec3386e..ecfbf28 100644 --- a/config/defconfig_i686-default-linuxapp-icc +++ b/config/defconfig_i686-default-linuxapp-icc @@ -123,6 +123,7 @@ CONFIG_RTE_LOG_HISTORY=3D256 CONFIG_RTE_LIBEAL_USE_HPET=3Dn CONFIG_RTE_EAL_ALLOW_INV_SOCKET_ID=3Dn CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=3Dn +CONFIG_RTE_EAL_IGB_UIO=3Dy # # Compile Environment Abstraction Layer for linux diff --git a/config/defconfig_x86_64-default-linuxapp-gcc b/config/defconfi= g_x86_64-default-linuxapp-gcc index f11ffbf..fc69b80 100644 --- a/config/defconfig_x86_64-default-linuxapp-gcc +++ b/config/defconfig_x86_64-default-linuxapp-gcc @@ -123,6 +123,7 @@ CONFIG_RTE_LOG_HISTORY=3D256 CONFIG_RTE_LIBEAL_USE_HPET=3Dn CONFIG_RTE_EAL_ALLOW_INV_SOCKET_ID=3Dn CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=3Dn +CONFIG_RTE_EAL_IGB_UIO=3Dy # # Compile Environment Abstraction Layer for linux diff --git a/config/defconfig_x86_64-default-linuxapp-icc b/config/defconfi= g_x86_64-default-linuxapp-icc index 4eaca4c..4ab45b3 100644 --- a/config/defconfig_x86_64-default-linuxapp-icc +++ b/config/defconfig_x86_64-default-linuxapp-icc @@ -123,6 +123,7 @@ CONFIG_RTE_LOG_HISTORY=3D256 CONFIG_RTE_LIBEAL_USE_HPET=3Dn CONFIG_RTE_EAL_ALLOW_INV_SOCKET_ID=3Dn CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=3Dn +CONFIG_RTE_EAL_IGB_UIO=3Dy # # Compile Environment Abstraction Layer for linux diff --git a/lib/librte_eal/linuxapp/Makefile b/lib/librte_eal/linuxapp/Mak= efile index b00e89f..acbf500 100644 --- a/lib/librte_eal/linuxapp/Makefile +++ b/lib/librte_eal/linuxapp/Makefile @@ -31,7 +31,9 @@ include $(RTE_SDK)/mk/rte.vars.mk +ifeq ($(CONFIG_RTE_EAL_IGB_UIO),y) DIRS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) +=3D igb_uio +endif DIRS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) +=3D eal ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) DIRS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) +=3D kni diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxap= p/eal/eal_pci.c index de1b0a0..7256406 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -434,7 +434,7 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr,= struct rte_pci_device *d return 1; } - 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 ((ret =3D pci_uio_map_res= ource(dev)) !=3D 0) return ret; -- 1.7.0.7