[src/trunk]: src/sys/arch G/C misleading <evbppc/tlb.h>. Use <powerpc/ibm4xx/...

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

details:   https://anonhg.NetBSD.org/src/rev/96be7b891584
branches:  trunk
changeset: 960831:96be7b891584
user:      rin <rin%NetBSD.org@localhost>
date:      Tue Mar 30 03:15:53 2021 +0000

description:
G/C misleading <evbppc/tlb.h>. Use <powerpc/ibm4xx/tlb.h> directly.

diffstat:

 sys/arch/evbppc/explora/machdep.c       |   6 +++---
 sys/arch/evbppc/include/tlb.h           |  11 -----------
 sys/arch/evbppc/virtex/design_gsrd2.c   |   6 +++---
 sys/arch/powerpc/ibm4xx/pmap.c          |   6 +++---
 sys/arch/powerpc/include/ibm4xx/tlb.h   |   6 +++++-
 sys/arch/powerpc/powerpc/db_interface.c |   6 +++---
 6 files changed, 17 insertions(+), 24 deletions(-)

diffs (156 lines):

diff -r ad13f16cbb76 -r 96be7b891584 sys/arch/evbppc/explora/machdep.c
--- a/sys/arch/evbppc/explora/machdep.c Tue Mar 30 03:04:51 2021 +0000
+++ b/sys/arch/evbppc/explora/machdep.c Tue Mar 30 03:15:53 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.49 2021/03/30 03:04:51 rin Exp $ */
+/*     $NetBSD: machdep.c,v 1.50 2021/03/30 03:15:53 rin Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.49 2021/03/30 03:04:51 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2021/03/30 03:15:53 rin Exp $");
 
 #include "opt_explora.h"
 
@@ -43,13 +43,13 @@
 #include <prop/proplib.h>
 
 #include <machine/explora.h>
-#include <machine/tlb.h>
 
 #include <powerpc/spr.h>
 #include <powerpc/ibm4xx/spr.h>
 
 #include <powerpc/ibm4xx/cpu.h>
 #include <powerpc/ibm4xx/dcr403cgx.h>
+#include <powerpc/ibm4xx/tlb.h>
 
 #define TLB_PG_SIZE    (16*1024*1024)
 
diff -r ad13f16cbb76 -r 96be7b891584 sys/arch/evbppc/include/tlb.h
--- a/sys/arch/evbppc/include/tlb.h     Tue Mar 30 03:04:51 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-/*     $NetBSD: tlb.h,v 1.1 2002/12/09 12:16:18 scw Exp $      */
-
-#ifdef _KERNEL_OPT
-#include "opt_ppcarch.h"
-#endif
-
-#ifdef PPC_IBM4XX
-#include <powerpc/ibm4xx/tlb.h>
-
-#define        ppc4xx_tlbflags(va, pa)        (0)
-#endif
diff -r ad13f16cbb76 -r 96be7b891584 sys/arch/evbppc/virtex/design_gsrd2.c
--- a/sys/arch/evbppc/virtex/design_gsrd2.c     Tue Mar 30 03:04:51 2021 +0000
+++ b/sys/arch/evbppc/virtex/design_gsrd2.c     Tue Mar 30 03:15:53 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: design_gsrd2.c,v 1.5 2021/03/29 13:14:13 rin Exp $ */
+/*     $NetBSD: design_gsrd2.c,v 1.6 2021/03/30 03:15:53 rin Exp $ */
 
 /*
  * Copyright (c) 2006 Jachym Holecek
@@ -32,7 +32,7 @@
 #include "opt_virtex.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: design_gsrd2.c,v 1.5 2021/03/29 13:14:13 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: design_gsrd2.c,v 1.6 2021/03/30 03:15:53 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -45,9 +45,9 @@
 #include <sys/intr.h>
 
 #include <machine/powerpc.h>
-#include <machine/tlb.h>
 
 #include <powerpc/ibm4xx/cpu.h>
+#include <powerpc/ibm4xx/tlb.h>
 #include <powerpc/ibm4xx/dev/plbvar.h>
 
 #include <evbppc/virtex/dev/xcvbusvar.h>
diff -r ad13f16cbb76 -r 96be7b891584 sys/arch/powerpc/ibm4xx/pmap.c
--- a/sys/arch/powerpc/ibm4xx/pmap.c    Tue Mar 30 03:04:51 2021 +0000
+++ b/sys/arch/powerpc/ibm4xx/pmap.c    Tue Mar 30 03:15:53 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.95 2020/09/10 04:36:24 rin Exp $    */
+/*     $NetBSD: pmap.c,v 1.96 2021/03/30 03:15:53 rin Exp $    */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.95 2020/09/10 04:36:24 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.96 2021/03/30 03:15:53 rin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -86,7 +86,6 @@
 #include <uvm/uvm.h>
 
 #include <machine/powerpc.h>
-#include <machine/tlb.h>
 
 #include <powerpc/pcb.h>
 
@@ -94,6 +93,7 @@
 #include <powerpc/ibm4xx/spr.h>
 
 #include <powerpc/ibm4xx/cpu.h>
+#include <powerpc/ibm4xx/tlb.h>
 
 /*
  * kernmap is an array of PTEs large enough to map in
diff -r ad13f16cbb76 -r 96be7b891584 sys/arch/powerpc/include/ibm4xx/tlb.h
--- a/sys/arch/powerpc/include/ibm4xx/tlb.h     Tue Mar 30 03:04:51 2021 +0000
+++ b/sys/arch/powerpc/include/ibm4xx/tlb.h     Tue Mar 30 03:15:53 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tlb.h,v 1.6 2020/03/05 02:14:53 rin Exp $      */
+/*     $NetBSD: tlb.h,v 1.7 2021/03/30 03:15:53 rin Exp $      */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -104,8 +104,12 @@
 void   ppc4xx_tlb_reserve(paddr_t, vaddr_t, size_t, int);
 void   *ppc4xx_tlb_mapiodev(paddr_t, psize_t);
 
+#ifndef ppc4xx_tlbflags
+#define        ppc4xx_tlbflags(va, pa) (0)
 #endif
 
+#endif /* !_LOCORE */
+
 #define TLB_PID_INVALID 0xFFFF
 
 #endif /* _IBM4XX_TLB_H_ */
diff -r ad13f16cbb76 -r 96be7b891584 sys/arch/powerpc/powerpc/db_interface.c
--- a/sys/arch/powerpc/powerpc/db_interface.c   Tue Mar 30 03:04:51 2021 +0000
+++ b/sys/arch/powerpc/powerpc/db_interface.c   Tue Mar 30 03:15:53 2021 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: db_interface.c,v 1.55 2021/02/23 07:13:52 mrg Exp $ */
+/*     $NetBSD: db_interface.c,v 1.56 2021/03/30 03:15:53 rin Exp $ */
 /*     $OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $ */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.55 2021/02/23 07:13:52 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.56 2021/03/30 03:15:53 rin Exp $");
 
 #define USERACC
 
@@ -36,7 +36,7 @@
 #ifdef PPC_IBM4XX
 #include <powerpc/ibm4xx/cpu.h>
 #include <powerpc/ibm4xx/spr.h>
-#include <machine/tlb.h>
+#include <powerpc/ibm4xx/tlb.h>
 #include <uvm/uvm_extern.h>
 #endif