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

Commit 19a5a7fa authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: arm-smmu: Add support for new attributes"

parents df997bf3 58e71e69

drivers/iommu/arm-smmu.c

+23 −20
Original line number Diff line number Diff line
@@ -1640,13 +1640,15 @@ static void arm_smmu_write_context_bank(struct arm_smmu_device *smmu, int idx, 
		reg |= FIELD_PREP(SCTLR_SHCFG, SCTLR_SHCFG_NSH);

	}



	if (attributes && test_bit(DOMAIN_ATTR_CB_STALL_DISABLE, attributes)) {

	if (attributes && test_bit(DOMAIN_ATTR_FAULT_MODEL_NO_CFRE, attributes))

		reg &= ~SCTLR_CFRE;



	if (attributes && test_bit(DOMAIN_ATTR_FAULT_MODEL_NO_STALL,

				   attributes))

		reg &= ~SCTLR_CFCFG;

		reg |= SCTLR_HUPCF;

	}



	if (attributes && test_bit(DOMAIN_ATTR_NO_CFRE, attributes))

		reg &= ~SCTLR_CFRE;

	if (attributes && test_bit(DOMAIN_ATTR_FAULT_MODEL_HUPCF, attributes))

		reg |= SCTLR_HUPCF;



	if (!attributes || (!test_bit(DOMAIN_ATTR_S1_BYPASS, attributes) &&

	     !test_bit(DOMAIN_ATTR_EARLY_MAP, attributes)) || !stage1)
@@ -2744,16 +2746,20 @@ static int arm_smmu_setup_default_domain(struct device *dev, 
	if (of_property_match_string(np, "qcom,iommu-faults",

				     "stall-disable") >= 0)

		__arm_smmu_domain_set_attr(domain,

			DOMAIN_ATTR_CB_STALL_DISABLE, &attr);

			DOMAIN_ATTR_FAULT_MODEL_NO_STALL, &attr);



	if (of_property_match_string(np, "qcom,iommu-faults", "no-CFRE") >= 0)

		__arm_smmu_domain_set_attr(

			domain, DOMAIN_ATTR_FAULT_MODEL_NO_CFRE, &attr);



	if (of_property_match_string(np, "qcom,iommu-faults", "HUPCF") >= 0)

		__arm_smmu_domain_set_attr(

			domain, DOMAIN_ATTR_FAULT_MODEL_HUPCF, &attr);



	if (of_property_match_string(np, "qcom,iommu-faults", "non-fatal") >= 0)

		__arm_smmu_domain_set_attr(domain,

			DOMAIN_ATTR_NON_FATAL_FAULTS, &attr);



	if (of_property_match_string(np, "qcom,iommu-faults", "no-CFRE") >= 0)

		__arm_smmu_domain_set_attr(

			domain, DOMAIN_ATTR_NO_CFRE, &attr);



	/* Default value: disabled */

	ret = of_property_read_u32(np, "qcom,iommu-vmid", &val);

	if (!ret) {
@@ -3617,14 +3623,10 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain, 
				 smmu_domain->attributes);

		ret = 0;

		break;

	case DOMAIN_ATTR_CB_STALL_DISABLE:

		*((int *)data) = test_bit(DOMAIN_ATTR_CB_STALL_DISABLE,

					  smmu_domain->attributes);

		ret = 0;

		break;

	case DOMAIN_ATTR_NO_CFRE:

		*((int *)data) = test_bit(DOMAIN_ATTR_NO_CFRE,

					  smmu_domain->attributes);

	case DOMAIN_ATTR_FAULT_MODEL_NO_CFRE:

	case DOMAIN_ATTR_FAULT_MODEL_NO_STALL:

	case DOMAIN_ATTR_FAULT_MODEL_HUPCF:

		*((int *)data) = test_bit(attr, smmu_domain->attributes);

		ret = 0;

		break;

	case DOMAIN_ATTR_SPLIT_TABLES:
@@ -3838,8 +3840,9 @@ static int __arm_smmu_domain_set_attr2(struct iommu_domain *domain, 
		}

		break;

	}

	case DOMAIN_ATTR_CB_STALL_DISABLE:

	case DOMAIN_ATTR_NO_CFRE:

	case DOMAIN_ATTR_FAULT_MODEL_NO_CFRE:

	case DOMAIN_ATTR_FAULT_MODEL_NO_STALL:

	case DOMAIN_ATTR_FAULT_MODEL_HUPCF:

		if (*((int *)data))

			set_bit(attr, smmu_domain->attributes);

		ret = 0;

drivers/iommu/iommu-debug.c

+6 −2
Original line number Diff line number Diff line
@@ -82,10 +82,14 @@ static const char *iommu_debug_attr_to_string(enum iommu_attr attr) 
		return "DOMAIN_ATTR_FAST";

	case DOMAIN_ATTR_EARLY_MAP:

		return "DOMAIN_ATTR_EARLY_MAP";

	case DOMAIN_ATTR_CB_STALL_DISABLE:

		return "DOMAIN_ATTR_CB_STALL_DISABLE";

	case DOMAIN_ATTR_SPLIT_TABLES:

		return "DOMAIN_ATTR_SPLIT_TABLES";

	case DOMAIN_ATTR_FAULT_MODEL_NO_CFRE:

		return "DOMAIN_ATTR_FAULT_MODEL_NO_CFRE";

	case DOMAIN_ATTR_FAULT_MODEL_NO_STALL:

		return "DOMAIN_ATTR_FAULT_MODEL_NO_STALL";

	case DOMAIN_ATTR_FAULT_MODEL_HUPCF:

		return "DOMAIN_ATTR_FAULT_MODEL_HUPCF";

	default:

		return "Unknown attr!";

	}

include/linux/iommu.h

+6 −5
Original line number Diff line number Diff line
@@ -186,11 +186,12 @@ enum iommu_attr { 
#define DOMAIN_ATTR_PAGE_TABLE_IS_COHERENT	(EXTENDED_ATTR_BASE + 14)

#define DOMAIN_ATTR_PAGE_TABLE_FORCE_COHERENT	(EXTENDED_ATTR_BASE + 15)

#define DOMAIN_ATTR_PAGE_TABLE_FORCE_NON_COHERENT (EXTENDED_ATTR_BASE + 16)

#define DOMAIN_ATTR_CB_STALL_DISABLE		(EXTENDED_ATTR_BASE + 17)

#define DOMAIN_ATTR_USE_LLC_NWA			(EXTENDED_ATTR_BASE + 18)

#define DOMAIN_ATTR_NO_CFRE			(EXTENDED_ATTR_BASE + 19)

#define DOMAIN_ATTR_SPLIT_TABLES		(EXTENDED_ATTR_BASE + 20)

#define DOMAIN_ATTR_EXTENDED_MAX		(EXTENDED_ATTR_BASE + 21)

#define DOMAIN_ATTR_USE_LLC_NWA			(EXTENDED_ATTR_BASE + 17)

#define DOMAIN_ATTR_SPLIT_TABLES		(EXTENDED_ATTR_BASE + 18)

#define DOMAIN_ATTR_FAULT_MODEL_NO_CFRE		(EXTENDED_ATTR_BASE + 19)

#define DOMAIN_ATTR_FAULT_MODEL_NO_STALL	(EXTENDED_ATTR_BASE + 20)

#define DOMAIN_ATTR_FAULT_MODEL_HUPCF		(EXTENDED_ATTR_BASE + 21)

#define DOMAIN_ATTR_EXTENDED_MAX		(EXTENDED_ATTR_BASE + 22)



/* These are the possible reserved region types */

enum iommu_resv_type {