Skip to content

Commit 7fee5d6

Browse files
Sam Protsenkojoergroedel
authored andcommitted
iommu/exynos: Enable default VM instance on SysMMU v7
In order to enable SysMMU v7 with VM register layout, at least the default VM instance (n=0) must be enabled, in addition to enabling the SysMMU itself. To do so, add corresponding write to MMU_CTRL_VM[0] register, before writing to MMU_CTRL register. Signed-off-by: Sam Protsenko <[email protected]> Acked-by: Marek Szyprowski <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Joerg Roedel <[email protected]>
1 parent 0892c49 commit 7fee5d6

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

drivers/iommu/exynos-iommu.c

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ static u32 lv2ent_offset(sysmmu_iova_t iova)
135135
#define CFG_SYSSEL (1 << 22) /* System MMU 3.2 only */
136136
#define CFG_FLPDCACHE (1 << 20) /* System MMU 3.2+ only */
137137

138+
#define CTRL_VM_ENABLE BIT(0)
139+
#define CTRL_VM_FAULT_MODE_STALL BIT(3)
138140
#define CAPA0_CAPA1_EXIST BIT(11)
139141
#define CAPA1_VCR_ENABLED BIT(14)
140142

@@ -163,6 +165,7 @@ static u32 lv2ent_offset(sysmmu_iova_t iova)
163165
/* v7.x registers */
164166
#define REG_V7_CAPA0 0x870
165167
#define REG_V7_CAPA1 0x874
168+
#define REG_V7_CTRL_VM 0x8000
166169

167170
#define has_sysmmu(dev) (dev_iommu_priv_get(dev) != NULL)
168171

@@ -548,6 +551,18 @@ static void __sysmmu_init_config(struct sysmmu_drvdata *data)
548551
writel(cfg, data->sfrbase + REG_MMU_CFG);
549552
}
550553

554+
static void __sysmmu_enable_vid(struct sysmmu_drvdata *data)
555+
{
556+
u32 ctrl;
557+
558+
if (MMU_MAJ_VER(data->version) < 7 || !data->has_vcr)
559+
return;
560+
561+
ctrl = readl(data->sfrbase + REG_V7_CTRL_VM);
562+
ctrl |= CTRL_VM_ENABLE | CTRL_VM_FAULT_MODE_STALL;
563+
writel(ctrl, data->sfrbase + REG_V7_CTRL_VM);
564+
}
565+
551566
static void __sysmmu_enable(struct sysmmu_drvdata *data)
552567
{
553568
unsigned long flags;
@@ -558,6 +573,7 @@ static void __sysmmu_enable(struct sysmmu_drvdata *data)
558573
writel(CTRL_BLOCK, data->sfrbase + REG_MMU_CTRL);
559574
__sysmmu_init_config(data);
560575
__sysmmu_set_ptbase(data, data->pgtable);
576+
__sysmmu_enable_vid(data);
561577
writel(CTRL_ENABLE, data->sfrbase + REG_MMU_CTRL);
562578
data->active = true;
563579
spin_unlock_irqrestore(&data->lock, flags);

0 commit comments

Comments
 (0)