For linux-yocto update to v5.10.69, there is a boot issue caused
by merge conflict(the related commit is 2d3a9dff763f "arm64: mm:
Fix TLBI vs ASID rollover"), this patch is to fix the issue. Or else,
the S32G platform board will hange when /sbin/init process starts
to work due to the tlb flushed wrong address.
Signed-off-by: Zhantao Tang <zhantao.t...@windriver.com>
---
arch/arm64/include/asm/tlbflush.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/include/asm/tlbflush.h
b/arch/arm64/include/asm/tlbflush.h
index e614f157dfb5..40f993ddedb9 100644
--- a/arch/arm64/include/asm/tlbflush.h
+++ b/arch/arm64/include/asm/tlbflush.h
@@ -272,6 +272,7 @@ static inline void flush_tlb_page_nosync(struct
vm_area_struct *vma,
unsigned long addr;
dsb(ishst);
+ addr = __TLBI_VADDR(uaddr, ASID(vma->vm_mm));
#if IS_ENABLED(CONFIG_NXP_S32GEN1_ERRATUM_ERR050481)
if (S32_IS_KERN_ADDR(addr)) {
__tlbi(vmalle1is);
@@ -281,6 +282,7 @@ static inline void flush_tlb_page_nosync(struct
vm_area_struct *vma,
__tlbi(vale1is, addr);
__tlbi_user(vale1is, addr);
}
+
}
static inline void flush_tlb_page(struct vm_area_struct *vma,
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#10492):
https://lists.yoctoproject.org/g/linux-yocto/message/10492
Mute This Topic: https://lists.yoctoproject.org/mt/85948086/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
