From patchwork Tue May 17 03:11:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongdong Liu X-Patchwork-Id: 9108341 Return-Path: X-Original-To: patchwork-linux-arm@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 3307FBF29F for ; Tue, 17 May 2016 03:17:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3D98520268 for ; Tue, 17 May 2016 03:17:38 +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 21D6520251 for ; Tue, 17 May 2016 03:17:37 +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 1b2VTm-0005Og-4E; Tue, 17 May 2016 03:15:30 +0000 Received: from szxga02-in.huawei.com ([119.145.14.65]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b2VTh-0004Aj-FN for linux-arm-kernel@lists.infradead.org; Tue, 17 May 2016 03:15:27 +0000 Received: from 172.24.1.60 (EHLO szxeml425-hub.china.huawei.com) ([172.24.1.60]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DHE95068; Tue, 17 May 2016 11:12:10 +0800 (CST) Received: from [127.0.0.1] (10.61.21.156) by szxeml425-hub.china.huawei.com (10.82.67.180) with Microsoft SMTP Server id 14.3.235.1; Tue, 17 May 2016 11:11:44 +0800 Subject: Re: [PATCH V7 07/11] pci, acpi: Handle ACPI companion assignment. To: Tomasz Nowicki , , , , , , , , , References: <1462893601-8937-1-git-send-email-tn@semihalf.com> <1462893601-8937-8-git-send-email-tn@semihalf.com> From: Dongdong Liu Message-ID: <573A8BED.7030908@huawei.com> Date: Tue, 17 May 2016 11:11:41 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <1462893601-8937-8-git-send-email-tn@semihalf.com> X-Originating-IP: [10.61.21.156] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090201.573A8C0C.00B6, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 661e487e791578d941086aadde1fdac1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160516_201526_111759_3FF36587 X-CRM114-Status: GOOD ( 15.11 ) X-Spam-Score: -5.6 (-----) 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: jcm@redhat.com, linaro-acpi@lists.linaro.org, linux-pci@vger.kernel.org, dhdang@apm.com, Liviu.Dudau@arm.com, ddaney@caviumnetworks.com, jeremy.linton@arm.com, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, robert.richter@caviumnetworks.com, Linuxarm , cov@codeaurora.org, Suravee.Suthikulpanit@amd.com, msalter@redhat.com, wangyijing@huawei.com, mw@semihalf.com, andrea.gallo@linaro.org, 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=-5.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Tomasz I used the patchset and added "PATCH V6 11/13 specic quirks", tested on HiSilicon D02 board but met the below problem. [ 2.614115] [] hisi_pcie_init+0x6c/0x1ec [ 2.619571] [] pci_ecam_create+0x130/0x1ec [ 2.625209] [] pci_acpi_scan_root+0x160/0x218 [ 2.631096] [] acpi_pci_root_add+0x36c/0x42c [ 2.636897] [] acpi_bus_attach+0xe4/0x1a8 [ 2.642438] [] acpi_bus_attach+0x150/0x1a8 [ 2.648066] [] acpi_bus_attach+0x150/0x1a8 [ 2.653693] [] acpi_bus_scan+0x64/0x74 [ 2.658975] [] acpi_scan_init+0x5c/0x19c [ 2.664429] [] acpi_init+0x280/0x2a4 [ 2.669538] [] do_one_initcall+0x8c/0x19c [ 2.675080] [] kernel_init_freeable+0x14c/0x1ec [ 2.681139] [] kernel_init+0x10/0xfc [ 2.686248] [] ret_from_fork+0x10/0x40 In hisi_pcie_init, I used "struct acpi_device *device = ACPI_COMPANION(dev);". I found the reason is V7 lack the below code. I added the below code, it worked ok. [PATCH V6 01/13] pci, acpi, x86, ia64: Move ACPI host bridge device companion assignment to core code. ? 2016/5/10 23:19, Tomasz Nowicki ??: > This patch provides a way to set the ACPI companion in PCI code. > We define acpi_pci_set_companion() to set the ACPI companion pointer and > call it from PCI core code. The function is stub for now. > > Signed-off-by: Jayachandran C > Signed-off-by: Tomasz Nowicki > --- > drivers/pci/probe.c | 2 ++ > include/linux/pci-acpi.h | 4 ++++ > 2 files changed, 6 insertions(+) > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index 8004f67..fb0b752 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -12,6 +12,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -2141,6 +2142,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, > bridge->dev.parent = parent; > bridge->dev.release = pci_release_host_bridge_dev; > dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus); > + acpi_pci_set_companion(bridge); > error = pcibios_root_bridge_prepare(bridge); > if (error) { > kfree(bridge); > diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h > index 09f9f02..1baa515 100644 > --- a/include/linux/pci-acpi.h > +++ b/include/linux/pci-acpi.h > @@ -111,6 +111,10 @@ static inline void acpi_pci_add_bus(struct pci_bus *bus) { } > static inline void acpi_pci_remove_bus(struct pci_bus *bus) { } > #endif /* CONFIG_ACPI */ > > +static inline void acpi_pci_set_companion(struct pci_host_bridge *bridge) > +{ > +} > + > static inline int acpi_pci_bus_domain_nr(struct pci_bus *bus) > { > return 0; > --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -564,6 +564,11 @@ static int acpi_pci_root_add(struct acpi_device *device, } } + /* + * pci_create_root_bus() needs to detect the parent device type, + * so initialize its companion data accordingly. + */ + ACPI_COMPANION_SET(&device->dev, device); This code will be upstreamed with the "PATCH V6 11/13 specic quirks" in next time after the patchset is accepted. Right ?