Date: Wed, 30 Dec 2020 22:45:53 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ac19bf854b8c - main - powerpc/aim: Add machine check handler for TLB multihit Message-ID: <202012302245.0BUMjrc6032470@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=ac19bf854b8c0bedc793af0cb501f08c6612ccd5 commit ac19bf854b8c0bedc793af0cb501f08c6612ccd5 Author: Justin Hibbits <chmeeedalf@gmail.com> AuthorDate: 2020-05-29 02:02:41 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2020-12-30 22:45:10 +0000 powerpc/aim: Add machine check handler for TLB multihit Handle TLB multi-hit the same as ERAT multi-hit, by flushing the full TLB. --- sys/powerpc/aim/aim_machdep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/powerpc/aim/aim_machdep.c b/sys/powerpc/aim/aim_machdep.c index 8824e7447ea6..0ce7cf03403f 100644 --- a/sys/powerpc/aim/aim_machdep.c +++ b/sys/powerpc/aim/aim_machdep.c @@ -563,7 +563,8 @@ cpu_machine_check(struct thread *td, struct trapframe *frame, int *ucode) /* SLB multi-hit is recoverable. */ if ((frame->cpu.aim.dsisr & DSISR_MC_SLB_MULTIHIT) != 0) return (0); - if ((frame->cpu.aim.dsisr & DSISR_MC_DERAT_MULTIHIT) != 0) { + if ((frame->cpu.aim.dsisr & + (DSISR_MC_DERAT_MULTIHIT | DSISR_MC_TLB_MULTIHIT)) != 0) { pmap_tlbie_all(); return (0); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012302245.0BUMjrc6032470>