Other part of the cbb isa/pci split. This likely is causing problems

wrt cbb module.

2 files changed, 76 insertions, 10 deletions

diff --git a/sys/dev/exca/exca.c b/sys/dev/exca/exca.c
index 54b85de..54c2d6f 100644
--- a/sys/dev/exca/exca.c
+++ b/sys/dev/exca/exca.c
@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/exca/excareg.h>
 #include <dev/exca/excavar.h>
 
+#define EXCA_DEBUG
 #ifdef EXCA_DEBUG
 #define DEVPRINTF(dev, fmt, args...)	device_printf((dev), (fmt), ## args)
 #define DPRINTF(fmt, args...)		printf(fmt, ## args)
@@ -195,7 +196,8 @@ exca_do_mem_map(struct exca_softc *sc, int win)
 	exca_putb(sc, map->sysmem_stop_msb,
 	    (((mem->addr + mem->realsize - 1) >>
 	    (EXCA_SYSMEM_ADDRX_SHIFT + 8)) &
-	    EXCA_SYSMEM_ADDRX_STOP_MSB_ADDR_MASK));
+	    EXCA_SYSMEM_ADDRX_STOP_MSB_ADDR_MASK) |
+	    EXCA_SYSMEM_ADDRX_STOP_MSB_WAIT2);
 
 	exca_putb(sc, map->sysmem_win,
 	    (mem->addr >> EXCA_MEMREG_WIN_SHIFT) & 0xff);
@@ -208,14 +210,14 @@ exca_do_mem_map(struct exca_softc *sc, int win)
 	    ((mem->kind == PCCARD_A_MEM_ATTR) ?
 	    EXCA_CARDMEM_ADDRX_MSB_REGACTIVE_ATTR : 0));
 
-	exca_setb(sc, EXCA_ADDRWIN_ENABLE, map->memenable);
 #ifdef EXCA_DEBUG
 	if (mem->kind == PCCARD_A_MEM_ATTR)
 		printf("attribtue memory\n");
 	else
 		printf("common memory\n");
 #endif
-	exca_setb(sc, EXCA_ADDRWIN_ENABLE, EXCA_ADDRWIN_ENABLE_MEMCS16);
+	exca_setb(sc, EXCA_ADDRWIN_ENABLE, map->memenable |
+	    EXCA_ADDRWIN_ENABLE_MEMCS16);
 
 	DELAY(100);
 #ifdef EXCA_DEBUG
@@ -228,8 +230,8 @@ exca_do_mem_map(struct exca_softc *sc, int win)
 		r5 = exca_getb(sc, map->cardmem_msb);
 		r6 = exca_getb(sc, map->cardmem_lsb);
 		r7 = exca_getb(sc, map->sysmem_win);
-		printf("exca_do_mem_map window %d: %02x%02x %02x%02x "
-		    "%02x%02x %02x (%08x+%08x.%08x*%08x)\n",
+		printf("exca_do_mem_map win %d: %02x%02x %02x%02x "
+		    "%02x%02x %02x (%08x+%06x.%06x*%06x)\n",
 		    win, r1, r2, r3, r4, r5, r6, r7,
 		    mem->addr, mem->size, mem->realsize,
 		    mem->cardaddr);
@@ -824,6 +826,73 @@ exca_deactivate_resource(struct exca_softc *exca, device_t child, int type,
 	    type, rid, res));
 }
 
+#if 0
+static struct resource *
+exca_alloc_resource(struct exca_softc *sc, device_t child, int type, int *rid,
+    u_long start, u_long end, u_long count, uint flags)
+{
+	struct resource *res = NULL;
+	int tmp;
+
+	switch (type) {
+	case SYS_RES_MEMORY:
+		if (start < cbb_start_mem)
+			start = cbb_start_mem;
+		if (end < start)
+			end = start;
+		flags = (flags & ~RF_ALIGNMENT_MASK) |
+		    rman_make_alignment_flags(CBB_MEMALIGN);
+		break;
+	case SYS_RES_IOPORT:
+		if (start < cbb_start_16_io)
+			start = cbb_start_16_io;
+		if (end < start)
+			end = start;
+		break;
+	case SYS_RES_IRQ:
+		tmp = rman_get_start(sc->irq_res);
+		if (start > tmp || end < tmp || count != 1) {
+			device_printf(child, "requested interrupt %ld-%ld,"
+			    "count = %ld not supported by cbb\n",
+			    start, end, count);
+			return (NULL);
+		}
+		flags |= RF_SHAREABLE;
+		start = end = rman_get_start(sc->irq_res);
+		break;
+	}
+	res = BUS_ALLOC_RESOURCE(up, child, type, rid,
+	    start, end, count, flags & ~RF_ACTIVE);
+	if (res == NULL)
+		return (NULL);
+	cbb_insert_res(sc, res, type, *rid);
+	if (flags & RF_ACTIVE) {
+		if (bus_activate_resource(child, type, *rid, res) != 0) {
+			bus_release_resource(child, type, *rid, res);
+			return (NULL);
+		}
+	}
+
+	return (res);
+}
+
+static int
+exca_release_resource(struct exca_softc *sc, device_t child, int type,
+    int rid, struct resource *res)
+{
+	int error;
+
+	if (rman_get_flags(res) & RF_ACTIVE) {
+		error = bus_deactivate_resource(child, type, rid, res);
+		if (error != 0)
+			return (error);
+	}
+	cbb_remove_res(sc, res);
+	return (BUS_RELEASE_RESOURCE(device_get_parent(brdev), child,
+	    type, rid, res));
+}
+#endif
+
 static int
 exca_modevent(module_t mod, int cmd, void *arg)
 {
diff --git a/sys/dev/exca/excavar.h b/sys/dev/exca/excavar.h
index e79bd6a..147cf15 100644
--- a/sys/dev/exca/excavar.h
+++ b/sys/dev/exca/excavar.h
@@ -77,8 +77,7 @@ struct exca_softc
 #define EXCA_SOCKET_PRESENT	0x00000001
 #define EXCA_HAS_MEMREG_WIN	0x00000002
 #define EXCA_CARD_OK		0x00000004
-#define	EXCA_KTHREAD_RUNNING	0x00000008
-#define	EXCA_KTHREAD_DONE	0x00000010
+#define EXCA_EVENT		0x80000000
 	uint32_t	offset;
 	int		chipset;
 #define EXCA_CARDBUS	0
@@ -99,10 +98,8 @@ struct exca_softc
 #define EXCA_BOGUS	-1		/* Invalid/not present/etc */
 	exca_getb_fn	*getb;
 	exca_putb_fn	*putb;
-	struct proc	*event_thread;
-	struct mtx	mtx;
-	struct cv	cv;
 	device_t	pccarddev;
+	uint32_t	status;		/* status, hw dependent */
 };
 
 void exca_init(struct exca_softc *sc, device_t dev,