[src/trunk]: src/sys/arch/x86/include Hum. Move the __HAVE_DIRECT_MAP block a...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/907f7eec1c18
branches:  trunk
changeset: 833853:907f7eec1c18
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sun Jul 15 08:47:43 2018 +0000

description:
Hum. Move the __HAVE_DIRECT_MAP block a little below, otherwise dynamically
loaded kernel modules use a wrong offset for some ci_* fields. Found when
modloading tprof_amd on an AMD 10h, the read of ci_signature was at a
wrong address, and the cpu family was not detected correctly.

diffstat:

 sys/arch/x86/include/cpu.h |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (43 lines):

diff -r 34a379908b5c -r 907f7eec1c18 sys/arch/x86/include/cpu.h
--- a/sys/arch/x86/include/cpu.h        Sun Jul 15 07:24:11 2018 +0000
+++ b/sys/arch/x86/include/cpu.h        Sun Jul 15 08:47:43 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.94 2018/06/30 14:21:19 riastradh Exp $       */
+/*     $NetBSD: cpu.h,v 1.95 2018/07/15 08:47:43 maxv Exp $    */
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -135,16 +135,6 @@
        volatile int    ci_mtx_count;   /* Negative count of spin mutexes */
        volatile int    ci_mtx_oldspl;  /* Old SPL at this ci_idepth */
 
-#ifndef __HAVE_DIRECT_MAP
-#define VPAGE_SRC 0
-#define VPAGE_DST 1
-#define VPAGE_ZER 2
-#define VPAGE_PTP 3
-#define VPAGE_MAX 4
-       vaddr_t         vpage[VPAGE_MAX];
-       pt_entry_t      *vpage_pte[VPAGE_MAX];
-#endif
-
        /* The following must be aligned for cmpxchg8b. */
        struct {
                uint32_t        ipending;
@@ -184,6 +174,16 @@
        u_int ci_cflush_lsize;  /* CLFLUSH insn line size */
        struct x86_cache_info ci_cinfo[CAI_COUNT];
 
+#ifndef __HAVE_DIRECT_MAP
+#define VPAGE_SRC 0
+#define VPAGE_DST 1
+#define VPAGE_ZER 2
+#define VPAGE_PTP 3
+#define VPAGE_MAX 4
+       vaddr_t         vpage[VPAGE_MAX];
+       pt_entry_t      *vpage_pte[VPAGE_MAX];
+#endif
+
 #ifdef PAE
        uint32_t        ci_pae_l3_pdirpa; /* PA of L3 PD */
        pd_entry_t *    ci_pae_l3_pdir; /* VA pointer to L3 PD */