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

Commit 22c29693 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: disable smmu stalls on faulty transactions"

parents 94bc5fd5 ad3b1dcc

drivers/iommu/arm-smmu.c

+17 −1
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ 


#define SCTLR_S1_ASIDPNE		(1 << 12)

#define SCTLR_CFCFG			(1 << 7)

#define SCTLR_HUPCF			(1 << 8)

#define SCTLR_CFIE			(1 << 6)

#define SCTLR_CFRE			(1 << 5)

#define SCTLR_E				(1 << 4)
@@ -1628,6 +1629,11 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, 
	/* SCTLR */

	reg = SCTLR_CFCFG | SCTLR_CFIE | SCTLR_CFRE | SCTLR_EAE_SBOP;



	if (smmu_domain->attributes & (1 << DOMAIN_ATTR_CB_STALL_DISABLE)) {

		reg &= ~SCTLR_CFCFG;

		reg |= SCTLR_HUPCF;

	}



	if ((!(smmu_domain->attributes & (1 << DOMAIN_ATTR_S1_BYPASS)) &&

	     !(smmu_domain->attributes & (1 << DOMAIN_ATTR_EARLY_MAP))) ||

								!stage1)
@@ -3138,7 +3144,11 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain, 
					& (1 << DOMAIN_ATTR_ENABLE_TTBR1));

		ret = 0;

		break;



	case DOMAIN_ATTR_CB_STALL_DISABLE:

		*((int *)data) = !!(smmu_domain->attributes

			& (1 << DOMAIN_ATTR_CB_STALL_DISABLE));

		ret = 0;

		break;

	default:

		ret = -ENODEV;

		break;
@@ -3325,6 +3335,12 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain, 
		ret = 0;

		break;

	}

	case DOMAIN_ATTR_CB_STALL_DISABLE:

		if (*((int *)data))

			smmu_domain->attributes |=

				1 << DOMAIN_ATTR_CB_STALL_DISABLE;

		ret = 0;

		break;

	default:

		ret = -ENODEV;

		break;

drivers/iommu/iommu-debug.c

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ 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";

	default:

		return "Unknown attr!";

	}

include/linux/iommu.h

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ enum iommu_attr { 
	DOMAIN_ATTR_PAGE_TABLE_IS_COHERENT,

	DOMAIN_ATTR_PAGE_TABLE_FORCE_COHERENT,

	DOMAIN_ATTR_ENABLE_TTBR1,

	DOMAIN_ATTR_CB_STALL_DISABLE,

	DOMAIN_ATTR_MAX,

};