Mon Mar 29 14:27:36 2021 UTC ()

Use IBM405GP_UART0_BASE instead of hard-coded magic number 0xef000000.

No functional changes since:

	IBM405GP_UART0_BASE & ~(TLB_PG_SIZE - 1) == 0xef000000

See ppc4xx_tlb_reserve() in ibm4xx/pmap.c.


(rin)

diff -r1.60 -r1.61 src/sys/arch/evbppc/walnut/machdep.c

--- src/sys/arch/evbppc/walnut/machdep.c 2021/03/29 14:21:08	1.60
+++ src/sys/arch/evbppc/walnut/machdep.c 2021/03/29 14:27:36	1.61

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.60 2021/03/29 14:21:08 rin Exp $	*/
+/*	$NetBSD: machdep.c,v 1.61 2021/03/29 14:27:36 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.60 2021/03/29 14:21:08 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.61 2021/03/29 14:27:36 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>
 @@ -96,26 +96,27 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
 #include <prop/proplib.h>
 #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/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>
 @@ -154,27 +155,27 @@ initppc(vaddr_t startkernel, vaddr_t end
         cpu_probe_cache();
 	/* 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(0xef000000,
+	ppc4xx_tlb_reserve(IBM405GP_UART0_BASE,
 	    roundup(board_data.mem_size, TLB_PG_SIZE),
 	    TLB_PG_SIZE, TLB_I | TLB_G);
 	mtspr(SPR_TCR, 0);	/* disable all timers */
 	ibm4xx_init(startkernel, endkernel, pic_ext_intr);
 #ifdef DEBUG
 	printf("Board config data:\n");
 	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",