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

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

Merge "iommu/arm-smmu: Pass external fault information to client handlers"

parents 9bc505a9 fd8e24d4

drivers/iommu/arm-smmu.c

+2 −0
Original line number Diff line number Diff line
@@ -1087,6 +1087,8 @@ static irqreturn_t arm_smmu_context_fault(int irq, void *dev) 
		flags |= IOMMU_FAULT_TRANSLATION;

	if (fsr & FSR_PF)

		flags |= IOMMU_FAULT_PERMISSION;

	if (fsr & FSR_EF)

		flags |= IOMMU_FAULT_EXTERNAL;

	if (fsr & FSR_SS)

		flags |= IOMMU_FAULT_TRANSACTION_STALLED;

include/linux/iommu.h

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ struct notifier_block; 
#define IOMMU_FAULT_WRITE               (1 << 1)

#define IOMMU_FAULT_TRANSLATION         (1 << 2)

#define IOMMU_FAULT_PERMISSION          (1 << 3)

#define IOMMU_FAULT_TRANSACTION_STALLED (1 << 4)

#define IOMMU_FAULT_EXTERNAL            (1 << 4)

#define IOMMU_FAULT_TRANSACTION_STALLED (1 << 5)



typedef int (*iommu_fault_handler_t)(struct iommu_domain *,

			struct device *, unsigned long, int, void *);