From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933797AbbI1Ncq (ORCPT ); Mon, 28 Sep 2015 09:32:46 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:34318 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932920AbbI1Ncp (ORCPT ); Mon, 28 Sep 2015 09:32:45 -0400 X-IronPort-AV: E=Sophos;i="5.17,602,1437436800"; d="scan'208";a="306541325" From: Julien Grall To: CC: , , , , "Julien Grall" , Robert Richter , Konrad Rzeszutek Wilk , Boris Ostrovsky , "David Vrabel" Subject: [PATCH] xen/pci: Don't build Xen pci code for ARM and ARM64 Date: Mon, 28 Sep 2015 14:30:44 +0100 Message-ID: <1443447044-24985-1-git-send-email-julien.grall@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The PCI support for Xen doesn't compile on ARM/ARM64 when CONFIG_PCI_MMCONFIG=y: drivers/xen/pci.c:31:25: fatal error: asm/pci_x86.h: No such file or directory #include Although, Xen is not currently involved in PCI management for ARM/ARM64. There is plan to support it, but it would require some changes in Linux side. For now, introduce a new config options XEN_PCI which will be turned off for ARM platform. Reported-by: Robert Richter Signed-off-by: Julien Grall --- Cc: Konrad Rzeszutek Wilk Cc: Boris Ostrovsky Cc: David Vrabel --- drivers/xen/Kconfig | 6 +++++- drivers/xen/Makefile | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 73708ac..6bcc8b0 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -168,7 +168,7 @@ config XEN_TMEM config XEN_PCIDEV_BACKEND tristate "Xen PCI-device backend driver" - depends on PCI && X86 && XEN + depends on XEN_PCI depends on XEN_BACKEND default m help @@ -189,6 +189,10 @@ config XEN_PCIDEV_BACKEND If in doubt, say m. +config XEN_PCI + def_bool y + depends on PCI && !ARM && !ARM64 + config XEN_SCSI_BACKEND tristate "XEN SCSI backend driver" depends on XEN && XEN_BACKEND && TARGET_CORE diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index e293bc5..c9f23b7 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -11,7 +11,7 @@ CFLAGS_features.o := $(nostackp) CFLAGS_efi.o += -fshort-wchar -dom0-$(CONFIG_PCI) += pci.o +dom0-$(CONFIG_XEN_PCI) += pci.o dom0-$(CONFIG_USB_SUPPORT) += dbgp.o dom0-$(CONFIG_XEN_ACPI) += acpi.o $(xen-pad-y) xen-pad-$(CONFIG_X86) += xen-acpi-pad.o -- 2.1.4