| From 834eb971ccfc690bbb2c27ed298e23c4f2df72d4 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm+renesas@opensource.se> |
| Date: Mon, 16 Oct 2017 21:30:50 +0900 |
| Subject: [PATCH 0107/1795] iommu/ipmmu-vmsa: Hook up r8a7795 DT matching code |
| |
| Tie in r8a7795 features and update the IOMMU_OF_DECLARE |
| compat string to include the updated compat string. |
| |
| Signed-off-by: Magnus Damm <damm+renesas@opensource.se> |
| Signed-off-by: Alex Williamson <alex.williamson@redhat.com> |
| (cherry picked from commit 58b8e8bf409236cdea379b8a3ab5d7b85a003d22) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/iommu/ipmmu-vmsa.c | 29 +++++++++++++++++++++++++++++ |
| 1 file changed, 29 insertions(+) |
| |
| diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c |
| index 65ad6910cb70..8dce3a9de9d8 100644 |
| --- a/drivers/iommu/ipmmu-vmsa.c |
| +++ b/drivers/iommu/ipmmu-vmsa.c |
| @@ -25,6 +25,7 @@ |
| #include <linux/platform_device.h> |
| #include <linux/sizes.h> |
| #include <linux/slab.h> |
| +#include <linux/sys_soc.h> |
| |
| #if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA) |
| #include <asm/dma-iommu.h> |
| @@ -749,9 +750,24 @@ static int ipmmu_init_platform_device(struct device *dev, |
| return 0; |
| } |
| |
| +static bool ipmmu_slave_whitelist(struct device *dev) |
| +{ |
| + /* By default, do not allow use of IPMMU */ |
| + return false; |
| +} |
| + |
| +static const struct soc_device_attribute soc_r8a7795[] = { |
| + { .soc_id = "r8a7795", }, |
| + { /* sentinel */ } |
| +}; |
| + |
| static int ipmmu_of_xlate(struct device *dev, |
| struct of_phandle_args *spec) |
| { |
| + /* For R-Car Gen3 use a white list to opt-in slave devices */ |
| + if (soc_device_match(soc_r8a7795) && !ipmmu_slave_whitelist(dev)) |
| + return -ENODEV; |
| + |
| iommu_fwspec_add_ids(dev, spec->args, 1); |
| |
| /* Initialize once - xlate() will call multiple times */ |
| @@ -903,10 +919,21 @@ static const struct ipmmu_features ipmmu_features_default = { |
| .twobit_imttbcr_sl0 = false, |
| }; |
| |
| +static const struct ipmmu_features ipmmu_features_r8a7795 = { |
| + .use_ns_alias_offset = false, |
| + .has_cache_leaf_nodes = true, |
| + .number_of_contexts = 8, |
| + .setup_imbuscr = false, |
| + .twobit_imttbcr_sl0 = true, |
| +}; |
| + |
| static const struct of_device_id ipmmu_of_ids[] = { |
| { |
| .compatible = "renesas,ipmmu-vmsa", |
| .data = &ipmmu_features_default, |
| + }, { |
| + .compatible = "renesas,ipmmu-r8a7795", |
| + .data = &ipmmu_features_r8a7795, |
| }, { |
| /* Terminator */ |
| }, |
| @@ -1090,6 +1117,8 @@ static int __init ipmmu_vmsa_iommu_of_setup(struct device_node *np) |
| |
| IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa", |
| ipmmu_vmsa_iommu_of_setup); |
| +IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795", |
| + ipmmu_vmsa_iommu_of_setup); |
| #endif |
| |
| MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU"); |
| -- |
| 2.19.0 |
| |