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

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

Merge "iommu/arm-smmu: report BID, PID and MID of client on context fault"

parents b0093c18 f6081209

drivers/iommu/arm-smmu.c

+10 −1
Original line number Diff line number Diff line
@@ -1354,6 +1354,11 @@ static irqreturn_t arm_smmu_context_fault(int irq, void *dev) 
		dev_dbg(smmu->dev,

			"Context fault handled by client: iova=0x%08lx, cb=%d, fsr=0x%x, fsynr0=0x%x, fsynr1=0x%x\n",

			iova, cfg->cbndx, fsr, fsynr0, fsynr1);

		dev_dbg(smmu->dev,

			"Client info: BID=0x%x, PID=0x%x, MID=0x%x\n",

			FIELD_GET(FSYNR1_BID, fsynr1),

			FIELD_GET(FSYNR1_PID, fsynr1),

			FIELD_GET(FSYNR1_MID, fsynr1));

		dev_dbg(smmu->dev,

			"soft iova-to-phys=%pa\n", &phys_soft);

		ret = IRQ_HANDLED;
@@ -1367,7 +1372,11 @@ static irqreturn_t arm_smmu_context_fault(int irq, void *dev) 
			dev_err(smmu->dev,

				"Unhandled context fault: iova=0x%08lx, cb=%d, fsr=0x%x, fsynr0=0x%x, fsynr1=0x%x\n",

				iova, cfg->cbndx, fsr, fsynr0, fsynr1);



			dev_err(smmu->dev,

				"Client info: BID=0x%x, PID=0x%x, MID=0x%x\n",

				FIELD_GET(FSYNR1_BID, fsynr1),

				FIELD_GET(FSYNR1_PID, fsynr1),

				FIELD_GET(FSYNR1_MID, fsynr1));



			dev_err(smmu->dev,

				"soft iova-to-phys=%pa\n", &phys_soft);

drivers/iommu/arm-smmu.h

+4 −0
Original line number Diff line number Diff line
@@ -211,6 +211,10 @@ enum arm_smmu_cbar_type { 
#define FSYNR0_WNR			BIT(4)



#define ARM_SMMU_CB_FSYNR1		0x6c

#define FSYNR1_BID			GENMASK(15, 13)

#define FSYNR1_PID			GENMASK(12, 8)

#define FSYNR1_MID			GENMASK(7, 0)



#define ARM_SMMU_CB_S1_TLBIVA		0x600

#define ARM_SMMU_CB_S1_TLBIASID		0x610

#define ARM_SMMU_CB_S1_TLBIALL		0x618