 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.50 2009/05/21 20:59:11 skrll Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.51 2009/05/24 15:27:08 skrll Exp $	*/
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthew Fredette.
+ *
  * 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.
 @@ -53,27 +53,27 @@
  * 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 OR HIS RELATIVES 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 MIND, 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: mainbus.c,v 1.50 2009/05/21 20:59:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.51 2009/05/24 15:27:08 skrll Exp $");
 #include "locators.h"
 #include "power.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/extent.h>
 #include <sys/mbuf.h>
 #include <uvm/uvm_page.h>
 #include <uvm/uvm.h>
 @@ -185,27 +185,26 @@ mbus_add_mapping(bus_addr_t bpa, bus_siz
 	/*
 	 * We must be called with a page-aligned address in
 	 * I/O space, and with a multiple of the page size.
 	 */
 	KASSERT((bpa & PGOFSET) == 0);
 	KASSERT(bpa >= HPPA_IOSPACE);
 	KASSERT((size & PGOFSET) == 0);
 	/*
 	 * Assume that this will succeed.
 	 */
 	*bshp = bpa;
 printf("%s: bpa 0x%016llx size 0x%016llx\n", __func__, (unsigned long long)bpa, (unsigned long long)size);
 	/*
 	 * Loop while there is space left to map.
 	 */
 	frames = size >> PGSHIFT;
 	while (frames > 0) {
 		/*
 		 * If this mapping is more than eight pages long,
 		 * try to add a BTLB entry.
 		 */
 #ifdef USE_BTLB
 		if (frames > 8 &&
 		    frames >= hppa_btlb_size_min) {
 @@ -220,27 +219,27 @@ printf("%s: bpa 0x%016llx size 0x%016llx
 			if (error == 0) {
 				bpa += btlb_size;
 				frames -= (btlb_size >> PGSHIFT);
 				continue;
+			}
 			else if (error != ENOMEM)
 				return error;
+		}
 #endif /* USE_BTLB */
 		/*
 		 * Enter another single-page mapping.
 		 */
-		pmap_kenter_pa(bpa, bpa, VM_PROT_READ | VM_PROT_WRITE | PMAP_NC);
+		pmap_kenter_pa(bpa, bpa, VM_PROT_READ | VM_PROT_WRITE);
 		bpa += PAGE_SIZE;
 		frames--;
+	}
 	/* Success. */
 	return 0;
+}
 /*
  * This removes a mapping added by mbus_add_mapping.
  */
 int
 mbus_remove_mapping(bus_space_handle_t bsh, bus_size_t size, bus_addr_t *bpap)
 @@ -1488,77 +1487,52 @@ mb_cpu_mem_callback(device_t self, struc
 	     ca->ca_type.iodc_type == HPPA_TYPE_MEMORY))
 		config_found_sm_loc(self, "gedoens", NULL, ca, mbprint,
 		    mbsubmatch);
+}
 void
 mbattach(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_softc *sc = device_private(self);
 	struct confargs nca;
 	bus_space_handle_t ioh;
 	hppa_hpa_t hpabase;
 	struct iomod_openbsd {
 /* SRS (Supervisor Register Set) */
         u_int   io_eir;         /* (WO) interrupt CPU; set bits in EIR CR */
         u_int   io_eim;         /* (WO) External Interrupt Message address */
         u_int   io_dc_rw;       /* write address of IODC to read IODC data */
         u_int   io_ii_rw;       /* read/clear external intrpt msg (bit-26) */
         u_int   io_dma_link;    /* pointer to "next quad" in DMA chain */
         u_int   io_dma_command; /* (RO) chain command to exec on "next quad" */
         u_int   io_dma_address; /* (RO) start of DMA */
         u_int   io_dma_count;   /* (RO) number of bytes remaining to xfer */
         u_int   io_flex;        /* (WO) HPA flex addr, LSB: bus master flag */
 	} *fred;
 	sc->sc_dv = self;
 	mb_attached = 1;
 	/* fetch the "default" cpu hpa */
 	if (pdc_call((iodcio_t)pdc, 0, PDC_HPA, PDC_HPA_DFLT, &pdc_hpa) < 0)
 		panic("mbattach: PDC_HPA failed");
 	/*
 	 * Map all of Fixed Physical, Local Broadcast, and
 	 * Global Broadcast space.  These spaces are adjacent
 	 * and in that order and run to the end of the address
 	 * space.
 	 */
 	/*
 	 * XXX fredette - this may be a copout, or it may
  	 * be a great idea.  I'm not sure which yet.
 	 */
 	if (bus_space_map(&hppa_bustag, pdc_hpa.hpa, 0 - pdc_hpa.hpa, 0, &ioh))
 		panic("mbattach: can't map mainbus IO space");
 	/*
 	 * Local-Broadcast the HPA to all modules on the bus
 	 */
 #if 0
 	fred = (struct iomod_openbsd *)HPPA_LBCAST;
         fred->io_flex =
 		(pdc_hpa.hpa & FLEX_MASK) | DMA_ENABLE;
 #else
 	fred = (struct iomod_openbsd *)HPPA_LBCAST;
 	printf("fred->io_flex %p\n", &fred->io_flex);
 	((struct iomod *)(pdc_hpa.hpa & FLEX_MASK))[FPA_IOMOD].io_flex =
 		(void *)((pdc_hpa.hpa & FLEX_MASK) | DMA_ENABLE);
 #endif
 	sc->sc_hpa = pdc_hpa.hpa;
 	aprint_normal(" [flex %lx]\n", pdc_hpa.hpa & FLEX_MASK);
 	/* PDC first */
 	memset(&nca, 0, sizeof(nca));
 	nca.ca_name = "pdc";
 	nca.ca_hpa = 0;
 	nca.ca_iot = &hppa_bustag;
 	nca.ca_dmatag = &hppa_dmatag;
 	config_found(self, &nca, mbprint);
 #if NPOWER > 0