From owner-dev-commits-src-main@freebsd.org Sun May 30 02:54:03 2021 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 2078464D2B6; Sun, 30 May 2021 02:54:03 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ft30V6p9qz3Hns; Sun, 30 May 2021 02:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B958215D1B; Sun, 30 May 2021 02:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14U2s2IV010317; Sun, 30 May 2021 02:54:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14U2s2tT010316; Sun, 30 May 2021 02:54:02 GMT (envelope-from git) Date: Sun, 30 May 2021 02:54:02 GMT Message-Id: <202105300254.14U2s2tT010316@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 66b2b71df8aa - main - Wrap the default SPE config in its own #define MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66b2b71df8aa12b19862bfdc19acc0498165ab53 Auto-Submitted: auto-generated 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: Sun, 30 May 2021 02:54:03 -0000 The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=66b2b71df8aa12b19862bfdc19acc0498165ab53 commit 66b2b71df8aa12b19862bfdc19acc0498165ab53 Author: Justin Hibbits AuthorDate: 2021-05-30 02:53:26 +0000 Commit: Justin Hibbits CommitDate: 2021-05-30 02:53:26 +0000 Wrap the default SPE config in its own #define No functional change. Cleans up the code a little. --- sys/powerpc/include/spr.h | 2 ++ sys/powerpc/powerpc/exec_machdep.c | 6 ++---- sys/powerpc/powerpc/swtch32.S | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/powerpc/include/spr.h b/sys/powerpc/include/spr.h index a97e49e77d76..2e2c3306cee1 100644 --- a/sys/powerpc/include/spr.h +++ b/sys/powerpc/include/spr.h @@ -337,6 +337,8 @@ #define SPEFSCR_FUNFE 0x00000008 #define SPEFSCR_FOVFE 0x00000004 #define SPEFSCR_FRMC_M 0x00000003 +#define SPEFSCR_DFLT (SPEFSCR_FINVE | SPEFSCR_FDBZE | \ + SPEFSCR_FUNFE | SPEFSCR_FOVFE) #define SPR_IBAT0U 0x210 /* .6. Instruction BAT Reg 0 Upper */ #define SPR_IBAT0L 0x211 /* .6. Instruction BAT Reg 0 Lower */ #define SPR_IBAT1U 0x212 /* .6. Instruction BAT Reg 1 Upper */ diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c index 97e4caba956a..869fad96e2bd 100644 --- a/sys/powerpc/powerpc/exec_machdep.c +++ b/sys/powerpc/powerpc/exec_machdep.c @@ -1057,8 +1057,7 @@ cpu_copy_thread(struct thread *td, struct thread *td0) #endif pcb2->pcb_cpu.aim.usr_vsid = 0; #ifdef __SPE__ - pcb2->pcb_vec.vscr = SPEFSCR_FINVE | SPEFSCR_FDBZE | - SPEFSCR_FUNFE | SPEFSCR_FOVFE; + pcb2->pcb_vec.vscr = SPEFSCR_DFLT; #endif /* Setup to release spin count in fork_exit(). */ @@ -1113,8 +1112,7 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, td->td_pcb->pcb_flags = 0; #ifdef __SPE__ - td->td_pcb->pcb_vec.vscr = SPEFSCR_FINVE | SPEFSCR_FDBZE | - SPEFSCR_FUNFE | SPEFSCR_FOVFE; + td->td_pcb->pcb_vec.vscr = SPEFSCR_DFLT; #endif td->td_retval[0] = (register_t)entry; diff --git a/sys/powerpc/powerpc/swtch32.S b/sys/powerpc/powerpc/swtch32.S index 6ad781895dc3..dba0171577a4 100644 --- a/sys/powerpc/powerpc/swtch32.S +++ b/sys/powerpc/powerpc/swtch32.S @@ -224,7 +224,7 @@ ENTRY(fork_trampoline) does when allocating space for a frame pointer/saved LR */ #ifdef __SPE__ - li %r3,SPEFSCR_FINVE|SPEFSCR_FDBZE|SPEFSCR_FUNFE|SPEFSCR_FOVFE + li %r3,SPEFSCR_DFLT mtspr SPR_SPEFSCR, %r3 #endif b trapexit