From patchwork Thu Sep 15 15:18:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 9334043 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0FCED6077A for ; Thu, 15 Sep 2016 15:18:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFE4E2993D for ; Thu, 15 Sep 2016 15:18:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E39CE2994D; Thu, 15 Sep 2016 15:18:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D58AD29947 for ; Thu, 15 Sep 2016 15:18:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753650AbcIOPSR (ORCPT ); Thu, 15 Sep 2016 11:18:17 -0400 Received: from foss.arm.com ([217.140.101.70]:39370 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753556AbcIOPSR (ORCPT ); Thu, 15 Sep 2016 11:18:17 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0FD7CF0; Thu, 15 Sep 2016 08:18:16 -0700 (PDT) Received: from [10.1.207.16] (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 745A83F21A; Thu, 15 Sep 2016 08:18:13 -0700 (PDT) Subject: Re: [RFC PATCH v2 05/11] ACPI: platform: setup MSI domain for ACPI based platform device To: Hanjun Guo , Hanjun Guo , "Rafael J. Wysocki" , Lorenzo Pieralisi References: <1473862879-7769-1-git-send-email-guohanjun@huawei.com> <1473862879-7769-6-git-send-email-guohanjun@huawei.com> <57D97087.5040703@arm.com> <57DAAAAE.6010206@linaro.org> Cc: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Thomas Gleixner , Bjorn Helgaas , Greg KH , Tomasz Nowicki , Ma Jun , Kefeng Wang , Charles Garcia-Tobin , linuxarm@huawei.com From: Marc Zyngier X-Enigmail-Draft-Status: N1110 Organization: ARM Ltd Message-ID: <57DABBB3.3020208@arm.com> Date: Thu, 15 Sep 2016 16:18:11 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.7.0 MIME-Version: 1.0 In-Reply-To: <57DAAAAE.6010206@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 15/09/16 15:05, Hanjun Guo wrote: > Hi Marc, > > Thanks for your review, reply inline. > > On 09/14/2016 11:45 PM, Marc Zyngier wrote: >> On 14/09/16 15:21, Hanjun Guo wrote: >>> From: Hanjun Guo >>> >>> With the platform msi domain created, we can set up the msi domain >>> for a platform device when it's probed. >>> >>> This patch introduces acpi_configure_msi_domain(), which retrieves >>> the domain from iort and set it to platform device. >>> >>> As some platform devices such as an irqchip needs the msi irqdomain >>> to be the interrupt parent domain, we need to get irqdomain before >>> platform device is probed. >>> >>> Cc: Marc Zyngier >>> Cc: Greg KH >>> Cc: Thomas Gleixner >>> Cc: Bjorn Helgaas >>> Cc: Lorenzo Pieralisi >>> Cc: Tomasz Nowicki >>> Signed-off-by: Hanjun Guo >>> --- >>> drivers/acpi/arm64/iort.c | 5 ++++- >>> drivers/base/platform-msi.c | 15 ++++++++++++++- >>> drivers/base/platform.c | 2 ++ >>> include/linux/msi.h | 1 + >>> 4 files changed, 21 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c >>> index 13a1905..bccd3cc 100644 >>> --- a/drivers/acpi/arm64/iort.c >>> +++ b/drivers/acpi/arm64/iort.c >>> @@ -478,6 +478,7 @@ struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id) >>> { >>> struct fwnode_handle *handle; >>> int its_id; >>> + enum irq_domain_bus_token bus_token; >>> >>> if (iort_dev_find_its_id(dev, req_id, 0, &its_id)) >>> return NULL; >>> @@ -486,7 +487,9 @@ struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id) >>> if (!handle) >>> return NULL; >>> >>> - return irq_find_matching_fwnode(handle, DOMAIN_BUS_PCI_MSI); >>> + bus_token = dev_is_pci(dev) ? >>> + DOMAIN_BUS_PCI_MSI : DOMAIN_BUS_PLATFORM_MSI; >>> + return irq_find_matching_fwnode(handle, bus_token); >>> } >>> >>> static int __get_pci_rid(struct pci_dev *pdev, u16 alias, void *data) >>> diff --git a/drivers/base/platform-msi.c b/drivers/base/platform-msi.c >>> index 279e539..f6eae18 100644 >>> --- a/drivers/base/platform-msi.c >>> +++ b/drivers/base/platform-msi.c >>> @@ -17,8 +17,8 @@ >>> * along with this program. If not, see . >>> */ >>> >>> +#include >>> #include >>> -#include >>> #include >>> #include >>> #include >>> @@ -416,3 +416,16 @@ int platform_msi_domain_alloc(struct irq_domain *domain, unsigned int virq, >>> >>> return err; >>> } >>> + >>> +int acpi_configure_msi_domain(struct device *dev) >>> +{ >>> + struct irq_domain *d = NULL; >>> + >>> + d = iort_get_device_domain(dev, 0); >> >> This looks completely wrong. Why RID 0? As far as I can see, 0 is not a >> special value, and could be something else. > > You are right. I tried to reuse the API of get irqdomain in IORT for > PCI devices, but for platform device, we don't have req id in named > component, so I just pass 0 here, I think I need to prepare another > API for platform devices. > >> >>> + if (d) { >>> + dev_set_msi_domain(dev, d); >>> + return 0; >>> + } >>> + >>> + return -EINVAL; >>> +} >> >> I really hate this, as the platform MSI code is intentionally free of >> any firmware reference. This should live in the ACPI code. > > Will do, I think locate it in iort.c is better. > >> >>> diff --git a/drivers/base/platform.c b/drivers/base/platform.c >>> index 6482d47..ea01a37 100644 >>> --- a/drivers/base/platform.c >>> +++ b/drivers/base/platform.c >>> @@ -24,6 +24,7 @@ >>> #include >>> #include >>> #include >>> +#include >>> #include >>> #include >>> #include >>> @@ -500,6 +501,7 @@ struct platform_device *platform_device_register_full( >>> pdev->dev.parent = pdevinfo->parent; >>> pdev->dev.fwnode = pdevinfo->fwnode; >>> >>> + acpi_configure_msi_domain(&pdev->dev); >> >> It feels odd to put this in the generic code, while you could perfectly >> put the call into acpi_platform.c and keep the firmware stuff away from >> the generic code. > > My feeling is the same, I'm still trying to find a new way to do it, > but I can't simply put that in acpi_platform.c, because > > acpi_create_platform_device() > platform_device_register_full() > platform_device_alloc() --> dev is alloced > ... > dev.fwnode is set > (I get the msi domain by the fwnode in acpi_configure_msi_domain) > ... > platform_device_add() --> which the device is probed. > > For devices like irqchip which needs the dev->msi_domain to be > set before it's really probed, because it needs the msi domain > to be the parent domain. > > If I call the function in acpi_create_platform_device() before > platform_device_register_full(), we just can't set dev's msi > domain, but if call it after platform_device_register_full(), > the irqchip like mbigen will not get its parent domain... > > DT is using another API for platform device probe, so has no > problems like I said above, any suggestions to do it right in > ACPI? How about having something that's completely generic and solves the problem once and for all? Something like this: Plug pre_add_cb with your ACPI callback where you can do all the processing you want before the device is actually added. Thanks, M. diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 6482d47..6f0f90b 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -533,6 +533,9 @@ struct platform_device *platform_device_register_full( goto err; } + if (pdevinfo->pre_add_cb) + pdevinfo->pre_add_cb(&pdev->dev); + ret = platform_device_add(pdev); if (ret) { err: diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 98c2a7c..44ea133 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -74,6 +74,7 @@ struct platform_device_info { u64 dma_mask; struct property_entry *properties; + void (*pre_add_cb)(struct device *); }; extern struct platform_device *platform_device_register_full( const struct platform_device_info *pdevinfo);