Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/powerpc/oea avoid mapping 0xfffff000 - my beige G3 ...



details:   https://anonhg.NetBSD.org/src/rev/38f264513379
branches:  trunk
changeset: 982119:38f264513379
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Apr 01 22:02:20 2021 +0000

description:
avoid mapping 0xfffff000 - my beige G3 DSIs on it
with this my the machine boots again
tested on a variety of G4 and G5 models with no problems

diffstat:

 sys/arch/powerpc/oea/ofwoea_machdep.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r e6a4462e2775 -r 38f264513379 sys/arch/powerpc/oea/ofwoea_machdep.c
--- a/sys/arch/powerpc/oea/ofwoea_machdep.c     Thu Apr 01 19:00:33 2021 +0000
+++ b/sys/arch/powerpc/oea/ofwoea_machdep.c     Thu Apr 01 22:02:20 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwoea_machdep.c,v 1.59 2021/03/05 18:10:06 thorpej Exp $ */
+/* $NetBSD: ofwoea_machdep.c,v 1.60 2021/04/01 22:02:20 macallan Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.59 2021/03/05 18:10:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.60 2021/04/01 22:02:20 macallan Exp $");
 
 #include "ksyms.h"
 #include "wsdisplay.h"
@@ -378,6 +378,14 @@
                if (va < 0xf0000000)    /* XXX */
                        continue;
 
+               /*
+                * XXX
+                * my beige G3 throws a DSI trap if we try to map the last page
+                * of the firmware ROM
+                */
+               if (pa == 0xffc00000 && size == 0x400000)
+                       size = 0x3ff000;
+
                while (size > 0) {
                        pmap_enter(&ofw_pmap, va, pa, VM_PROT_ALL,
                            VM_PROT_ALL|PMAP_WIRED);



Home | Main Index | Thread Index | Old Index