Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751913AbcLXHiS (ORCPT ); Sat, 24 Dec 2016 02:38:18 -0500 Received: from szxga01-in.huawei.com ([58.251.152.64]:2675 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750919AbcLXHiQ (ORCPT ); Sat, 24 Dec 2016 02:38:16 -0500 Subject: Re: [PATCH v5 09/14] ACPI: platform: setup MSI domain for ACPI based platform device To: "Rafael J. Wysocki" References: <1482384922-21507-1-git-send-email-guohanjun@huawei.com> <1482384922-21507-10-git-send-email-guohanjun@huawei.com> CC: Marc Zyngier , "Rafael J. Wysocki" , Lorenzo Pieralisi , "ACPI Devel Maling List" , "linux-arm-kernel@lists.infradead.org" , Linux Kernel Mailing List , Thomas Gleixner , Greg KH , Tomasz Nowicki , Ma Jun , Kefeng Wang , "Agustin Vega-Frias" , Sinan Kaya , Charles Garcia-Tobin , , , , Jon Masters , Hanjun Guo From: Hanjun Guo Message-ID: <585E24FB.9050805@huawei.com> Date: Sat, 24 Dec 2016 15:34:19 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.17.188] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6733 Lines: 184 Hi Rafael, Thank you for your comments, when I was demoing your suggestion, I got a little bit confusions, please see my comments below. On 2016/12/22 20:57, Rafael J. Wysocki wrote: > On Thu, Dec 22, 2016 at 6:35 AM, 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. >> >> In order to do that, we need to get the domain that the platform >> device connecting to, so the iort_get_platform_device_domain() is >> introduced to retrieve the domain from iort. >> >> After the domain is retrieved, we need a proper way to set the >> domain to paltform 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 but after >> the platform device is allocated, so introduce a callback (pre_add_cb) >> in pdevinfo to prepare firmware related information which is needed >> for device probe, then set the msi domain in that callback. >> >> Signed-off-by: Hanjun Guo >> Cc: Marc Zyngier >> Cc: Rafael J. Wysocki >> Cc: Greg KH >> Cc: Lorenzo Pieralisi >> Cc: Thomas Gleixner >> --- >> drivers/acpi/acpi_platform.c | 11 +++++++++++ >> drivers/acpi/arm64/iort.c | 43 +++++++++++++++++++++++++++++++++++++++++ >> drivers/base/platform.c | 3 +++ >> include/linux/acpi_iort.h | 3 +++ >> include/linux/platform_device.h | 3 +++ >> 5 files changed, 63 insertions(+) >> >> diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c >> index b4c1a6a..5d8d61b4 100644 >> --- a/drivers/acpi/acpi_platform.c >> +++ b/drivers/acpi/acpi_platform.c >> @@ -12,6 +12,7 @@ >> */ >> >> #include >> +#include >> #include >> #include >> #include >> @@ -48,6 +49,15 @@ static void acpi_platform_fill_resource(struct acpi_device *adev, >> } >> >> /** >> + * acpi_platform_pre_add_cb - callback before platform device is added, to >> + * prepare firmware related information which is needed for device probe >> + */ >> +static void acpi_platform_pre_add_cb(struct device *dev) >> +{ >> + acpi_configure_pmsi_domain(dev); >> +} >> + >> +/** >> * acpi_create_platform_device - Create platform device for ACPI device node >> * @adev: ACPI device node to create a platform device for. >> * @properties: Optional collection of build-in properties. >> @@ -109,6 +119,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev, >> pdevinfo.num_res = count; >> pdevinfo.fwnode = acpi_fwnode_handle(adev); >> pdevinfo.properties = properties; >> + pdevinfo.pre_add_cb = acpi_platform_pre_add_cb; > Why don't you point that directly to acpi_configure_pmsi_domain()? It > doesn't look like the wrapper is necessary at all. I was thinking that we can add something more in the future if we need to extend the function of the callback, I can just use acpi_configure_pmsi_domain() here. > > And I'm not sure why the new callback is necessary -> I was demoing your suggestion but... > >> if (acpi_dma_supported(adev)) >> pdevinfo.dma_mask = DMA_BIT_MASK(32); >> diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c >> index bc68d93..6b72fcb 100644 >> --- a/drivers/acpi/arm64/iort.c >> +++ b/drivers/acpi/arm64/iort.c >> @@ -527,6 +527,49 @@ struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id) >> return irq_find_matching_fwnode(handle, DOMAIN_BUS_PCI_MSI); >> } >> >> +/** >> + * iort_get_platform_device_domain() - Find MSI domain related to a >> + * platform device >> + * @dev: the dev pointer associated with the platform device >> + * >> + * Returns: the MSI domain for this device, NULL otherwise >> + */ >> +static struct irq_domain *iort_get_platform_device_domain(struct device *dev) >> +{ >> + struct acpi_iort_node *node, *msi_parent; >> + struct fwnode_handle *iort_fwnode; >> + struct acpi_iort_its_group *its; >> + >> + /* find its associated iort node */ >> + node = iort_scan_node(ACPI_IORT_NODE_NAMED_COMPONENT, >> + iort_match_node_callback, dev); >> + if (!node) >> + return NULL; >> + >> + /* then find its msi parent node */ >> + msi_parent = iort_node_get_id(node, NULL, IORT_MSI_TYPE, 0); >> + if (!msi_parent) >> + return NULL; >> + >> + /* Move to ITS specific data */ >> + its = (struct acpi_iort_its_group *)msi_parent->node_data; >> + >> + iort_fwnode = iort_find_domain_token(its->identifiers[0]); >> + if (!iort_fwnode) >> + return NULL; >> + >> + return irq_find_matching_fwnode(iort_fwnode, DOMAIN_BUS_PLATFORM_MSI); >> +} >> + >> +void acpi_configure_pmsi_domain(struct device *dev) >> +{ >> + struct irq_domain *msi_domain; >> + >> + msi_domain = iort_get_platform_device_domain(dev); >> + if (msi_domain) >> + dev_set_msi_domain(dev, msi_domain); >> +} >> + >> static int __get_pci_rid(struct pci_dev *pdev, u16 alias, void *data) >> { >> u32 *rid = data; >> diff --git a/drivers/base/platform.c b/drivers/base/platform.c >> index c4af003..3e68f31 100644 >> --- a/drivers/base/platform.c >> +++ b/drivers/base/platform.c >> @@ -537,6 +537,9 @@ struct platform_device *platform_device_register_full( >> goto err; >> } >> >> + if (pdevinfo->pre_add_cb) >> + pdevinfo->pre_add_cb(&pdev->dev); >> + > -> because it looks like this might be done in acpi_platform_notify() > for platform devices. It works and I just simply add the code below: diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index f8d6564..e0cd649 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include "internal.h" @@ -315,6 +316,8 @@ static int acpi_platform_notify(struct device *dev) if (!adev) goto out; + acpi_configure_pmsi_domain(dev); + if (type && type->setup) type->setup(dev); else if (adev->handler && adev->handler->bind) Do you suggesting to configure the msi domain in this way? or add the function in the type->setup() callback (which needs to introduce a new acpi bus type)? Thanks Hanjun