From owner-svn-src-all@freebsd.org Tue Apr 30 03:45:47 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B8EA11581919; Tue, 30 Apr 2019 03:45:47 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 501358A437; Tue, 30 Apr 2019 03:45:47 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DD3DE4081; Tue, 30 Apr 2019 03:45:46 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3U3jkSm037564; Tue, 30 Apr 2019 03:45:46 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3U3jkFC037560; Tue, 30 Apr 2019 03:45:46 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201904300345.x3U3jkFC037560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Tue, 30 Apr 2019 03:45:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346941 - head/sys/powerpc/booke X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/booke X-SVN-Commit-Revision: 346941 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 501358A437 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.950,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Apr 2019 03:45:48 -0000 Author: jhibbits Date: Tue Apr 30 03:45:46 2019 New Revision: 346941 URL: https://svnweb.freebsd.org/changeset/base/346941 Log: powerpc: Stop pretending we run on e500v1 cores Unconditional writing to MAS7, which doesn't exist on the e500v1 core, in a TLB miss handler has been in the code for several years now. Since this has gone unnoticed for so long, it's easily concluded that e500v1 is not in use with FreeBSD. Simplify the code path a bit, by unconditionally zeroing MAS7 instead of calling a subroutine to do it. Modified: head/sys/powerpc/booke/locore.S head/sys/powerpc/booke/trap_subr.S Modified: head/sys/powerpc/booke/locore.S ============================================================================== --- head/sys/powerpc/booke/locore.S Tue Apr 30 01:25:02 2019 (r346940) +++ head/sys/powerpc/booke/locore.S Tue Apr 30 03:45:46 2019 (r346941) @@ -250,7 +250,8 @@ __start: ori %r4, %r4, (MAS3_SX | MAS3_SW | MAS3_SR)@l mtspr SPR_MAS3, %r4 /* Set RPN and protection */ isync - bl zero_mas7 + li %r4, 0 + mtspr SPR_MAS7, %r4 bl zero_mas8 isync tlbwe @@ -505,7 +506,8 @@ bp_kernload: ori %r3, %r3, (MAS3_SX | MAS3_SW | MAS3_SR)@l mtspr SPR_MAS3, %r3 isync - bl zero_mas7 + li %r4, 0 + mtspr SPR_MAS7, %r4 bl zero_mas8 isync tlbwe @@ -696,7 +698,8 @@ tlb1_temp_mapping_as1: mtspr SPR_MAS1, %r5 isync mflr %r3 - bl zero_mas7 + li %r4, 0 + mtspr SPR_MAS7, %r4 bl zero_mas8 mtlr %r3 isync @@ -736,20 +739,8 @@ tlb1_inval_all_but_current: blr /* - * MAS7 and MAS8 conditional zeroing. + * MAS8 conditional zeroing. */ -.globl zero_mas7 -zero_mas7: - mfpvr %r20 - rlwinm %r20, %r20, 16, 16, 31 - cmpli 0, 0, %r20, FSL_E500v1 - beq 1f - - li %r20, 0 - mtspr SPR_MAS7, %r20 -1: - blr - .globl zero_mas8 zero_mas8: mfpvr %r20 Modified: head/sys/powerpc/booke/trap_subr.S ============================================================================== --- head/sys/powerpc/booke/trap_subr.S Tue Apr 30 01:25:02 2019 (r346940) +++ head/sys/powerpc/booke/trap_subr.S Tue Apr 30 03:45:46 2019 (r346941) @@ -765,7 +765,8 @@ search_failed: mtspr SPR_MAS2, %r27 mtspr SPR_MAS3, %r23 - bl zero_mas7 + li %r23, 0 + mtspr SPR_MAS7, %r23 bl zero_mas8 isync