From: Rob Herring <robh+dt@kernel.org>
To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE"
<linux-arm-kernel@lists.infradead.org>,
Joerg Roedel <joro@8bytes.org>,
Robin Murphy <robin.murphy@arm.com>,
Marc Zyngier <maz@kernel.org>,
Linux IOMMU <iommu@lists.linux-foundation.org>,
linux-acpi@vger.kernel.org, devicetree@vger.kernel.org,
PCI <linux-pci@vger.kernel.org>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Hanjun Guo <guohanjun@huawei.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Sudeep Holla <sudeep.holla@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Makarand Pawagi <makarand.pawagi@nxp.com>,
Diana Craciun <diana.craciun@oss.nxp.com>,
Laurentiu Tudor <laurentiu.tudor@nxp.com>
Subject: Re: [PATCH 06/12] of/iommu: Make of_map_rid() PCI agnostic
Date: Thu, 21 May 2020 16:47:19 -0600 [thread overview]
Message-ID: <CAL_JsqK5aiEMAZpqgTmrOq=HPRSFEoQWJrpR2YA0hziEtLMwrg@mail.gmail.com> (raw)
In-Reply-To: <20200521130008.8266-7-lorenzo.pieralisi@arm.com>
On Thu, May 21, 2020 at 7:00 AM Lorenzo Pieralisi
<lorenzo.pieralisi@arm.com> wrote:
>
> There is nothing PCI specific (other than the RID - requester ID)
> in the of_map_rid() implementation, so the same function can be
> reused for input/output IDs mapping for other busses just as well.
>
> Rename the RID instances/names to a generic "id" tag and provide
> an of_map_rid() wrapper function so that we can leave the existing
> (and legitimate) callers unchanged.
It's not all that clear to a casual observer that RID is a PCI thing,
so I don't know that keeping it buys much. And there's only 3 callers.
> No functionality change intended.
>
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: Joerg Roedel <joro@8bytes.org>
> Cc: Robin Murphy <robin.murphy@arm.com>
> Cc: Marc Zyngier <maz@kernel.org>
> ---
> drivers/iommu/of_iommu.c | 2 +-
> drivers/of/base.c | 42 ++++++++++++++++++++--------------------
> include/linux/of.h | 17 +++++++++++++++-
> 3 files changed, 38 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
> index 20738aacac89..ad96b87137d6 100644
> --- a/drivers/iommu/of_iommu.c
> +++ b/drivers/iommu/of_iommu.c
> @@ -145,7 +145,7 @@ static int of_fsl_mc_iommu_init(struct fsl_mc_device *mc_dev,
> struct of_phandle_args iommu_spec = { .args_count = 1 };
> int err;
>
> - err = of_map_rid(master_np, mc_dev->icid, "iommu-map",
> + err = of_map_id(master_np, mc_dev->icid, "iommu-map",
I'm not sure this is an improvement because I'd refactor this function
and of_pci_iommu_init() into a single function:
of_bus_iommu_init(struct device *dev, struct device_node *np, u32 id)
Then of_pci_iommu_init() becomes:
of_pci_iommu_init()
{
return of_bus_iommu_init(info->dev, info->np, alias);
}
And replace of_fsl_mc_iommu_init call with:
err = of_bus_iommu_init(dev, master_np, to_fsl_mc_device(dev)->icid);
> "iommu-map-mask", &iommu_spec.np,
> iommu_spec.args);
> if (err)
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index ae03b1218b06..e000e17bd602 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -2201,15 +2201,15 @@ int of_find_last_cache_level(unsigned int cpu)
> }
>
> /**
> - * of_map_rid - Translate a requester ID through a downstream mapping.
> + * of_map_id - Translate a requester ID through a downstream mapping.
Still a requester ID?
> * @np: root complex device node.
> - * @rid: device requester ID to map.
> + * @id: device ID to map.
> * @map_name: property name of the map to use.
> * @map_mask_name: optional property name of the mask to use.
> * @target: optional pointer to a target device node.
> * @id_out: optional pointer to receive the translated ID.
> *
> - * Given a device requester ID, look up the appropriate implementation-defined
> + * Given a device ID, look up the appropriate implementation-defined
> * platform ID and/or the target device which receives transactions on that
> * ID, as per the "iommu-map" and "msi-map" bindings. Either of @target or
> * @id_out may be NULL if only the other is required. If @target points to
> @@ -2219,11 +2219,11 @@ int of_find_last_cache_level(unsigned int cpu)
> *
> * Return: 0 on success or a standard error code on failure.
> */
> -int of_map_rid(struct device_node *np, u32 rid,
> +int of_map_id(struct device_node *np, u32 id,
> const char *map_name, const char *map_mask_name,
> struct device_node **target, u32 *id_out)
> {
> - u32 map_mask, masked_rid;
> + u32 map_mask, masked_id;
> int map_len;
> const __be32 *map = NULL;
>
> @@ -2235,7 +2235,7 @@ int of_map_rid(struct device_node *np, u32 rid,
> if (target)
> return -ENODEV;
> /* Otherwise, no map implies no translation */
> - *id_out = rid;
> + *id_out = id;
> return 0;
> }
>
> @@ -2255,22 +2255,22 @@ int of_map_rid(struct device_node *np, u32 rid,
> if (map_mask_name)
> of_property_read_u32(np, map_mask_name, &map_mask);
>
> - masked_rid = map_mask & rid;
> + masked_id = map_mask & id;
> for ( ; map_len > 0; map_len -= 4 * sizeof(*map), map += 4) {
> struct device_node *phandle_node;
> - u32 rid_base = be32_to_cpup(map + 0);
> + u32 id_base = be32_to_cpup(map + 0);
> u32 phandle = be32_to_cpup(map + 1);
> u32 out_base = be32_to_cpup(map + 2);
> - u32 rid_len = be32_to_cpup(map + 3);
> + u32 id_len = be32_to_cpup(map + 3);
>
> - if (rid_base & ~map_mask) {
> - pr_err("%pOF: Invalid %s translation - %s-mask (0x%x) ignores rid-base (0x%x)\n",
> + if (id_base & ~map_mask) {
> + pr_err("%pOF: Invalid %s translation - %s-mask (0x%x) ignores id-base (0x%x)\n",
> np, map_name, map_name,
> - map_mask, rid_base);
> + map_mask, id_base);
> return -EFAULT;
> }
>
> - if (masked_rid < rid_base || masked_rid >= rid_base + rid_len)
> + if (masked_id < id_base || masked_id >= id_base + id_len)
> continue;
>
> phandle_node = of_find_node_by_phandle(phandle);
> @@ -2288,20 +2288,20 @@ int of_map_rid(struct device_node *np, u32 rid,
> }
>
> if (id_out)
> - *id_out = masked_rid - rid_base + out_base;
> + *id_out = masked_id - id_base + out_base;
>
> - pr_debug("%pOF: %s, using mask %08x, rid-base: %08x, out-base: %08x, length: %08x, rid: %08x -> %08x\n",
> - np, map_name, map_mask, rid_base, out_base,
> - rid_len, rid, masked_rid - rid_base + out_base);
> + pr_debug("%pOF: %s, using mask %08x, id-base: %08x, out-base: %08x, length: %08x, id: %08x -> %08x\n",
> + np, map_name, map_mask, id_base, out_base,
> + id_len, id, masked_id - id_base + out_base);
> return 0;
> }
>
> - pr_info("%pOF: no %s translation for rid 0x%x on %pOF\n", np, map_name,
> - rid, target && *target ? *target : NULL);
> + pr_info("%pOF: no %s translation for id 0x%x on %pOF\n", np, map_name,
> + id, target && *target ? *target : NULL);
>
> /* Bypasses translation */
> if (id_out)
> - *id_out = rid;
> + *id_out = id;
> return 0;
> }
> -EXPORT_SYMBOL_GPL(of_map_rid);
> +EXPORT_SYMBOL_GPL(of_map_id);
> diff --git a/include/linux/of.h b/include/linux/of.h
> index c669c0a4732f..b7934566a1aa 100644
> --- a/include/linux/of.h
> +++ b/include/linux/of.h
> @@ -554,10 +554,18 @@ bool of_console_check(struct device_node *dn, char *name, int index);
>
> extern int of_cpu_node_to_id(struct device_node *np);
>
> -int of_map_rid(struct device_node *np, u32 rid,
> +int of_map_id(struct device_node *np, u32 id,
> const char *map_name, const char *map_mask_name,
> struct device_node **target, u32 *id_out);
>
> +static inline int of_map_rid(struct device_node *np, u32 rid,
> + const char *map_name,
> + const char *map_mask_name,
> + struct device_node **target, u32 *id_out)
> +{
> + return of_map_id(np, rid, map_name, map_mask_name, target, id_out);
> +}
> +
> #else /* CONFIG_OF */
>
> static inline void of_core_init(void)
> @@ -978,6 +986,13 @@ static inline int of_cpu_node_to_id(struct device_node *np)
> return -ENODEV;
> }
>
> +static inline int of_map_id(struct device_node *np, u32 id,
> + const char *map_name, const char *map_mask_name,
> + struct device_node **target, u32 *id_out)
> +{
> + return -EINVAL;
> +}
> +
> static inline int of_map_rid(struct device_node *np, u32 rid,
> const char *map_name, const char *map_mask_name,
> struct device_node **target, u32 *id_out)
> --
> 2.26.1
>
next prev parent reply other threads:[~2020-05-21 22:47 UTC|newest]
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 [this message]
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
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='CAL_JsqK5aiEMAZpqgTmrOq=HPRSFEoQWJrpR2YA0hziEtLMwrg@mail.gmail.com' \
--to=robh+dt@kernel.org \
--cc=bhelgaas@google.com \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=diana.craciun@oss.nxp.com \
--cc=guohanjun@huawei.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.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=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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).