Skip to content

Commit ae684ca

Browse files
shimodayjoergroedel
authored andcommitted
iommu/ipmmu-vmsa: Add support for R-Car Gen4
Add support for R-Car Gen4 like r8a779f0 (R-Car S4-8). The IPMMU hardware design of r8a779f0 is the same as r8a779a0. So, rename "r8a779a0" to "rcar_gen4". Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://lore.kernel.org/r/20220208002030.1319984-3-yoshihiro.shimoda.uh@renesas.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent da9f838 commit ae684ca

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

drivers/iommu/ipmmu-vmsa.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -719,6 +719,7 @@ static int ipmmu_init_platform_device(struct device *dev,
719719

720720
static const struct soc_device_attribute soc_needs_opt_in[] = {
721721
{ .family = "R-Car Gen3", },
722+
{ .family = "R-Car Gen4", },
722723
{ .family = "RZ/G2", },
723724
{ /* sentinel */ }
724725
};
@@ -743,7 +744,7 @@ static bool ipmmu_device_is_allowed(struct device *dev)
743744
unsigned int i;
744745

745746
/*
746-
* R-Car Gen3 and RZ/G2 use the allow list to opt-in devices.
747+
* R-Car Gen3/4 and RZ/G2 use the allow list to opt-in devices.
747748
* For Other SoCs, this returns true anyway.
748749
*/
749750
if (!soc_device_match(soc_needs_opt_in))
@@ -926,7 +927,7 @@ static const struct ipmmu_features ipmmu_features_rcar_gen3 = {
926927
.utlb_offset_base = 0,
927928
};
928929

929-
static const struct ipmmu_features ipmmu_features_r8a779a0 = {
930+
static const struct ipmmu_features ipmmu_features_rcar_gen4 = {
930931
.use_ns_alias_offset = false,
931932
.has_cache_leaf_nodes = true,
932933
.number_of_contexts = 16,
@@ -982,7 +983,10 @@ static const struct of_device_id ipmmu_of_ids[] = {
982983
.data = &ipmmu_features_rcar_gen3,
983984
}, {
984985
.compatible = "renesas,ipmmu-r8a779a0",
985-
.data = &ipmmu_features_r8a779a0,
986+
.data = &ipmmu_features_rcar_gen4,
987+
}, {
988+
.compatible = "renesas,rcar-gen4-ipmmu",
989+
.data = &ipmmu_features_rcar_gen4,
986990
}, {
987991
/* Terminator */
988992
},

0 commit comments

Comments
 (0)