Sun Apr 16 16:55:02 2023 UTC ()
DesignWare watchdog ACPI attach glue


(jmcneill)
diff -r1.210 -r1.211 src/sys/arch/evbarm/conf/GENERIC64
diff -r0 -r1.1 src/sys/dev/acpi/dwcwdt_acpi.c
diff -r1.126 -r1.127 src/sys/dev/acpi/files.acpi

cvs diff -r1.210 -r1.211 src/sys/arch/evbarm/conf/GENERIC64 (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/GENERIC64 2023/02/25 08:19:35 1.210
+++ src/sys/arch/evbarm/conf/GENERIC64 2023/04/16 16:55:01 1.211
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# 1#
2# $NetBSD: GENERIC64,v 1.210 2023/02/25 08:19:35 skrll Exp $ 2# $NetBSD: GENERIC64,v 1.211 2023/04/16 16:55:01 jmcneill Exp $
3# 3#
4# GENERIC ARM (aarch64) kernel 4# GENERIC ARM (aarch64) kernel
5# 5#
6 6
7include "arch/evbarm/conf/std.generic64" 7include "arch/evbarm/conf/std.generic64"
8include "arch/evbarm/conf/files.generic64" 8include "arch/evbarm/conf/files.generic64"
9include "arch/evbarm/conf/GENERIC.common" 9include "arch/evbarm/conf/GENERIC.common"
10 10
11maxusers 64 11maxusers 64
12 12
13options CPU_CORTEX 13options CPU_CORTEX
14options CPU_THUNDERX 14options CPU_THUNDERX
15options SOC_APPLE 15options SOC_APPLE
@@ -152,26 +152,27 @@ gpioleds* at fdt? @@ -152,26 +152,27 @@ gpioleds* at fdt?
152syscon* at fdt? pass 1 # Generic System Controller 152syscon* at fdt? pass 1 # Generic System Controller
153sunxisramc* at fdt? pass 1 # Allwinner System Control 153sunxisramc* at fdt? pass 1 # Allwinner System Control
154 154
155# Timer 155# Timer
156gtmr* at fdt? pass 2 # ARM Generic Timer 156gtmr* at fdt? pass 2 # ARM Generic Timer
157gtmr* at acpi? 157gtmr* at acpi?
158armgtmr0 at gtmr? 158armgtmr0 at gtmr?
159tegratimer* at fdt? # Timers 159tegratimer* at fdt? # Timers
160 160
161# Watchdog 161# Watchdog
162applewdog* at fdt? # Apple watchdog 162applewdog* at fdt? # Apple watchdog
163bcmpmwdog* at fdt? # Broadcom BCM283x watchdog 163bcmpmwdog* at fdt? # Broadcom BCM283x watchdog
164dwcwdt* at fdt? # DesignWare watchdog 164dwcwdt* at fdt? # DesignWare watchdog
 165dwcwdt* at acpi?
165mesongxwdt* at fdt? # Amlogic Meson GX watchdog 166mesongxwdt* at fdt? # Amlogic Meson GX watchdog
166sbsawdt* at acpi? # ARM SBSA-compliant watchdog 167sbsawdt* at acpi? # ARM SBSA-compliant watchdog
167sunxiwdt* at fdt? # Allwinner watchdog 168sunxiwdt* at fdt? # Allwinner watchdog
168 169
169# Interrupt controller 170# Interrupt controller
170appleintc* at fdt? pass 1 # Apple AIC 171appleintc* at fdt? pass 1 # Apple AIC
171bcmicu* at fdt? pass 1 # Broadcom BCM283x ICU 172bcmicu* at fdt? pass 1 # Broadcom BCM283x ICU
172tegralic* at fdt? pass 1 # NVIDIA Tegra LIC 173tegralic* at fdt? pass 1 # NVIDIA Tegra LIC
173gic* at fdt? pass 1 # ARM GICv2 174gic* at fdt? pass 1 # ARM GICv2
174gic* at acpi? 175gic* at acpi?
175armgic0 at gic? 176armgic0 at gic?
176gicvthree* at fdt? pass 1 # ARM GICv3 177gicvthree* at fdt? pass 1 # ARM GICv3
177gicvthree* at acpi? 178gicvthree* at acpi?

File Added: src/sys/dev/acpi/dwcwdt_acpi.c
/* $NetBSD: dwcwdt_acpi.c,v 1.1 2023/04/16 16:55:01 jmcneill Exp $ */

/*-
 * Copyright (c) 2023 Jared McNeill <jmcneill@invisible.ca>
 * 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);

cvs diff -r1.126 -r1.127 src/sys/dev/acpi/files.acpi (expand / switch to unified diff)

--- src/sys/dev/acpi/files.acpi 2022/05/26 02:16:44 1.126
+++ src/sys/dev/acpi/files.acpi 2023/04/16 16:55:01 1.127
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: files.acpi,v 1.126 2022/05/26 02:16:44 mrg Exp $ 1# $NetBSD: files.acpi,v 1.127 2023/04/16 16:55:01 jmcneill Exp $
2 2
3defflag opt_acpi.h ACPIVERBOSE ACPI_DEBUG ACPI_ACTIVATE_DEV 3defflag opt_acpi.h ACPIVERBOSE ACPI_DEBUG ACPI_ACTIVATE_DEV
4 ACPI_DSDT_OVERRIDE ACPI_SCANPCI ACPI_BREAKPOINT 4 ACPI_DSDT_OVERRIDE ACPI_SCANPCI ACPI_BREAKPOINT
5 ACPI_REDUCED_HW ACPI__DIS_IS_BROKEN 5 ACPI_REDUCED_HW ACPI__DIS_IS_BROKEN
6defparam opt_acpi.h ACPI_DSDT_FILE := "\"/dev/null\"" 6defparam opt_acpi.h ACPI_DSDT_FILE := "\"/dev/null\""
7defparam opt_acpi.h ACPI_BLACKLIST_YEAR = 2000 7defparam opt_acpi.h ACPI_BLACKLIST_YEAR = 2000
8 8
9define acpiapmbus { } 9define acpiapmbus { }
10define acpinodebus { } 10define acpinodebus { }
11define acpiecdtbus { } 11define acpiecdtbus { }
12define acpihpetbus { } 12define acpihpetbus { }
13define acpiwdrtbus { } 13define acpiwdrtbus { }
14define acpisdtbus { } 14define acpisdtbus { }
@@ -298,14 +298,18 @@ file dev/acpi/genet_acpi.c genet_acpi @@ -298,14 +298,18 @@ file dev/acpi/genet_acpi.c genet_acpi
298 298
299# DesignWare Ethernet Quality-of-Service controller 299# DesignWare Ethernet Quality-of-Service controller
300attach eqos at acpinodebus with eqos_acpi 300attach eqos at acpinodebus with eqos_acpi
301file dev/acpi/eqos_acpi.c eqos_acpi 301file dev/acpi/eqos_acpi.c eqos_acpi
302 302
303# Intel GPIO 303# Intel GPIO
304attach igpio at acpinodebus with igpio_acpi 304attach igpio at acpinodebus with igpio_acpi
305file dev/acpi/igpio_acpi.c igpio_acpi 305file dev/acpi/igpio_acpi.c igpio_acpi
306 306
307# DesignWare Mobile Storage Host Controller 307# DesignWare Mobile Storage Host Controller
308attach dwcmmc at acpinodebus with dwcmmc_acpi 308attach dwcmmc at acpinodebus with dwcmmc_acpi
309file dev/acpi/dwcmmc_acpi.c dwcmmc_acpi 309file dev/acpi/dwcmmc_acpi.c dwcmmc_acpi
310 310
 311# DesignWare Watchdog
 312attach dwcwdt at acpinodebus with dwcwdt_acpi
 313file dev/acpi/dwcwdt_acpi.c dwcwdt_acpi
 314
311include "dev/acpi/wmi/files.wmi" 315include "dev/acpi/wmi/files.wmi"