summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjmcneill <jmcneill@NetBSD.org>2022-01-11 22:32:44 +0000
committerjmcneill <jmcneill@NetBSD.org>2022-01-11 22:32:44 +0000
commit696d566f0ba20c50809c88202ec00471a6e6493c (patch)
tree0c33fa4b343eca35547760a6adc2e5093edb4af5 /sys/dev
parentddb1a1176df8a43605bde34cac035c5eb37091e8 (diff)
acpi: sdhc: Support sdhci-caps and sdhci-caps-mask properties.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/sdhc_acpi.c23
1 files changed, 21 insertions, 2 deletions
diff --git a/sys/dev/acpi/sdhc_acpi.c b/sys/dev/acpi/sdhc_acpi.c
index a13610466a4..4af2d1eb893 100644
--- a/sys/dev/acpi/sdhc_acpi.c
+++ b/sys/dev/acpi/sdhc_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc_acpi.c,v 1.15 2021/12/28 13:41:12 jmcneill Exp $ */
+/* $NetBSD: sdhc_acpi.c,v 1.16 2022/01/11 22:32:44 jmcneill Exp $ */
/*
* Copyright (c) 2016 Kimihiro Nonaka <nonaka@NetBSD.org>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc_acpi.c,v 1.15 2021/12/28 13:41:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc_acpi.c,v 1.16 2022/01/11 22:32:44 jmcneill Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -148,6 +148,7 @@ sdhc_acpi_attach(device_t parent, device_t self, void *opaque)
struct acpi_irq *irq;
ACPI_STATUS rv;
ACPI_INTEGER clock_freq;
+ ACPI_INTEGER caps, caps_mask;
sc->sc.sc_dev = self;
sc->sc.sc_dmat = aa->aa_dmat;
@@ -216,6 +217,24 @@ sdhc_acpi_attach(device_t parent, device_t self, void *opaque)
sc->sc.sc_flags |= SDHC_FLAG_NO_CLKBASE;
}
+ /* Capability overrides */
+ caps = caps_mask = 0;
+ acpi_dsd_integer(aa->aa_node->ad_handle, "sdhci-caps-mask", &caps_mask);
+ acpi_dsd_integer(aa->aa_node->ad_handle, "sdhci-caps", &caps);
+ if (caps || caps_mask) {
+ sc->sc.sc_caps = bus_space_read_4(sc->sc_memt, sc->sc_memh,
+ SDHC_CAPABILITIES);
+ sc->sc.sc_caps &= ~(caps_mask & 0xffffffff);
+ sc->sc.sc_caps |= (caps & 0xffffffff);
+ if (((caps | caps_mask) >> 32) != 0) {
+ sc->sc.sc_caps2 = bus_space_read_4(sc->sc_memt,
+ sc->sc_memh, SDHC_CAPABILITIES2);
+ sc->sc.sc_caps2 &= ~(caps_mask >> 32);
+ sc->sc.sc_caps2 |= (caps >> 32);
+ }
+ sc->sc.sc_flags |= SDHC_FLAG_HOSTCAPS;
+ }
+
if (sdhc_host_found(&sc->sc, sc->sc_memt, sc->sc_memh,
sc->sc_memsize) != 0) {
aprint_error_dev(self, "couldn't initialize host\n");