From patchwork Wed Dec 16 15:16:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 7862851 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CC86DBEEE1 for ; Wed, 16 Dec 2015 15:24:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EF8E120396 for ; Wed, 16 Dec 2015 15:24:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DFEE820382 for ; Wed, 16 Dec 2015 15:24:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934107AbbLPPXf (ORCPT ); Wed, 16 Dec 2015 10:23:35 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:37748 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965731AbbLPPRv (ORCPT ); Wed, 16 Dec 2015 10:17:51 -0500 Received: by mail-wm0-f44.google.com with SMTP id p187so5605335wmp.0 for ; Wed, 16 Dec 2015 07:17:51 -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=/I5V+rN4J83OTTljjItoXQmTSSVwKXa9n2uxsLRKsIo=; b=Nhj+HGsC2VJYytwZ+T1MLZb3h4XAlS/+UbPFss8H9uc9AoFII5vQtbHQ06CAek8RBF xAjQN/8zTAPc5j/sXV5ruJaeyh3pnFzcX4G65HhSXifKIrTVhpWUNYtjm2SCi9AweJ2e pPSxRErCLKiNU55eOm7V8iCf18aKlXW2LtUl28QzUnvqk3bkc9oghKUdWpu5Tbt4Y/8o XV6dH6zwxZFDqwsvzSWSzKGj3/1ys1zXj6vVMAtZ3tytfDEXWvOjw0oVxNRRotczz02I i7R5vM7pr9aqZbUPvyJqPPYQMFKyiJzueoFSEKL3Vodz9Hx4SP8DBozXCex0lz+48DQN l9sA== 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=/I5V+rN4J83OTTljjItoXQmTSSVwKXa9n2uxsLRKsIo=; b=R/VrF+5Rby4AXFLDm0kDz35VysYrzHFWgSOnO4jYobfL8K49i5APMbnuHj4RhNWo3D SJ88zsW7baPE4VNRVEBwaZDTYC1uq6ZPU+A0n+NaoZG/oxuBHtbBGX+CxBs+ubbPopMm Hcc/Yvw6D5btraSUBvrYxG/9Vy0CaZwJR+I27GcerZZbd3W68/bGfEUW3p5KSsXkA9jP DNSXs3JUD+fLSppxwrtkfpQ3q5SC5regkAdTvP8vW8BXQTYlOYdfNMbKPIIPMmiy9+/e fzrSc/pr7b4YJbu9EwAd+SiPc7ueAqqlNqRSSj2wO79keBSYuU+AzYTz8eQ2sPQPRlJ3 cEpA== X-Gm-Message-State: ALoCoQl8GHkvfnzIqeP3TkVWU5Lc8hq3f2uVfD0zFwXfZGAg1Xb7PVh/z2aatXQYH3MJLiuo9Sa9UDbTmsbV4uu+bCYFE8rjhg== X-Received: by 10.194.11.66 with SMTP id o2mr25229543wjb.103.1450279070238; Wed, 16 Dec 2015 07:17:50 -0800 (PST) Received: from tn-HP-4.semihalf.local ([80.82.22.190]) by smtp.gmail.com with ESMTPSA id z17sm6438761wjq.1.2015.12.16.07.17.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Dec 2015 07:17:49 -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 V2 06/23] XEN / PCI: Remove the dependence on arch x86 when PCI_MMCONFIG=y Date: Wed, 16 Dec 2015 16:16:16 +0100 Message-Id: <1450278993-12664-7-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450278993-12664-1-git-send-email-tn@semihalf.com> References: <1450278993-12664-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 X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,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 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 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;