From: Diana Craciun OSS <diana.craciun@oss.nxp.com> To: Makarand Pawagi <makarand.pawagi@nxp.com>, Laurentiu Tudor <laurentiu.tudor@nxp.com>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, "linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>, Sudeep Holla <sudeep.holla@arm.com>, "Rafael J. Wysocki" <rjw@rjwysocki.net>, "linux-acpi@vger.kernel.org" <linux-acpi@vger.kernel.org>, "iommu@lists.linux-foundation.org" <iommu@lists.linux-foundation.org>, Rob Herring <robh+dt@kernel.org>, Marc Zyngier <maz@kernel.org>, Hanjun Guo <guohanjun@huawei.com>, Bjorn Helgaas <bhelgaas@google.com>, Robin Murphy <robin.murphy@arm.com>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org> Subject: Re: [EXT] Re: [PATCH v2 12/12] bus: fsl-mc: Add ACPI support for fsl-mc Date: Thu, 9 Jul 2020 13:47:07 +0300 Message-ID: <d41589da-c2f9-a750-f57a-25dccf51e69f@oss.nxp.com> (raw) In-Reply-To: <DB7PR04MB4986C63772CB47A2A827D028EB640@DB7PR04MB4986.eurprd04.prod.outlook.com> On 7/9/2020 1:37 PM, Makarand Pawagi wrote: > >> -----Original Message----- >> From: Laurentiu Tudor <laurentiu.tudor@nxp.com> >> Sent: Thursday, July 9, 2020 3:45 PM >> To: Makarand Pawagi <makarand.pawagi@nxp.com>; Lorenzo Pieralisi >> <lorenzo.pieralisi@arm.com> >> Cc: linux-arm-kernel@lists.infradead.org; Diana Madalina Craciun (OSS) >> <diana.craciun@oss.nxp.com>; iommu@lists.linux-foundation.org; linux- >> acpi@vger.kernel.org; devicetree@vger.kernel.org; linux-pci@vger.kernel.org; >> Rob Herring <robh+dt@kernel.org>; Rafael J. Wysocki <rjw@rjwysocki.net>; >> Joerg Roedel <joro@8bytes.org>; Hanjun Guo <guohanjun@huawei.com>; Bjorn >> Helgaas <bhelgaas@google.com>; Sudeep Holla <sudeep.holla@arm.com>; >> Robin Murphy <robin.murphy@arm.com>; Catalin Marinas >> <catalin.marinas@arm.com>; Will Deacon <will@kernel.org>; Marc Zyngier >> <maz@kernel.org> >> Subject: Re: [EXT] Re: [PATCH v2 12/12] bus: fsl-mc: Add ACPI support for fsl-mc >> >> >> >> On 7/9/2020 12:26 PM, Makarand Pawagi wrote: >>> >>>> -----Original Message----- >>>> From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> >>>> Sent: Thursday, July 9, 2020 2:50 PM >>>> To: Laurentiu Tudor <laurentiu.tudor@nxp.com> >>>> Cc: linux-arm-kernel@lists.infradead.org; Makarand Pawagi >>>> <makarand.pawagi@nxp.com>; Diana Madalina Craciun (OSS) >>>> <diana.craciun@oss.nxp.com>; iommu@lists.linux-foundation.org; linux- >>>> acpi@vger.kernel.org; devicetree@vger.kernel.org; >>>> linux-pci@vger.kernel.org; Rob Herring <robh+dt@kernel.org>; Rafael >>>> J. Wysocki <rjw@rjwysocki.net>; Joerg Roedel <joro@8bytes.org>; >>>> Hanjun Guo <guohanjun@huawei.com>; Bjorn Helgaas >>>> <bhelgaas@google.com>; Sudeep Holla <sudeep.holla@arm.com>; Robin >>>> Murphy <robin.murphy@arm.com>; Catalin Marinas >>>> <catalin.marinas@arm.com>; Will Deacon <will@kernel.org>; Marc >>>> Zyngier <maz@kernel.org> >>>> Subject: [EXT] Re: [PATCH v2 12/12] bus: fsl-mc: Add ACPI support for >>>> fsl-mc >>>> >>>> Caution: EXT Email >>>> >>>> On Wed, Jul 01, 2020 at 07:55:28PM +0300, Laurentiu Tudor wrote: >>>>> >>>>> On 6/19/2020 11:20 AM, Lorenzo Pieralisi wrote: >>>>>> From: Makarand Pawagi <makarand.pawagi@nxp.com> >>>>>> >>>>>> Add ACPI support in the fsl-mc driver. Driver parses MC DSDT table >>>>>> to extract memory and other resources. >>>>>> >>>>>> Interrupt (GIC ITS) information is extracted from the MADT table by >>>>>> drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c. >>>>>> >>>>>> IORT table is parsed to configure DMA. >>>>>> >>>>>> Signed-off-by: Makarand Pawagi <makarand.pawagi@nxp.com> >>>>>> Signed-off-by: Diana Craciun <diana.craciun@oss.nxp.com> >>>>>> Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> >>>>>> --- >>>>>> drivers/bus/fsl-mc/fsl-mc-bus.c | 73 ++++++++++++---- >>>>>> drivers/bus/fsl-mc/fsl-mc-msi.c | 37 +++++---- >>>>>> drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c | 92 >>>>>> ++++++++++++++++----- >>>>>> 3 files changed, 150 insertions(+), 52 deletions(-) >>>>>> >>>>>> diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c >>>>>> b/drivers/bus/fsl-mc/fsl-mc-bus.c index 824ff77bbe86..324d49d6df89 >>>>>> 100644 >>>>>> --- a/drivers/bus/fsl-mc/fsl-mc-bus.c >>>>>> +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c >>>>>> @@ -18,6 +18,8 @@ >>>>>> #include <linux/bitops.h> >>>>>> #include <linux/msi.h> >>>>>> #include <linux/dma-mapping.h> >>>>>> +#include <linux/acpi.h> >>>>>> +#include <linux/iommu.h> >>>>>> >>>>>> #include "fsl-mc-private.h" >>>>>> >>>>>> @@ -38,6 +40,7 @@ struct fsl_mc { >>>>>> struct fsl_mc_device *root_mc_bus_dev; >>>>>> u8 num_translation_ranges; >>>>>> struct fsl_mc_addr_translation_range *translation_ranges; >>>>>> + void *fsl_mc_regs; >>>>>> }; >>>>>> >>>>>> /** >>>>>> @@ -56,6 +59,10 @@ struct fsl_mc_addr_translation_range { >>>>>> phys_addr_t start_phys_addr; >>>>>> }; >>>>>> >>>>>> +#define FSL_MC_FAPR 0x28 >>>>>> +#define MC_FAPR_PL BIT(18) >>>>>> +#define MC_FAPR_BMT BIT(17) >>>>>> + >>>>>> /** >>>>>> * fsl_mc_bus_match - device to driver matching callback >>>>>> * @dev: the fsl-mc device to match against @@ -124,7 +131,10 @@ >>>>>> static int fsl_mc_dma_configure(struct device *dev) >>>>>> while (dev_is_fsl_mc(dma_dev)) >>>>>> dma_dev = dma_dev->parent; >>>>>> >>>>>> - return of_dma_configure_id(dev, dma_dev->of_node, 0, &input_id); >>>>>> + if (dev_of_node(dma_dev)) >>>>>> + return of_dma_configure_id(dev, dma_dev->of_node, 0, >>>>>> + &input_id); >>>>>> + >>>>>> + return acpi_dma_configure_id(dev, DEV_DMA_COHERENT, &input_id); >>>>>> } >>>>>> >>>>>> static ssize_t modalias_show(struct device *dev, struct >>>>>> device_attribute *attr, @@ -865,8 +875,11 @@ static int >>>> fsl_mc_bus_probe(struct platform_device *pdev) >>>>>> struct fsl_mc_io *mc_io = NULL; >>>>>> int container_id; >>>>>> phys_addr_t mc_portal_phys_addr; >>>>>> - u32 mc_portal_size; >>>>>> - struct resource res; >>>>>> + u32 mc_portal_size, mc_stream_id; >>>>>> + struct resource *plat_res; >>>>>> + >>>>>> + if (!iommu_present(&fsl_mc_bus_type)) >>>>>> + return -EPROBE_DEFER; >>>>>> >>>>>> mc = devm_kzalloc(&pdev->dev, sizeof(*mc), GFP_KERNEL); >>>>>> if (!mc) >>>>>> @@ -874,19 +887,33 @@ static int fsl_mc_bus_probe(struct >>>>>> platform_device *pdev) >>>>>> >>>>>> platform_set_drvdata(pdev, mc); >>>>>> >>>>>> + plat_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); >>>>>> + mc->fsl_mc_regs = devm_ioremap_resource(&pdev->dev, plat_res); >>>>>> + if (IS_ERR(mc->fsl_mc_regs)) >>>>>> + return PTR_ERR(mc->fsl_mc_regs); >>>>>> + >>>>>> + if (IS_ENABLED(CONFIG_ACPI) && !dev_of_node(&pdev->dev)) { >>>>>> + mc_stream_id = readl(mc->fsl_mc_regs + FSL_MC_FAPR); >>>>>> + /* >>>>>> + * HW ORs the PL and BMT bit, places the result in bit 15 of >>>>>> + * the StreamID and ORs in the ICID. Calculate it accordingly. >>>>>> + */ >>>>>> + mc_stream_id = (mc_stream_id & 0xffff) | >>>>>> + ((mc_stream_id & (MC_FAPR_PL | MC_FAPR_BMT)) ? >>>>>> + 0x4000 : 0); >>>>>> + error = acpi_dma_configure_id(&pdev->dev, DEV_DMA_COHERENT, >>>>>> + &mc_stream_id); >>>>>> + if (error) >>>>>> + dev_warn(&pdev->dev, "failed to configure dma: %d.\n", >>>>>> + error); >>>>>> + } >>>>>> + >>>>>> /* >>>>>> * Get physical address of MC portal for the root DPRC: >>>>>> */ >>>>>> - error = of_address_to_resource(pdev->dev.of_node, 0, &res); >>>>>> - if (error < 0) { >>>>>> - dev_err(&pdev->dev, >>>>>> - "of_address_to_resource() failed for %pOF\n", >>>>>> - pdev->dev.of_node); >>>>>> - return error; >>>>>> - } >>>>>> - >>>>>> - mc_portal_phys_addr = res.start; >>>>>> - mc_portal_size = resource_size(&res); >>>>>> + plat_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >>>>>> + mc_portal_phys_addr = plat_res->start; >>>>>> + mc_portal_size = resource_size(plat_res); >>>>>> error = fsl_create_mc_io(&pdev->dev, mc_portal_phys_addr, >>>>>> mc_portal_size, NULL, >>>>>> FSL_MC_IO_ATOMIC_CONTEXT_PORTAL, >>>>>> &mc_io); @@ -903,11 +930,13 @@ static int fsl_mc_bus_probe(struct >>>> platform_device *pdev) >>>>>> dev_info(&pdev->dev, "MC firmware version: %u.%u.%u\n", >>>>>> mc_version.major, mc_version.minor, >>>>>> mc_version.revision); >>>>>> >>>>>> - error = get_mc_addr_translation_ranges(&pdev->dev, >>>>>> - &mc->translation_ranges, >>>>>> - &mc->num_translation_ranges); >>>>>> - if (error < 0) >>>>>> - goto error_cleanup_mc_io; >>>>>> + if (dev_of_node(&pdev->dev)) { >>>>>> + error = get_mc_addr_translation_ranges(&pdev->dev, >>>>>> + &mc->translation_ranges, >>>>>> + &mc->num_translation_ranges); >>>>>> + if (error < 0) >>>>>> + goto error_cleanup_mc_io; >>>>>> + } >>>>>> >>>>>> error = dprc_get_container_id(mc_io, 0, &container_id); >>>>>> if (error < 0) { >>>>>> @@ -934,6 +963,7 @@ static int fsl_mc_bus_probe(struct >>>>>> platform_device >>>> *pdev) >>>>>> goto error_cleanup_mc_io; >>>>>> >>>>>> mc->root_mc_bus_dev = mc_bus_dev; >>>>>> + mc_bus_dev->dev.fwnode = pdev->dev.fwnode; >>>>> Makarand, this looks a bit weird. Is there really a reason for it? >>>> Can you clarify please so that we can reach a conclusion on this matter ? >>>> >>> Laurentiu, can you clarify what exactly is the doubt here? Are you asking about >> fwnode assignment from pdev to mc_bus_dev? >> Yes. I remember that a while ago I tested without this fwnode assignment and >> didn't encounter any issues. Maybe we can just drop it? > Did you tested with PHY changes? Because this is needed for MAC driver, where it needs the mc bus node. Maybe it worth a comment or maybe have it in a different patch? Thanks, Diana > >> --- >> Best Regards, Laurentiu _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply index Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-21 12:59 [PATCH 00/12] ACPI/OF: Upgrade MSI/IOMMU ID mapping APIs Lorenzo Pieralisi 2020-05-21 12:59 ` [PATCH 01/12] ACPI/IORT: Make iort_match_node_callback walk the ACPI namespace for NC Lorenzo Pieralisi 2020-05-21 12:59 ` [PATCH 02/12] ACPI/IORT: Make iort_get_device_domain IRQ domain agnostic Lorenzo Pieralisi 2020-05-21 19:56 ` Bjorn Helgaas 2020-05-21 12:59 ` [PATCH 03/12] ACPI/IORT: Make iort_msi_map_rid() PCI agnostic Lorenzo Pieralisi 2020-05-21 13:00 ` [PATCH 04/12] ACPI/IORT: Remove useless PCI bus walk Lorenzo Pieralisi 2020-05-21 13:00 ` [PATCH 05/12] ACPI/IORT: Add an input ID to acpi_dma_configure() Lorenzo Pieralisi 2020-05-21 13:00 ` [PATCH 06/12] of/iommu: Make of_map_rid() PCI agnostic Lorenzo Pieralisi 2020-05-21 22:47 ` Rob Herring 2020-06-04 14:27 ` Lorenzo Pieralisi 2020-05-21 13:00 ` [PATCH 07/12] of/device: Add input id to of_dma_configure() Lorenzo Pieralisi 2020-05-21 23:02 ` Rob Herring 2020-06-04 14:49 ` Lorenzo Pieralisi 2020-05-21 13:00 ` [PATCH 08/12] of/irq: make of_msi_map_get_device_domain() bus agnostic Lorenzo Pieralisi 2020-05-21 19:57 ` Bjorn Helgaas 2020-05-21 13:00 ` [PATCH 09/12] dt-bindings: arm: fsl: Add msi-map device-tree binding for fsl-mc bus Lorenzo Pieralisi 2020-05-21 23:10 ` Rob Herring 2020-05-22 9:42 ` Robin Murphy 2020-05-22 9:57 ` Diana Craciun OSS 2020-05-22 14:08 ` Rob Herring 2020-05-22 14:34 ` Robin Murphy 2020-05-22 14:02 ` Rob Herring 2020-05-22 15:38 ` Laurentiu Tudor 2020-05-21 13:00 ` [PATCH 10/12] of/irq: Make of_msi_map_rid() PCI bus agnostic Lorenzo Pieralisi 2020-05-21 23:17 ` Rob Herring 2020-06-04 15:08 ` Lorenzo Pieralisi 2020-05-21 13:00 ` [PATCH 11/12] bus/fsl-mc: Refactor the MSI domain creation in the DPRC driver Lorenzo Pieralisi 2020-05-21 13:00 ` [PATCH 12/12] bus: fsl-mc: Add ACPI support for fsl-mc Lorenzo Pieralisi 2020-05-21 15:03 ` Laurentiu Tudor 2020-05-22 5:32 ` Makarand Pawagi 2020-05-22 9:53 ` Lorenzo Pieralisi 2020-06-19 8:20 ` [PATCH v2 00/12] ACPI/OF: Upgrade MSI/IOMMU ID mapping APIs Lorenzo Pieralisi 2020-06-19 8:20 ` [PATCH v2 01/12] ACPI/IORT: Make iort_match_node_callback walk the ACPI namespace for NC Lorenzo Pieralisi 2020-06-29 4:24 ` Hanjun Guo 2020-06-29 9:05 ` Lorenzo Pieralisi 2020-06-30 3:06 ` Hanjun Guo 2020-06-30 10:24 ` Lorenzo Pieralisi 2020-06-30 13:04 ` Hanjun Guo 2020-07-01 16:12 ` Robin Murphy 2020-07-02 8:22 ` Hanjun Guo 2020-07-09 9:21 ` Lorenzo Pieralisi 2020-07-09 12:48 ` Hanjun Guo 2020-08-18 0:49 ` Hanjun Guo 2020-06-19 8:20 ` [PATCH v2 02/12] ACPI/IORT: Make iort_get_device_domain IRQ domain agnostic Lorenzo Pieralisi 2020-06-19 8:20 ` [PATCH v2 03/12] ACPI/IORT: Make iort_msi_map_rid() PCI agnostic Lorenzo Pieralisi 2020-07-15 9:15 ` Lorenzo Pieralisi 2020-07-21 14:59 ` Bjorn Helgaas 2020-07-27 6:06 ` [EXT] " Makarand Pawagi 2020-06-19 8:20 ` [PATCH v2 04/12] ACPI/IORT: Remove useless PCI bus walk Lorenzo Pieralisi 2020-06-19 8:20 ` [PATCH v2 05/12] ACPI/IORT: Add an input ID to acpi_dma_configure() Lorenzo Pieralisi 2020-07-09 9:35 ` Lorenzo Pieralisi 2020-07-15 9:13 ` Lorenzo Pieralisi 2020-07-28 12:48 ` Lorenzo Pieralisi 2020-07-28 13:00 ` Rafael J. Wysocki 2020-06-19 8:20 ` [PATCH v2 06/12] of/iommu: Make of_map_rid() PCI agnostic Lorenzo Pieralisi 2020-06-22 13:26 ` Joerg Roedel 2020-07-13 23:57 ` Rob Herring 2020-06-19 8:20 ` [PATCH v2 07/12] of/device: Add input id to of_dma_configure() Lorenzo Pieralisi 2020-06-30 21:50 ` Rob Herring 2020-06-19 8:20 ` [PATCH v2 08/12] dt-bindings: arm: fsl: Add msi-map device-tree binding for fsl-mc bus Lorenzo Pieralisi 2020-06-30 21:55 ` Rob Herring 2020-06-19 8:20 ` [PATCH v2 09/12] of/irq: make of_msi_map_get_device_domain() bus agnostic Lorenzo Pieralisi 2020-06-30 21:50 ` Rob Herring 2020-06-19 8:20 ` [PATCH v2 10/12] of/irq: Make of_msi_map_rid() PCI " Lorenzo Pieralisi 2020-06-30 21:56 ` Rob Herring 2020-06-19 8:20 ` [PATCH v2 11/12] bus/fsl-mc: Refactor the MSI domain creation in the DPRC driver Lorenzo Pieralisi 2020-07-15 13:05 ` Marc Zyngier 2020-06-19 8:20 ` [PATCH v2 12/12] bus: fsl-mc: Add ACPI support for fsl-mc Lorenzo Pieralisi 2020-07-01 16:55 ` Laurentiu Tudor 2020-07-09 9:19 ` Lorenzo Pieralisi 2020-07-09 9:26 ` [EXT] " Makarand Pawagi 2020-07-09 10:14 ` Laurentiu Tudor 2020-07-09 10:37 ` Makarand Pawagi 2020-07-09 10:39 ` Laurentiu Tudor 2020-07-09 10:47 ` Diana Craciun OSS [this message] 2020-07-09 10:52 ` Makarand Pawagi 2020-07-15 10:06 ` Lorenzo Pieralisi 2020-07-16 3:23 ` Makarand Pawagi 2020-07-16 7:57 ` Marc Zyngier 2020-07-20 16:54 ` [PATCH v2 00/12] ACPI/OF: Upgrade MSI/IOMMU ID mapping APIs Lorenzo Pieralisi 2020-07-21 4:28 ` [EXT] " Makarand Pawagi 2020-07-28 17:01 ` Catalin Marinas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=d41589da-c2f9-a750-f57a-25dccf51e69f@oss.nxp.com \ --to=diana.craciun@oss.nxp.com \ --cc=bhelgaas@google.com \ --cc=catalin.marinas@arm.com \ --cc=devicetree@vger.kernel.org \ --cc=guohanjun@huawei.com \ --cc=iommu@lists.linux-foundation.org \ --cc=laurentiu.tudor@nxp.com \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-pci@vger.kernel.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=makarand.pawagi@nxp.com \ --cc=maz@kernel.org \ --cc=rjw@rjwysocki.net \ --cc=robh+dt@kernel.org \ --cc=robin.murphy@arm.com \ --cc=sudeep.holla@arm.com \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
IOMMU Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-iommu/0 linux-iommu/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-iommu linux-iommu/ https://lore.kernel.org/linux-iommu \ iommu@lists.linux-foundation.org public-inbox-index linux-iommu Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.linux-foundation.lists.iommu AGPL code for this site: git clone https://public-inbox.org/public-inbox.git