From owner-dev-commits-src-main@freebsd.org Wed Dec 30 22:59:24 2020 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 211924D1FE9; Wed, 30 Dec 2020 22:59:24 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D5mty2SSGz4pcv; Wed, 30 Dec 2020 22:59:21 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from auth1-smtp.messagingengine.com (auth1-smtp.messagingengine.com [66.111.4.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bdragon/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id EB8A88748; Wed, 30 Dec 2020 22:59:17 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailauth.nyi.internal (Postfix) with ESMTP id DA51F27C0054; Wed, 30 Dec 2020 17:59:17 -0500 (EST) Received: from imap1 ([10.202.2.51]) by compute3.internal (MEProxy); Wed, 30 Dec 2020 17:59:17 -0500 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvddvgedgtdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne gfrhhlucfvnfffucdluddtmdenucfjughrpefofgggkfgjfhffhffvufgtsehttdertder reejnecuhfhrohhmpedfuehrrghnughonhcuuegvrhhgrhgvnhdfuceosggurhgrghhonh eshfhrvggvuefuffdrohhrgheqnecuggftrfgrthhtvghrnhepheeiieekkeffkeelkeel geetgfeltdetgffhudetieekveefvdfhgefgffdujefgnecuffhomhgrihhnpehfrhgvvg gsshgurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhf rhhomhepsggurhgrghhonhdomhgvshhmthhprghuthhhphgvrhhsohhnrghlihhthidqud dtgedvfeehkeeigedqudekuddtkeehuddqsggurhgrghhonheppefhrhgvvgeuufffrdho rhhgsehimhgrphdrtggt X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 3DF14C200A5; Wed, 30 Dec 2020 17:59:18 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.3.1-61-gb52c239-fm-20201210.001-gb52c2396 Mime-Version: 1.0 Message-Id: In-Reply-To: <202012302245.0BUMjrc6032470@gitrepo.freebsd.org> References: <202012302245.0BUMjrc6032470@gitrepo.freebsd.org> Date: Wed, 30 Dec 2020 16:58:57 -0600 From: "Brandon Bergren" To: "Piotr Kubaj" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: =?UTF-8?Q?Re:_git:_ac19bf854b8c_-_main_-_powerpc/aim:_Add_machine_check_?= =?UTF-8?Q?handler_for_TLB_multihit?= Content-Type: text/plain X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for the main branch of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2020 22:59:24 -0000 Approved-By: bdragon (in IRC) On Wed, Dec 30, 2020, at 4:45 PM, Piotr Kubaj wrote: > The branch main has been updated by pkubaj (ports committer): > > URL: > https://cgit.FreeBSD.org/src/commit/?id=ac19bf854b8c0bedc793af0cb501f08c6612ccd5 > > commit ac19bf854b8c0bedc793af0cb501f08c6612ccd5 > Author: Justin Hibbits > AuthorDate: 2020-05-29 02:02:41 +0000 > Commit: Piotr Kubaj > 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); > } > -- Brandon Bergren bdragon@FreeBSD.org