Module Name: src
Committed By: riastradh
Date: Sat Aug 20 23:19:09 UTC 2022
Modified Files:
src/sys/arch/amd64/include: pte.h
src/sys/arch/i386/include: pte.h
src/sys/arch/x86/include: pte.h
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem_gtt.c
src/sys/external/bsd/drm2/dist/drm/i915/gt: intel_gtt.h
Log Message:
x86: Forbid using x86/pte.h directly; use machine/pte.h.
machine/pte.h already used outside sys/arch, so let's make it the
primary thing and make sure to use x86/pte.h only as a subroutine.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amd64/include/pte.h
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/include/pte.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/include/pte.h
cvs rdiff -u -r1.23 -r1.24 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/include/pte.h
diff -u src/sys/arch/amd64/include/pte.h:1.15 src/sys/arch/amd64/include/pte.h:1.16
--- src/sys/arch/amd64/include/pte.h:1.15 Sat Aug 20 23:18:39 2022
+++ src/sys/arch/amd64/include/pte.h Sat Aug 20 23:19:08 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pte.h,v 1.15 2022/08/20 23:18:39 riastradh Exp $ */
+/* $NetBSD: pte.h,v 1.16 2022/08/20 23:19:08 riastradh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -121,7 +121,9 @@ typedef uint64_t pt_entry_t; /* PTE */
#define PTE_FRAME PTE_4KFRAME
#define PTE_LGFRAME PTE_2MFRAME
+#define _MACHINE_PTE_H_X86
#include <x86/pte.h>
+#undef _MACHINE_PTE_H_X86
#else /* !__x86_64__ */
Index: src/sys/arch/i386/include/pte.h
diff -u src/sys/arch/i386/include/pte.h:1.34 src/sys/arch/i386/include/pte.h:1.35
--- src/sys/arch/i386/include/pte.h:1.34 Sat Aug 20 23:18:40 2022
+++ src/sys/arch/i386/include/pte.h Sat Aug 20 23:19:08 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pte.h,v 1.34 2022/08/20 23:18:40 riastradh Exp $ */
+/* $NetBSD: pte.h,v 1.35 2022/08/20 23:19:08 riastradh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -168,6 +168,8 @@ typedef uint32_t pt_entry_t; /* PTE */
#define PTE_NX 0 /* Dummy */
#endif
+#define _MACHINE_PTE_H_X86
#include <x86/pte.h>
+#undef _MACHINE_PTE_H_X86
#endif /* _I386_PTE_H_ */
Index: src/sys/arch/x86/include/pte.h
diff -u src/sys/arch/x86/include/pte.h:1.6 src/sys/arch/x86/include/pte.h:1.7
--- src/sys/arch/x86/include/pte.h:1.6 Sat Aug 20 23:18:51 2022
+++ src/sys/arch/x86/include/pte.h Sat Aug 20 23:19:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pte.h,v 1.6 2022/08/20 23:18:51 riastradh Exp $ */
+/* $NetBSD: pte.h,v 1.7 2022/08/20 23:19:09 riastradh Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -32,6 +32,10 @@
#ifndef _X86_PTE_H
#define _X86_PTE_H
+#ifndef _MACHINE_PTE_H_X86
+#error Use machine/pte.h, not x86/pte.h directly.
+#endif
+
/* Cacheability bits when we are using PAT */
#define PGC_WB 0 /* The default */
#define PGC_WC PTE_PWT /* WT and CD is WC */
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.23 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.24
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.23 Sun Dec 19 11:33:30 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c Sat Aug 20 23:19:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_gtt.c,v 1.23 2021/12/19 11:33:30 riastradh Exp $ */
+/* $NetBSD: i915_gem_gtt.c,v 1.24 2022/08/20 23:19:09 riastradh Exp $ */
// SPDX-License-Identifier: MIT
/*
@@ -6,7 +6,7 @@
* Copyright © 2020 Intel Corporation
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.23 2021/12/19 11:33:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.24 2022/08/20 23:19:09 riastradh Exp $");
#include <linux/slab.h> /* fault-inject.h is not standalone! */
@@ -33,7 +33,7 @@ __KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt
#ifdef __NetBSD__
#include <drm/bus_dma_hacks.h>
#include <x86/machdep.h>
-#include <x86/pte.h>
+#include <machine/pte.h>
#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 */
Index: src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h:1.12 src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h:1.13
--- src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h:1.12 Sun Dec 19 11:39:55 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h Sat Aug 20 23:19:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_gtt.h,v 1.12 2021/12/19 11:39:55 riastradh Exp $ */
+/* $NetBSD: intel_gtt.h,v 1.13 2022/08/20 23:19:09 riastradh Exp $ */
/* SPDX-License-Identifier: MIT */
/*
@@ -37,7 +37,7 @@
#ifdef __NetBSD__
#include <drm/bus_dma_hacks.h>
#include <x86/machdep.h>
-#include <x86/pte.h>
+#include <machine/pte.h>
#define _PAGE_PRESENT PTE_P /* 0x01 PTE is present / valid */
#define _PAGE_RW PTE_W /* 0x02 read/write */
#define _PAGE_PWT PTE_PWT /* 0x08 write-through */
