Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b8ac140 authored by Magnus Damm's avatar Magnus Damm Committed by Joerg Roedel
Browse files

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: default avatarJacopo Mondi <jacopo+renesas@jmondi.org>
Signed-off-by: default avatarMagnus Damm <damm+renesas@opensource.se>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent ddbbddd7

drivers/iommu/ipmmu-vmsa.c

+9 −4
Original line number Diff line number Diff line
@@ -760,8 +760,9 @@ static bool ipmmu_slave_whitelist(struct device *dev) 
	return false;

}



static const struct soc_device_attribute soc_r8a7795[] = {

static const struct soc_device_attribute soc_rcar_gen3[] = {

	{ .soc_id = "r8a7795", },

	{ .soc_id = "r8a7796", },

	{ /* sentinel */ }

};
@@ -769,7 +770,7 @@ 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))

	if (soc_device_match(soc_rcar_gen3) && !ipmmu_slave_whitelist(dev))

		return -ENODEV;



	iommu_fwspec_add_ids(dev, spec->args, 1);
@@ -923,7 +924,7 @@ static const struct ipmmu_features ipmmu_features_default = { 
	.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,

	.has_cache_leaf_nodes = true,

	.number_of_contexts = 8,
@@ -937,7 +938,10 @@ static const struct of_device_id ipmmu_of_ids[] = { 
		.data = &ipmmu_features_default,

	}, {

		.compatible = "renesas,ipmmu-r8a7795",

		.data = &ipmmu_features_r8a7795,

		.data = &ipmmu_features_rcar_gen3,

	}, {

		.compatible = "renesas,ipmmu-r8a7796",

		.data = &ipmmu_features_rcar_gen3,

	}, {

		/* Terminator */

	},
@@ -1114,6 +1118,7 @@ module_exit(ipmmu_exit); 


IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa");

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_AUTHOR("Laurent Pinchart <laurent.pinchart@ideasonboard.com>");