Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/aarch64/aarch64 Meant to do a store here, not a loa...



details:   https://anonhg.NetBSD.org/src/rev/8633fd34ab83
branches:  trunk
changeset: 1009105:8633fd34ab83
user:      maxv <maxv%NetBSD.org@localhost>
date:      Mon Apr 13 06:02:03 2020 +0000

description:
Meant to do a store here, not a load. Ie we want to replace the initial
weak key by the stronger one we just generated.

Rototilled this place too many times.

diffstat:

 sys/arch/aarch64/aarch64/cpuswitch.S |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r ffb5a58c56ef -r 8633fd34ab83 sys/arch/aarch64/aarch64/cpuswitch.S
--- a/sys/arch/aarch64/aarch64/cpuswitch.S      Mon Apr 13 05:40:25 2020 +0000
+++ b/sys/arch/aarch64/aarch64/cpuswitch.S      Mon Apr 13 06:02:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.17 2020/04/13 05:40:25 maxv Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.18 2020/04/13 06:02:03 maxv Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 #include "opt_ddb.h"
 #include "opt_kasan.h"
 
-RCSID("$NetBSD: cpuswitch.S,v 1.17 2020/04/13 05:40:25 maxv Exp $")
+RCSID("$NetBSD: cpuswitch.S,v 1.18 2020/04/13 06:02:03 maxv Exp $")
 
        ARMV8_DEFINE_OPTIONS
 
@@ -249,10 +249,10 @@
        cbz     w4, 1f
        mov     x26, x1
        bl      _C_LABEL(cprng_strong64)
-       ldr     x0, [x26, #L_MD_IA_KERN_LO]
+       str     x0, [x26, #L_MD_IA_KERN_LO]
        msr     APIAKeyLo_EL1, x0
        bl      _C_LABEL(cprng_strong64)
-       ldr     x0, [x26, #L_MD_IA_KERN_HI]
+       str     x0, [x26, #L_MD_IA_KERN_HI]
        msr     APIAKeyHi_EL1, x0
 1:
 #endif



Home | Main Index | Thread Index | Old Index