CVS commit: src/sys/arch/ofppc/ofppc
Module Name:src
Committed By: andvar
Date: Fri Nov 3 20:25:13 UTC 2023
Modified Files:
src/sys/arch/ofppc/ofppc: cpu.c
Log Message:
Remove unused msr definition.
Fixes ofppc GENERIC.MP build.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/ofppc/ofppc/cpu.c
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/ofppc/ofppc/cpu.c
diff -u src/sys/arch/ofppc/ofppc/cpu.c:1.16 src/sys/arch/ofppc/ofppc/cpu.c:1.17
--- src/sys/arch/ofppc/ofppc/cpu.c:1.16 Wed Jun 29 06:13:09 2011
+++ src/sys/arch/ofppc/ofppc/cpu.c Fri Nov 3 20:25:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.16 2011/06/29 06:13:09 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.17 2023/11/03 20:25:13 andvar Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.16 2011/06/29 06:13:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.17 2023/11/03 20:25:13 andvar Exp $");
#include "opt_ppcparam.h"
#include "opt_multiprocessor.h"
@@ -238,9 +238,7 @@ int
md_setup_trampoline(volatile struct cpu_hatch_data *h, struct cpu_info *ci)
{
int i;
- u_int msr;
- msr = mfmsr();
h->hatch_running = -1;
cpu_spinstart_cpunum = ci->ci_cpuid;
__asm volatile("dcbf 0,%0"::"r"(&cpu_spinstart_cpunum):"memory");
CVS commit: src/sys/arch/ofppc/ofppc
Module Name:src Committed By: andvar Date: Fri Nov 3 20:25:13 UTC 2023 Modified Files: src/sys/arch/ofppc/ofppc: cpu.c Log Message: Remove unused msr definition. Fixes ofppc GENERIC.MP build. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/ofppc/ofppc/cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
re: CVS commit: src/sys/arch/ofppc/ofppc
"Frank Wille" writes: > Module Name: src > Committed By: phx > Date: Wed Dec 31 18:43:18 UTC 2014 > > Modified Files: > src/sys/arch/ofppc/ofppc: mainbus.c > > Log Message: > Make it compile with GCC48. thanks. no idea how this didn't trigger for me. we might need this on netbsd-7 as well.. .mrg.
Re: CVS commit: src/sys/arch/ofppc/ofppc
On Thu, Aug 18, 2011 at 08:55:44AM +, Frank Wille wrote: > Module Name: src > Committed By: phx > Date: Thu Aug 18 08:55:43 UTC 2011 > > Modified Files: > src/sys/arch/ofppc/ofppc: disksubr.c > > Log Message: > First check whether an MBR is present. Then use it for locating the disklabel. > Otherwise try to construct a disklabel from RDB partitions, and when > everything fails, look for a raw NetBSD disklabel in LABELSECTOR. > This is the same sequence as in ofwboot now. > Also fixed some typos in the comments. Might be worth looking/using/updating the MI(ish) code that i386 uses when playing 'hunt the label'. After all disks get moved between machines. David -- David Laight: da...@l8s.co.uk
CVS commit: src/sys/arch/ofppc/ofppc
Module Name:src Committed By: kiyohara Date: Wed Mar 10 18:18:47 UTC 2010 Modified Files: src/sys/arch/ofppc/ofppc: machdep.c Log Message: Remove unnecessary function declarations. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/sys/arch/ofppc/ofppc/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ofppc/ofppc
Module Name:src Committed By: kiyohara Date: Wed Mar 10 18:18:47 UTC 2010 Modified Files: src/sys/arch/ofppc/ofppc: machdep.c Log Message: Remove unnecessary function declarations. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/sys/arch/ofppc/ofppc/machdep.c 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/ofppc/ofppc/machdep.c diff -u src/sys/arch/ofppc/ofppc/machdep.c:1.111 src/sys/arch/ofppc/ofppc/machdep.c:1.112 --- src/sys/arch/ofppc/ofppc/machdep.c:1.111 Wed Mar 10 18:06:57 2010 +++ src/sys/arch/ofppc/ofppc/machdep.c Wed Mar 10 18:18:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.111 2010/03/10 18:06:57 kiyohara Exp $ */ +/* $NetBSD: machdep.c,v 1.112 2010/03/10 18:18:47 kiyohara Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. * All rights reserved. @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.111 2010/03/10 18:06:57 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.112 2010/03/10 18:18:47 kiyohara Exp $"); #include #include @@ -68,9 +68,6 @@ struct pmap ofw_pmap; char bootpath[256]; -void ofwppc_batinit(void); -void ofppc_bootstrap_console(void); - extern u_int l2cr_config; #if (NRTAS > 0) extern int machine_has_rtas;
CVS commit: src/sys/arch/ofppc/ofppc
Module Name:src
Committed By: kiyohara
Date: Wed Mar 10 18:06:57 UTC 2010
Modified Files:
src/sys/arch/ofppc/ofppc: locore.S machdep.c mainbus.c
Log Message:
Remove white-spaces.
Indent.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/ofppc/ofppc/locore.S
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/ofppc/ofppc/machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/ofppc/ofppc/mainbus.c
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/ofppc/ofppc/locore.S
diff -u src/sys/arch/ofppc/ofppc/locore.S:1.43 src/sys/arch/ofppc/ofppc/locore.S:1.44
--- src/sys/arch/ofppc/ofppc/locore.S:1.43 Thu Feb 25 23:33:45 2010
+++ src/sys/arch/ofppc/ofppc/locore.S Wed Mar 10 18:06:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.43 2010/02/25 23:33:45 matt Exp $ */
+/* $NetBSD: locore.S,v 1.44 2010/03/10 18:06:57 kiyohara Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -129,7 +129,7 @@
bl _C_LABEL(initppc)
bl _C_LABEL(main)
b _C_LABEL(OF_exit)
-
+
/*
* Pull in common OFW code.
*/
Index: src/sys/arch/ofppc/ofppc/machdep.c
diff -u src/sys/arch/ofppc/ofppc/machdep.c:1.110 src/sys/arch/ofppc/ofppc/machdep.c:1.111
--- src/sys/arch/ofppc/ofppc/machdep.c:1.110 Thu Feb 25 23:33:45 2010
+++ src/sys/arch/ofppc/ofppc/machdep.c Wed Mar 10 18:06:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.110 2010/02/25 23:33:45 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.111 2010/03/10 18:06:57 kiyohara Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.110 2010/02/25 23:33:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.111 2010/03/10 18:06:57 kiyohara Exp $");
#include
#include
@@ -391,7 +391,8 @@
}
if (!of_to_uint32_prop(dict, node, "address", "address")) {
uint32_t fbaddr = 0;
- OF_interpret("frame-buffer-adr", 0, 1, &fbaddr);
+
+ OF_interpret("frame-buffer-adr", 0, 1, &fbaddr);
if (fbaddr != 0)
prop_dictionary_set_uint32(dict, "address", fbaddr);
}
Index: src/sys/arch/ofppc/ofppc/mainbus.c
diff -u src/sys/arch/ofppc/ofppc/mainbus.c:1.24 src/sys/arch/ofppc/ofppc/mainbus.c:1.25
--- src/sys/arch/ofppc/ofppc/mainbus.c:1.24 Fri Jan 15 20:57:25 2010
+++ src/sys/arch/ofppc/ofppc/mainbus.c Wed Mar 10 18:06:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.24 2010/01/15 20:57:25 phx Exp $ */
+/* $NetBSD: mainbus.c,v 1.25 2010/03/10 18:06:57 kiyohara Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.24 2010/01/15 20:57:25 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.25 2010/03/10 18:06:57 kiyohara Exp $");
#include "opt_interrupt.h"
#include "opt_multiprocessor.h"
@@ -152,7 +152,7 @@
if (len < sizeof(int)*2)
return FALSE;
- if (len == sizeof(int)*2) {
+ if (len == sizeof(int)*2) {
baseaddr = (unsigned char *)mapiodev(reg[0], reg[1]);
aprint_verbose("Found openpic at %08x\n", reg[0]);
#ifdef PIC_OPENPIC
@@ -179,7 +179,7 @@
return FALSE;
if (i > OPENPIC_MAX_ISUS)
aprint_error("Increase OPENPIC_MAX_ISUS to %d\n", i);
-
+
baseaddr = (unsigned char *)mapiodev(reg[0], 0x4);
aprint_verbose("Found openpic at %08x\n", reg[0]);
CVS commit: src/sys/arch/ofppc/ofppc
Module Name:src Committed By: kiyohara Date: Wed Mar 10 18:06:57 UTC 2010 Modified Files: src/sys/arch/ofppc/ofppc: locore.S machdep.c mainbus.c Log Message: Remove white-spaces. Indent. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/ofppc/ofppc/locore.S cvs rdiff -u -r1.110 -r1.111 src/sys/arch/ofppc/ofppc/machdep.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/ofppc/ofppc/mainbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ofppc/ofppc
Module Name:src Committed By: phx Date: Wed Jan 20 17:12:08 UTC 2010 Modified Files: src/sys/arch/ofppc/ofppc: machdep.c Log Message: Have to include rtas.h for NRTAS definition. To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/sys/arch/ofppc/ofppc/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ofppc/ofppc
Module Name:src Committed By: phx Date: Sat Jan 16 21:05:28 UTC 2010 Modified Files: src/sys/arch/ofppc/ofppc: machdep.c Log Message: Allow compilation without rtas device being configured. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/arch/ofppc/ofppc/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ofppc/ofppc
Module Name:src Committed By: phx Date: Fri Jan 15 20:57:25 UTC 2010 Modified Files: src/sys/arch/ofppc/ofppc: mainbus.c Log Message: Fixed crash, when /rtas was not found: OF_finddevice() returns -1 when the device is not found. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/ofppc/ofppc/mainbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
