 @@ -1,14 +1,14 @@
-/*	$NetBSD: empb_bsm.c,v 1.4 2012/06/04 19:45:50 rkujawa Exp $ */
+/*	$NetBSD: empb_bsm.c,v 1.5 2012/06/27 18:53:03 rkujawa Exp $ */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Radoslaw Kujawa.
+ *
  * 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.
 @@ -132,31 +132,28 @@ empb_bsm_init(void)
 /* === common bus space methods === */
 static int
 empb_bsm(bus_space_tag_t space, bus_addr_t address, bus_size_t size,
     int flags, bus_space_handle_t *handlep)
+{
 	/* Check for bridge driver softc. */
 	if (empb_sc==NULL)
 		if(empb_bsm_init() == false)
 			return -1;
 	/* Fail miserably if the driver wants linear space. */
-	if (flags & BUS_SPACE_MAP_LINEAR)
+	if ( (flags & BUS_SPACE_MAP_LINEAR) && (size > 8*1024*1024))
 		aprint_error("empb: linear space mapping might not work\n");
 		aprint_error("empb: linear space mapping not possible\n");
 		return -1;
 	/*
 	 * Just store the desired PCI bus address as handlep. Don't make things
 	 * more complicated than they need to be.
 	 */
 	*handlep = address;
 	return 0;
+}
 static int
 empb_bsms(bus_space_handle_t handle,
     bus_size_t offset, bus_size_t size, bus_space_handle_t *nhandlep)
 @@ -173,122 +170,127 @@ empb_bsu(bus_space_handle_t handle, bus_
 /* === 8-bit methods === */
 static uint8_t
 empb_bsr1(bus_space_handle_t handle, bus_size_t offset)
+{
 	uint8_t *p;
 	uint8_t x;
 	bus_addr_t wp; /* window position */
 	wp = empb_switch_window(empb_sc, handle);
 	/* window address + (PCI mem address - window position) */
-	p = (uint8_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
+	p = (uint8_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp) + offset);
 	x = *p;
 	return x;
+}
 static void
 empb_bsw1(bus_space_handle_t handle, bus_size_t offset, unsigned value)
+{
 	uint8_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (uint8_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
+	p = (uint8_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp) + offset);
 	*p = value;
+}
 static void
 empb_bsrm1(bus_space_handle_t handle, bus_size_t offset, u_int8_t *pointer,
     bus_size_t count)
+{
 	volatile uint8_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-  	p = (volatile u_int8_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+  	p = (volatile u_int8_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp) + offset);
 	while (count > 0) {
 		*pointer++ = *p;
 		amiga_bus_reorder_protect();
  		--count;
+	}
+}
 static void
 empb_bswm1(bus_space_handle_t handle, bus_size_t offset,
     const u_int8_t *pointer, bus_size_t count)
+{
 	volatile uint8_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile u_int8_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile u_int8_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp) + offset);
 	while (count > 0) {
 		*p = *pointer++;
  		amiga_bus_reorder_protect();
 		--count;
+	}
+}
 static void
 empb_bsrr1(bus_space_handle_t handle, bus_size_t offset, u_int8_t *pointer,
     bus_size_t count)
+{
 	volatile uint8_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile u_int8_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile u_int8_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp) + offset);
 	while (count > 0) {
 		*pointer++ = *p;
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
 static void
 empb_bswr1(bus_space_handle_t handle, bus_size_t offset,
     const u_int8_t *pointer, bus_size_t count)
+{
 	volatile uint8_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile u_int8_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile u_int8_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp) + offset);
  	while (count > 0) {
 		*p = *pointer++;
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
 static void
 empb_bssr1(bus_space_handle_t handle, bus_size_t offset, unsigned value,
     bus_size_t count)
+{
 	volatile uint8_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile u_int8_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile u_int8_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp) + offset);
  	while (count > 0) {
  		*p = value;
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
 /* XXX: this is broken, rewrite */
 static void
 empb_bscr1(bus_space_handle_t handlefrom, bus_size_t from,
     bus_space_handle_t handleto, bus_size_t to, bus_size_t count)
 @@ -312,224 +314,232 @@ empb_bscr1(bus_space_handle_t handlefrom
+}
 /* === 16-bit methods === */
 static uint16_t
 empb_bsr2(bus_space_handle_t handle, bus_size_t offset)
+{
 	uint16_t *p;
 	uint16_t x;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (uint16_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
+	p = (uint16_t*) ((empb_sc->pci_mem_win_t->base) + (handle - wp)
 	    + offset);
 	x = *p;
 	return x;
+}
 static uint16_t
 empb_bsr2_swap(bus_space_handle_t handle, bus_size_t offset)
+{
 	uint16_t *p;
 	uint16_t x;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (uint16_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
+	p = (uint16_t*) ((empb_sc->pci_mem_win_t->base) + (handle - wp)
 	    + offset);
 	x = *p;
 	return bswap16(x);
+}
 static void
 empb_bsw2(bus_space_handle_t handle, bus_size_t offset, unsigned value)
+{
 	uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (uint16_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
+	p = (uint16_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp)
 	     + offset);
 	*p = value;
+}
 static void
 empb_bsw2_swap(bus_space_handle_t handle, bus_size_t offset, unsigned value)
+{
 	uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (uint16_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
+	p = (uint16_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp)
 	    + offset);
 	*p = bswap16(value);
+}
 static void
 empb_bsrm2(bus_space_handle_t handle, bus_size_t offset, u_int16_t *pointer,
     bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
   	p = (volatile uint16_t *) ((empb_sc->pci_mem_win_t->base) +
-	    (handle - wp));
+	    (handle - wp) + offset);
 	while (count > 0) {
 		*pointer++ = *p;
 		amiga_bus_reorder_protect();
  		--count;
+	}
+}
 static void
 empb_bsrm2_swap(bus_space_handle_t handle, bus_size_t offset,
     u_int16_t *pointer, bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
   	p = (volatile uint16_t *) ((empb_sc->pci_mem_win_t->base) +
-	    (handle - wp));
+	    (handle - wp) + offset);
 	while (count > 0) {
 		*pointer++ = bswap16(*p);
 		amiga_bus_reorder_protect();
  		--count;
+	}
+}
 static void
 empb_bswm2(bus_space_handle_t handle, bus_size_t offset,
     const u_int16_t *pointer, bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (volatile uint16_t *) ((empb_sc->pci_mem_win_t->base) +
-	    (handle - wp));
+	    (handle - wp) + offset);
 	while (count > 0) {
 		*p = *pointer++;
  		amiga_bus_reorder_protect();
 		--count;
+	}
+}
 static void
 empb_bswm2_swap(bus_space_handle_t handle, bus_size_t offset,
     const u_int16_t *pointer, bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (volatile uint16_t *) ((empb_sc->pci_mem_win_t->base) +
-	    (handle - wp));
+	    (handle - wp) + offset);
 	while (count > 0) {
 		*p = bswap16(*pointer++);
  		amiga_bus_reorder_protect();
 		--count;
+	}
+}
 static void
 empb_bsrr2(bus_space_handle_t handle, bus_size_t offset, u_int16_t *pointer,
     bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile uint16_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile uint16_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp) + offset);
 	while (count > 0) {
 		*pointer++ = *p;
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
 static void
 empb_bsrr2_swap(bus_space_handle_t handle, bus_size_t offset,
     u_int16_t *pointer, bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile uint16_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile uint16_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp) + offset);
 	while (count > 0) {
 		*pointer++ = bswap16(*p);
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
 static void
 empb_bssr2_swap(bus_space_handle_t handle, bus_size_t offset, unsigned value,
     bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (volatile uint16_t *) ((empb_sc->pci_mem_win_t->base) +
-	    (handle - wp));
+	    (handle - wp) + offset);
  	while (count > 0) {
  		*p = bswap16(value);
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
 static void
 empb_bswr2(bus_space_handle_t handle, bus_size_t offset,
     const u_int16_t *pointer, bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile u_int16_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile u_int16_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp) + offset);
  	while (count > 0) {
 		*p = *pointer++;
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
 static void
 empb_bswr2_swap(bus_space_handle_t handle, bus_size_t offset,
     const u_int16_t *pointer, bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile u_int16_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile u_int16_t *) ((empb_sc->pci_mem_win_t->base)
 	    + (handle - wp) + offset);
  	while (count > 0) {
 		*p = bswap16(*pointer++);
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
 /* XXX: this is broken, rewrite, XXX 2: should we swap here? */
 static void
 empb_bscr2(bus_space_handle_t handlefrom, bus_size_t from,
     bus_space_handle_t handleto, bus_size_t to, bus_size_t count)
 @@ -553,224 +563,232 @@ empb_bscr2(bus_space_handle_t handlefrom
+}
 /* === 32-bit methods === */
 static uint32_t
 empb_bsr4(bus_space_handle_t handle, bus_size_t offset)
+{
 	uint32_t *p;
 	uint32_t x;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (uint32_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
+	p = (uint32_t*) ((empb_sc->pci_mem_win_t->base)
 	    + (handle - wp) + offset);
 	x = *p;
 	return x;
+}
 static uint32_t
 empb_bsr4_swap(bus_space_handle_t handle, bus_size_t offset)
+{
 	uint32_t *p;
 	uint32_t x;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (uint32_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
+	p = (uint32_t*) ((empb_sc->pci_mem_win_t->base) + (handle - wp)
 	    + offset);
 	x = *p;
 	return bswap32(x);
+}
 static void
 empb_bsw4(bus_space_handle_t handle, bus_size_t offset, unsigned value)
+{
 	uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (uint32_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
+	p = (uint32_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp)
 	    + offset);
 	*p = value;
+}
 static void
 empb_bsw4_swap(bus_space_handle_t handle, bus_size_t offset, unsigned value)
+{
 	uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (uint32_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
+	p = (uint32_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp)
 	    + offset);
 	*p = bswap32(value);
+}
 static void
 empb_bsrm4(bus_space_handle_t handle, bus_size_t offset, u_int32_t *pointer,
     bus_size_t count)
+{
 	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
   	p = (volatile uint32_t *) ((empb_sc->pci_mem_win_t->base) +
-	    (handle - wp));
+	    (handle - wp) + offset);
 	while (count > 0) {
 		*pointer++ = *p;
 		amiga_bus_reorder_protect();
  		--count;
+	}
+}
 static void
 empb_bsrm4_swap(bus_space_handle_t handle, bus_size_t offset,
     u_int32_t *pointer, bus_size_t count)
+{
 	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
   	p = (volatile uint32_t *) ((empb_sc->pci_mem_win_t->base) +
-	    (handle - wp));
+	    (handle - wp) + offset);
 	while (count > 0) {
 		*pointer++ = bswap32(*p);
 		amiga_bus_reorder_protect();
  		--count;
+	}
+}
 static void
 empb_bswm4(bus_space_handle_t handle, bus_size_t offset,
     const u_int32_t *pointer, bus_size_t count)
+{
 	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (volatile uint32_t *) ((empb_sc->pci_mem_win_t->base) +
-	    (handle - wp));
+	    (handle - wp) + offset);
 	while (count > 0) {
 		*p = *pointer++;
  		amiga_bus_reorder_protect();
 		--count;
+	}
+}
 static void
 empb_bswm4_swap(bus_space_handle_t handle, bus_size_t offset,
     const u_int32_t *pointer, bus_size_t count)
+{
 	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (volatile uint32_t *) ((empb_sc->pci_mem_win_t->base) +
-	    (handle - wp));
+	    (handle - wp) + offset);
 	while (count > 0) {
 		*p = bswap32(*pointer++);
  		amiga_bus_reorder_protect();
 		--count;
+	}
+}
 static void
 empb_bsrr4(bus_space_handle_t handle, bus_size_t offset, u_int32_t *pointer,
     bus_size_t count)
+{
 	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile uint32_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile uint32_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp) + offset);
 	while (count > 0) {
 		*pointer++ = *p;
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
 static void
 empb_bsrr4_swap(bus_space_handle_t handle, bus_size_t offset,
     u_int32_t *pointer, bus_size_t count)
+{
 	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile uint32_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile uint32_t *) ((empb_sc->pci_mem_win_t->base)
 	    + (handle - wp) + offset);
 	while (count > 0) {
 		*pointer++ = bswap32(*p);
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
 static void
 empb_bssr4_swap(bus_space_handle_t handle, bus_size_t offset, unsigned value,
     bus_size_t count)
+{
 	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (volatile uint32_t *) ((empb_sc->pci_mem_win_t->base) +
-	    (handle - wp));
+	    (handle - wp) + offset);
  	while (count > 0) {
  		*p = bswap32(value);
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
 static void
 empb_bswr4(bus_space_handle_t handle, bus_size_t offset,
     const u_int32_t *pointer, bus_size_t count)
+{
 	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile uint32_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile uint32_t *) ((empb_sc->pci_mem_win_t->base)
 	    + (handle - wp) + offset);
  	while (count > 0) {
 		*p = *pointer++;
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
 static void
 empb_bswr4_swap(bus_space_handle_t handle, bus_size_t offset,
     const u_int32_t *pointer, bus_size_t count)
+{
 	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile uint32_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile uint32_t *) ((empb_sc->pci_mem_win_t->base)
 	    + (handle - wp) + offset);
  	while (count > 0) {
 		*p = bswap32(*pointer++);
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
 /* XXX: this is broken, rewrite, XXX 2: should we swap here? */
 void
 empb_bscr4(bus_space_handle_t handlefrom, bus_size_t from,
     bus_space_handle_t handleto, bus_size_t to, bus_size_t count)
 @@ -832,17 +850,18 @@ const struct amiga_bus_space_methods emp
 	.bsr4 =		empb_bsr4_swap,
 	.bsw4 =		empb_bsw4_swap,
 	.bsrs4 =	empb_bsr4,
 	.bsws4 =	empb_bsw4,
 	.bsrm4 =	empb_bsrm4_swap,
 	.bswm4 =	empb_bswm4_swap,
 	.bsrms4 =	empb_bsrm4,
 	.bswms4 =	empb_bswm4,
 	.bsrr4 =	empb_bsrr4_swap,
 	.bswr4 =	empb_bswr4_swap,
 	.bsrrs4 =	empb_bsrr4,
 	.bswrs4 =	empb_bswr4,
 	.bssr4 = 	empb_bssr4_swap,
-	.bscr4 =	empb_bscr4	/* swap? */
+	.bscr4 =	empb_bscr4		/* swap? */
 };

 @@ -1,14 +1,14 @@
-/*	$NetBSD: empb.c,v 1.6 2012/06/04 19:45:50 rkujawa Exp $ */
+/*	$NetBSD: empb.c,v 1.7 2012/06/27 18:53:03 rkujawa Exp $ */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Radoslaw Kujawa.
+ *
  * 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.
 @@ -45,27 +45,27 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <amiga/dev/zbusvar.h>
 #include <amiga/pci/empbreg.h>
 #include <amiga/pci/empbvar.h>
 #include <amiga/pci/emmemvar.h>
 #include <dev/pci/pciconf.h>
 #include "opt_pci.h"
-/* #define EMPB_DEBUG 1 */
+/*#define EMPB_DEBUG 1 */
 #define	PCI_CONF_LOCK(s)	(s) = splhigh()
 #define	PCI_CONF_UNLOCK(s)	splx((s))
 #define WINDOW_LOCK(s)		(s) = splhigh()
 #define WINDOW_UNLOCK(s)	splx((s))
 static int	empb_match(struct device *, struct cfdata *, void *);
 static void	empb_attach(struct device *, struct device *, void *);
 static void	empb_callback(device_t self);
 static void	empb_find_mem(struct empb_softc *sc);