* [PATCH 0/2] iommu/ipmmu-vmsa: refactoring and allow SDHI devices
@ 2021-01-28 13:02 Yoshihiro Shimoda
2021-01-28 13:02 ` [PATCH 1/2] iommu/ipmmu-vmsa: refactor ipmmu_of_xlate() Yoshihiro Shimoda
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Yoshihiro Shimoda @ 2021-01-28 13:02 UTC (permalink / raw)
To: joro; +Cc: linux-renesas-soc, iommu
I intend to add new SoC support in near the future, but before that,
I would like to refactor the ipmmu_of_xlate() to improve
readability/scalability. Also, adds SDHI devices into the allow list.
Yoshihiro Shimoda (2):
iommu/ipmmu-vmsa: refactor ipmmu_of_xlate()
iommu/ipmmu-vmsa: Allow SDHI devices
drivers/iommu/ipmmu-vmsa.c | 53 +++++++++++++++++++---------------------------
1 file changed, 22 insertions(+), 31 deletions(-)
--
2.7.4
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] iommu/ipmmu-vmsa: refactor ipmmu_of_xlate()
2021-01-28 13:02 [PATCH 0/2] iommu/ipmmu-vmsa: refactoring and allow SDHI devices Yoshihiro Shimoda
@ 2021-01-28 13:02 ` Yoshihiro Shimoda
2021-01-28 13:03 ` [PATCH 2/2] iommu/ipmmu-vmsa: Allow SDHI devices Yoshihiro Shimoda
2021-01-29 8:27 ` [PATCH 0/2] iommu/ipmmu-vmsa: refactoring and allow " Joerg Roedel
2 siblings, 0 replies; 4+ messages in thread
From: Yoshihiro Shimoda @ 2021-01-28 13:02 UTC (permalink / raw)
To: joro; +Cc: linux-renesas-soc, iommu
Refactor ipmmu_of_xlate() to improve readability/scalability.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
drivers/iommu/ipmmu-vmsa.c | 49 +++++++++++++++++-----------------------------
1 file changed, 18 insertions(+), 31 deletions(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index 0f18abd..0bdf354 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -735,54 +735,41 @@ static int ipmmu_init_platform_device(struct device *dev,
return 0;
}
-static const struct soc_device_attribute soc_rcar_gen3[] = {
- { .soc_id = "r8a774a1", },
- { .soc_id = "r8a774b1", },
- { .soc_id = "r8a774c0", },
- { .soc_id = "r8a774e1", },
- { .soc_id = "r8a7795", },
- { .soc_id = "r8a77961", },
- { .soc_id = "r8a7796", },
- { .soc_id = "r8a77965", },
- { .soc_id = "r8a77970", },
- { .soc_id = "r8a77990", },
- { .soc_id = "r8a77995", },
+static const struct soc_device_attribute soc_needs_opt_in[] = {
+ { .family = "R-Car Gen3", },
+ { .family = "RZ/G2", },
{ /* sentinel */ }
};
-static const struct soc_device_attribute soc_rcar_gen3_whitelist[] = {
- { .soc_id = "r8a774b1", },
- { .soc_id = "r8a774c0", },
- { .soc_id = "r8a774e1", },
- { .soc_id = "r8a7795", .revision = "ES3.*" },
- { .soc_id = "r8a77961", },
- { .soc_id = "r8a77965", },
- { .soc_id = "r8a77990", },
- { .soc_id = "r8a77995", },
+static const struct soc_device_attribute soc_denylist[] = {
+ { .soc_id = "r8a774a1", },
+ { .soc_id = "r8a7795", .revision = "ES1.*" },
+ { .soc_id = "r8a7795", .revision = "ES2.*" },
+ { .soc_id = "r8a7796", },
{ /* sentinel */ }
};
-static const char * const rcar_gen3_slave_whitelist[] = {
+static const char * const devices_allowlist[] = {
};
-static bool ipmmu_slave_whitelist(struct device *dev)
+static bool ipmmu_device_is_allowed(struct device *dev)
{
unsigned int i;
/*
- * For R-Car Gen3 use a white list to opt-in slave devices.
+ * R-Car Gen3 and RZ/G2 use the allow list to opt-in devices.
* For Other SoCs, this returns true anyway.
*/
- if (!soc_device_match(soc_rcar_gen3))
+ if (!soc_device_match(soc_needs_opt_in))
return true;
- /* Check whether this R-Car Gen3 can use the IPMMU correctly or not */
- if (!soc_device_match(soc_rcar_gen3_whitelist))
+ /* Check whether this SoC can use the IPMMU correctly or not */
+ if (soc_device_match(soc_denylist))
return false;
- /* Check whether this slave device can work with the IPMMU */
- for (i = 0; i < ARRAY_SIZE(rcar_gen3_slave_whitelist); i++) {
- if (!strcmp(dev_name(dev), rcar_gen3_slave_whitelist[i]))
+ /* Check whether this device can work with the IPMMU */
+ for (i = 0; i < ARRAY_SIZE(devices_allowlist); i++) {
+ if (!strcmp(dev_name(dev), devices_allowlist[i]))
return true;
}
@@ -793,7 +780,7 @@ static bool ipmmu_slave_whitelist(struct device *dev)
static int ipmmu_of_xlate(struct device *dev,
struct of_phandle_args *spec)
{
- if (!ipmmu_slave_whitelist(dev))
+ if (!ipmmu_device_is_allowed(dev))
return -ENODEV;
iommu_fwspec_add_ids(dev, spec->args, 1);
--
2.7.4
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] iommu/ipmmu-vmsa: Allow SDHI devices
2021-01-28 13:02 [PATCH 0/2] iommu/ipmmu-vmsa: refactoring and allow SDHI devices Yoshihiro Shimoda
2021-01-28 13:02 ` [PATCH 1/2] iommu/ipmmu-vmsa: refactor ipmmu_of_xlate() Yoshihiro Shimoda
@ 2021-01-28 13:03 ` Yoshihiro Shimoda
2021-01-29 8:27 ` [PATCH 0/2] iommu/ipmmu-vmsa: refactoring and allow " Joerg Roedel
2 siblings, 0 replies; 4+ messages in thread
From: Yoshihiro Shimoda @ 2021-01-28 13:03 UTC (permalink / raw)
To: joro; +Cc: linux-renesas-soc, iommu
Add SDHI devices into devices_allowlist.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
drivers/iommu/ipmmu-vmsa.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index 0bdf354..5715fbe 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -750,6 +750,10 @@ static const struct soc_device_attribute soc_denylist[] = {
};
static const char * const devices_allowlist[] = {
+ "ee100000.mmc",
+ "ee120000.mmc",
+ "ee140000.mmc",
+ "ee160000.mmc"
};
static bool ipmmu_device_is_allowed(struct device *dev)
--
2.7.4
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] iommu/ipmmu-vmsa: refactoring and allow SDHI devices
2021-01-28 13:02 [PATCH 0/2] iommu/ipmmu-vmsa: refactoring and allow SDHI devices Yoshihiro Shimoda
2021-01-28 13:02 ` [PATCH 1/2] iommu/ipmmu-vmsa: refactor ipmmu_of_xlate() Yoshihiro Shimoda
2021-01-28 13:03 ` [PATCH 2/2] iommu/ipmmu-vmsa: Allow SDHI devices Yoshihiro Shimoda
@ 2021-01-29 8:27 ` Joerg Roedel
2 siblings, 0 replies; 4+ messages in thread
From: Joerg Roedel @ 2021-01-29 8:27 UTC (permalink / raw)
To: Yoshihiro Shimoda; +Cc: linux-renesas-soc, iommu
On Thu, Jan 28, 2021 at 10:02:58PM +0900, Yoshihiro Shimoda wrote:
> Yoshihiro Shimoda (2):
> iommu/ipmmu-vmsa: refactor ipmmu_of_xlate()
> iommu/ipmmu-vmsa: Allow SDHI devices
>
> drivers/iommu/ipmmu-vmsa.c | 53 +++++++++++++++++++---------------------------
> 1 file changed, 22 insertions(+), 31 deletions(-)
Applied, thanks.
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-29 8:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-28 13:02 [PATCH 0/2] iommu/ipmmu-vmsa: refactoring and allow SDHI devices Yoshihiro Shimoda
2021-01-28 13:02 ` [PATCH 1/2] iommu/ipmmu-vmsa: refactor ipmmu_of_xlate() Yoshihiro Shimoda
2021-01-28 13:03 ` [PATCH 2/2] iommu/ipmmu-vmsa: Allow SDHI devices Yoshihiro Shimoda
2021-01-29 8:27 ` [PATCH 0/2] iommu/ipmmu-vmsa: refactoring and allow " Joerg Roedel
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).