From patchwork Mon Sep 28 13:30:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 7277651 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id ADC0C9F39B for ; Mon, 28 Sep 2015 13:36:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CAB992062A for ; Mon, 28 Sep 2015 13:36:04 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DB4DC2051C for ; Mon, 28 Sep 2015 13:36:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZgYYz-0002uk-7y; Mon, 28 Sep 2015 13:33:53 +0000 Received: from smtp02.citrix.com ([66.165.176.63]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZgYYH-0002rz-R0 for linux-arm-kernel@lists.infradead.org; Mon, 28 Sep 2015 13:33:10 +0000 X-IronPort-AV: E=Sophos;i="5.17,602,1437436800"; d="scan'208";a="306541325" From: Julien Grall To: 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 X-DLP: MIA2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150928_063310_082144_9B27D1AC X-CRM114-Status: UNSURE ( 9.88 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.2 (----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, Konrad Rzeszutek Wilk , linux-kernel@vger.kernel.org, Julien Grall , Robert Richter , David Vrabel , Boris Ostrovsky , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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