From patchwork Wed Jan 13 13:20:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 566935 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AF44F140C04 for ; Thu, 14 Jan 2016 00:29:35 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=semihalf-com.20150623.gappssmtp.com header.i=@semihalf-com.20150623.gappssmtp.com header.b=Ym/vhxDd; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760516AbcAMN3d (ORCPT ); Wed, 13 Jan 2016 08:29:33 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:33264 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758314AbcAMNVb (ORCPT ); Wed, 13 Jan 2016 08:21:31 -0500 Received: by mail-wm0-f44.google.com with SMTP id f206so295436026wmf.0 for ; Wed, 13 Jan 2016 05:21:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dHc49EinJL8EzNEAoedlpfAdW4QqQ8G27Jt7XandV1c=; b=Ym/vhxDdpketllqn/V8JoX+sfd70jS8Jp+leyV9slayaFoaNBNfdTAGSKPRMfNj+lr dec4xVi7vs2ti3lpG2xR6NsuiuKgiX8OHDbM/JgtyXyqx5kkshIidzFAGEO1prC/DDOF ayLnmDrAysux7RmjbDV/UKLIX6w0Pj2dXjmDeXV1I86zm9akPfXEZ1FG7y9I/adrqxzi /h9ogvRWLJGIR0hG+RqlqsfS0dYyb667ubW0iGN+p9RaX5ZkMcVPdJM52Ul/fnxEvi+d 10IMS0HO9NqZlzB6f3b5R3+H9nltPdzXRqb5rAroj+ql6TCgEAHWOybryDFhbrKOswSL lQeA== 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=dHc49EinJL8EzNEAoedlpfAdW4QqQ8G27Jt7XandV1c=; b=A4fbH4wOWAvPUuNJKFhlHRv7Ue0q7PTg4mJ2oOmHFVM/6qw2QRSxeqbIOOpPT2vvml wk/7QZVxOQvGyEsOi8HJiNGtPYT0LNqr8H368022YkV2SzLg4BAsBbS7brNB5HZ7IBW4 9i7adjeDnv7DpEMGbcEU+ApDd9WZeyRbmBXW2NyYOlvEjgE42oe/B0MDOBb+t934y07p c8OF2wSwY5C7jTUksbLEM5/flDkUAqVdd4FQXb60+LiX6YcGTUZo37eTyfNdx5752GXm 0ZTIRDdQVYnJ0GvOxiz+kp0WQFk5DdvynnO7t8JMyp+BloQrUT/wZ7YIdocEyMYEM9tj eyMw== X-Gm-Message-State: ALoCoQlenGWB5vJJKwt776Cefwj2/+PSEQ1hhUFRAohNe3jTapxmdpWViAgrpz30y2XuBvJpLOMv8LIVdv/W2ghJhOSpuPXhpg== X-Received: by 10.28.3.134 with SMTP id 128mr24177716wmd.92.1452691290009; Wed, 13 Jan 2016 05:21:30 -0800 (PST) Received: from tn-HP-4.semihalf.local (cardhu.semihalf.com. [213.17.239.108]) by smtp.gmail.com with ESMTPSA id y124sm8858741wmg.3.2016.01.13.05.21.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Jan 2016 05:21:29 -0800 (PST) From: Tomasz Nowicki To: bhelgaas@google.com, arnd@arndb.de, will.deacon@arm.com, catalin.marinas@arm.com, rjw@rjwysocki.net, hanjun.guo@linaro.org, Lorenzo.Pieralisi@arm.com, okaya@codeaurora.org, jiang.liu@linux.intel.com, Stefano.Stabellini@eu.citrix.com Cc: robert.richter@caviumnetworks.com, mw@semihalf.com, Liviu.Dudau@arm.com, ddaney@caviumnetworks.com, tglx@linutronix.de, wangyijing@huawei.com, Suravee.Suthikulpanit@amd.com, msalter@redhat.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, jchandra@broadcom.com, jcm@redhat.com, Tomasz Nowicki , Konrad Rzeszutek Wilk , Boris Ostrovsky Subject: [PATCH V3 06/21] XEN / PCI: Remove the dependence on arch x86 when PCI_MMCONFIG=y Date: Wed, 13 Jan 2016 14:20:52 +0100 Message-Id: <1452691267-32240-7-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452691267-32240-1-git-send-email-tn@semihalf.com> References: <1452691267-32240-1-git-send-email-tn@semihalf.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org In drivers/xen/pci.c, there are arch x86 dependent codes when CONFIG_PCI_MMCONFIG is enabled, since CONFIG_PCI_MMCONFIG depends on ACPI, so this will prevent XEN PCI running on other architectures using ACPI with PCI_MMCONFIG enabled (such as ARM64). Fortunatly, it can be sloved in a simple way. In drivers/xen/pci.c, the only x86 dependent code is if ((pci_probe & PCI_PROBE_MMCONF) == 0), and it's defined in asm/pci_x86.h, the code means that if the PCI resource is not probed in PCI_PROBE_MMCONF way, just ingnore the xen mcfg init. Actually this is duplicate, because if PCI resource is not probed in PCI_PROBE_MMCONF way, the pci_mmconfig_list will be empty, and the if (list_empty()) after it will do the same job. So just remove the arch related code and the head file, this will be no functional change for x86, and also makes xen/pci.c usable for other architectures. Signed-off-by: Hanjun Guo CC: Konrad Rzeszutek Wilk CC: Boris Ostrovsky Cc: Stefano Stabellini Tested-by: Suravee Suthikulpanit Tested-by: Jeremy Linton Reviewed-by: Boris Ostrovsky Acked-by: Stefano Stabellini --- drivers/xen/pci.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/xen/pci.c b/drivers/xen/pci.c index 6785ebb..9a8dbe3 100644 --- a/drivers/xen/pci.c +++ b/drivers/xen/pci.c @@ -28,9 +28,6 @@ #include #include #include "../pci/pci.h" -#ifdef CONFIG_PCI_MMCONFIG -#include -#endif static bool __read_mostly pci_seg_supported = true; @@ -222,9 +219,6 @@ static int __init xen_mcfg_late(void) if (!xen_initial_domain()) return 0; - if ((pci_probe & PCI_PROBE_MMCONF) == 0) - return 0; - if (list_empty(&pci_mmcfg_list)) return 0;