 @@ -1,14 +1,14 @@
-/*	$NetBSD: atari_init.c,v 1.100 2012/08/10 17:43:32 tsutsui Exp $	*/
+/*	$NetBSD: atari_init.c,v 1.100.32.1 2018/03/13 13:41:13 martin Exp $	*/
 /*
  * Copyright (c) 1995 Leo Weppelman
  * Copyright (c) 1994 Michael L. Hitch
  * Copyright (c) 1993 Markus Wild
  * All rights reserved.
+ *
  * 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
 @@ -23,27 +23,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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: atari_init.c,v 1.100 2012/08/10 17:43:32 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.100.32.1 2018/03/13 13:41:13 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_mbtype.h"
 #include "opt_m060sp.h"
 #include "opt_m68k_arch.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/tty.h>
 #include <sys/buf.h>
 #include <sys/msgbuf.h>
 @@ -81,38 +81,55 @@ __KERNEL_RCSID(0, "$NetBSD: atari_init.c
 void start_c(int, u_int, u_int, u_int, char *);
 static void atari_hwinit(void);
 static void cpu_init_kcorehdr(paddr_t, paddr_t);
 static void initcpu(void);
 static void mmu030_setup(paddr_t, u_int, paddr_t, psize_t, paddr_t, paddr_t);
 static void map_io_areas(paddr_t, psize_t, u_int);
 static void set_machtype(void);
 #if defined(M68040) || defined(M68060)
 static void mmu040_setup(paddr_t, u_int, paddr_t, psize_t, paddr_t, paddr_t);
 #endif
 #if defined(_MILANHW_)
 static u_int milan_probe_bank_1(paddr_t paddr);
 static u_int milan_probe_bank(paddr_t paddr);
 #define NBANK	2
 #define NSLOT	4
 #define MB(n)		((n) * 1024 * 1024)
 #define MB_END(n)	(MB(n) - 1)
 #define MAGIC_4M	(4 - 1)
 #define MAGIC_4M_INV	((uint8_t)~MAGIC_4M)
 #define MAGIC_8M	(8 - 1)
 #define MAGIC_16M	(16 - 1)
 #define MAGIC_32M	(32 - 1)
 #define MAGIC_64M	(64 - 1)
 #endif
 /*
  * Extent maps to manage all memory space, including I/O ranges.  Allocate
- * storage for 8 regions in each, initially.  Later, iomem_malloc_safe
+ * storage for 16 regions in each, initially.  Later, iomem_malloc_safe
  * will indicate that it's safe to use malloc() to dynamically allocate
  * region descriptors.
  * This means that the fixed static storage is only used for registrating
  * the found memory regions and the bus-mapping of the console.
+ *
  * The extent maps are not static!  They are used for bus address space
  * allocation.
  */
-static long iomem_ex_storage[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)];
+static long iomem_ex_storage[EXTENT_FIXED_STORAGE_SIZE(16) / sizeof(long)];
 struct extent *iomem_ex;
 int iomem_malloc_safe;
 /*
  * All info needed to generate a panic dump. All fields are setup by
  * start_c().
  * XXX: Should sheck usage of phys_segs. There is some unwanted overlap
  *      here.... Also, the name is badly choosen. Phys_segs contains the
  *      segment descriptions _after_ reservations are made.
  * XXX: 'lowram' is obsoleted by the new panicdump format
  */
 static cpu_kcore_hdr_t cpu_kcore_hdr;
 @@ -194,43 +211,87 @@ start_c(int id, u_int ttphystart, u_int
 	vaddr_t		vstart;		/* Next available virtual address */
 	vsize_t		avail;
 	paddr_t		ptpa;
 	psize_t		ptsize;
 	u_int		ptextra;
 	vaddr_t		kva;
 	u_int		tc, i;
 	pt_entry_t	*pg, *epg;
 	pt_entry_t	pg_proto;
 	vaddr_t		end_loaded;
 	paddr_t		kbase;
 	u_int		kstsize;
 	paddr_t		Sysptmap_pa;
 #if defined(_MILANHW_)
-	/* XXX
+	/*
 	 * XXX The right place todo this is probably the booter (Leo)
 	 * XXX More than 16MB memory is not yet supported on the Milan!
 	 * The Milan Lies about the presence of TT-RAM. If you insert
 	 * 16MB it is split in 14MB ST starting at address 0 and 2MB TT RAM,
-	 * starting at address 16MB.
+	 * starting at address 16MB as the BIOS remapping memory using MMU.
+	 *
 	 * Milan actually has four SIMM slots and each slot has two banks,
 	 * so it could have up to 8 memory segment regions.
 	 */
-	stphysize += ttphysize;
+	const paddr_t simm_base[NBANK][NSLOT] = {
-	ttphysize  = ttphystart = 0;
+		/* slot 0-3, bank 0 */
-#endif
+		{ 0x00000000, 0x04000000, 0x08000000, 0x0c000000 },
 		/* slot 0-3, bank 1 */
 		{ 0x10000000, 0x14000000, 0x18000000, 0x1c000000 }
 	};
 	int slot, bank, seg;
 	u_int mb;
 	/* On Milan, all RAMs are fast 32 bit so no need to reloc kernel */
 	reloc_kernel = 0;
 	/* probe memory region in all SIMM slots and banks */
 	seg = 0;
 	ttphysize = 0;
 	for (bank = 0; bank < 2; bank++) {
 		for (slot = 0; slot < 4; slot++) {
 			if (bank == 0 && slot == 0) {
 				/*
 				 * The first bank has at least 16MB because
 				 * the Milan's ROM bootloader requires it
 				 * to allocate ST RAM.
 				 */
 				mb = milan_probe_bank_1(simm_base[bank][slot]);
 				boot_segs[0].start = 0;
 				boot_segs[0].end   = MB(mb);
 				stphysize          = MB(mb);
 				seg++;
 			} else {
 				/*
 				 * The rest banks could be empty or
 				 * have 4, 8, 16, 32, or 64MB.
 				 */
 				mb = milan_probe_bank(simm_base[bank][slot]);
 				if (mb > 0) {
 					boot_segs[seg].start =
 					    simm_base[bank][slot];
 					boot_segs[seg].end   =
 					    simm_base[bank][slot] + MB(mb);
 					ttphysize += MB(mb);
 					seg++;
+				}
+			}
+		}
+	}
 #else /* _MILANHW_ */
 	boot_segs[0].start       = 0;
 	boot_segs[0].end         = stphysize;
 	boot_segs[1].start       = ttphystart;
 	boot_segs[1].end         = ttphystart + ttphysize;
 	boot_segs[2].start = boot_segs[2].end = 0; /* End of segments! */
 #endif
 	/*
 	 * The following is a hack. We do not know how much ST memory we
 	 * really need until after configuration has finished. At this
 	 * time I have no idea how to grab ST memory at that time.
 	 * The round_page() call is ment to correct errors made by
 	 * binpatching!
 	 */
 	st_pool_size   = m68k_round_page(st_pool_size);
 	st_pool_phys   = stphysize - st_pool_size;
 	stphysize      = st_pool_phys;
 	physmem        = btoc(stphysize) + btoc(ttphysize);
 @@ -474,49 +535,60 @@ start_c(int id, u_int ttphystart, u_int
 		Sysseg_pa   += kbase;
 		Sysptmap_pa += kbase;
+	}
 	lowram  = 0 >> PGSHIFT; /* XXX */
 	/*
 	 * Fill in usable segments. The page indexes will be initialized
 	 * later when all reservations are made.
 	 */
 	usable_segs[0].start = 0;
 	usable_segs[0].end   = stphysize;
 	usable_segs[0].free_list = VM_FREELIST_STRAM;
 #if defined(_MILANHW_)
 	for (i = 1; i < seg; i++) {
 		usable_segs[i].start = boot_segs[i].start;
 		usable_segs[i].end   = boot_segs[i].end;
 		usable_segs[i].free_list = VM_FREELIST_TTRAM;
+	}
 	for (; i < NMEM_SEGS; i++) {
 		usable_segs[i].start = usable_segs[i].end = 0;
+	}
 #else
 	usable_segs[1].start = ttphystart;
 	usable_segs[1].end   = ttphystart + ttphysize;
 	usable_segs[1].free_list = VM_FREELIST_TTRAM;
 	usable_segs[2].start = usable_segs[2].end = 0; /* End of segments! */
 #endif
 	if (kbase) {
 		/*
 		 * First page of ST-ram is unusable, reserve the space
 		 * for the kernel in the TT-ram segment.
 		 * Note: Because physical page-zero is partially mapped to ROM
 		 *       by hardware, it is unusable.
 		 */
 		usable_segs[0].start  = PAGE_SIZE;
 		usable_segs[1].start += pstart;
 	} else
 		usable_segs[0].start += pstart;
 	/*
 	 * As all segment sizes are now valid, calculate page indexes and
 	 * available physical memory.
 	 */
 	usable_segs[0].first_page = 0;
-	for (i = 1; usable_segs[i].start; i++) {
+	for (i = 1; i < NMEM_SEGS && usable_segs[i].start; i++) {
 		usable_segs[i].first_page  = usable_segs[i-1].first_page;
 		usable_segs[i].first_page +=
 		    (usable_segs[i-1].end - usable_segs[i-1].start) / PAGE_SIZE;
+	}
 	for (i = 0, physmem = 0; usable_segs[i].start; i++)
 		physmem += usable_segs[i].end - usable_segs[i].start;
 	physmem >>= PGSHIFT;
 	/*
 	 * get the pmap module in sync with reality.
 	 */
 	pmap_bootstrap(vstart);
 @@ -599,41 +671,186 @@ start_c(int id, u_int ttphystart, u_int
 	 * descriptor storage has already been allocated).
+	 *
 	 * N.B. The iomem extent manages _all_ physical addresses
 	 * on the machine.  When the amount of RAM is found, all
 	 * extents of RAM are allocated from the map.
 	 */
 	iomem_ex = extent_create("iomem", 0x0, 0xffffffff,
 	    (void *)iomem_ex_storage, sizeof(iomem_ex_storage),
 	    EX_NOCOALESCE|EX_NOWAIT);
 	/*
 	 * Allocate the physical RAM from the extent map
 	 */
-	for (i = 0; boot_segs[i].end != 0; i++) {
+	for (i = 0; i < NMEM_SEGS && boot_segs[i].end != 0; i++) {
 		if (extent_alloc_region(iomem_ex, boot_segs[i].start,
 		    boot_segs[i].end - boot_segs[i].start, EX_NOWAIT)) {
 			/* XXX: Ahum, should not happen ;-) */
 			printf("Warning: Cannot allocate boot memory from"
 			    " extent map!?\n");
+		}
+	}
 	/*
 	 * Initialize interrupt mapping.
 	 */
 	intr_init();
+}
 #if defined(_MILANHW_)
 /*
  * Probe and return available memory size in MB at specfied address.
  * The first slot SIMM have at least 16MB, so check if it has 32 or 64 MB.
+ *
  * Note it seems Milan does not generate bus errors on accesses against
  * address regions where memory doesn't exist, but it returns memory images
  * of lower address of the bank.
  */
 static u_int
 milan_probe_bank_1(paddr_t start_paddr)
+{
 	volatile uint8_t *base;
 	u_int mb;
 	uint8_t save_16, save_32, save_64;
 	/* Assume that this bank has at least 16MB */
 	mb = 16;
 	base = (uint8_t *)start_paddr;
 	/* save and write a MAGIC at the end of 16MB region */
 	save_16 = base[MB_END(16)];
 	base[MB_END(16)] = MAGIC_16M;
 	/* check bus error at the end of 32MB region */
 	if (badbaddr(__UNVOLATILE(base + MB_END(32)), sizeof(uint8_t))) {
 		/* bus error; assume no memory there */
 		goto out16;
+	}
 	/* check if the 32MB region is not image of the prior 16MB region */
 	save_32 = base[MB_END(32)];
 	base[MB_END(32)] = MAGIC_32M;
 	if (base[MB_END(32)] != MAGIC_32M || base[MB_END(16)] != MAGIC_16M) {
 		/* no memory or image at the 32MB region */
 		goto out16;
+	}
 	/* we have at least 32MB */
 	mb = 32;
 	/* check bus error at the end of 64MB region */
 	if (badbaddr(__UNVOLATILE(base + MB_END(64)), sizeof(uint8_t))) {
 		/* bus error; assume no memory there */
 		goto out32;
+	}
 	/* check if the 64MB region is not image of the prior 32MB region */
 	save_64 = base[MB_END(64)];
 	base[MB_END(64)] = MAGIC_64M;
 	if (base[MB_END(64)] != MAGIC_64M || base[MB_END(32)] != MAGIC_32M) {
 		/* no memory or image at the 64MB region */
 		goto out32;
+	}
 	/* we have 64MB */
 	mb = 64;
 	base[MB_END(64)] = save_64;
  out32:
 	base[MB_END(32)] = save_32;
  out16:
 	base[MB_END(16)] = save_16;
 	return mb;
+}
 /*
  * Probe and return available memory size in MB at specfied address.
  * The rest slot could be empty so check all possible size.
  */
 static u_int
 milan_probe_bank(paddr_t start_paddr)
+{
 	volatile uint8_t *base;
 	u_int mb;
 	uint8_t save_4, save_8, save_16;
 	/* The rest banks might have no memory */
 	mb = 0;
 	base = (uint8_t *)start_paddr;
 	/* check bus error at the end of 4MB region */
 	if (badbaddr(__UNVOLATILE(base + MB_END(4)), sizeof(uint8_t))) {
 		/* bus error; assume no memory there */
 		goto out;
+	}
 	/* check if the 4MB region has memory */
 	save_4 = base[MB_END(4)];
 	base[MB_END(4)] = MAGIC_4M_INV;
 	if (base[MB_END(4)] != MAGIC_4M_INV) {
 		/* no memory */
 		goto out;
+	}
 	base[MB_END(4)] = MAGIC_4M;
 	if (base[MB_END(4)] != MAGIC_4M) {
 		/* no memory */
 		goto out;
+	}
 	/* we have at least 4MB */
 	mb = 4;
 	/* check bus error at the end of 8MB region */
 	if (badbaddr(__UNVOLATILE(base + MB_END(8)), sizeof(uint8_t))) {
 		/* bus error; assume no memory there */
 		goto out4;
+	}
 	/* check if the 8MB region is not image of the prior 4MB region */
 	save_8 = base[MB_END(8)];
 	base[MB_END(8)] = MAGIC_8M;
 	if (base[MB_END(8)] != MAGIC_8M || base[MB_END(4)] != MAGIC_4M) {
 		/* no memory or image at the 8MB region */
 		goto out4;
+	}
 	/* we have at least 8MB */
 	mb = 8;
 	/* check bus error at the end of 16MB region */
 	if (badbaddr(__UNVOLATILE(base + MB_END(16)), sizeof(uint8_t))) {
 		/* bus error; assume no memory there */
 		goto out8;
+	}
 	/* check if the 16MB region is not image of the prior 8MB region */
 	save_16 = base[MB_END(16)];
 	base[MB_END(16)] = MAGIC_16M;
 	if (base[MB_END(16)] != MAGIC_16M || base[MB_END(8)] != MAGIC_8M) {
 		/* no memory or image at the 32MB region */
 		goto out8;
+	}
 	/* we have at least 16MB, so check more region as the first bank */
 	mb = milan_probe_bank_1(start_paddr);
 	base[MB_END(16)] = save_16;
  out8:
 	base[MB_END(8)] = save_8;
  out4:
 	base[MB_END(4)] = save_4;
  out:
 	return mb;
+}
 #endif	/* _MILANHW_ */
 /*
  * Try to figure out on what type of machine we are running
  * Note: This module runs *before* the io-mapping is setup!
  */
 static void
 set_machtype(void)
+{
 #ifdef _MILANHW_
 	machineid |= ATARI_MILAN;
 #else
 	stio_addr = 0xff8000;	/* XXX: For TT & Falcon only */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus.c,v 1.58 2014/10/18 08:33:24 snj Exp $	*/
+/*	$NetBSD: bus.c,v 1.58.12.1 2018/03/13 13:41:13 martin Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and by Chris G. Demetriou.
+ *
  * 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
 @@ -23,27 +23,27 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * 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 "opt_m68k_arch.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.58 2014/10/18 08:33:24 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.58.12.1 2018/03/13 13:41:13 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <uvm/uvm.h>
 #include <machine/cpu.h>
 #include <m68k/cacheops.h>
 #define	_ATARI_BUS_DMA_PRIVATE
 @@ -241,27 +241,27 @@ bus_mem_add_mapping(bus_space_tag_t t, b
+	}
 	va = uvm_km_alloc(kernel_map, endpa - pa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (va == 0)
 		return ENOMEM;
 	*bshp = va + (bpa & PGOFSET);
 	for (; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
 		u_int	*ptep, npte;
 		pmap_enter(pmap_kernel(), (vaddr_t)va, pa,
-		    VM_PROT_READ|VM_PROT_WRITE, PMAP_WIRED);
+		    VM_PROT_READ|VM_PROT_WRITE, VM_PROT_READ|VM_PROT_WRITE);
 		ptep = kvtopte(va);
 		npte = *ptep & ~PG_CMASK;
 		if ((flags & BUS_SPACE_MAP_CACHEABLE) == 0)
 			npte |= PG_CI;
 		else if (mmutype == MMU_68040)
 			npte |= PG_CCB;
 		*ptep = npte;
+	}
 	pmap_update(pmap_kernel());
 	TBIAS();
 @@ -538,66 +538,223 @@ _bus_dmamap_unload(bus_dma_tag_t t, bus_
 	 * No resources to free; just mark the mappings as
 	 * invalid.
 	 */
 	map->dm_maxsegsz = map->_dm_maxmaxsegsz;
 	map->dm_mapsize = 0;
 	map->dm_nsegs = 0;
+}
 /*
  * Common function for DMA map synchronization.  May be called
  * by bus-specific DMA map synchronization functions.
  */
 void
-_bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t off,
+_bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t offset,
     bus_size_t len, int ops)
+{
 #if defined(M68040) || defined(M68060)
-	int	i, pa_off, inc, seglen;
+	bus_addr_t p, e, ps, pe;
-	u_long	pa, end_pa;
+	bus_size_t seglen;
 	bus_dma_segment_t *seg;
 	int i;
 #endif
-	pa_off = t->_displacement;
+#if defined(M68020) || defined(M68030)
 #if defined(M68040) || defined(M68060)
 	if (cputype == CPU_68020 || cputype == CPU_68030)
 #endif
 		/* assume no L2 physical cache */
 		return;
 #endif
-	/* Flush granularity */
+#if defined(M68040) || defined(M68060)
-	inc = (len > 1024) ? PAGE_SIZE : 16;
+	/* If the whole DMA map is uncached, do nothing. */
 	if ((map->_dm_flags & BUS_DMA_COHERENT) != 0)
 		return;
 	/* Short-circuit for unsupported `ops' */
 	if ((ops & (BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE)) == 0)
 		return;
-	for (i = 0; i < map->dm_nsegs && len > 0; i++) {
+	/*
-		if (map->dm_segs[i].ds_len <= off) {
+	 * flush/purge the cache.
 	 */
 	for (i = 0; i < map->dm_nsegs && len != 0; i++) {
 		seg = &map->dm_segs[i];
 		if (seg->ds_len <= offset) {
 			/* Segment irrelevant - before requested offset */
-			off -= map->dm_segs[i].ds_len;
+			offset -= seg->ds_len;
 			continue;
+		}
 		seglen = map->dm_segs[i].ds_len - off;
 		/*
 		 * Now at the first segment to sync; nail
 		 * each segment until we have exhausted the
 		 * length.
 		 */
 		seglen = seg->ds_len - offset;
 		if (seglen > len)
 			seglen = len;
 		len -= seglen;
 		pa = map->dm_segs[i].ds_addr + off - pa_off;
 		end_pa = pa + seglen;
-		if (inc == 16) {
+		ps = seg->ds_addr + offset;
-			pa &= ~15;
+		pe = ps + seglen;
 			while (pa < end_pa) {
-				DCFL(pa);
+		if (ops & BUS_DMASYNC_PREWRITE) {
-				pa += 16;
+			p = ps & ~CACHELINE_MASK;
 			e = (pe + CACHELINE_MASK) & ~CACHELINE_MASK;
 			/* flush cacheline */
 			while ((p < e) && (p & (CACHELINE_SIZE * 8 - 1)) != 0) {
 				DCFL(p);
 				p += CACHELINE_SIZE;
+			}
 		} else {
-			pa &= ~PGOFSET;
+			/* flush cachelines per 128bytes */
-			while (pa < end_pa) {
+			while ((p < e) && (p & PAGE_MASK) != 0) {
-				DCFP(pa);
+				DCFL(p);
-				pa += PAGE_SIZE;
+				p += CACHELINE_SIZE;
 				DCFL(p);
 				p += CACHELINE_SIZE;
 				DCFL(p);
 				p += CACHELINE_SIZE;
 				DCFL(p);
 				p += CACHELINE_SIZE;
 				DCFL(p);
 				p += CACHELINE_SIZE;
 				DCFL(p);
 				p += CACHELINE_SIZE;
 				DCFL(p);
 				p += CACHELINE_SIZE;
 				DCFL(p);
 				p += CACHELINE_SIZE;
+			}
 			/* flush page */
 			while (p + PAGE_SIZE <= e) {
 				DCFP(p);
 				p += PAGE_SIZE;
+			}
 			/* flush cachelines per 128bytes */
 			while (p + CACHELINE_SIZE * 8 <= e) {
 				DCFL(p);
 				p += CACHELINE_SIZE;
 				DCFL(p);
 				p += CACHELINE_SIZE;
 				DCFL(p);
 				p += CACHELINE_SIZE;
 				DCFL(p);
 				p += CACHELINE_SIZE;
 				DCFL(p);
 				p += CACHELINE_SIZE;
 				DCFL(p);
 				p += CACHELINE_SIZE;
 				DCFL(p);
 				p += CACHELINE_SIZE;
 				DCFL(p);
 				p += CACHELINE_SIZE;
+			}
 			/* flush cacheline */
 			while (p < e) {
 				DCFL(p);
 				p += CACHELINE_SIZE;
+			}
+		}
 		/*
 		 * Normally, the `PREREAD' flag instructs us to purge the
 		 * cache for the specified offset and length. However, if
 		 * the offset/length is not aligned to a cacheline boundary,
 		 * we may end up purging some legitimate data from the
 		 * start/end of the cache. In such a case, *flush* the
 		 * cachelines at the start and end of the required region.
 		 */
 		else if (ops & BUS_DMASYNC_PREREAD) {
 			/* flush cacheline on start boundary */
 			if (ps & CACHELINE_MASK) {
 				DCFL(ps & ~CACHELINE_MASK);
+			}
 			p = (ps + CACHELINE_MASK) & ~CACHELINE_MASK;
 			e = pe & ~CACHELINE_MASK;
 			/* purge cacheline */
 			while ((p < e) && (p & (CACHELINE_SIZE * 8 - 1)) != 0) {
 				DCPL(p);
 				p += CACHELINE_SIZE;
+			}
 			/* purge cachelines per 128bytes */
 			while ((p < e) && (p & PAGE_MASK) != 0) {
 				DCPL(p);
 				p += CACHELINE_SIZE;
 				DCPL(p);
 				p += CACHELINE_SIZE;
 				DCPL(p);
 				p += CACHELINE_SIZE;
 				DCPL(p);
 				p += CACHELINE_SIZE;
 				DCPL(p);
 				p += CACHELINE_SIZE;
 				DCPL(p);
 				p += CACHELINE_SIZE;
 				DCPL(p);
 				p += CACHELINE_SIZE;
 				DCPL(p);
 				p += CACHELINE_SIZE;
+			}
 			/* purge page */
 			while (p + PAGE_SIZE <= e) {
 				DCPP(p);
 				p += PAGE_SIZE;
+			}
 			/* purge cachelines per 128bytes */
 			while (p + CACHELINE_SIZE * 8 <= e) {
 				DCPL(p);
 				p += CACHELINE_SIZE;
 				DCPL(p);
 				p += CACHELINE_SIZE;
 				DCPL(p);
 				p += CACHELINE_SIZE;
 				DCPL(p);
 				p += CACHELINE_SIZE;
 				DCPL(p);
 				p += CACHELINE_SIZE;
 				DCPL(p);
 				p += CACHELINE_SIZE;
 				DCPL(p);
 				p += CACHELINE_SIZE;
 				DCPL(p);
 				p += CACHELINE_SIZE;
+			}
 			/* purge cacheline */
 			while (p < e) {
 				DCPL(p);
 				p += CACHELINE_SIZE;
+			}
 			/* flush cacheline on end boundary */
 			if (p < pe) {
 				DCFL(p);
+			}
+		}
 		offset = 0;
 		len -= seglen;
+	}
-#endif
+#endif	/* defined(M68040) || defined(M68060) */
+}
 /*
  * Common function for DMA-safe memory allocation.  May be called
  * by bus-specific DMA memory allocation functions.
  */
 int
 bus_dmamem_alloc(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment,
     bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs,
     int flags)
+{
 	return bus_dmamem_alloc_range(t, size, alignment, boundary,
 @@ -657,27 +814,27 @@ bus_dmamem_map(bus_dma_tag_t t, bus_dma_
 	if (va == 0)
 		return ENOMEM;
 	*kvap = (void *)va;
 	for (curseg = 0; curseg < nsegs; curseg++) {
 		for (addr = segs[curseg].ds_addr;
 		    addr < (segs[curseg].ds_addr + segs[curseg].ds_len);
 		    addr += PAGE_SIZE, va += PAGE_SIZE, size -= PAGE_SIZE) {
 			if (size == 0)
 				panic("_bus_dmamem_map: size botch");
 			pmap_enter(pmap_kernel(), va, addr - offset,
 			    VM_PROT_READ | VM_PROT_WRITE,
-			    VM_PROT_READ | VM_PROT_WRITE | PMAP_WIRED);
+			    VM_PROT_READ | VM_PROT_WRITE);
+		}
+	}
 	pmap_update(pmap_kernel());
 	return 0;
+}
 /*
  * Common function for unmapping DMA-safe memory.  May be called by
  * bus-specific DMA memory unmapping functions.
  */
 void
 bus_dmamem_unmap(bus_dma_tag_t t, void *kva, size_t size)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.s,v 1.110 2011/12/22 15:33:28 tsutsui Exp $	*/
+/*	$NetBSD: locore.s,v 1.110.40.1 2018/03/13 13:41:13 martin Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1980, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -389,27 +389,27 @@ ENTRY_NOPROFILE(lev6intr)
 	oriw	#0x0700,%sr
 	movl	%d0,%a0@(PLX_CNTRL)
 	movq	#0,%d1			| clear upper bits
 					| Read any (uncached!) PCI address
 					|  to fetch vector number
 	movl	_C_LABEL(pci_mem_uncached),%a1
 	movb	%a1@,%d1
 	orw	#0x0600,%d0		| Change PCI command code back
 	movel	%d0,%a0@(PLX_CNTRL)	|  to Read Cycle
 	movew	%d2,%sr			| Re-enable interrupts
 	movel	%d1,%sp@-		| Call handler
 	jbsr	_C_LABEL(milan_isa_intr)
 	addql	#8,%sp
-	INTERRUPT_RESTOREREG
+	moveml  %sp@+,%d0-%d2/%a0-%a1
 	subql	#1,_C_LABEL(idepth)
 	jra	_ASM_LABEL(rei)
 /*
  * Support functions for reading and writing the Milan PCI config space.
  * Of interest:
  *   - We need exclusive access to the PLX9080 during config space
  *     access, hence the splhigh().
  *   - The 'confread' function shortcircuits the NMI to make probes to
  *     unexplored pci-config space possible.
  */
 ENTRY(milan_pci_confread)
 	movl	%sp@(4),%d0		| get tag and regno
 @@ -440,41 +440,39 @@ ENTRY(milan_pci_confwrite)
 	movw	%sr,%d1			| goto splhigh
 	oriw	#0x0700,%sr
 	movl	%d0,%a0@(PLX_DMCFGA)	| write tag to the config register
 	movl	_C_LABEL(pci_io_addr),%a1
 	movl	%sp@(8),%a1@		| write value
 	movl	#0,%a0@(PLX_DMCFGA)	| back to normal PCI access
 	movw	%d1,%sr			| splx
 	rts
 ENTRY_NOPROFILE(lev7intr)
 	tstl	_ASM_LABEL(plx_nonmi)	| milan_conf_read shortcut
 	jne	1f			| .... get out immediately
 	INTERRUPT_SAVEREG
 	moveml	%d0-%d1/%a0-%a1,%sp@-
 	movl	_C_LABEL(stio_addr),%a0	| get KVA of ST-IO area
 	movw	%a0@(PLX_PCICR),_C_LABEL(plx_status)
 	movw	#0xf900,%a0@(PLX_PCICR)	| Clear error bits
 	jbsr	_C_LABEL(nmihandler)	| notify...
 	INTERRUPT_RESTOREREG
 	addql	#1,_C_LABEL(intrcnt)+28	| add another nmi interrupt
 :
 	rte				| all done
 #endif /* _MILANHW_ */
 ENTRY_NOPROFILE(lev3intr)
 ENTRY_NOPROFILE(badtrap)
 	addql	#1,_C_LABEL(idepth)
 	moveml	#0xC0C0,%sp@-		|  save scratch regs
 	INTERRUPT_SAVEREG
 	movw	%sp@(22),%sp@-		|  push exception vector info
 	clrw	%sp@-
 	movl	%sp@(22),%sp@-		|  and PC
 	jbsr	_C_LABEL(straytrap)	|  report
 	addql	#8,%sp			|  pop args
 	INTERRUPT_RESTOREREG		|  restore regs
 	subql	#1,_C_LABEL(idepth)
 	jra	_ASM_LABEL(rei)		|  all done
 ENTRY_NOPROFILE(badmfpint)
 	addql	#1,_C_LABEL(idepth)
 	INTERRUPT_SAVEREG		|  save scratch regs

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nvram.c,v 1.20 2015/03/06 12:41:05 christos Exp $	*/
+/*	$NetBSD: nvram.c,v 1.20.10.1 2018/03/13 13:41:13 martin Exp $	*/
 /*
  * Copyright (c) 1995 Leo Weppelman.
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -20,27 +20,27 @@
  * 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.
  */
 /*
  * Nvram driver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.20 2015/03/06 12:41:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.20.10.1 2018/03/13 13:41:13 martin Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/buf.h>
 #include <sys/uio.h>
 #include <machine/iomap.h>
 #include <machine/cpu.h>
 @@ -82,31 +82,35 @@ nvr_match(device_t parent, cfdata_t cf,
 	return (0);
+}
 /*ARGSUSED*/
 static void
 nvr_attach(device_t parent, device_t self, void *aux)
+{
 	struct nvr_softc	*sc;
 	int			nreg;
 	/*
 	 * Check the validity of the NVram contents
 	 */
-	if (!nvram_csum_valid(nvram_csum())) {
+	/* XXX: Milan's firmware seems to use different check method */
-		printf(": Invalid checksum - re-initialized");
+	if ((machineid & ATARI_MILAN) == 0) {
-		for (nreg = MC_NVRAM_START; nreg < MC_NVRAM_CSUM; nreg++)
+		if (!nvram_csum_valid(nvram_csum())) {
-			mc146818_write(RTC, nreg, 0);
+			printf(": Invalid checksum - re-initialized");
-		nvram_set_csum(nvram_csum());
+			for (nreg = MC_NVRAM_START; nreg < MC_NVRAM_CSUM;
 			    nreg++)
 				mc146818_write(RTC, nreg, 0);
 			nvram_set_csum(nvram_csum());
+		}
+	}
 	sc = device_private(self);
 	sc->sc_dev = self;
 	sc->sc_flags = NVR_CONFIGURED;
 	printf("\n");
+}
 /*
  * End of auto config stuff....
  */
 #endif /* NNVR > 0 */
 /*
  * Kernel internal interface

 @@ -1,14 +1,14 @@
-/*	$NetBSD: isa_machdep.c,v 1.40 2012/10/13 17:58:54 jdc Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.40.30.1 2018/03/13 13:41:14 martin Exp $	*/
 /*
  * Copyright (c) 1997 Leo Weppelman.  All rights reserved.
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
  * Copyright (c) 1994 Charles M. Hannum.  All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
 @@ -22,27 +22,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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: isa_machdep.c,v 1.40 2012/10/13 17:58:54 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.40.30.1 2018/03/13 13:41:14 martin Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #define _ATARI_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <dev/isa/isavar.h>
 #include <dev/isa/isareg.h>
 #include "pckbc.h"
 #if (NPCKBC > 0)
 @@ -101,54 +101,55 @@ isabusmatch(device_t parent, cfdata_t cf
 		 * The Hades and Milan have only one pci bus
 		 */
 		if (nmatched)
 			return 0;
 		nmatched++;
 		return 1;
+	}
 	return 0;
+}
 void
 isabusattach(device_t parent, device_t self, void *aux)
+{
-	struct isabus_softc *sc = device_private(self);
+	struct isabus_softc *sc;
 	struct isabus_attach_args	iba;
 	extern struct atari_bus_dma_tag isa_bus_dma_tag;
 	extern void isa_bus_init(void);
 	sc->sc_dev = self;
 	iba.iba_dmat	= &isa_bus_dma_tag;
 	iba.iba_iot     = leb_alloc_bus_space_tag(&bs_storage[0]);
 	iba.iba_memt    = leb_alloc_bus_space_tag(&bs_storage[1]);
 	iba.iba_ic	= &sc->sc_chipset;
 	if ((iba.iba_iot == NULL) || (iba.iba_memt == NULL)) {
 		printf("leb_alloc_bus_space_tag failed!\n");
 		return;
+	}
 	iba.iba_iot->base  = ISA_IOSTART;
 	iba.iba_memt->base = ISA_MEMSTART;
 	if (machineid & ATARI_HADES)
 	    MFP->mf_aer |= (IO_ISA1|IO_ISA2); /* ISA interrupts: LOW->HIGH */
 	isa_bus_init();
 	if (self == NULL) { /* Early init */
 #if (NPCKBC > 0)
 		pckbc_cnattach(iba.iba_iot, IO_KBD, KBCMDP, PCKBC_KBD_SLOT, 0);
 #endif
 		return;
+	}
 	sc = device_private(self);
 	sc->sc_dev = self;
 	iba.iba_ic = &sc->sc_chipset;
 	printf("\n");
 	config_found_ia(self, "isabus", &iba, atariisabusprint);
+}
 int
 atariisabusprint(void *aux, const char *name)
+{
 	if (name == NULL)
 		return UNCONF;
 	return QUIET;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: isa_milan.c,v 1.14 2009/03/18 10:22:25 cegger Exp $	*/
+/*	$NetBSD: isa_milan.c,v 1.14.56.1 2018/03/13 13:41:14 martin Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Leo Weppelman.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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 THE FOUNDATION OR CONTRIBUTORS
  * 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: isa_milan.c,v 1.14 2009/03/18 10:22:25 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_milan.c,v 1.14.56.1 2018/03/13 13:41:14 martin Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <dev/isa/isavar.h>
 #include <dev/isa/isareg.h>
 #include <machine/iomap.h>
 void	isa_bus_init(void);
 @@ -112,66 +112,66 @@ new_imask(void)
 	WICU(AD_8259_SLAVE+1 , (imask_enable >> 8) & 0xff);
+}
 static void
 isa_callback(int vector)
+{
 	isa_intr_info_t	*iinfo_p;
 	int		s;
 	iinfo_p = &milan_isa_iinfo[vector];
 	s = splx(iinfo_p->ipl);
 	(void) (iinfo_p->ifunc)(iinfo_p->iarg);
-	if (vector > 7)
+	if (vector > 7) {
 		WICU(AD_8259_SLAVE, 0x60 | (vector & 7));
-	else WICU(AD_8259_MASTER, 0x60 | (vector & 7));
+		vector = IRQ_SLAVE;
+	}
 	WICU(AD_8259_MASTER, 0x60 | (vector & 7));
 	splx(s);
+}
 void milan_isa_intr(int, int);
 void
 milan_isa_intr(int vector, int sr)
+{
 	isa_intr_info_t *iinfo_p;
 	int		s;
 	if (vector >= MILAN_MAX_ISA_INTS) {
 		printf("milan_isa_intr: Bogus vector %d\n", vector);
 		return;
+	}
 	/* Ack cascade 0x60 == Specific EOI		*/
 	if (vector > 7)
 		WICU(AD_8259_MASTER, 0x60|IRQ_SLAVE);
 	iinfo_p = &milan_isa_iinfo[vector];
 	if (iinfo_p->ifunc == NULL) {
 		printf("milan_isa_intr: Stray interrupt: %d (mask:%04x)\n",
 				vector, imask_enable);
 		return;
+	}
 	if ((sr & PSL_IPL) >= (iinfo_p->ipl & PSL_IPL)) {
 		/*
 		 * We're running at a too high priority now.
 		 */
 		add_sicallback((si_farg)isa_callback, (void*)vector, 0);
+	}
 	else {
 		s = splx(iinfo_p->ipl);
 		(void) (iinfo_p->ifunc)(iinfo_p->iarg);
-		if (vector > 7)
+		if (vector > 7) {
 			WICU(AD_8259_SLAVE, 0x60 | (vector & 7));
-		else WICU(AD_8259_MASTER, 0x60 | (vector & 7));
+			vector = IRQ_SLAVE;
+		}
 		WICU(AD_8259_MASTER, 0x60 | (vector & 7));
 		splx(s);
+	}
+}
 /*
  * Try to allocate a free interrupt... On the Milan, we have available:
  * 5, 9, 10, 11, 13. Or in a bitmask: 0x1720.
  */
 #define	MILAN_AVAIL_ISA_INTS	0x1720
 int
 isa_intr_alloc(isa_chipset_tag_t ic, int mask, int type, int *irq)
+{
 @@ -199,27 +199,27 @@ isa_intr_establish(isa_chipset_tag_t ic,
+{
 	isa_intr_info_t *iinfo_p;
 	iinfo_p = &milan_isa_iinfo[irq];
 	if (iinfo_p->ifunc != NULL) {
 		printf("isa_intr_establish: interrupt %d was already "
 			"established\n", irq);
 		return NULL;
+	}
 	iinfo_p->slot  = 0;	/* Unused on Milan */
 	iinfo_p->ihand = NULL;	/* Unused on Milan */
-	iinfo_p->ipl   = level;
+	iinfo_p->ipl   = ipl2psl_table[level];
 	iinfo_p->ifunc = ih_fun;
 	iinfo_p->iarg  = ih_arg;
 	new_imask();
 	return(iinfo_p);
+}
 void
 isa_intr_disestablish(isa_chipset_tag_t ic, void *handler)
+{
 	isa_intr_info_t *iinfo_p = (isa_intr_info_t *)handler;
 	if (iinfo_p->ifunc == NULL)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_machdep.c,v 1.54 2014/03/29 19:28:26 christos Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.54.22.1 2018/03/13 13:41:14 martin Exp $	*/
 /*
  * Copyright (c) 1996 Leo Weppelman.  All rights reserved.
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
  * Copyright (c) 1994 Charles M. Hannum.  All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
 @@ -22,43 +22,44 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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: pci_machdep.c,v 1.54 2014/03/29 19:28:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.54.22.1 2018/03/13 13:41:14 martin Exp $");
 #include "opt_mbtype.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #define _ATARI_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpu.h>
 #include <machine/iomap.h>
 #include <machine/mfp.h>
 #include <atari/atari/device.h>
 #include <atari/pci/pci_vga.h>
 /*
  * Sizes of pci memory and I/O area.
  */
 @@ -439,26 +440,44 @@ enable_pci_devices(void)
 #if defined(_ATARIHW_)
 	/*
 	 * Both interrupt pin & line are set to the device (== slot)
 	 * number. This makes sense on the atari Hades because the
 	 * individual slots are hard-wired to a specific MFP-pin.
 	 */
 	csr  = (DEV2SLOT(dev) << PCI_INTERRUPT_PIN_SHIFT);
 	csr |= (DEV2SLOT(dev) << PCI_INTERRUPT_LINE_SHIFT);
 	pci_conf_write(pc, tag, PCI_INTERRUPT_REG, csr);
 #else
 	/*
 	 * On the Milan, we accept the BIOS's choice.
 	 */
 	/* ..except the secondary IDE interrupt that the BIOS doesn't setup. */
 #define PIIX_PCIB_MBIRQ0	0x70
 	if ((PCI_VENDOR(id) == PCI_VENDOR_INTEL) &&
 	    (PCI_PRODUCT(id) == PCI_PRODUCT_INTEL_82371FB_ISA)) {
 		/*
 		 * Set Interrupt Routing for MBIRQ0 to IRQ15.
 		 * Note Milan's ROM bootloader v1.2 and v1.4 incorrectly
 		 * set MBIRQ0 to IRQ14 (not 15) and unused MBIRQ1 to IRQ 15,
 		 * so explicitly disable MBIRQ1.
 		 */
 		csr = pci_conf_read(pc, tag, PIIX_PCIB_MBIRQ0);
 		csr &= ~0x000ffff;
 		csr |=  0x000800f;	/* MBIRQ1: disable, MBIRQ0: IRQ15 */
 		pci_conf_write(pc, tag, PIIX_PCIB_MBIRQ0, csr);
 #ifdef DEBUG_PCI_MACHDEP
 		printf("\npcib0: enable and route MBIRQ0 to irq 15\n");
 #endif
+	}
 #endif
+    }
     /*
      * second step: calculate the memory and I/O addresses beginning from
      * PCI_MEM_START and PCI_IO_START. Care about already mapped areas.
+     *
      * begin with memory list
      */
     address = PCI_MEM_START;
     sizecnt = 0;
     membase_1m = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_milan.c,v 1.14 2015/10/02 05:22:50 msaitoh Exp $	*/
+/*	$NetBSD: pci_milan.c,v 1.14.10.1 2018/03/13 13:41:14 martin Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Leo Weppelman.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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 THE FOUNDATION OR CONTRIBUTORS
  * 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: pci_milan.c,v 1.14 2015/10/02 05:22:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_milan.c,v 1.14.10.1 2018/03/13 13:41:14 martin Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/isa/isavar.h>		/* isa_intr_{dis}establish */
 #include <dev/isa/isareg.h>		/* isa_intr_{dis}establish */
 #include <sys/bswap.h>
 @@ -110,39 +110,61 @@ pci_intr_establish(pci_chipset_tag_t pc,
 	if (ih == 0 || ih >= 16 || ih == 2)
 		panic("pci_intr_establish: bogus handle 0x%x", ih);
 	return isa_intr_establish(NULL, ih, IST_LEVEL, level, ih_fun, ih_arg);
+}
 void
 pci_intr_disestablish(pci_chipset_tag_t pc, void *cookie)
+{
 	isa_intr_disestablish(NULL, cookie);
+}
 /*
  * VGA related stuff...
  * XXX: Currently, you can only boot the Milan through loadbsd.ttp, hence the
  *      text mode ;-)
  * It looks like the Milan BIOS is initializing the VGA card in a reasonably
  * standard text mode. However, the screen mode is 640*480 instead of 640*400.
  * Since wscons does not handle the right by default, the card is reprogrammed
  * to 640*400 using only 'standard' VGA registers (I hope!). So this ought to
  * work on cards other than the S3Trio card I have tested it on.
  */
-static u_char crt_tab[] = {
+static const uint8_t crt_tab[] = {
-x60, 0x53, 0x4f, 0x14, 0x56, 0x05, 0xc1, 0x1f,
+	/* taken from vga_crtc[] in sys/dev/ic/vga_subr.c */
-x00, 0x4f, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00,
+x5f,	/* 00: horizontal total */
-x98, 0x3d, 0x8f, 0x28, 0x0f, 0x8f, 0xc1, 0xc3,
+x4f,	/* 01: horizontal display-enable end */
-xff };
+x50,	/* 02: start horizontal blanking */
 x82,	/* 03: display skew control / end horizontal blanking */
 x55,	/* 04: start horizontal retrace pulse */
 x81,	/* 05: horizontal retrace delay / end horizontal retrace */
 xbf,	/* 06: vertical total */
 x1f,	/* 07: overflow register */
 x00,	/* 08: preset row scan */
 x4f,	/* 09: overflow / maximum scan line */
 x0d,	/* 0A: cursor off / cursor start */
 x0e,	/* 0B: cursor skew / cursor end */
 x00,	/* 0C: start regenerative buffer address high */
 x00,	/* 0D: start regenerative buffer address low */
 x00,	/* 0E: cursor location high */
 x00,	/* 0F: cursor location low */
 x9c,	/* 10: vertical retrace start */
 x8e,	/* 11: vertical interrupt / vertical retrace end */
 x8f,	/* 12: vertical display enable end */
 x28,	/* 13: logical line width */
 x00,	/* 14: underline location */
 x96,	/* 15: start vertical blanking */
 xb9,	/* 16: end vertical blanking */
 xa3,	/* 17: CRT mode control */
 xff	/* 18: line compare */
 };
 /*
  * XXX: Why are we repeating this everywhere! (Leo)
  */
 #define PCI_LINMEMBASE  0x0e000000
 void
 milan_vga_init(pci_chipset_tag_t pc, pcitag_t tag, int id, volatile u_char *ba, u_char *fb)
+{
 	int			i, csr;
 	/* Turn on the card */
 	pci_conf_write(pc, tag, PCI_MAPREG_START, PCI_LINMEMBASE);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fd.c,v 1.110 2015/12/08 20:36:15 christos Exp $	*/
+/*	$NetBSD: fd.c,v 1.110.10.1 2018/03/13 13:41:13 martin Exp $	*/
 /*-
  * Copyright (c) 1998, 2003, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * 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.
 @@ -71,27 +71,27 @@
  * use ..." clause:
+ *
  * Copyright (c) 1993, 1994 by
  *  jc@irbs.UUCP (John Capo)
  *  vak@zebub.msk.su (Serge Vakulenko)
  *  ache@astral.msk.su (Andrew A. Chernov)
+ *
  * Copyright (c) 1993, 1994, 1995 by
  *  joerg_wunsch@uriah.sax.de (Joerg Wunsch)
  *  dufault@hda.com (Peter Dufault)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.110 2015/12/08 20:36:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.110.10.1 2018/03/13 13:41:13 martin Exp $");
 #include "opt_ddb.h"
 /*
  * XXX This driver should be properly MI'd some day, but this allows us
  * XXX to eliminate a lot of code duplication for now.
  */
 #if !defined(alpha) && !defined(algor) && !defined(atari) && \
     !defined(bebox) && !defined(evbmips) && !defined(i386) && \
     !defined(prep) && !defined(sandpoint) && !defined(x86_64) && \
     !defined(mvmeppc) && !defined(ofppc)
 #error platform not supported by this driver, yet
 #endif
 @@ -450,34 +450,36 @@ fdcfinishattach(device_t self)
 	for (fa.fa_drive = 0; fa.fa_drive < 4; fa.fa_drive++) {
 		if (fdc->sc_known) {
 			if (fdc->sc_present & (1 << fa.fa_drive)) {
 				fa.fa_deftype = fdc->sc_knownfds[fa.fa_drive];
 				config_found(fdc->sc_dev, (void *)&fa,
 				    fdprint);
+			}
 		} else {
 #if defined(atari)
 			/*
 			 * Atari has a different ordening, defaults to 1.44
 			 */
 			fa.fa_deftype = &fd_types[2];
 			 /* Atari also configures ISA fdc(4) as "fdcisa" */
 			(void)config_found_ia(fdc->sc_dev, "fdcisa", (void *)&fa, fdprint);
 #else
 			/*
 			 * Default to 1.44MB on Alpha and BeBox.  How do we tell
 			 * on these platforms?
 			 */
 			fa.fa_deftype = &fd_types[0];
 #endif
 			(void)config_found_ia(fdc->sc_dev, "fdc", (void *)&fa, fdprint);
 #endif
+		}
+	}
 	fdc->sc_state = DEVIDLE;
+}
 int
 fdprobe(device_t parent, cfdata_t match, void *aux)
+{
 	struct fdc_softc *fdc = device_private(parent);
 	cfdata_t cf = match;
 	struct fdc_attach_args *fa = aux;
 	int drive = fa->fa_drive;
 	bus_space_tag_t iot = fdc->sc_iot;

 @@ -1,25 +1,27 @@
-# $NetBSD: md.atari,v 1.54 2014/08/06 12:15:01 martin Exp $
+# $NetBSD: md.atari,v 1.54.16.1 2018/03/13 13:41:14 martin Exp $
 ./sbin/ahdilabel				base-sysutil-root
 ./sbin/binpatch					base-sysutil-root
 ./sbin/edahdi					base-sysutil-root
 ./usr/bin/msconfig				base-util-bin
 ./usr/mdec/installboot				base-sysutil-bin
 ./usr/mdec/milan				base-sysutil-bin
 ./usr/mdec/milan/boot.atari			base-sysutil-bin
 ./usr/mdec/milan/bootxx				base-sysutil-bin
 ./usr/mdec/milan/fdboot				base-sysutil-bin
 ./usr/mdec/milan/sdb00t.ahdi			base-sysutil-bin
 ./usr/mdec/milan/sdboot				base-sysutil-bin
 ./usr/mdec/milan/wdb00t.ahdi			base-sysutil-bin
 ./usr/mdec/milan/wdboot				base-sysutil-bin
 ./usr/mdec/milan/xxboot.ahdi			base-sysutil-bin
 ./usr/mdec/std					base-sysutil-bin
 ./usr/mdec/std/boot.atari			base-sysutil-bin
 ./usr/mdec/std/bootxx				base-sysutil-bin
 ./usr/mdec/std/fdboot				base-sysutil-bin
 ./usr/mdec/std/sdb00t.ahdi			base-sysutil-bin
 ./usr/mdec/std/sdboot				base-sysutil-bin
 ./usr/mdec/std/wdb00t.ahdi			base-sysutil-bin
 ./usr/mdec/std/wdboot				base-sysutil-bin
 ./usr/mdec/std/xxboot.ahdi			base-sysutil-bin
 ./usr/sbin/bootpref				base-sysutil-bin
 ./usr/sbin/iteconfig				base-sysutil-bin
 ./usr/sbin/loadkmap				base-sysutil-bin

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.8 2016/12/22 14:47:54 cherry Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.8.8.1 2018/03/13 13:41:13 martin Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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
 @@ -103,46 +103,46 @@ pmap_bootstrap(vaddr_t vstart)
+{
 	vaddr_t	va;
 	int	i;
 	/*
 	 * Announce page-size to the VM-system
 	 */
 	uvmexp.pagesize = NBPG;
 	uvm_md_init();
 	/*
 	 * Setup physical address ranges
 	 */
-	for (i = 0; usable_segs[i + 1].start; i++)
+	for (i = 0; i < NMEM_SEGS && usable_segs[i].start; i++)
 		continue;
 	/* XXX: allow for msgbuf */
-	usable_segs[i].end -= m68k_round_page(MSGBUFSIZE);
+	usable_segs[i - 1].end -= m68k_round_page(MSGBUFSIZE);
-	msgbufpa = usable_segs[i].end;
+	msgbufpa = usable_segs[i - 1].end;
 	/*
 	 * Count physical memory
 	 */
 	mem_size = 0;
 	for (i = 0; i < NMEM_SEGS; i++) {
 		if (boot_segs[i].start == boot_segs[i].end)
 			break;
 		mem_size += boot_segs[i].end - boot_segs[i].start;
+	}
 	/*
 	 * Announce available memory to the VM-system
 	 */
-	for (i = 0; usable_segs[i].start; i++)
+	for (i = 0; i < NMEM_SEGS && usable_segs[i].start; i++)
 		uvm_page_physload(atop(usable_segs[i].start),
 				 atop(usable_segs[i].end),
 				 atop(usable_segs[i].start),
 				 atop(usable_segs[i].end),
 				 usable_segs[i].free_list);
 	avail_start = usable_segs[0].start;
 	avail_end   = usable_segs[i - 1].end;
 	virtual_avail = vstart;
 	virtual_end   = VM_MAX_KERNEL_ADDRESS;
 	/*

 @@ -1,15 +1,15 @@
+#
-#	$NetBSD: MILAN.in,v 1.27 2014/07/05 09:24:23 tsutsui Exp $
+#	$NetBSD: MILAN.in,v 1.27.20.1 2018/03/13 13:41:13 martin Exp $
+#
 # Milan
+#
 # This configuration file is for a generic Milan
+#
 #include "GENERIC.in"
+#
 # For the moment, the MILAN will be the only one to use wscons, so define
 # the wscons options here too for the moment.
 # wscons options
+#
 @@ -67,40 +67,41 @@ fdisa0 		at fdcisa0 drive 0
 #     the MILAN-ISAIDE version.
 #   - If _all_ of your disks are byteswapped, use the  MILAN-PCIIDE version
 # The is no way to mix things!
+#
 #if defined(MILAN_ISAIDE)
 # wdc on ISA with flags = WDC_OPTIONS_ATA_NOSTREAM!
 wdc0 		at isa? port 0x1f0 irq 14 flags 0x04	# 1st IDE controller
 wdc1 		at isa? port 0x170 irq 15 flags 0x04	# 2nd IDE controller
 #endif /* MILAN_ISAIDE */
 #if defined(MILAN_PCIIDE)
 pciide* 	at pci? dev ? function ? flags 0x0000	# GENERIC pciide driver
-acardide*	at pci? dev ? function ?	# Acard IDE controllers
+#acardide*	at pci? dev ? function ?	# Acard IDE controllers
-aceride* 	at pci? dev ? function ?	# Acer Lab IDE controllers
+#aceride* 	at pci? dev ? function ?	# Acer Lab IDE controllers
-artsata*	at pci? dev ? function ?	# Intel i31244 SATA controller
+#artsata*	at pci? dev ? function ?	# Intel i31244 SATA controller
-cmdide* 	at pci? dev ? function ?	# CMD tech IDE controllers
+#cmdide* 	at pci? dev ? function ?	# CMD tech IDE controllers
-cypide* 	at pci? dev ? function ?	# Cypress IDE controllers
+#cypide* 	at pci? dev ? function ?	# Cypress IDE controllers
-hptide* 	at pci? dev ? function ?	# Triones/HighPoint IDE controllers
+#hptide* 	at pci? dev ? function ?	# Triones/HighPoint IDE controllers
-optiide* 	at pci? dev ? function ?	# Opti IDE controllers
+#optiide* 	at pci? dev ? function ?	# Opti IDE controllers
-pdcide* 	at pci? dev ? function ?	# Promise IDE controllers
+#pdcide* 	at pci? dev ? function ?	# Promise IDE controllers
-pdcsata* 	at pci? dev ? function ?	# Promise SATA150 controllers
+#pdcsata* 	at pci? dev ? function ?	# Promise SATA150 controllers
-satalink*	at pci? dev ? function ?	# SiI SATALink controllers
+piixide* 	at pci? dev ? function ?	# Intel IDE controllers
-siside* 	at pci? dev ? function ?	# SiS IDE controllers
+#satalink*	at pci? dev ? function ?	# SiI SATALink controllers
-slide*  	at pci? dev ? function ?	# Symphony Labs IDE controllers
+#siside* 	at pci? dev ? function ?	# SiS IDE controllers
-viaide* 	at pci? dev ? function ?	# VIA/AMD/Nvidia IDE controllers
+#slide*  	at pci? dev ? function ?	# Symphony Labs IDE controllers
-#endif /* MILAN_ISAIDE */
+#viaide* 	at pci? dev ? function ?	# VIA/AMD/Nvidia IDE controllers
 #endif /* MILAN_PCIIDE */
 atabus*		at ata? channel ?
+#
 # The Milan uses wscons
+#
 vga0 		at pci? dev ? function ?	# a PCI VGA card
 wsdisplay* 	at vga? console ?		# as a wscons console
 pckbc0 		at isa? 			# PC keyboard controller
 pckbd* 		at pckbc?			# PC keyboard
 wskbd* 		at pckbd? console ?		# wscons keyboard
 # ATA devices

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vmparam.h,v 1.31 2017/02/02 21:53:54 rin Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.31.6.1 2018/03/13 13:41:14 martin Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -94,28 +94,30 @@
 #define VM_MIN_ADDRESS		((vaddr_t)0)
 #define VM_MAX_ADDRESS		((vaddr_t)0xFFF00000)
 #define VM_MAXUSER_ADDRESS	((vaddr_t)0xFFF00000)
 #define VM_MIN_KERNEL_ADDRESS	((vaddr_t)0)
 #define VM_MAX_KERNEL_ADDRESS	((vaddr_t)-(NPTEPG * PAGE_SIZE))
 /*
  * virtual sizes (bytes) for various kernel submaps
  */
 #define VM_PHYS_SIZE		(USRIOSIZE*PAGE_SIZE)
 /*
  * Our bootloader currently passes up to 2 segments (ST and TT ram).
  * On the other hand, Milan has four SIMM slots with 2 banks
  * so it could have upto 8 segments.
  */
-#define VM_PHYSSEG_MAX		(2)
+#define VM_PHYSSEG_MAX		(8)
 #define VM_PHYSSEG_STRAT	VM_PSTRAT_RANDOM
 #define	VM_NFREELIST		2
 #define	VM_FREELIST_DEFAULT	0
 #define	VM_FREELIST_TTRAM	VM_FREELIST_DEFAULT
 #define	VM_FREELIST_STRAM	1
 #define	__HAVE_PMAP_PHYSSEG
 /*
  * pmap-specific data stored in the vm_physmem[] array.
  */
 struct pmap_physseg {

 @@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2003/06/28 09:09:53 he Exp $
+# $NetBSD: Makefile,v 1.3.188.1 2018/03/13 13:41:13 martin Exp $
 BTYPE=MILAN
 LINKS=	${BINDIR}/sdb00t.ahdi ${BINDIR}/wdb00t.ahdi
 .include <../Makefile.xxb>