Commit ae4ab47a authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Greg Kroah-Hartman
Browse files

iommu/sun50i: Consider all fault sources for reset 



[ Upstream commit cef20703 ]

We have to reset masters for all faults - permissions, L1 fault or L2
fault. Currently it's done only for permissions. If other type of fault
happens, master is in locked up state. Fix that by really considering
all fault sources.

Fixes: 4100b8c2 ("iommu: Add Allwinner H6 IOMMU driver")
Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Link: https://lore.kernel.org/r/20221025165415.307591-3-jernej.skrabec@gmail.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 84fee3ce

drivers/iommu/sun50i-iommu.c

+6 −2
Original line number Diff line number Diff line
@@ -870,8 +870,8 @@ static phys_addr_t sun50i_iommu_handle_perm_irq(struct sun50i_iommu *iommu) 


static irqreturn_t sun50i_iommu_irq(int irq, void *dev_id)

{

	u32 status, l1_status, l2_status, resets;

	struct sun50i_iommu *iommu = dev_id;

	u32 status;



	spin_lock(&iommu->iommu_lock);
@@ -881,6 +881,9 @@ static irqreturn_t sun50i_iommu_irq(int irq, void *dev_id) 
		return IRQ_NONE;

	}



	l1_status = iommu_read(iommu, IOMMU_L1PG_INT_REG);

	l2_status = iommu_read(iommu, IOMMU_L2PG_INT_REG);



	if (status & IOMMU_INT_INVALID_L2PG)

		sun50i_iommu_handle_pt_irq(iommu,

					    IOMMU_INT_ERR_ADDR_L2_REG,
@@ -894,7 +897,8 @@ static irqreturn_t sun50i_iommu_irq(int irq, void *dev_id) 


	iommu_write(iommu, IOMMU_INT_CLR_REG, status);



	iommu_write(iommu, IOMMU_RESET_REG, ~status);

	resets = (status | l1_status | l2_status) & IOMMU_INT_MASTER_MASK;

	iommu_write(iommu, IOMMU_RESET_REG, ~resets);

	iommu_write(iommu, IOMMU_RESET_REG, IOMMU_RESET_RELEASE_ALL);



	spin_unlock(&iommu->iommu_lock);