Skip to content

Commit e8118ef

Browse files
committed
wip smmu
Signed-off-by: Pierrick Bouvier <[email protected]>
1 parent 5ee7f6b commit e8118ef

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

hw/arm/smmuv3.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ static void smmuv3_init_regs(SMMUv3State *s)
290290
}
291291
s->idr[3] = FIELD_DP32(s->idr[3], IDR3, RIL, 1);
292292
s->idr[3] = FIELD_DP32(s->idr[3], IDR3, BBML, 2);
293+
s->idr[3] = FIELD_DP32(s->idr[3], IDR3, STT, 1); /* FEAT_TTST */
293294

294295
s->idr[5] = FIELD_DP32(s->idr[5], IDR5, OAS, SMMU_IDR5_OAS); /* 44 bits */
295296
/* 4K, 16K and 64K granule support */
@@ -358,7 +359,11 @@ static int smmu_get_cd(SMMUv3State *s, STE *ste, SMMUTransCfg *cfg,
358359

359360
trace_smmuv3_get_cd(addr);
360361

362+
if (cfg->stage == SMMU_STAGE_2) {
363+
g_assert_not_reached();
364+
}
361365
if (cfg->stage == SMMU_NESTED) {
366+
g_assert_not_reached();
362367
status = smmuv3_do_translate(s, addr, cfg, event,
363368
IOMMU_RO, &entry, SMMU_CLASS_CD);
364369

@@ -397,6 +402,7 @@ static int smmu_get_cd(SMMUv3State *s, STE *ste, SMMUTransCfg *cfg,
397402
*/
398403
static bool s2t0sz_valid(SMMUTransCfg *cfg)
399404
{
405+
abort();
400406
if (cfg->s2cfg.tsz > 39) {
401407
return false;
402408
}

0 commit comments

Comments
 (0)