From patchwork Mon May 18 13:08:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 6429141 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@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 621AF9F1CC for ; Mon, 18 May 2015 13:08:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 88AB3203B7 for ; Mon, 18 May 2015 13:08:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F660205ED for ; Mon, 18 May 2015 13:08:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753171AbbERNIj (ORCPT ); Mon, 18 May 2015 09:08:39 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:34079 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751947AbbERNIf (ORCPT ); Mon, 18 May 2015 09:08:35 -0400 Received: by pabru16 with SMTP id ru16so151787718pab.1 for ; Mon, 18 May 2015 06:08:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=EbPnXdOqOU1dK6vAxVztA/hHN3i0hOpXo6qTi1Q4l9Q=; b=WNYJiKgrgqlLdBGw1TcB8E0hBlNFJsr/Q9B3xNPmShomblENrBX+XzzLdFL3pUT69s dEU7VJB3xg8LMdzsQqUMUsxxK4p524wQeOYKF8YLe1hVE0encRWauAD7GE4vtVxYvDQO heqdtP6XIyqSwBXLXovRhUwojeKqxpvXF0zVl1szefGTluMTj5EnwohmAC/RRRr1DJ6y NC4fG2kWQKvmnAUI4wjtL200YlBnmZxmmdVAq0teGvmqcg0wizq+dxehTjScEKte/psh w7hpHRwQqI+cQ497yICp1dBBndlLhVUIFmHwMSBvb8fvAb0dDBtfBmZCJBjgPglvQ8ku WWDg== X-Gm-Message-State: ALoCoQk/gPy9HtNWFPQAsSr6OB20HxS1n9mYJJckgNYgEMvYJjw79WsAkmmPnSHVK6IAMdMpkdjv X-Received: by 10.68.68.203 with SMTP id y11mr38219590pbt.34.1431954514825; Mon, 18 May 2015 06:08:34 -0700 (PDT) Received: from [10.10.1.10] ([180.150.148.224]) by mx.google.com with ESMTPSA id j9sm10084063pdm.53.2015.05.18.06.08.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 May 2015 06:08:34 -0700 (PDT) Message-ID: <5559E44B.2010702@linaro.org> Date: Mon, 18 May 2015 21:08:27 +0800 From: Hanjun Guo User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Jiang Liu , "Rafael J . Wysocki" , Bjorn Helgaas , Marc Zyngier , Yijing Wang , Len Brown CC: Lv Zheng , LKML , linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, "x86 @ kernel . org" , linux-arm-kernel@lists.infradead.org Subject: Re: [Patch v3 5/7] PCI/ACPI: Consolidate common PCI host bridge code into ACPI core References: <1431593803-5213-1-git-send-email-jiang.liu@linux.intel.com> <1431593803-5213-6-git-send-email-jiang.liu@linux.intel.com> In-Reply-To: <1431593803-5213-6-git-send-email-jiang.liu@linux.intel.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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Hi Jiang, On 2015?05?14? 16:56, Jiang Liu wrote: > Introduce common interface acpi_pci_root_create() and related data > structures to create PCI root bus for ACPI PCI host bridges. It will > be used to kill duplicated arch specific code for IA64 and x86. It may > also help ARM64 in future. As I commented in previous version, this patch will introduce compile error on ACPI enabled ARM64 kernel because struct pci_controller is not defined for ARM64, so how about adding the following patch before this patch, or squash to this one, does it make sense? From 11d0e98154e681e75936698208398cb4dcd73632 Mon Sep 17 00:00:00 2001 From: Hanjun Guo Date: Mon, 18 May 2015 19:41:56 +0800 Subject: [PATCH] ARM64 / PCI: introduce struct pci_controller for ACPI ARM64 ACPI based PCI host bridge init needs a arch dependent struct pci_controller to accommodate common PCI host bridge code which is introduced later, or it will lead to compile errors on ARM64. Signed-off-by: Hanjun Guo CC: Liviu Dudau CC: Will Deacon CC: Catalin Marinas CC: Lorenzo Pieralisi CC: Arnd Bergmann Tested-by: Suravee Suthikulpanit --- arch/arm64/include/asm/pci.h | 10 ++++++++++ 1 file changed, 10 insertions(+) Thanks Hanjun -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm64/include/asm/pci.h b/arch/arm64/include/asm/pci.h index b008a72..7088495 100644 --- a/arch/arm64/include/asm/pci.h +++ b/arch/arm64/include/asm/pci.h @@ -10,6 +10,16 @@ #include #include +struct acpi_device; + +struct pci_controller { +#ifdef CONFIG_ACPI + struct acpi_device *companion; /* ACPI companion device */ +#endif + int segment; /* PCI domain */ + int node; /* NUMA node */ +}; + #define PCIBIOS_MIN_IO 0x1000 #define PCIBIOS_MIN_MEM 0