Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/acpi DesignWare watchdog ACPI attach glue



details:   https://anonhg.NetBSD.org/src/rev/0315d6d27244
branches:  trunk
changeset: 374275:0315d6d27244
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Apr 16 16:55:01 2023 +0000

description:
DesignWare watchdog ACPI attach glue

diffstat:

 sys/arch/evbarm/conf/GENERIC64 |    3 +-
 sys/dev/acpi/dwcwdt_acpi.c     |  100 +++++++++++++++++++++++++++++++++++++++++
 sys/dev/acpi/files.acpi        |    6 ++-
 3 files changed, 107 insertions(+), 2 deletions(-)

diffs (140 lines):

diff -r c592a2b921e5 -r 0315d6d27244 sys/arch/evbarm/conf/GENERIC64
--- a/sys/arch/evbarm/conf/GENERIC64    Sun Apr 16 16:51:38 2023 +0000
+++ b/sys/arch/evbarm/conf/GENERIC64    Sun Apr 16 16:55:01 2023 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC64,v 1.210 2023/02/25 08:19:35 skrll Exp $
+#      $NetBSD: GENERIC64,v 1.211 2023/04/16 16:55:01 jmcneill Exp $
 #
 #      GENERIC ARM (aarch64) kernel
 #
@@ -162,6 +162,7 @@ tegratimer* at fdt?                 # Timers
 applewdog*     at fdt?                 # Apple watchdog
 bcmpmwdog*     at fdt?                 # Broadcom BCM283x watchdog
 dwcwdt*        at fdt?                 # DesignWare watchdog
+dwcwdt*                at acpi?
 mesongxwdt*    at fdt?                 # Amlogic Meson GX watchdog
 sbsawdt*       at acpi?                # ARM SBSA-compliant watchdog
 sunxiwdt*      at fdt?                 # Allwinner watchdog
diff -r c592a2b921e5 -r 0315d6d27244 sys/dev/acpi/dwcwdt_acpi.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/acpi/dwcwdt_acpi.c        Sun Apr 16 16:55:01 2023 +0000
@@ -0,0 +1,100 @@
+/* $NetBSD: dwcwdt_acpi.c,v 1.1 2023/04/16 16:55:01 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2023 Jared McNeill <jmcneill%invisible.ca@localhost>
+ * All rights reserved.
+ *
+ * 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.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: dwcwdt_acpi.c,v 1.1 2023/04/16 16:55:01 jmcneill Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/systm.h>
+#include <sys/mutex.h>
+#include <sys/wdog.h>
+
+#include <dev/sysmon/sysmonvar.h>
+#include <dev/ic/dwc_wdt_var.h>
+
+#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
+
+static const struct device_compatible_entry compat_data[] = {
+       { .compat = "snps,dw-wdt" },
+       DEVICE_COMPAT_EOL
+};
+
+static int
+dwcwdt_acpi_match(device_t parent, cfdata_t cf, void *aux)
+{
+       struct acpi_attach_args *aa = aux;
+
+       return acpi_compatible_match(aa, compat_data);
+}
+
+static void
+dwcwdt_acpi_attach(device_t parent, device_t self, void *aux)
+{
+       struct dwcwdt_softc * const sc = device_private(self);
+       struct acpi_attach_args *aa = aux;
+       ACPI_HANDLE handle = aa->aa_node->ad_handle;
+       struct acpi_resources res;
+       struct acpi_mem *mem;
+       ACPI_INTEGER ival;
+       ACPI_STATUS rv;
+
+       rv = acpi_resource_parse(sc->sc_dev, handle, "_CRS",
+           &res, &acpi_resource_parse_ops_default);
+       if (ACPI_FAILURE(rv)) {
+               return;
+       }
+
+       mem = acpi_res_mem(&res, 0);
+       if (mem == NULL) {
+               aprint_error_dev(self, "couldn't find mem resource\n");
+               goto done;
+       }
+
+       sc->sc_dev = self;
+       sc->sc_bst = aa->aa_memt;
+       if (bus_space_map(sc->sc_bst, mem->ar_base, mem->ar_length,
+           0, &sc->sc_bsh) != 0) {
+               aprint_error_dev(self, "couldn't map registers\n");
+               goto done;
+       }
+       if (ACPI_SUCCESS(acpi_dsd_integer(handle, "clock-frequency", &ival))) {
+               sc->sc_clkrate = ival;
+       }
+
+       dwcwdt_init(sc);
+
+done:
+       acpi_resource_cleanup(&res);
+}
+
+CFATTACH_DECL_NEW(dwcwdt_acpi, sizeof(struct dwcwdt_softc),
+    dwcwdt_acpi_match, dwcwdt_acpi_attach, NULL, NULL);
diff -r c592a2b921e5 -r 0315d6d27244 sys/dev/acpi/files.acpi
--- a/sys/dev/acpi/files.acpi   Sun Apr 16 16:51:38 2023 +0000
+++ b/sys/dev/acpi/files.acpi   Sun Apr 16 16:55:01 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.acpi,v 1.126 2022/05/26 02:16:44 mrg Exp $
+#      $NetBSD: files.acpi,v 1.127 2023/04/16 16:55:01 jmcneill Exp $
 
 defflag        opt_acpi.h      ACPIVERBOSE ACPI_DEBUG ACPI_ACTIVATE_DEV
                        ACPI_DSDT_OVERRIDE ACPI_SCANPCI ACPI_BREAKPOINT
@@ -308,4 +308,8 @@ file        dev/acpi/igpio_acpi.c           igpio_acpi
 attach dwcmmc at acpinodebus with dwcmmc_acpi
 file   dev/acpi/dwcmmc_acpi.c          dwcmmc_acpi
 
+# DesignWare Watchdog
+attach dwcwdt at acpinodebus with dwcwdt_acpi
+file   dev/acpi/dwcwdt_acpi.c          dwcwdt_acpi
+
 include        "dev/acpi/wmi/files.wmi"



Home | Main Index | Thread Index | Old Index