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

Commit 9db017f6 authored by Liam Mark's avatar Liam Mark
Browse files

iommu/io-pgtable-fast: fix sign extension position 



The introduction of support for ttbr1 wrongly caused the
fastmap stage 1 input address sign extension position to
be set to bit 31.
This was causing valid IOVAs to page fault.
Set the sign extension position back to its previous value.

Change-Id: I95ca88f8c033dd79006eff8dfea85007d091f869
Signed-off-by: default avatarLiam Mark <lmark@codeaurora.org>
parent 26db1949

drivers/iommu/io-pgtable-fast.c

+4 −0
Original line number Diff line number Diff line
@@ -133,6 +133,9 @@ struct av8l_fast_io_pgtable { 
#define AV8L_FAST_TCR_EPD1_SHIFT	23

#define AV8L_FAST_TCR_EPD1_FAULT	1



#define AV8L_FAST_TCR_SEP_SHIFT		(15 + 32)

#define AV8L_FAST_TCR_SEP_UPSTREAM	7ULL



#define AV8L_FAST_MAIR_ATTR_SHIFT(n)	((n) << 3)

#define AV8L_FAST_MAIR_ATTR_MASK	0xff

#define AV8L_FAST_MAIR_ATTR_DEVICE	0x04
@@ -522,6 +525,7 @@ av8l_fast_alloc_pgtable(struct io_pgtable_cfg *cfg, void *cookie) 
#if defined(CONFIG_ARM)

	reg |= ARM_32_LPAE_TCR_EAE;

#endif

	reg |= AV8L_FAST_TCR_SEP_UPSTREAM << AV8L_FAST_TCR_SEP_SHIFT;

	cfg->av8l_fast_cfg.tcr = reg;



	/* MAIRs */