CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: rillig Date: Sun Mar 10 17:07:31 UTC 2024 Modified Files: src/sys/arch/powerpc/include/oea: hid.h Log Message: powerpc/hid: fix snprintb format for HID0_970_BITMASK_U To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/include/oea/hid.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/powerpc/include/oea/hid.h diff -u src/sys/arch/powerpc/include/oea/hid.h:1.14 src/sys/arch/powerpc/include/oea/hid.h:1.15 --- src/sys/arch/powerpc/include/oea/hid.h:1.14 Sat Jan 20 09:47:35 2024 +++ src/sys/arch/powerpc/include/oea/hid.h Sun Mar 10 17:07:31 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: hid.h,v 1.14 2024/01/20 09:47:35 jmcneill Exp $ */ +/* $NetBSD: hid.h,v 1.15 2024/03/10 17:07:31 rillig Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -112,7 +112,7 @@ "\040EMCP" #define HID0_970_BITMASK_U "\020" \ -"\040ONEPPC\036DOSNGL\036ISYNCSC\035SERGP\034res\033res\032res\031DEEPNAP" \ +"\040ONEPPC\037DOSNGL\036ISYNCSC\035SERGP\034res\033res\032res\031DEEPNAP" \ "\030DOZE\027NAP\026res\025DPM\024res\023TG\022HNGDIS\021NHR" \ "\020INORDER\017res\016TBCTRL\015EXTBEN\014res\013res\012CIABREN\011HDICEEN" \ "\001ENATTN"
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: rillig Date: Sun Mar 10 17:07:31 UTC 2024 Modified Files: src/sys/arch/powerpc/include/oea: hid.h Log Message: powerpc/hid: fix snprintb format for HID0_970_BITMASK_U To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/include/oea/hid.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: jmcneill Date: Sat Jan 20 09:47:35 UTC 2024 Modified Files: src/sys/arch/powerpc/include/oea: hid.h Log Message: fix comments: HID0 ICFI/DCFI are "flash invalidate", not "flush invalidate" To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/include/oea/hid.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/powerpc/include/oea/hid.h diff -u src/sys/arch/powerpc/include/oea/hid.h:1.13 src/sys/arch/powerpc/include/oea/hid.h:1.14 --- src/sys/arch/powerpc/include/oea/hid.h:1.13 Mon Jul 6 10:31:23 2020 +++ src/sys/arch/powerpc/include/oea/hid.h Sat Jan 20 09:47:35 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: hid.h,v 1.13 2020/07/06 10:31:23 rin Exp $ */ +/* $NetBSD: hid.h,v 1.14 2024/01/20 09:47:35 jmcneill Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -81,8 +81,8 @@ #define HID0_DCE 0x4000 /* Enable d-cache */ #define HID0_ILOCK 0x2000 /* i-cache lock */ #define HID0_DLOCK 0x1000 /* d-cache lock */ -#define HID0_ICFI 0x0800 /* i-cache flush invalidate */ -#define HID0_DCFI 0x0400 /* d-cache flush invalidate */ +#define HID0_ICFI 0x0800 /* i-cache flash invalidate */ +#define HID0_DCFI 0x0400 /* d-cache flash invalidate */ #define HID0_SPD 0x0200 /* Disable speculative cache access */ #define HID0_IFEM 0x0100 /* Enable M-bit for I-fetch */ #define HID0_XBSEN 0x0100 /* Extended BAT block size enable (7455+) */
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: jmcneill Date: Sat Jan 20 09:47:35 UTC 2024 Modified Files: src/sys/arch/powerpc/include/oea: hid.h Log Message: fix comments: HID0 ICFI/DCFI are "flash invalidate", not "flush invalidate" To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/include/oea/hid.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Thu Feb 3 17:23:50 UTC 2022 Modified Files: src/sys/arch/powerpc/include/oea: vmparam.h Log Message: bump MAXTSIZ now clang runs again To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/include/oea/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Thu Feb 3 17:23:50 UTC 2022 Modified Files: src/sys/arch/powerpc/include/oea: vmparam.h Log Message: bump MAXTSIZ now clang runs again To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/include/oea/vmparam.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/powerpc/include/oea/vmparam.h diff -u src/sys/arch/powerpc/include/oea/vmparam.h:1.22 src/sys/arch/powerpc/include/oea/vmparam.h:1.23 --- src/sys/arch/powerpc/include/oea/vmparam.h:1.22 Sat Sep 11 20:28:05 2021 +++ src/sys/arch/powerpc/include/oea/vmparam.h Thu Feb 3 17:23:50 2022 @@ -55,7 +55,7 @@ #endif #ifndef MAXTSIZ -#define MAXTSIZ (128*1024*1024) /* maximum text size */ +#define MAXTSIZ (256*1024*1024) /* maximum text size */ #endif #ifndef MAXDSIZ
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: rin Date: Sat Apr 17 09:22:29 UTC 2021 Modified Files: src/sys/arch/powerpc/include/oea: vmparam.h Log Message: Adjust TABs. No functional changes. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/include/oea/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: rin Date: Sat Apr 17 09:22:29 UTC 2021 Modified Files: src/sys/arch/powerpc/include/oea: vmparam.h Log Message: Adjust TABs. No functional changes. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/include/oea/vmparam.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/powerpc/include/oea/vmparam.h diff -u src/sys/arch/powerpc/include/oea/vmparam.h:1.20 src/sys/arch/powerpc/include/oea/vmparam.h:1.21 --- src/sys/arch/powerpc/include/oea/vmparam.h:1.20 Thu Aug 17 22:55:47 2017 +++ src/sys/arch/powerpc/include/oea/vmparam.h Sat Apr 17 09:22:28 2021 @@ -47,54 +47,54 @@ #define PAGE_MASK (PAGE_SIZE - 1) #ifndef USRSTACK -#define USRSTACK VM_MAXUSER_ADDRESS +#define USRSTACK VM_MAXUSER_ADDRESS #endif #ifndef USRSTACK32 -#define USRSTACK32 VM_MAXUSER_ADDRESS32 +#define USRSTACK32 VM_MAXUSER_ADDRESS32 #endif #ifndef MAXTSIZ -#define MAXTSIZ (128*1024*1024) /* maximum text size */ +#define MAXTSIZ (128*1024*1024) /* maximum text size */ #endif #ifndef MAXDSIZ -#define MAXDSIZ (1024*1024*1024) /* maximum data size */ +#define MAXDSIZ (1024*1024*1024) /* maximum data size */ #endif #ifndef MAXDSIZ32 -#define MAXDSIZ32 (1024*1024*1024) /* maximum data size */ +#define MAXDSIZ32 (1024*1024*1024) /* maximum data size */ #endif #ifndef MAXSSIZ -#define MAXSSIZ (32*1024*1024) /* maximum stack size */ +#define MAXSSIZ (32*1024*1024) /* maximum stack size */ #endif #ifndef MAXSSIZ32 -#define MAXSSIZ32 (32*1024*1024) /* maximum stack size */ +#define MAXSSIZ32 (32*1024*1024) /* maximum stack size */ #endif #ifndef DFLDSIZ -#define DFLDSIZ (256*1024*1024) /* default data size */ +#define DFLDSIZ (256*1024*1024) /* default data size */ #endif #ifndef DFLDSIZ32 -#define DFLSSIZ32 (256*1024*1024) +#define DFLSSIZ32 (256*1024*1024) #endif #ifndef DFLSSIZ -#define DFLSSIZ (2*1024*1024) /* default stack size */ +#define DFLSSIZ (2*1024*1024) /* default stack size */ #endif #ifndef DFLSSIZ32 -#define DFLSSIZ32 (2*1024*1024) /* default stack size */ +#define DFLSSIZ32 (2*1024*1024) /* default stack size */ #endif /* * Default number of pages in the user raw I/O map. */ #ifndef USRIOSIZE -#define USRIOSIZE 1024 +#define USRIOSIZE 1024 #endif /* @@ -102,7 +102,7 @@ * considered very swappable. */ #ifndef MAXSLP -#define MAXSLP 20 +#define MAXSLP 20 #endif /*
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: rin Date: Mon Jul 6 10:57:03 UTC 2020 Modified Files: src/sys/arch/powerpc/include/oea: pmap.h Log Message: Include missing opt_modular.h so that struct vm_page_md is compatible to that for booke. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/powerpc/include/oea/pmap.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/powerpc/include/oea/pmap.h diff -u src/sys/arch/powerpc/include/oea/pmap.h:1.31 src/sys/arch/powerpc/include/oea/pmap.h:1.32 --- src/sys/arch/powerpc/include/oea/pmap.h:1.31 Mon Jul 6 09:10:02 2020 +++ src/sys/arch/powerpc/include/oea/pmap.h Mon Jul 6 10:57:03 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.31 2020/07/06 09:10:02 rin Exp $ */ +/* $NetBSD: pmap.h,v 1.32 2020/07/06 10:57:03 rin Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -44,6 +44,7 @@ #ifdef _KERNEL_OPT #include "opt_ppcarch.h" +#include "opt_modular.h" #endif #include
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: rin Date: Mon Jul 6 10:57:03 UTC 2020 Modified Files: src/sys/arch/powerpc/include/oea: pmap.h Log Message: Include missing opt_modular.h so that struct vm_page_md is compatible to that for booke. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/powerpc/include/oea/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: rin Date: Mon Jul 6 09:10:02 UTC 2020 Modified Files: src/sys/arch/powerpc/include/oea: pmap.h Log Message: LKM was gone. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/powerpc/include/oea/pmap.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/powerpc/include/oea/pmap.h diff -u src/sys/arch/powerpc/include/oea/pmap.h:1.30 src/sys/arch/powerpc/include/oea/pmap.h:1.31 --- src/sys/arch/powerpc/include/oea/pmap.h:1.30 Sat Mar 14 14:05:43 2020 +++ src/sys/arch/powerpc/include/oea/pmap.h Mon Jul 6 09:10:02 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.30 2020/03/14 14:05:43 ad Exp $ */ +/* $NetBSD: pmap.h,v 1.31 2020/07/06 09:10:02 rin Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -38,7 +38,7 @@ #error use assym.h instead #endif -#if defined(_LKM) || defined(_MODULE) +#ifdef _MODULE #error this file should not be included by loadable kernel modules #endif
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: rin Date: Mon Jul 6 09:10:02 UTC 2020 Modified Files: src/sys/arch/powerpc/include/oea: pmap.h Log Message: LKM was gone. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/powerpc/include/oea/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src
Committed By: macallan
Date: Fri Jun 1 18:18:11 UTC 2018
Modified Files:
src/sys/arch/powerpc/include/oea: spr.h
Log Message:
add functions to access SCOM registers on 970 CPUs
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/include/oea/spr.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/powerpc/include/oea/spr.h
diff -u src/sys/arch/powerpc/include/oea/spr.h:1.5 src/sys/arch/powerpc/include/oea/spr.h:1.6
--- src/sys/arch/powerpc/include/oea/spr.h:1.5 Fri May 4 16:57:14 2018
+++ src/sys/arch/powerpc/include/oea/spr.h Fri Jun 1 18:18:11 2018
@@ -1,8 +1,17 @@
-/* $NetBSD: spr.h,v 1.5 2018/05/04 16:57:14 macallan Exp $ */
+/* $NetBSD: spr.h,v 1.6 2018/06/01 18:18:11 macallan Exp $ */
#ifndef _POWERPC_OEA_SPR_H_
#define _POWERPC_OEA_SPR_H_
+#if !defined(_LOCORE) && defined(_KERNEL)
+#if defined(PPC_OEA64_BRIDGE) || defined (_ARCH_PPC64)
+
+#include
+#include
+
+#endif
+#endif
+
/*
* Special Purpose Register declarations.
*
@@ -299,4 +308,50 @@
#define PMCN_TBLTRANS 3 /* TBL bit transitions */
#define PCMN_IDISPATCH 4 /* Instructions dispatched */
+#if !defined(_LOCORE) && defined(_KERNEL)
+
+#if defined(PPC_OEA64_BRIDGE) || defined (_ARCH_PPC64)
+
+static inline uint64_t
+scom_read(register_t address)
+{
+ register_t msr;
+ uint64_t ret;
+
+ msr = mfmsr();
+ mtmsr(msr & ~PSL_EE);
+ __asm volatile("isync;");
+
+ mtspr(SPR_SCOMC, address | SCOMC_READ);
+ __asm volatile("isync;");
+
+ ret = mfspr(SPR_SCOMD);
+ mtmsr(msr);
+ __asm volatile("isync;");
+
+ return ret;
+}
+
+static inline void
+scom_write(register_t address, uint64_t data)
+{
+ register_t msr;
+
+ msr = mfmsr();
+ mtmsr(msr & ~PSL_EE);
+ __asm volatile("isync;");
+
+ mtspr(SPR_SCOMD, data);
+ __asm volatile("isync;");
+ mtspr(SPR_SCOMC, address | SCOMC_WRITE);
+ __asm volatile("isync;");
+
+ mtmsr(msr);
+ __asm volatile("isync;");
+}
+
+#endif /* defined(PPC_OEA64_BRIDGE) || defined (_ARCH_PPC64) */
+
+#endif /* !defined(_LOCORE) && defined(_KERNEL) */
+
#endif /* !_POWERPC_SPR_H_ */
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Fri Jun 1 18:18:11 UTC 2018 Modified Files: src/sys/arch/powerpc/include/oea: spr.h Log Message: add functions to access SCOM registers on 970 CPUs To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/include/oea/spr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Fri May 4 16:57:14 UTC 2018 Modified Files: src/sys/arch/powerpc/include/oea: spr.h Log Message: add Hardware Interrupt Offset Register found on 970 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/oea/spr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Fri May 4 16:57:14 UTC 2018 Modified Files: src/sys/arch/powerpc/include/oea: spr.h Log Message: add Hardware Interrupt Offset Register found on 970 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/oea/spr.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/powerpc/include/oea/spr.h diff -u src/sys/arch/powerpc/include/oea/spr.h:1.4 src/sys/arch/powerpc/include/oea/spr.h:1.5 --- src/sys/arch/powerpc/include/oea/spr.h:1.4 Fri Feb 16 18:04:06 2018 +++ src/sys/arch/powerpc/include/oea/spr.h Fri May 4 16:57:14 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: spr.h,v 1.4 2018/02/16 18:04:06 macallan Exp $ */ +/* $NetBSD: spr.h,v 1.5 2018/05/04 16:57:14 macallan Exp $ */ #ifndef _POWERPC_OEA_SPR_H_ #define _POWERPC_OEA_SPR_H_ @@ -85,6 +85,7 @@ #define MPCe300c1 0x8083 #define MPCe300c2 0x8084 #define MPCe300c3 0x8085 +#define SPR_HIOR 0x137 /* HW Interrupt Offset (970) */ #define SPR_IBAT0U 0x210 /* ..68 Instruction BAT Reg 0 Upper */ #define SPR_IBAT0L 0x211 /* ..6. Instruction BAT Reg 0 Lower */
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Thu Mar 22 21:26:27 UTC 2018 Modified Files: src/sys/arch/powerpc/include/oea: cpufeat.h Log Message: provide a wrapper for mapiodev() - if we have BATs just use the paddr, if we don't then actually map it To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/oea/cpufeat.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/powerpc/include/oea/cpufeat.h diff -u src/sys/arch/powerpc/include/oea/cpufeat.h:1.4 src/sys/arch/powerpc/include/oea/cpufeat.h:1.5 --- src/sys/arch/powerpc/include/oea/cpufeat.h:1.4 Mon Apr 28 20:23:32 2008 +++ src/sys/arch/powerpc/include/oea/cpufeat.h Thu Mar 22 21:26:27 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufeat.h,v 1.4 2008/04/28 20:23:32 martin Exp $ */ +/* $NetBSD: cpufeat.h,v 1.5 2018/03/22 21:26:27 macallan Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. @@ -50,6 +50,10 @@ #ifdef _KERNEL void cpu_model_init(void); extern unsigned long oeacpufeat; + +#define oea_mapiodev(addr, size) ((oeacpufeat & OEACPU_NOBAT) ? \ + mapiodev((paddr_t)(addr), (size), 0) : (void *)(addr)) + #endif #endif /* _POWERPC_OEA_OEAFEAT_H_ */
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Thu Mar 22 21:26:27 UTC 2018 Modified Files: src/sys/arch/powerpc/include/oea: cpufeat.h Log Message: provide a wrapper for mapiodev() - if we have BATs just use the paddr, if we don't then actually map it To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/oea/cpufeat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Fri Feb 16 18:04:06 UTC 2018 Modified Files: src/sys/arch/powerpc/include/oea: hid.h spr.h Log Message: add a few pp970-specific bits To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/include/oea/hid.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/include/oea/spr.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/powerpc/include/oea/hid.h diff -u src/sys/arch/powerpc/include/oea/hid.h:1.11 src/sys/arch/powerpc/include/oea/hid.h:1.12 --- src/sys/arch/powerpc/include/oea/hid.h:1.11 Fri Jul 7 22:13:35 2017 +++ src/sys/arch/powerpc/include/oea/hid.h Fri Feb 16 18:04:06 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: hid.h,v 1.11 2017/07/07 22:13:35 macallan Exp $ */ +/* $NetBSD: hid.h,v 1.12 2018/02/16 18:04:06 macallan Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -172,4 +172,18 @@ #define HID1_SYNCBE 0x0800 /* Enable sync/eieio broadcast */ #define HID1_ABE 0x0400 /* Enable address broadcast */ +/* PPC970 HID4 */ +#define HID4_RMLR0 0x0020 /* real mode limit bit 0 */ +#define HID4_RMLR1 0x4000 /* real mode limit bit 1 */ +#define HID4_RMLR2 0x2000 /* real mode limit bit 2 */ +/* + * real mode limit bits 012 + * 011 - 64MB + * 111 - 128MB + * 100 - 256MB + * x10 - 1GB + * x01 - 16GB + * 000 - 256GB + */ + #endif /* _POWERPC_OEA_HID_H_ */ Index: src/sys/arch/powerpc/include/oea/spr.h diff -u src/sys/arch/powerpc/include/oea/spr.h:1.3 src/sys/arch/powerpc/include/oea/spr.h:1.4 --- src/sys/arch/powerpc/include/oea/spr.h:1.3 Tue Jul 7 15:41:46 2015 +++ src/sys/arch/powerpc/include/oea/spr.h Fri Feb 16 18:04:06 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: spr.h,v 1.3 2015/07/07 15:41:46 macallan Exp $ */ +/* $NetBSD: spr.h,v 1.4 2018/02/16 18:04:06 macallan Exp $ */ #ifndef _POWERPC_OEA_SPR_H_ #define _POWERPC_OEA_SPR_H_ @@ -28,6 +28,15 @@ #define SPR_RTCL_W 0x015 /* ..6. 601 RTC Lower - Write */ #define SPR_SDR1 0x019 /* ..68 Page table base address register */ #define SPR_VRSAVE 0x100 /* ..6. AltiVec VRSAVE */ +#define SPR_SCOMC 0x114 /* SCOM Control Register (970) */ +#define SPR_SCOMD 0x115 /* SCOM Data Register (970) */ +#define SCOM_PCR 0x0aa00100 /* Power Control Register */ +#define SCOM_PCR_BIT 0x8000 /* Data bit */ +#define SCOM_PSR 0x40800100 /* Power Status Register */ +#define PSR_RECEIVED (1ULL << 61) +#define PSR_COMPLETED (1ULL << 60) +#define SCOMC_READ 0x8000 +#define SCOMC_WRITE 0x #define SPR_ASR 0x118 /* ..6. Address Space Register (PPC64) */ #define SPR_EAR 0x11a /* ..68 External Access Register */ #define MPC601 0x0001
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Fri Feb 16 18:04:06 UTC 2018 Modified Files: src/sys/arch/powerpc/include/oea: hid.h spr.h Log Message: add a few pp970-specific bits To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/include/oea/hid.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/include/oea/spr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: sevan Date: Thu Aug 17 22:55:47 UTC 2017 Modified Files: src/sys/arch/powerpc/include/oea: vmparam.h Log Message: Raise the maximum text size value to 128MB, this allows binaries such as clang which currently has a text area of around 96MB to execute successfully on macppc. ok macallan To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/include/oea/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: sevan Date: Thu Aug 17 22:55:47 UTC 2017 Modified Files: src/sys/arch/powerpc/include/oea: vmparam.h Log Message: Raise the maximum text size value to 128MB, this allows binaries such as clang which currently has a text area of around 96MB to execute successfully on macppc. ok macallan To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/include/oea/vmparam.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/powerpc/include/oea/vmparam.h diff -u src/sys/arch/powerpc/include/oea/vmparam.h:1.19 src/sys/arch/powerpc/include/oea/vmparam.h:1.20 --- src/sys/arch/powerpc/include/oea/vmparam.h:1.19 Mon Feb 13 09:46:30 2017 +++ src/sys/arch/powerpc/include/oea/vmparam.h Thu Aug 17 22:55:47 2017 @@ -55,7 +55,7 @@ #endif #ifndef MAXTSIZ -#define MAXTSIZ (64*1024*1024) /* maximum text size */ +#define MAXTSIZ (128*1024*1024) /* maximum text size */ #endif #ifndef MAXDSIZ
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Fri Jul 7 22:13:36 UTC 2017 Modified Files: src/sys/arch/powerpc/include/oea: hid.h Log Message: add bits & masks for ppc970 HID0 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/include/oea/hid.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/powerpc/include/oea/hid.h diff -u src/sys/arch/powerpc/include/oea/hid.h:1.10 src/sys/arch/powerpc/include/oea/hid.h:1.11 --- src/sys/arch/powerpc/include/oea/hid.h:1.10 Sun Sep 22 17:51:31 2013 +++ src/sys/arch/powerpc/include/oea/hid.h Fri Jul 7 22:13:35 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: hid.h,v 1.10 2013/09/22 17:51:31 matt Exp $ */ +/* $NetBSD: hid.h,v 1.11 2017/07/07 22:13:35 macallan Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -31,6 +31,28 @@ /* Hardware Implementation Dependent registers for the PowerPC */ +#if defined(_ARCH_PPC64) || defined (PPC_OEA64_BRIDGE) +/* this way we can use the same bit numbers as IBM's PowerPC manuals */ +#define HIDBIT(x) (0x8000LL >> x) +#define HID0_64_ONE_PPC HIDBIT(0) /* one instruction per dispatch group */ +#define HID0_64_DO_SNGL HIDBIT(1) /* single group completion mode */ +#define HID0_64_ISYNCSC HIDBIT(2) /* Disable isync scoreboard optimization */ +#define HID0_64_SER_GP HIDBIT(3) /* Serialize group dispatch */ +#define HID0_64_DEEPNAP HIDBIT(7) /* Enable deep nap mode (970) */ +#define HID0_64_DOZE HIDBIT(8) /* Enable doze mode */ +#define HID0_64_NAP HIDBIT(9) /* Enable nap mode */ +#define HID0_64_DPM HIDBIT(11) /* Enable Dynamic power management */ +#define HID0_64_TG HIDBIT(13) /* Perfmon threshold granularity control */ +#define HID0_64_HNG_DIS HIDBIT(14) /* Disable processor hang-detection */ +#define HID0_64_NHR HIDBIT(15) /* No Hard Reset */ +#define HID0_64_INORDER HIDBIT(16) /* Serialized group issue mode */ +#define HID0_64_TB_CTRL HIDBIT(18) /* TB keeps running if CPU stopped */ +#define HID0_64_EX_TBEN HIDBIT(19) /* timebase runs at external clock */ +#define HID0_64_CIABREN HIDBIT(22) /* enable CIABR register */ +#define HID0_64_HDICEEN HIDBIT(23) /* hypervisor decrementer enable */ +#define HID0_64_EN_ATTN HIDBIT(31) /* support processor attention inst. */ +#define HID0_64_EN_MCHK HIDBIT(32) /* ext. mchk interrupts */ +#endif #define HID0_EMCP 0x8000 /* Enable MCP */ #define HID0_DBP 0x4000 /* Disable 60x bus parity generation */ #define HID0_EBA 0x2000 /* Enable 60x bus address parity checking */ @@ -82,6 +104,14 @@ "\020ICE\017DCE\016ILOCK\015DLOCK\014ICFI\013DCFI\012SPD\011XBSEN" \ "\010SGE\007b25\006BTIC\005LRSTK\004FOLD\003BHT\002NOPDST\001NOPTI" +#define HID0_970_BITMASK "\020" \ +"\040EMCP" + +#define HID0_970_BITMASK_U "\020" \ +"\040ONEPPC\036DOSNGL\036ISYNCSC\035SERGP\034res\033res\032res\031DEEPNAP" \ +"\030DOZE\027NAP\026res\025DPM\024res\023TG\022HNGDIS\021NHR" \ +"\020INORDER\017res\016TBCTRL\015EXTBEN\014res\013res\012CIABREN\011HDICEEN" \ +"\001ENATTN" /* * HID0 bit definitions per CPU model *
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Fri Jul 7 22:13:36 UTC 2017 Modified Files: src/sys/arch/powerpc/include/oea: hid.h Log Message: add bits & masks for ppc970 HID0 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/include/oea/hid.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Tue Jul 7 15:41:46 UTC 2015 Modified Files: src/sys/arch/powerpc/include/oea: spr.h Log Message: add instruction cache throttling SPR found on 750 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/include/oea/spr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Tue Jul 7 15:41:46 UTC 2015 Modified Files: src/sys/arch/powerpc/include/oea: spr.h Log Message: add instruction cache throttling SPR found on 750 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/include/oea/spr.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/powerpc/include/oea/spr.h diff -u src/sys/arch/powerpc/include/oea/spr.h:1.2 src/sys/arch/powerpc/include/oea/spr.h:1.3 --- src/sys/arch/powerpc/include/oea/spr.h:1.2 Wed Feb 1 05:25:57 2012 +++ src/sys/arch/powerpc/include/oea/spr.h Tue Jul 7 15:41:46 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: spr.h,v 1.2 2012/02/01 05:25:57 matt Exp $ */ +/* $NetBSD: spr.h,v 1.3 2015/07/07 15:41:46 macallan Exp $ */ #ifndef _POWERPC_OEA_SPR_H_ #define _POWERPC_OEA_SPR_H_ @@ -262,6 +262,9 @@ #define L3CR_L3DO 0x0040 /* 25: L3 data-only mode */ #define L3CR_PMEN 0x0004 /* 29: Private memory enable */ #define L3CR_PMSIZ 0x0004 /* 31: Private memory size (0=1MB, 1=2MB) */ +#define SPR_ICTC 0x3fb /* ..6. instruction cache throttling */ +#define ICTC_ENABLE 0x0001 /* enable throttling */ +#define ICTC_COUNT_M 0x01fe /* number of waits to insert */ #define SPR_THRM1 0x3fc /* ..6. Thermal Management Register */ #define SPR_THRM2 0x3fd /* ..6. Thermal Management Register */ #define SPR_THRM_TIN 0x8000 /* Thermal interrupt bit (RO) */
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src
Committed By: mrg
Date: Sun Jul 6 08:06:03 UTC 2014
Modified Files:
src/sys/arch/powerpc/include/oea: bat.h
Log Message:
make sure struct bat is aligned to 8 bytes as we shift them 3 bits.
fixes PReP lossage as reported on port-powerpc and port-prep.
thanks to mak...@ki.nu and kiyohara@netbsd.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/include/oea/bat.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/powerpc/include/oea/bat.h
diff -u src/sys/arch/powerpc/include/oea/bat.h:1.17 src/sys/arch/powerpc/include/oea/bat.h:1.18
--- src/sys/arch/powerpc/include/oea/bat.h:1.17 Wed Feb 15 04:33:19 2012
+++ src/sys/arch/powerpc/include/oea/bat.h Sun Jul 6 08:06:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bat.h,v 1.17 2012/02/15 04:33:19 macallan Exp $ */
+/* $NetBSD: bat.h,v 1.18 2014/07/06 08:06:03 mrg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
struct bat {
register_t batu;
register_t batl;
-};
+} __aligned(8);
#endif
/* Lower BAT bits (all but PowerPC 601): */
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: mrg Date: Sun Jul 6 08:06:03 UTC 2014 Modified Files: src/sys/arch/powerpc/include/oea: bat.h Log Message: make sure struct bat is aligned to 8 bytes as we shift them 3 bits. fixes PReP lossage as reported on port-powerpc and port-prep. thanks to mak...@ki.nu and kiyohara@netbsd. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/include/oea/bat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: matt Date: Fri Feb 28 05:32:01 UTC 2014 Modified Files: src/sys/arch/powerpc/include/oea: pmap.h Log Message: Add pmap_ste_spill To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/powerpc/include/oea/pmap.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/powerpc/include/oea/pmap.h diff -u src/sys/arch/powerpc/include/oea/pmap.h:1.27 src/sys/arch/powerpc/include/oea/pmap.h:1.28 --- src/sys/arch/powerpc/include/oea/pmap.h:1.27 Sat Jul 28 23:11:00 2012 +++ src/sys/arch/powerpc/include/oea/pmap.h Fri Feb 28 05:32:01 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.27 2012/07/28 23:11:00 matt Exp $ */ +/* $NetBSD: pmap.h,v 1.28 2014/02/28 05:32:01 matt Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -149,6 +149,7 @@ bool pmap_clear_bit(struct vm_page *, in void pmap_real_memory(paddr_t *, psize_t *); void pmap_procwr(struct proc *, vaddr_t, size_t); int pmap_pte_spill(pmap_t, vaddr_t, bool); +int pmap_ste_spill(pmap_t, vaddr_t, bool); void pmap_pinit(pmap_t); u_int powerpc_mmap_flags(paddr_t);
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: matt Date: Fri Feb 28 05:33:53 UTC 2014 Modified Files: src/sys/arch/powerpc/include/oea: vmparam.h Log Message: Make this 64-bit aware. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/include/oea/vmparam.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/powerpc/include/oea/vmparam.h diff -u src/sys/arch/powerpc/include/oea/vmparam.h:1.17 src/sys/arch/powerpc/include/oea/vmparam.h:1.18 --- src/sys/arch/powerpc/include/oea/vmparam.h:1.17 Mon Jun 20 20:24:29 2011 +++ src/sys/arch/powerpc/include/oea/vmparam.h Fri Feb 28 05:33:53 2014 @@ -51,7 +51,7 @@ #endif #ifndef USRSTACK32 -#define USRSTACK32 ((uint32_t)VM_MAXUSER_ADDRESS) +#define USRSTACK32 VM_MAXUSER_ADDRESS32 #endif #ifndef MAXTSIZ @@ -62,18 +62,34 @@ #define MAXDSIZ (1024*1024*1024) /* maximum data size */ #endif +#ifndef MAXDSIZ32 +#define MAXDSIZ32 (1024*1024*1024) /* maximum data size */ +#endif + #ifndef MAXSSIZ #define MAXSSIZ (32*1024*1024) /* maximum stack size */ #endif +#ifndef MAXSSIZ32 +#define MAXSSIZ32 (32*1024*1024) /* maximum stack size */ +#endif + #ifndef DFLDSIZ #define DFLDSIZ (256*1024*1024) /* default data size */ #endif +#ifndef DFLDSIZ32 +#define DFLSSIZ32 (256*1024*1024) +#endif + #ifndef DFLSSIZ #define DFLSSIZ (2*1024*1024) /* default stack size */ #endif +#ifndef DFLSSIZ32 +#define DFLSSIZ32 (2*1024*1024) /* default stack size */ +#endif + /* * Default number of pages in the user raw I/O map. */ @@ -128,6 +144,7 @@ (((vsid) SR_VSID) (SR_VSID_SHFT + VSID__HASHSHFT)) #endif /*0*/ +#ifndef _LP64 /* * Fixed segments */ @@ -141,6 +158,7 @@ #define KERNEL2_SR 14 #endif #define KERNEL2_SEGMENT VSID_MAKE(KERNEL2_SR, KERNEL_VSIDBITS) +#endif #define KERNEL_VSIDBITS 0xf #define PHYSMAP_VSIDBITS 0xe #define PHYSMAPN_SEGMENT(s) VSID_MAKE(s, PHYSMAP_VSIDBITS) @@ -158,10 +176,20 @@ #endif #define VM_MIN_ADDRESS ((vaddr_t) 0) -#define VM_MAXUSER_ADDRESS ((vaddr_t) ~0xfffL) +#define VM_MAXUSER_ADDRESS32 ((vaddr_t) (uint32_t) ~0xfffL) +#ifdef _LP64 +#define VM_MAXUSER_ADDRESS ((vaddr_t) 1UL 48) /* 256TB */ +#else +#define VM_MAXUSER_ADDRESS VM_MAXUSER_ADDRESS32 +#endif #define VM_MAX_ADDRESS VM_MAXUSER_ADDRESS +#ifdef _LP64 +#define VM_MIN_KERNEL_ADDRESS ((vaddr_t) 0xffUL 40) /* top 1TB */ +#define VM_MAX_KERNEL_ADDRESS ((vaddr_t) -32768) +#else #define VM_MIN_KERNEL_ADDRESS ((vaddr_t) (KERNEL_SR ADDR_SR_SHFT)) #define VM_MAX_KERNEL_ADDRESS (VM_MIN_KERNEL_ADDRESS + 2*SEGMENT_LENGTH) +#endif #define VM_PHYSSEG_STRAT VM_PSTRAT_BIGFIRST
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: matt Date: Fri Feb 28 05:32:01 UTC 2014 Modified Files: src/sys/arch/powerpc/include/oea: pmap.h Log Message: Add pmap_ste_spill To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/powerpc/include/oea/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: matt Date: Fri Feb 28 05:33:53 UTC 2014 Modified Files: src/sys/arch/powerpc/include/oea: vmparam.h Log Message: Make this 64-bit aware. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/include/oea/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src
Committed By: matt
Date: Sun Sep 22 17:51:31 UTC 2013
Modified Files:
src/sys/arch/powerpc/include/oea: hid.h
Log Message:
Define HID1_{SYNCBE,ABE} for the 7450
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/include/oea/hid.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/powerpc/include/oea/hid.h
diff -u src/sys/arch/powerpc/include/oea/hid.h:1.9 src/sys/arch/powerpc/include/oea/hid.h:1.10
--- src/sys/arch/powerpc/include/oea/hid.h:1.9 Sun May 25 10:52:08 2008
+++ src/sys/arch/powerpc/include/oea/hid.h Sun Sep 22 17:51:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hid.h,v 1.9 2008/05/25 10:52:08 phx Exp $ */
+/* $NetBSD: hid.h,v 1.10 2013/09/22 17:51:31 matt Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -139,5 +139,7 @@
#define HID1_PAR 0x0100 /* Disable Precharge for ... */
#define HID1_DFS4 0x0080 /* Dynamic Freq Switch / 4 (7448) */
#define HID1_DFS2 0x0040 /* Dynamic Freq Switch / 2 (7447A) */
+#define HID1_SYNCBE 0x0800 /* Enable sync/eieio broadcast */
+#define HID1_ABE 0x0400 /* Enable address broadcast */
#endif /* _POWERPC_OEA_HID_H_ */
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src
Committed By: matt
Date: Wed Feb 15 01:46:42 UTC 2012
Modified Files:
src/sys/arch/powerpc/include/oea: bat.h
Log Message:
When making BATU, use (BAT_XBL|BAT_BL) for the extended bat lengths.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/include/oea/bat.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/powerpc/include/oea/bat.h
diff -u src/sys/arch/powerpc/include/oea/bat.h:1.15 src/sys/arch/powerpc/include/oea/bat.h:1.16
--- src/sys/arch/powerpc/include/oea/bat.h:1.15 Wed Feb 1 05:25:57 2012
+++ src/sys/arch/powerpc/include/oea/bat.h Wed Feb 15 01:46:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bat.h,v 1.15 2012/02/01 05:25:57 matt Exp $ */
+/* $NetBSD: bat.h,v 1.16 2012/02/15 01:46:42 matt Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -129,7 +129,7 @@ struct bat {
#define BAT_BL_TO_SIZE(bl) (((bl)+4) 15)
#define BATU(va, len, v) \
- (((va) BAT_EPI) | ((len) BAT_BL) | ((v) BAT_V))
+ (((va) BAT_EPI) | ((len) (BAT_BL|BAT_XBL)) | ((v) BAT_V))
#define BATL(pa, wimg, pp) \
(((pa) BAT_RPN) | (wimg) | (pp))
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src
Committed By: macallan
Date: Wed Feb 15 04:33:19 UTC 2012
Modified Files:
src/sys/arch/powerpc/include/oea: bat.h
Log Message:
make BATs 256MB work, now macppc works again on 745x CPUs as well
ok riz
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/include/oea/bat.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/powerpc/include/oea/bat.h
diff -u src/sys/arch/powerpc/include/oea/bat.h:1.16 src/sys/arch/powerpc/include/oea/bat.h:1.17
--- src/sys/arch/powerpc/include/oea/bat.h:1.16 Wed Feb 15 01:46:42 2012
+++ src/sys/arch/powerpc/include/oea/bat.h Wed Feb 15 04:33:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bat.h,v 1.16 2012/02/15 01:46:42 matt Exp $ */
+/* $NetBSD: bat.h,v 1.17 2012/02/15 04:33:19 macallan Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -135,10 +135,10 @@ struct bat {
(((pa) BAT_RPN) | (wimg) | (pp))
#define BAT_VA_MATCH_P(batu,va) \
- (((~(((batu)BAT_BL)15))(va)BAT_EPI)==((batu)BAT_EPI))
+ (((~(((batu)(BAT_BL|BAT_XBL))15))(va)BAT_EPI)==((batu)BAT_EPI))
#define BAT_PA_MATCH_P(batu,batl,pa) \
- (((~(((batu)BAT_BL)15))(pa)BAT_RPN)==((batl)BAT_RPN))
+ (((~(((batu)(BAT_BL|BAT_XBL))15))(pa)BAT_RPN)==((batl)BAT_RPN))
#define BAT_VALID_P(batu, msr) \
(((msr)PSL_PR)?(((batu)BAT_Vu)==BAT_Vu):(((batu)BAT_Vs)==BAT_Vs))
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: matt Date: Wed Feb 15 01:46:42 UTC 2012 Modified Files: src/sys/arch/powerpc/include/oea: bat.h Log Message: When making BATU, use (BAT_XBL|BAT_BL) for the extended bat lengths. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/include/oea/bat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: macallan Date: Wed Feb 15 04:33:19 UTC 2012 Modified Files: src/sys/arch/powerpc/include/oea: bat.h Log Message: make BATs 256MB work, now macppc works again on 745x CPUs as well ok riz To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/include/oea/bat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src
Committed By: matt
Date: Mon Jun 20 06:04:34 UTC 2011
Modified Files:
src/sys/arch/powerpc/include/oea: bat.h
Log Message:
Include powerpc/psl.h
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/include/oea/bat.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/powerpc/include/oea/bat.h
diff -u src/sys/arch/powerpc/include/oea/bat.h:1.13 src/sys/arch/powerpc/include/oea/bat.h:1.14
--- src/sys/arch/powerpc/include/oea/bat.h:1.13 Tue Jul 21 07:08:57 2009
+++ src/sys/arch/powerpc/include/oea/bat.h Mon Jun 20 06:04:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bat.h,v 1.13 2009/07/21 07:08:57 nisimura Exp $ */
+/* $NetBSD: bat.h,v 1.14 2011/06/20 06:04:33 matt Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -64,6 +64,8 @@
#define _POWERPC_OEA_BAT_H_
#if defined(_KERNEL) !defined(_LOCORE)
+#include powerpc/psl.h
+
struct bat {
register_t batu;
register_t batl;
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: matt Date: Mon Jun 20 06:04:34 UTC 2011 Modified Files: src/sys/arch/powerpc/include/oea: bat.h Log Message: Include powerpc/psl.h To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/include/oea/bat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
