UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iommu/ipmmu-vmsa: Hook up r8a7796 DT matching code 

Support the r8a7796 IPMMU by sharing feature flags between
r8a7795 and r8a7796. Also update IOMMU_OF_DECLARE to hook
up the updated compat string.

[rebased on v4.17]
Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Magnus Damm 2018-06-14 12:48:22 +02:00 committed by Joerg Roedel
parent ddbbddd76a
commit 0b8ac14096
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/iommu/ipmmu-vmsa.c
View File

@ -760,8 +760,9 @@ static bool ipmmu_slave_whitelist(struct device *dev)
return false; return false;
} }
static const struct soc_device_attribute soc_r8a7795[] = { static const struct soc_device_attribute soc_rcar_gen3[] = {
{ .soc_id = "r8a7795", }, { .soc_id = "r8a7795", },
{ .soc_id = "r8a7796", },
{ /* sentinel */ } { /* sentinel */ }
}; };
@ -769,7 +770,7 @@ static int ipmmu_of_xlate(struct device *dev,
struct of_phandle_args *spec) struct of_phandle_args *spec)
{ {
/* For R-Car Gen3 use a white list to opt-in slave devices */ /* For R-Car Gen3 use a white list to opt-in slave devices */
if (soc_device_match(soc_r8a7795) && !ipmmu_slave_whitelist(dev)) if (soc_device_match(soc_rcar_gen3) && !ipmmu_slave_whitelist(dev))
return -ENODEV; return -ENODEV;
iommu_fwspec_add_ids(dev, spec->args, 1); iommu_fwspec_add_ids(dev, spec->args, 1);
@ -923,7 +924,7 @@ static const struct ipmmu_features ipmmu_features_default = {
.twobit_imttbcr_sl0 = false, .twobit_imttbcr_sl0 = false,
}; };
static const struct ipmmu_features ipmmu_features_r8a7795 = { static const struct ipmmu_features ipmmu_features_rcar_gen3 = {
.use_ns_alias_offset = false, .use_ns_alias_offset = false,
.has_cache_leaf_nodes = true, .has_cache_leaf_nodes = true,
.number_of_contexts = 8, .number_of_contexts = 8,
@ -937,7 +938,10 @@ static const struct of_device_id ipmmu_of_ids[] = {
.data = &ipmmu_features_default, .data = &ipmmu_features_default,
}, { }, {
.compatible = "renesas,ipmmu-r8a7795", .compatible = "renesas,ipmmu-r8a7795",
.data = &ipmmu_features_r8a7795, .data = &ipmmu_features_rcar_gen3,
}, {
.compatible = "renesas,ipmmu-r8a7796",
.data = &ipmmu_features_rcar_gen3,
}, { }, {
/* Terminator */ /* Terminator */
}, },
@ -1114,6 +1118,7 @@ module_exit(ipmmu_exit);
IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa"); IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa");
IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795"); IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795");
IOMMU_OF_DECLARE(ipmmu_r8a7796_iommu_of, "renesas,ipmmu-r8a7796");
MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU"); MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU");
MODULE_AUTHOR("Laurent Pinchart <laurent.pinchart@ideasonboard.com>"); MODULE_AUTHOR("Laurent Pinchart <laurent.pinchart@ideasonboard.com>");