Glue to deal with the retarded way the CF slots are wired up on the RB600.

2 files changed, 162 insertions, 1 deletions

diff --git a/sys/arch/socppc/conf/files.socppc b/sys/arch/socppc/conf/files.socppc
index 4f5377a4c6e..e3fae7412eb 100644
--- a/sys/arch/socppc/conf/files.socppc
+++ b/sys/arch/socppc/conf/files.socppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.socppc,v 1.5 2009/08/24 14:53:41 kettenis Exp $
+#	$OpenBSD: files.socppc,v 1.6 2009/08/24 17:48:14 kettenis Exp $
 
 #
 # macppc-specific configuration info
@@ -46,6 +46,10 @@ file	arch/socppc/dev/sociic.c
 attach	com at obio with com_obio
 file	arch/socppc/dev/com_obio.c
 
+# On-board CF
+attach	wdc at obio with wdc_obio
+file	arch/socppc/dev/wdc_obio.c
+
 #
 # Media Independent Interface (mii)
 #
diff --git a/sys/arch/socppc/dev/wdc_obio.c b/sys/arch/socppc/dev/wdc_obio.c
new file mode 100644
index 00000000000..ffe4c10e859
--- /dev/null
+++ b/sys/arch/socppc/dev/wdc_obio.c
@@ -0,0 +1,157 @@
+/*	$OpenBSD: wdc_obio.c,v 1.1 2009/08/24 17:48:14 kettenis Exp $	*/
+
+/*
+ * Copyright (c) 2009 Mark Kettenis
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * Driver for Compact Flash interface on the local bus of a PowerQUICC
+ * MPC8343E processor as found on the RouterBOARD 600.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/malloc.h>
+
+#include <machine/autoconf.h>
+
+#include <dev/ata/atavar.h>
+#include <dev/ic/wdcvar.h>
+
+struct wdc_obio_softc {
+	struct wdc_softc	sc_wdcdev;
+	struct channel_softc	*sc_chanptr;
+	struct channel_softc	sc_channel;
+
+	void	*sc_ih;
+};
+
+int	wdc_obio_match(struct device *, void *, void *);
+void	wdc_obio_attach(struct device *, struct device *, void *);
+
+struct cfattach wdc_obio_ca = {
+	sizeof(struct wdc_softc), wdc_obio_match, wdc_obio_attach
+};
+
+/*
+ * The CF slots on the RouterBOARD 600 are wired up in a completely
+ * retarded way.  Instead of using the obvious address lines it uses
+ * LAD[11:15], which means we need to waste more than 0.5 MB of
+ * address space to map 10 8-bit registers.
+ */
+#define	WDC_OBIO_REG_NPORTS	WDC_NREG
+#define	WDC_OBIO_REG_SIZE	(WDC_OBIO_REG_NPORTS << 16)
+#define WDC_OBIO_REG_OFFSET	(8 << 17)
+#define	WDC_OBIO_AUXREG_NPORTS	2
+#define	WDC_OBIO_AUXREG_SIZE	(WDC_OBIO_AUXREG_NPORTS << 16)
+#define	WDC_OBIO_AUXREG_OFFSET	(6 << 16)
+
+u_int8_t wdc_obio_read_reg(struct channel_softc *chp,  enum wdc_regs reg);
+void wdc_obio_write_reg(struct channel_softc *chp,  enum wdc_regs reg,
+    u_int8_t val);
+
+struct channel_softc_vtbl wdc_obio_vtbl = {
+	wdc_obio_read_reg,
+	wdc_obio_write_reg,
+	wdc_default_lba48_write_reg,
+	wdc_default_read_raw_multi_2,
+	wdc_default_write_raw_multi_2,
+	wdc_default_read_raw_multi_4,
+	wdc_default_write_raw_multi_4
+};
+
+int
+wdc_obio_match(struct device *parent, void *cfdata, void *aux)
+{
+	return (1);
+}
+
+void
+wdc_obio_attach(struct device *parent, struct device *self, void *aux)
+{
+	struct wdc_obio_softc *sc = (void *)self;
+	struct obio_attach_args *oa = aux;
+	struct channel_softc *chp = &sc->sc_channel;
+
+	chp->cmd_iot = chp->ctl_iot = oa->oa_iot;
+	chp->_vtbl = &wdc_obio_vtbl;
+
+	if (bus_space_map(chp->cmd_iot, oa->oa_offset + WDC_OBIO_REG_OFFSET,
+	    WDC_OBIO_REG_SIZE, 0, &chp->cmd_ioh)) {
+		printf(": can't map registers\n");
+		return;
+	}
+	if (bus_space_map(chp->ctl_iot, oa->oa_offset + WDC_OBIO_AUXREG_OFFSET,
+	    WDC_OBIO_AUXREG_SIZE, 0, &chp->ctl_ioh)) {
+		printf(": can't map registers\n");
+		return;
+	}
+
+	sc->sc_ih = intr_establish(oa->oa_ivec, IST_LEVEL, IPL_BIO, wdcintr,
+	    chp, self->dv_xname);
+
+	sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_PREATA;
+	sc->sc_wdcdev.PIO_cap = 0;
+	sc->sc_chanptr = chp;
+	sc->sc_wdcdev.channels = &sc->sc_chanptr;
+	sc->sc_wdcdev.nchannels = 1;
+	chp->channel = 0;
+	chp->wdc = &sc->sc_wdcdev;
+
+	chp->ch_queue = malloc(sizeof(struct channel_queue), M_DEVBUF,
+	    M_NOWAIT);
+	if (chp->ch_queue == NULL) {
+		printf("%s: can't allocate memory for command queue\n",
+		    self->dv_xname);
+		/* XXX disestablish interrupt */
+		return;
+	}
+
+	printf("\n");
+	
+	wdcattach(chp);
+	wdc_print_current_modes(chp);
+}
+
+u_int8_t
+wdc_obio_read_reg(struct channel_softc *chp, enum wdc_regs reg)
+{
+	uint8_t val;
+
+	if (reg & _WDC_AUX) {
+		val = bus_space_read_1(chp->ctl_iot, chp->ctl_ioh,
+		    (reg & _WDC_REGMASK) << 16);
+		if (val == 0xf9 && reg == wdr_altsts)
+			val = 0x7f;
+	} else {
+		val = bus_space_read_1(chp->cmd_iot, chp->cmd_ioh,
+		    (reg & _WDC_REGMASK) << 16);
+		if (val == 0xf9 && reg == wdr_status)
+			val = 0x7f;
+	}
+	return val;
+}
+
+void
+wdc_obio_write_reg(struct channel_softc *chp,  enum wdc_regs reg, u_int8_t val)
+{
+	if (reg & _WDC_AUX) 
+		bus_space_write_1(chp->ctl_iot, chp->ctl_ioh,
+		    (reg & _WDC_REGMASK) << 16, val);
+	else
+		bus_space_write_1(chp->cmd_iot, chp->cmd_ioh,
+		    (reg & _WDC_REGMASK) << 16, val);
+}