 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.64 2021/03/30 01:33:50 rin Exp $	*/
+/*	$NetBSD: machdep.c,v 1.65 2021/03/30 02:04:44 rin Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -57,27 +57,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.64 2021/03/30 01:33:50 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.65 2021/03/30 02:04:44 rin Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/boot_flag.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/exec.h>
 #include <sys/kernel.h>
 #include <sys/ksyms.h>
 @@ -98,26 +98,28 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
 #include <machine/powerpc.h>
 #include <machine/walnut.h>
 #include <powerpc/trap.h>
 #include <powerpc/pcb.h>
 #include <powerpc/spr.h>
 #include <powerpc/ibm4xx/spr.h>
 #include <powerpc/ibm4xx/cpu.h>
 #include <powerpc/ibm4xx/dcr4xx.h>
 #include <powerpc/ibm4xx/ibm405gp.h>
 #include <powerpc/ibm4xx/openbios.h>
 #include <powerpc/ibm4xx/pci_machdep.h>
 #include <powerpc/pic/picvar.h>
 #include <dev/cons.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
 #include "ksyms.h"
 #if defined(DDB)
 #include <powerpc/db_machdep.h>
 #include <ddb/db_extern.h>
 @@ -129,127 +131,78 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
 /*
  * Global variables used here and there
  */
 struct vm_map *phys_map = NULL;
 /*
  * This should probably be in autoconf!				XXX
  */
 char machine[] = MACHINE;		/* from <machine/param.h> */
 char machine_arch[] = MACHINE_ARCH;	/* from <machine/param.h> */
 void initppc(vaddr_t, vaddr_t, char *, void *);
 struct board_cfg_data board_data;
 void
 initppc(vaddr_t startkernel, vaddr_t endkernel, char *args, void *info_block)
+{
 	u_int memsize;
 	/* Disable all external interrupts */
 	mtdcr(DCR_UIC0_BASE + DCR_UIC_ER, 0);
-        /* Initialize cache info for memcpy, etc. */
+	/* Setup board from OpenBIOS */
-        cpu_probe_cache();
+	openbios_board_init(info_block);
 	memsize = openbios_board_memsize_get();
 	/* Save info block */
 	memcpy(&board_data, info_block, sizeof(board_data));
 	ibm40x_memsize_init(board_data.mem_size, startkernel);
 	/* Linear map kernel memory */
 	for (vaddr_t va = 0; va < endkernel; va += TLB_PG_SIZE) {
 		ppc4xx_tlb_reserve(va, va, TLB_PG_SIZE, TLB_EX);
+	}
 	/* Map console after physmem (see pmap_tlbmiss()) */
-	ppc4xx_tlb_reserve(IBM405GP_UART0_BASE,
+	ppc4xx_tlb_reserve(IBM405GP_UART0_BASE, roundup(memsize, TLB_PG_SIZE),
 	    roundup(board_data.mem_size, TLB_PG_SIZE),
 	    TLB_PG_SIZE, TLB_I | TLB_G);
 	mtspr(SPR_TCR, 0);	/* disable all timers */
 	ibm40x_memsize_init(memsize, startkernel);
 	ibm4xx_init(startkernel, endkernel, pic_ext_intr);
 #ifdef DEBUG
-	printf("Board config data:\n");
+	openbios_board_print();
 	printf("  usr_config_ver = %s\n", board_data.usr_config_ver);
 	printf("  rom_sw_ver = %s\n", board_data.rom_sw_ver);
 	printf("  mem_size = %u\n", board_data.mem_size);
 	printf("  mac_address_local = %02x:%02x:%02x:%02x:%02x:%02x\n",
 	    board_data.mac_address_local[0], board_data.mac_address_local[1],
 	    board_data.mac_address_local[2], board_data.mac_address_local[3],
 	    board_data.mac_address_local[4], board_data.mac_address_local[5]);
 	printf("  mac_address_pci = %02x:%02x:%02x:%02x:%02x:%02x\n",
 	    board_data.mac_address_pci[0], board_data.mac_address_pci[1],
 	    board_data.mac_address_pci[2], board_data.mac_address_pci[3],
 	    board_data.mac_address_pci[4], board_data.mac_address_pci[5]);
 	printf("  processor_speed = %u\n", board_data.processor_speed);
 	printf("  plb_speed = %u\n", board_data.plb_speed);
 	printf("  pci_speed = %u\n", board_data.pci_speed);
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/*
 	 * Look for the ibm4xx modules in the right place.
 	 */
 	module_machine = module_machine_ibm4xx;
+}
 /*
  * Machine dependent startup code.
  */
 void
 cpu_startup(void)
+{
 	prop_number_t pn;
 	prop_data_t pd;
 	ibm4xx_cpu_startup("Walnut PowerPC 405GP Evaluation Board");
-	board_info_init();
+	openbios_board_info_set();
 	pn = prop_number_create_integer(board_data.mem_size);
 	KASSERT(pn != NULL);
 	if (prop_dictionary_set(board_properties, "mem-size", pn) == false)
 		panic("setting mem-size");
 	prop_object_release(pn);
 	pd = prop_data_create_data_nocopy(board_data.mac_address_local,
 					  sizeof(board_data.mac_address_local));
 	KASSERT(pd != NULL);
 	if (prop_dictionary_set(board_properties, "emac0-mac-addr",
 				pd) == false)
 		panic("setting emac0-mac-addr");
 	prop_object_release(pd);
 	pd = prop_data_create_data_nocopy(board_data.mac_address_pci,
 					  sizeof(board_data.mac_address_pci));
 	KASSERT(pd != NULL);
 	if (prop_dictionary_set(board_properties, "sip0-mac-addr",
 				pd) == false)
 		panic("setting sip0-mac-addr");
 	prop_object_release(pd);
 	pn = prop_number_create_integer(board_data.processor_speed);
 	KASSERT(pn != NULL);
 	if (prop_dictionary_set(board_properties, "processor-frequency",
 				pn) == false)
 		panic("setting processor-frequency");
 	prop_object_release(pn);
 	/*
 	 * Now that we have VM, malloc()s are OK in bus_space.
 	 */
 	bus_space_mallocok();
 	fake_mapiodev = 0;
+}
 int
 ibm4xx_pci_bus_maxdevs(void *v, int busno)
+{
 	/*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.h,v 1.24 2021/03/30 01:16:45 rin Exp $	*/
+/*	$NetBSD: cpu.h,v 1.25 2021/03/30 02:04:44 rin Exp $	*/
 /*
  * Copyright 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -135,33 +135,14 @@ extern struct pic_ops pic_uic403;
 extern struct pic_ops pic_uic0;
 extern struct pic_ops pic_uic1;
 extern struct pic_ops pic_uic2;
 extern paddr_t msgbuf_paddr;
 extern vaddr_t msgbuf_vaddr;
 extern char msgbuf[MSGBUFSIZE];
 #endif /* _KERNEL */
 /* Board info dictionary */
 extern prop_dictionary_t board_properties;
 extern void board_info_init(void);
 /*****************************************************************************/
 /* THIS CODE IS OBSOLETE. WILL BE REMOVED */
 /*
  * Board configuration structure from the OpenBIOS.
  */
 struct board_cfg_data {
 	unsigned char	usr_config_ver[4];
 	unsigned char	rom_sw_ver[30];
 	unsigned int	mem_size;
 	unsigned char	mac_address_local[6];
 	unsigned char	mac_address_pci[6];
 	unsigned int	processor_speed;
 	unsigned int	plb_speed;
 	unsigned int	pci_speed;
 };
 extern struct board_cfg_data board_data;
 /*****************************************************************************/
 #endif	/* _IBM4XX_CPU_H_ */

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.walnut.inc,v 1.10 2021/03/29 13:12:38 rin Exp $
+#	$NetBSD: Makefile.walnut.inc,v 1.11 2021/03/30 02:04:43 rin Exp $
 MKIMG?=	${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
 CFLAGS+=-mcpu=405
 AFLAGS+=-mcpu=405
 TEXTADDR?=	25000
-SYSTEM_FIRST_OBJ=	walnut_start.o
+SYSTEM_FIRST_OBJ=	locore.o
-SYSTEM_FIRST_SFILE=	${THISPPC}/walnut/walnut_start.S
+SYSTEM_FIRST_SFILE=	${POWERPC}/${PPCDIR}/openbios/locore.S
 SYSTEM_LD_TAIL_EXTRA_EXTRA+=; \
 	echo ${MKIMG} $@ $@.img ; \
 	OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT}; \
 		export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img

 @@ -1,23 +1,24 @@
-#	$NetBSD: files.walnut,v 1.18 2021/03/29 14:21:08 rin Exp $
+#	$NetBSD: files.walnut,v 1.19 2021/03/30 02:04:43 rin Exp $
+#
 # walnut-specific configuration info
 file	arch/evbppc/walnut/autoconf.c
 file	arch/evbppc/walnut/consinit.c
 file	arch/evbppc/walnut/machdep.c
 file	arch/powerpc/ibm4xx/ibm4xx_autoconf.c
 file	arch/powerpc/ibm4xx/ibm40x_machdep.c
 file	arch/powerpc/ibm4xx/ibm4xx_machdep.c
 file	arch/powerpc/ibm4xx/openbios/openbios.c
 # Memory Disk for install kernel
 file	dev/md_root.c				memory_disk_hooks
 # Machine-independent SCSI drivers
 include	"dev/scsipi/files.scsipi"
 # Machine-independent ATA drivers
 include	"dev/ata/files.ata"
 # Off-chip peripheral bus
 device	pbus {[addr=-1], [irq=-1]}
 attach	pbus at plb