Module Name: src
Committed By: maxv
Date: Sat Apr 25 05:17:17 UTC 2020
Modified Files:
src/lib/libkvm: kvm_i386.c kvm_i386pae.c kvm_x86_64.c
src/sys/arch/amd64/include: pte.h
src/sys/arch/i386/i386: genassym.cf
src/sys/arch/i386/include: kcore.h pte.h
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem_gtt.c
Log Message:
Switch to the new PTE naming. The old naming is now unused, remove it.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/lib/libkvm/kvm_i386.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libkvm/kvm_i386pae.c
cvs rdiff -u -r1.11 -r1.12 src/lib/libkvm/kvm_x86_64.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amd64/include/pte.h
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/include/kcore.h
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/i386/include/pte.h
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libkvm/kvm_i386.c
diff -u src/lib/libkvm/kvm_i386.c:1.30 src/lib/libkvm/kvm_i386.c:1.31
--- src/lib/libkvm/kvm_i386.c:1.30 Wed Feb 19 20:21:22 2014
+++ src/lib/libkvm/kvm_i386.c Sat Apr 25 05:17:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_i386.c,v 1.30 2014/02/19 20:21:22 dsl Exp $ */
+/* $NetBSD: kvm_i386.c,v 1.31 2020/04/25 05:17:16 maxv Exp $ */
/*-
* Copyright (c) 1989, 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_i386.c,v 1.30 2014/02/19 20:21:22 dsl Exp $");
+__RCSID("$NetBSD: kvm_i386.c,v 1.31 2020/04/25 05:17:16 maxv Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -148,7 +148,7 @@ _kvm_kvatop_i386(kvm_t *kd, vaddr_t va,
* Find and read the page directory entry.
* pdppaddr being PAGE_SIZE aligned, we mask the option bits.
*/
- pde_pa = (cpu_kh->pdppaddr & PG_FRAME) + (pl2_pi(va) * sizeof(pde));
+ pde_pa = (cpu_kh->pdppaddr & PTE_FRAME) + (pl2_pi(va) * sizeof(pde));
if (_kvm_pread(kd, kd->pmfd, (void *)&pde, sizeof(pde),
_kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {
_kvm_syserr(kd, 0, "could not read PDE");
@@ -158,19 +158,19 @@ _kvm_kvatop_i386(kvm_t *kd, vaddr_t va,
/*
* Find and read the page table entry.
*/
- if ((pde & PG_V) == 0) {
+ if ((pde & PTE_P) == 0) {
_kvm_err(kd, 0, "invalid translation (invalid PDE)");
goto lose;
}
- if ((pde & PG_PS) != 0) {
+ if ((pde & PTE_PS) != 0) {
/*
* This is a 4MB page.
*/
- page_off = va & ~PG_LGFRAME;
- *pa = (pde & PG_LGFRAME) + page_off;
+ page_off = va & ~PTE_LGFRAME;
+ *pa = (pde & PTE_LGFRAME) + page_off;
return (int)(NBPD_L2 - page_off);
}
- pte_pa = (pde & PG_FRAME) + (pl1_pi(va) * sizeof(pt_entry_t));
+ pte_pa = (pde & PTE_FRAME) + (pl1_pi(va) * sizeof(pt_entry_t));
if (_kvm_pread(kd, kd->pmfd, (void *) &pte, sizeof(pte),
_kvm_pa2off(kd, pte_pa)) != sizeof(pte)) {
_kvm_syserr(kd, 0, "could not read PTE");
@@ -180,11 +180,11 @@ _kvm_kvatop_i386(kvm_t *kd, vaddr_t va,
/*
* Validate the PTE and return the physical address.
*/
- if ((pte & PG_V) == 0) {
+ if ((pte & PTE_P) == 0) {
_kvm_err(kd, 0, "invalid translation (invalid PTE)");
goto lose;
}
- *pa = (pte & PG_FRAME) + page_off;
+ *pa = (pte & PTE_FRAME) + page_off;
return (int)(NBPG - page_off);
lose:
Index: src/lib/libkvm/kvm_i386pae.c
diff -u src/lib/libkvm/kvm_i386pae.c:1.2 src/lib/libkvm/kvm_i386pae.c:1.3
--- src/lib/libkvm/kvm_i386pae.c:1.2 Wed Feb 19 20:21:22 2014
+++ src/lib/libkvm/kvm_i386pae.c Sat Apr 25 05:17:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_i386pae.c,v 1.2 2014/02/19 20:21:22 dsl Exp $ */
+/* $NetBSD: kvm_i386pae.c,v 1.3 2020/04/25 05:17:16 maxv Exp $ */
/*
* Copyright (c) 2010 Jean-Yves Migeon.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: kvm_i386pae.c,v 1.2 2014/02/19 20:21:22 dsl Exp $");
+__RCSID("$NetBSD: kvm_i386pae.c,v 1.3 2020/04/25 05:17:16 maxv Exp $");
/*
* This will expose PAE functions, macros, definitions and constants.
@@ -83,7 +83,7 @@ _kvm_kvatop_i386pae(kvm_t *kd, vaddr_t v
* to increment pdppaddr to compute the address of the PDE.
* pdppaddr being PAGE_SIZE aligned, we mask the option bits.
*/
- pde_pa = (cpu_kh->pdppaddr & PG_FRAME) + (pl2_pi(va) * sizeof(pde));
+ pde_pa = (cpu_kh->pdppaddr & PTE_FRAME) + (pl2_pi(va) * sizeof(pde));
if (_kvm_pread(kd, kd->pmfd, (void *)&pde, sizeof(pde),
_kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {
_kvm_syserr(kd, 0, "could not read PDE");
@@ -93,20 +93,20 @@ _kvm_kvatop_i386pae(kvm_t *kd, vaddr_t v
/*
* Find and read the page table entry.
*/
- if ((pde & PG_V) == 0) {
+ if ((pde & PTE_P) == 0) {
_kvm_err(kd, 0, "invalid translation (invalid PDE)");
goto lose;
}
- if ((pde & PG_PS) != 0) {
+ if ((pde & PTE_PS) != 0) {
/*
* This is a 2MB page.
*/
- page_off = va & ((vaddr_t)~PG_LGFRAME);
- *pa = (pde & PG_LGFRAME) + page_off;
+ page_off = va & ((vaddr_t)~PTE_LGFRAME);
+ *pa = (pde & PTE_LGFRAME) + page_off;
return (int)(NBPD_L2 - page_off);
}
- pte_pa = (pde & PG_FRAME) + (pl1_pi(va) * sizeof(pt_entry_t));
+ pte_pa = (pde & PTE_FRAME) + (pl1_pi(va) * sizeof(pt_entry_t));
if (_kvm_pread(kd, kd->pmfd, (void *) &pte, sizeof(pte),
_kvm_pa2off(kd, pte_pa)) != sizeof(pte)) {
_kvm_syserr(kd, 0, "could not read PTE");
@@ -116,11 +116,11 @@ _kvm_kvatop_i386pae(kvm_t *kd, vaddr_t v
/*
* Validate the PTE and return the physical address.
*/
- if ((pte & PG_V) == 0) {
+ if ((pte & PTE_P) == 0) {
_kvm_err(kd, 0, "invalid translation (invalid PTE)");
goto lose;
}
- *pa = (pte & PG_FRAME) + page_off;
+ *pa = (pte & PTE_FRAME) + page_off;
return (int)(NBPG - page_off);
lose:
Index: src/lib/libkvm/kvm_x86_64.c
diff -u src/lib/libkvm/kvm_x86_64.c:1.11 src/lib/libkvm/kvm_x86_64.c:1.12
--- src/lib/libkvm/kvm_x86_64.c:1.11 Sun Mar 8 00:14:18 2020
+++ src/lib/libkvm/kvm_x86_64.c Sat Apr 25 05:17:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_x86_64.c,v 1.11 2020/03/08 00:14:18 chs Exp $ */
+/* $NetBSD: kvm_x86_64.c,v 1.12 2020/04/25 05:17:16 maxv Exp $ */
/*-
* Copyright (c) 1989, 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_x86_64.c,v 1.11 2020/03/08 00:14:18 chs Exp $");
+__RCSID("$NetBSD: kvm_x86_64.c,v 1.12 2020/04/25 05:17:16 maxv Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -118,7 +118,7 @@ _kvm_kvatop(kvm_t *kd, vaddr_t va, paddr
_kvm_syserr(kd, 0, "could not read PT level 4 entry");
goto lose;
}
- if ((pde & PG_V) == 0) {
+ if ((pde & PTE_P) == 0) {
_kvm_err(kd, 0, "invalid translation (invalid level 4 PDE)");
goto lose;
}
@@ -126,45 +126,45 @@ _kvm_kvatop(kvm_t *kd, vaddr_t va, paddr
/*
* Level 3.
*/
- pde_pa = (pde & PG_FRAME) + (pl3_pi(va) * sizeof(pd_entry_t));
+ pde_pa = (pde & PTE_FRAME) + (pl3_pi(va) * sizeof(pd_entry_t));
if (_kvm_pread(kd, kd->pmfd, (void *)&pde, sizeof(pde),
_kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {
_kvm_syserr(kd, 0, "could not read PT level 3 entry");
goto lose;
}
- if ((pde & PG_V) == 0) {
+ if ((pde & PTE_P) == 0) {
_kvm_err(kd, 0, "invalid translation (invalid level 3 PDE)");
goto lose;
}
- if (pde & PG_PS) {
+ if (pde & PTE_PS) {
page_off = va & (NBPD_L3 - 1);
- *pa = (pde & PG_1GFRAME) + page_off;
+ *pa = (pde & PTE_1GFRAME) + page_off;
return (int)(NBPD_L3 - page_off);
}
/*
* Level 2.
*/
- pde_pa = (pde & PG_FRAME) + (pl2_pi(va) * sizeof(pd_entry_t));
+ pde_pa = (pde & PTE_FRAME) + (pl2_pi(va) * sizeof(pd_entry_t));
if (_kvm_pread(kd, kd->pmfd, (void *)&pde, sizeof(pde),
_kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {
_kvm_syserr(kd, 0, "could not read PT level 2 entry");
goto lose;
}
- if ((pde & PG_V) == 0) {
+ if ((pde & PTE_P) == 0) {
_kvm_err(kd, 0, "invalid translation (invalid level 2 PDE)");
goto lose;
}
- if (pde & PG_PS) {
+ if (pde & PTE_PS) {
page_off = va & (NBPD_L2 - 1);
- *pa = (pde & PG_2MFRAME) + page_off;
+ *pa = (pde & PTE_2MFRAME) + page_off;
return (int)(NBPD_L2 - page_off);
}
/*
* Level 1.
*/
- pte_pa = (pde & PG_FRAME) + (pl1_pi(va) * sizeof(pt_entry_t));
+ pte_pa = (pde & PTE_FRAME) + (pl1_pi(va) * sizeof(pt_entry_t));
if (_kvm_pread(kd, kd->pmfd, (void *) &pte, sizeof(pte),
_kvm_pa2off(kd, pte_pa)) != sizeof(pte)) {
_kvm_syserr(kd, 0, "could not read PTE");
@@ -173,12 +173,12 @@ _kvm_kvatop(kvm_t *kd, vaddr_t va, paddr
/*
* Validate the PTE and return the physical address.
*/
- if ((pte & PG_V) == 0) {
+ if ((pte & PTE_P) == 0) {
_kvm_err(kd, 0, "invalid translation (invalid PTE)");
goto lose;
}
page_off = va & PGOFSET;
- *pa = (pte & PG_FRAME) + page_off;
+ *pa = (pte & PTE_FRAME) + page_off;
return (int)(NBPG - page_off);
lose:
Index: src/sys/arch/amd64/include/pte.h
diff -u src/sys/arch/amd64/include/pte.h:1.12 src/sys/arch/amd64/include/pte.h:1.13
--- src/sys/arch/amd64/include/pte.h:1.12 Sat Mar 9 08:42:25 2019
+++ src/sys/arch/amd64/include/pte.h Sat Apr 25 05:17:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pte.h,v 1.12 2019/03/09 08:42:25 maxv Exp $ */
+/* $NetBSD: pte.h,v 1.13 2020/04/25 05:17:16 maxv Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -120,28 +120,6 @@ typedef uint64_t pt_entry_t; /* PTE */
#define PTE_FRAME PTE_4KFRAME
#define PTE_LGFRAME PTE_2MFRAME
-/* XXX To be deleted. */
-#define PG_V PTE_P
-#define PG_RW PTE_W
-#define PG_u PTE_U
-#define PG_WT PTE_PWT
-#define PG_N PTE_PCD
-#define PG_U PTE_A
-#define PG_M PTE_D
-#define PG_PAT PTE_PAT
-#define PG_PS PTE_PS
-#define PG_G PTE_G
-#define PG_AVAIL1 PTE_AVL1
-#define PG_AVAIL2 PTE_AVL2
-#define PG_AVAIL3 PTE_AVL3
-#define PG_LGPAT PTE_LGPAT
-#define PG_FRAME PTE_FRAME
-#define PG_NX PTE_NX
-#define PG_2MFRAME PTE_2MFRAME
-#define PG_1GFRAME PTE_1GFRAME
-#define PG_LGFRAME PTE_LGFRAME
-#define PG_KW PTE_W
-
#include <x86/pte.h>
#else /* !__x86_64__ */
Index: src/sys/arch/i386/i386/genassym.cf
diff -u src/sys/arch/i386/i386/genassym.cf:1.119 src/sys/arch/i386/i386/genassym.cf:1.120
--- src/sys/arch/i386/i386/genassym.cf:1.119 Mon Feb 17 09:09:48 2020
+++ src/sys/arch/i386/i386/genassym.cf Sat Apr 25 05:17:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.119 2020/02/17 09:09:48 skrll Exp $
+# $NetBSD: genassym.cf,v 1.120 2020/04/25 05:17:16 maxv Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -138,9 +138,6 @@ define KSTACK_SIZE KSTACK_SIZE
define KERNBASE KERNBASE
define KERNTEXTOFF KERNTEXTOFF
-define PG_RW PG_RW
-define PG_V PG_V
-define PG_KW PG_KW
define PTE_P PTE_P
define PTE_W PTE_W
define PGEX_U PGEX_U
Index: src/sys/arch/i386/include/kcore.h
diff -u src/sys/arch/i386/include/kcore.h:1.5 src/sys/arch/i386/include/kcore.h:1.6
--- src/sys/arch/i386/include/kcore.h:1.5 Tue Oct 5 23:48:16 2010
+++ src/sys/arch/i386/include/kcore.h Sat Apr 25 05:17:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kcore.h,v 1.5 2010/10/05 23:48:16 jym Exp $ */
+/* $NetBSD: kcore.h,v 1.6 2020/04/25 05:17:16 maxv Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -50,7 +50,7 @@ typedef struct cpu_kcore_hdr {
* To avoid any kind of conflict with existing MMU bits, we chose one
* ignored by hardware
*/
-#define I386_KCORE_PAE PG_AVAIL1
+#define I386_KCORE_PAE PTE_AVL1
#ifdef _KERNEL
void dumpsys(void);
Index: src/sys/arch/i386/include/pte.h
diff -u src/sys/arch/i386/include/pte.h:1.31 src/sys/arch/i386/include/pte.h:1.32
--- src/sys/arch/i386/include/pte.h:1.31 Sat Mar 9 08:42:25 2019
+++ src/sys/arch/i386/include/pte.h Sat Apr 25 05:17:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pte.h,v 1.31 2019/03/09 08:42:25 maxv Exp $ */
+/* $NetBSD: pte.h,v 1.32 2020/04/25 05:17:16 maxv Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -113,10 +113,6 @@ typedef uint32_t pt_entry_t; /* PTE */
#define L2_FRAME (L3_FRAME | L2_MASK)
#define L1_FRAME (L2_FRAME|L1_MASK)
-/* XXX To be deleted. */
-#define PG_FRAME 0x000ffffffffff000ULL /* page frame mask */
-#define PG_LGFRAME 0x000fffffffe00000ULL /* large (2MB) page frame mask */
-
#define PTE_4KFRAME 0x000ffffffffff000ULL
#define PTE_2MFRAME 0x000fffffffe00000ULL
@@ -140,10 +136,6 @@ typedef uint32_t pt_entry_t; /* PTE */
#define L2_FRAME (L2_MASK)
#define L1_FRAME (L2_FRAME|L1_MASK)
-/* XXX To be deleted. */
-#define PG_FRAME 0xfffff000 /* page frame mask */
-#define PG_LGFRAME 0xffc00000 /* large (4MB) page frame mask */
-
#define PTE_4KFRAME 0xfffff000
#define PTE_4MFRAME 0xffc00000
@@ -175,24 +167,6 @@ typedef uint32_t pt_entry_t; /* PTE */
#define PTE_NX 0 /* Dummy */
#endif
-/* XXX To be deleted. */
-#define PG_V PTE_P
-#define PG_RW PTE_W
-#define PG_u PTE_U
-#define PG_WT PTE_PWT
-#define PG_N PTE_PCD
-#define PG_U PTE_A
-#define PG_M PTE_D
-#define PG_PAT PTE_PAT
-#define PG_PS PTE_PS
-#define PG_G PTE_G
-#define PG_AVAIL1 PTE_AVL1
-#define PG_AVAIL2 PTE_AVL2
-#define PG_AVAIL3 PTE_AVL3
-#define PG_LGPAT PTE_LGPAT
-#define PG_KW PTE_W
-#define PG_NX PTE_NX
-
#include <x86/pte.h>
#endif /* _I386_PTE_H_ */
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.17 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.18
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.17 Fri Feb 14 14:34:58 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c Sat Apr 25 05:17:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_gtt.c,v 1.17 2020/02/14 14:34:58 maya Exp $ */
+/* $NetBSD: i915_gem_gtt.c,v 1.18 2020/04/25 05:17:17 maxv Exp $ */
/*
* Copyright © 2010 Daniel Vetter
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.17 2020/02/14 14:34:58 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.18 2020/04/25 05:17:17 maxv Exp $");
#include <linux/bitmap.h>
#include <linux/seq_file.h>
@@ -41,11 +41,11 @@ __KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt
#include <drm/bus_dma_hacks.h>
#include <x86/machdep.h>
#include <x86/pte.h>
-#define _PAGE_PRESENT PG_V /* 0x01 PTE is present / valid */
-#define _PAGE_RW PG_RW /* 0x02 read/write */
-#define _PAGE_PWT PG_WT /* 0x08 write-through */
-#define _PAGE_PCD PG_N /* 0x10 page cache disabled / non-cacheable */
-#define _PAGE_PAT PG_PAT /* 0x80 page attribute table on PTE */
+#define _PAGE_PRESENT PTE_P /* 0x01 PTE is present */
+#define _PAGE_RW PTE_W /* 0x02 read/write */
+#define _PAGE_PWT PTE_PWT /* 0x08 page write-through */
+#define _PAGE_PCD PTE_PCD /* 0x10 page cache disabled */
+#define _PAGE_PAT PTE_PAT /* 0x80 page attribute table on PTE */
#endif
/**
