From owner-svn-src-all@freebsd.org Sun Oct 20 15:50:34 2019 Return-Path: Delivered-To: svn-src-all@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 9922F161FFD; Sun, 20 Oct 2019 15:50:34 +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 46x43t3ZG3z3M5J; Sun, 20 Oct 2019 15:50:34 +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 5DEBEE044; Sun, 20 Oct 2019 15:50:34 +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 x9KFoY2t012540; Sun, 20 Oct 2019 15:50:34 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9KFoYQh012538; Sun, 20 Oct 2019 15:50:34 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201910201550.x9KFoYQh012538@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Sun, 20 Oct 2019 15:50:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353777 - 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: 353777 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Sun, 20 Oct 2019 15:50:34 -0000 Author: jhibbits Date: Sun Oct 20 15:50:33 2019 New Revision: 353777 URL: https://svnweb.freebsd.org/changeset/base/353777 Log: powerpc/booke: Don't zero MAS8, it's unnecessary MAS8 is hypervisor privileged, defining the logical partition (VM) to operate on for TLB accesses. It's already guaranteed to be cleared when booting bare metal (bootloader needs it zeroed to work), and we can't touch it from a guest. Assume that if/when we eventually port bhyve to PowerPC (and Book-E) the hypervisor module will take care of managing MAS8. This saves several (tens) of clocks on each TLB miss. MFC after: 2 weeks 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 Sun Oct 20 14:45:19 2019 (r353776) +++ head/sys/powerpc/booke/locore.S Sun Oct 20 15:50:33 2019 (r353777) @@ -252,7 +252,6 @@ __start: isync li %r4, 0 mtspr SPR_MAS7, %r4 - bl zero_mas8 isync tlbwe isync @@ -510,7 +509,6 @@ bp_kernload: isync li %r4, 0 mtspr SPR_MAS7, %r4 - bl zero_mas8 isync tlbwe isync @@ -702,7 +700,6 @@ tlb1_temp_mapping_as1: mflr %r3 li %r4, 0 mtspr SPR_MAS7, %r4 - bl zero_mas8 mtlr %r3 isync tlbwe @@ -738,24 +735,6 @@ tlb1_inval_all_but_current: 2: addi %r4, %r4, 1 cmpw %r4, %r3 /* Check if this is the last entry */ bne 1b - blr - -/* - * MAS8 conditional zeroing. - */ -.globl zero_mas8 -zero_mas8: - mfpvr %r20 - rlwinm %r20, %r20, 16, 16, 31 - cmpli 0, 0, %r20, FSL_E500mc - beq 1f - cmpli 0, 0, %r20, FSL_E5500 - beq 1f - - blr -1: - li %r20, 0 - mtspr SPR_MAS8, %r20 blr #endif Modified: head/sys/powerpc/booke/trap_subr.S ============================================================================== --- head/sys/powerpc/booke/trap_subr.S Sun Oct 20 14:45:19 2019 (r353776) +++ head/sys/powerpc/booke/trap_subr.S Sun Oct 20 15:50:33 2019 (r353777) @@ -767,7 +767,6 @@ search_failed: li %r23, 0 mtspr SPR_MAS7, %r23 - bl zero_mas8 isync tlbwe @@ -903,10 +902,6 @@ tlb_fill_entry: mtspr SPR_MAS2, %r27 mtspr SPR_MAS3, %r22 mtspr SPR_MAS7, %r23 - - mflr %r21 - bl zero_mas8 - mtlr %r21 isync tlbwe