Add glue to make sdhc(4) attach to acpi(4). Needed to support the SD host

controllers integrated on Intel's Bay Trail SoCs.

2 files changed, 160 insertions, 1 deletions

diff --git a/sys/dev/acpi/files.acpi b/sys/dev/acpi/files.acpi
index 97802ad9c4e..a27cb46ed0c 100644
--- a/sys/dev/acpi/files.acpi
+++ b/sys/dev/acpi/files.acpi
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.acpi,v 1.27 2013/11/06 10:40:36 mpi Exp $
+#	$OpenBSD: files.acpi,v 1.28 2016/01/11 07:36:10 kettenis Exp $
 #
 # Config file and device description for machine-independent ACPI code.
 # Included by ports that need it.
@@ -111,3 +111,7 @@ file	dev/acpi/acpipwrres.c		acpipwrres needs-flag
 device	aibs
 attach	aibs at acpi
 file	dev/acpi/atk0110.c		aibs
+
+# SD Host Controller
+attach	sdhc at acpi with sdhc_acpi
+file	dev/acpi/sdhc_acpi.c		sdhc
diff --git a/sys/dev/acpi/sdhc_acpi.c b/sys/dev/acpi/sdhc_acpi.c
new file mode 100644
index 00000000000..5987d29d335
--- /dev/null
+++ b/sys/dev/acpi/sdhc_acpi.c
@@ -0,0 +1,155 @@
+/*	$OpenBSD: sdhc_acpi.c,v 1.1 2016/01/11 07:36:10 kettenis Exp $	*/
+/*
+ * Copyright (c) 2016 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.
+ */
+
+#include <sys/param.h>
+#include <sys/malloc.h>
+#include <sys/systm.h>
+
+#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
+#include <dev/acpi/acpidev.h>
+#include <dev/acpi/amltypes.h>
+#include <dev/acpi/dsdt.h>
+#undef DEVNAME
+#include <dev/sdmmc/sdhcreg.h>
+#include <dev/sdmmc/sdhcvar.h>
+#include <dev/sdmmc/sdmmcvar.h>
+
+struct sdhc_acpi_softc {
+	struct sdhc_softc sc;
+	struct acpi_softc *sc_acpi;
+	struct aml_node *sc_node;
+
+	bus_space_tag_t sc_memt;
+	bus_space_handle_t sc_memh;
+	bus_addr_t sc_addr;
+	bus_size_t sc_size;
+
+	int sc_irq;
+	int sc_irq_flags;
+	void *sc_ih;
+
+	struct sdhc_host *sc_host;
+};
+
+int	sdhc_acpi_match(struct device *, void *, void *);
+void	sdhc_acpi_attach(struct device *, struct device *, void *);
+
+struct cfattach sdhc_acpi_ca = {
+	sizeof(struct sdhc_acpi_softc), sdhc_acpi_match, sdhc_acpi_attach
+};
+
+const char *sdhc_hids[] = {
+	"PNP0D40",
+	"INT33BB",
+	"80860F14",
+	"PNP0FFF",
+	0
+};
+
+int	sdhc_acpi_parse_resources(union acpi_resource *, void *);
+
+int
+sdhc_acpi_match(struct device *parent, void *match, void *aux)
+{
+	struct acpi_attach_args *aaa = aux;
+	struct cfdata *cf = match;
+	int64_t sta;
+
+	if (!acpi_matchhids(aaa, sdhc_hids, cf->cf_driver->cd_name))
+		return 0;
+
+	if (aml_evalinteger((struct acpi_softc *)parent, aaa->aaa_node,
+	    "_STA", 0, NULL, &sta))
+		sta = STA_PRESENT | STA_ENABLED | STA_DEV_OK | 0x1000;
+
+	if ((sta & STA_PRESENT) == 0)
+		return 0;
+
+	return 1;
+}
+
+void
+sdhc_acpi_attach(struct device *parent, struct device *self, void *aux)
+{
+	struct acpi_attach_args *aaa = aux;
+	struct sdhc_acpi_softc *sc = (struct sdhc_acpi_softc *)self;
+	struct aml_value res;
+
+	sc->sc_acpi = (struct acpi_softc *)parent;
+	sc->sc_node = aaa->aaa_node;
+	printf(": %s", sc->sc_node->name);
+
+	if (aml_evalname(sc->sc_acpi, sc->sc_node, "_CRS", 0, NULL, &res)) {
+		printf(", can't find registers\n");
+		return;
+	}
+
+	aml_parse_resource(&res, sdhc_acpi_parse_resources, sc);
+	printf(" addr 0x%lx/0x%lx", sc->sc_addr, sc->sc_size);
+	if (sc->sc_addr == 0 || sc->sc_size == 0) {
+		printf("\n");
+		return;
+	}
+
+	printf(" irq %d", sc->sc_irq);
+
+	sc->sc_memt = aaa->aaa_memt;
+	if (bus_space_map(sc->sc_memt, sc->sc_addr, sc->sc_size, 0,
+	    &sc->sc_memh)) {
+		printf(", can't map registers\n");
+		return;
+	}
+
+	sc->sc_ih = acpi_intr_establish(sc->sc_irq, sc->sc_irq_flags, IPL_BIO,
+	    sdhc_intr, sc, sc->sc.sc_dev.dv_xname);
+	if (sc->sc_ih == NULL) {
+		printf(", can't establish interrupt\n");
+		return;
+	}
+
+	printf("\n");
+
+	sc->sc.sc_host = &sc->sc_host;
+	sdhc_host_found(&sc->sc, sc->sc_memt, sc->sc_memh, sc->sc_size, 0, 0);
+}
+
+int
+sdhc_acpi_parse_resources(union acpi_resource *crs, void *arg)
+{
+	struct sdhc_acpi_softc *sc = arg;
+	int type = AML_CRSTYPE(crs);
+
+	switch (type) {
+	case LR_MEM32FIXED:
+		sc->sc_addr = crs->lr_m32fixed._bas;
+		sc->sc_size = crs->lr_m32fixed._len;
+		break;
+	case LR_EXTIRQ:
+		sc->sc_irq = crs->lr_extirq.irq[0];
+		sc->sc_irq_flags = crs->lr_extirq.flags;
+		break;
+	case 0x8c:
+		/* XXX GPIO; use for card detect. */
+		break;
+	default:
+		printf(" type 0x%x\n", type);
+		break;
+	}
+
+	return 0;
+}