From 6df2d0b7623cc2a6a8c92306616c0c0e14a428e5 Mon Sep 17 00:00:00 2001
From: kettenis <kettenis@openbsd.org>
Date: Wed, 9 Nov 2022 16:23:51 +0000
Subject: [PATCH] Make aplpmgr(4) work as a reset controller.

ok patrick@
---
 sys/arch/arm64/dev/aplpmgr.c | 42 ++++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/sys/arch/arm64/dev/aplpmgr.c b/sys/arch/arm64/dev/aplpmgr.c
index b858b028d5b..6b8d46c8d1c 100644
--- a/sys/arch/arm64/dev/aplpmgr.c
+++ b/sys/arch/arm64/dev/aplpmgr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplpmgr.c,v 1.1 2021/12/09 11:38:27 kettenis Exp $	*/
+/*	$OpenBSD: aplpmgr.c,v 1.2 2022/11/09 16:23:51 kettenis Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -24,6 +24,7 @@
 #include <machine/fdt.h>
 
 #include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_clock.h>
 #include <dev/ofw/ofw_misc.h>
 #include <dev/ofw/ofw_power.h>
 #include <dev/ofw/fdt.h>
@@ -34,6 +35,10 @@
 #define PMGR_PS_ACTUAL_SHIFT	4
 #define  PMGR_PS_ACTIVE		0xf
 #define  PMGR_PS_PWRGATE	0x0
+#define PMGR_WAS_PWRGATED	0x00000100
+#define PMGR_WAS_CLKGATED	0x00000200
+#define PMGR_DEV_DISABLE	0x00000400
+#define PMGR_RESET		0x80000000
 
 #define HREAD4(sc, reg)							\
 	(bus_space_read_4((sc)->sc_iot, (sc)->sc_ioh, (reg)))
@@ -44,8 +49,9 @@ struct aplpmgr_softc;
 
 struct aplpmgr_pwrstate {
 	struct aplpmgr_softc	*ps_sc;
-	struct power_domain_device ps_pd;
 	bus_size_t		ps_offset;
+	struct power_domain_device ps_pd;
+	struct reset_device	ps_rd;
 };
 
 struct aplpmgr_softc {
@@ -69,6 +75,7 @@ struct cfdriver aplpmgr_cd = {
 };
 
 void	aplpmgr_enable(void *, uint32_t *, int);
+void	aplpmgr_reset(void *, uint32_t *, int);
 
 int
 aplpmgr_match(struct device *parent, void *match, void *aux)
@@ -126,10 +133,17 @@ aplpmgr_attach(struct device *parent, struct device *self, void *aux)
 
 		ps->ps_sc = sc;
 		ps->ps_offset = reg[0];
+
 		ps->ps_pd.pd_node = node;
 		ps->ps_pd.pd_cookie = ps;
 		ps->ps_pd.pd_enable = aplpmgr_enable;
 		power_domain_register(&ps->ps_pd);
+
+		ps->ps_rd.rd_node = node;
+		ps->ps_rd.rd_cookie = ps;
+		ps->ps_rd.rd_reset = aplpmgr_reset;
+		reset_register(&ps->ps_rd);
+
 		ps++;
 	}
 }
@@ -158,3 +172,27 @@ aplpmgr_enable(void *cookie, uint32_t *cells, int on)
 		delay(1);
 	}
 }
+
+void
+aplpmgr_reset(void *cookie, uint32_t *cells, int on)
+{
+	struct aplpmgr_pwrstate *ps = cookie;
+	struct aplpmgr_softc *sc = ps->ps_sc;
+	uint32_t val;
+
+	if (on) {
+		val = HREAD4(sc, ps->ps_offset);
+		val &= ~(PMGR_WAS_CLKGATED | PMGR_WAS_PWRGATED);
+		HWRITE4(sc, ps->ps_offset, val | PMGR_DEV_DISABLE);
+		val = HREAD4(sc, ps->ps_offset);
+		val &= ~(PMGR_WAS_CLKGATED | PMGR_WAS_PWRGATED);
+		HWRITE4(sc, ps->ps_offset, val | PMGR_RESET);
+	} else {
+		val = HREAD4(sc, ps->ps_offset);
+		val &= ~(PMGR_WAS_CLKGATED | PMGR_WAS_PWRGATED);
+		HWRITE4(sc, ps->ps_offset, val & ~PMGR_RESET);
+		val = HREAD4(sc, ps->ps_offset);
+		val &= ~(PMGR_WAS_CLKGATED | PMGR_WAS_PWRGATED);
+		HWRITE4(sc, ps->ps_offset, val & ~PMGR_DEV_DISABLE);
+	}
+}
-- 
2.20.1