7 files changed, 224 insertions, 7 deletions

diff --git a/sys/dev/qcom_gcc/qcom_gcc_clock.c b/sys/dev/qcom_gcc/qcom_gcc_clock.c
index c8c10b0c5172..f51b4021a821 100644
--- a/sys/dev/qcom_gcc/qcom_gcc_clock.c
+++ b/sys/dev/qcom_gcc/qcom_gcc_clock.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2025, Adrian Chadd <adrian@FreeBSD.org>
+ * Copyright (c) 2026 Adrian Chadd <adrian@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,6 +37,7 @@
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
+#include <sys/rman.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/dev/qcom_gcc/qcom_gcc_ipq4018_reset.c b/sys/dev/qcom_gcc/qcom_gcc_ipq4018_reset.c
index f99d1d9ad9f1..127ca944c77e 100644
--- a/sys/dev/qcom_gcc/qcom_gcc_ipq4018_reset.c
+++ b/sys/dev/qcom_gcc/qcom_gcc_ipq4018_reset.c
@@ -38,6 +38,7 @@
 
 #include <machine/bus.h>
 #include <machine/resource.h>
+#include <sys/rman.h>
 #include <sys/bus.h>
 
 #include <dev/fdt/fdt_common.h>
@@ -136,7 +137,8 @@ qcom_gcc_ipq4018_hwreset_assert(device_t dev, intptr_t id, bool reset)
 	sc = device_get_softc(dev);
 
 	if (id > nitems(gcc_ipq4019_reset_list)) {
-		device_printf(dev, "%s: invalid id (%d)\n", __func__, id);
+		device_printf(dev, "%s: invalid id (%d)\n", __func__,
+		    (uint32_t) id);
 		return (EINVAL);
 	}
 
@@ -160,7 +162,8 @@ qcom_gcc_ipq4018_hwreset_is_asserted(device_t dev, intptr_t id, bool *reset)
 	sc = device_get_softc(dev);
 
 	if (id > nitems(gcc_ipq4019_reset_list)) {
-		device_printf(dev, "%s: invalid id (%d)\n", __func__, id);
+		device_printf(dev, "%s: invalid id (%d)\n", __func__,
+		    (uint32_t) id);
 		return (EINVAL);
 	}
 	mtx_lock(&sc->mtx);
@@ -171,7 +174,7 @@ qcom_gcc_ipq4018_hwreset_is_asserted(device_t dev, intptr_t id, bool *reset)
 		*reset = false;
 	mtx_unlock(&sc->mtx);
 
-	device_printf(dev, "called; id=%d\n", id);
+	device_printf(dev, "called; id=%d\n", (uint32_t) id);
 	return (0);
 }
 
diff --git a/sys/dev/qcom_gcc/qcom_gcc_main.c b/sys/dev/qcom_gcc/qcom_gcc_main.c
index 3950bd985feb..38f409827541 100644
--- a/sys/dev/qcom_gcc/qcom_gcc_main.c
+++ b/sys/dev/qcom_gcc/qcom_gcc_main.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2025, Adrian Chadd <adrian@FreeBSD.org>
+ * Copyright (c) 2026 Adrian Chadd <adrian@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -39,6 +39,7 @@
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
+#include <sys/rman.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
@@ -51,6 +52,7 @@
 
 #include "qcom_gcc_var.h"
 #include "qcom_gcc_ipq4018.h"
+#include "qcom_gcc_msm8916.h"
 
 static int	qcom_gcc_modevent(module_t, int, void *);
 
@@ -67,6 +69,8 @@ struct qcom_gcc_chipset_list_entry {
 static struct qcom_gcc_chipset_list_entry qcom_gcc_chipset_list[] = {
 	{ "qcom,gcc-ipq4019", "Qualcomm IPQ4018 Clock/Reset Controller",
 	    QCOM_GCC_CHIPSET_IPQ4018 },
+	{ "qcom,gcc-msm8916", "Qualcomm MSM8916 Clock/Reset Controller",
+	    QCOM_GCC_CHIPSET_MSM8916 },
 	{ NULL, NULL, 0 },
 };
 
@@ -135,6 +139,10 @@ qcom_gcc_attach(device_t dev)
 		qcom_gcc_ipq4018_hwreset_init(sc);
 		mem_sz = 0x60000;
 		break;
+	case QCOM_GCC_CHIPSET_MSM8916:
+		qcom_gcc_msm8916_hwreset_init(sc);
+		mem_sz = 0x0;
+		break;
 	case QCOM_GCC_CHIPSET_NONE:
 		device_printf(dev, "Invalid chipset (%d)\n", sc->sc_chipset);
 		return (ENXIO);
@@ -142,8 +150,13 @@ qcom_gcc_attach(device_t dev)
 
 	sc->reg_rid = 0;
 
-	sc->reg = bus_alloc_resource_anywhere(dev, SYS_RES_MEMORY,
-	    &sc->reg_rid, mem_sz, RF_ACTIVE);
+	if (mem_sz != 0)
+		sc->reg = bus_alloc_resource_anywhere(dev, SYS_RES_MEMORY,
+		    &sc->reg_rid, mem_sz, RF_ACTIVE);
+	else
+		sc->reg = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+		    &sc->reg_rid, RF_ACTIVE);
+
 	if (sc->reg == NULL) {
 		device_printf(dev, "Couldn't allocate memory resource!\n");
 		return (ENXIO);
@@ -163,6 +176,9 @@ qcom_gcc_attach(device_t dev)
 	case QCOM_GCC_CHIPSET_IPQ4018:
 		qcom_gcc_ipq4018_clock_setup(sc);
 		break;
+	case QCOM_GCC_CHIPSET_MSM8916:
+		qcom_gcc_msm8916_clock_setup(sc);
+		break;
 	case QCOM_GCC_CHIPSET_NONE:
 		device_printf(dev, "Invalid chipset (%d)\n", sc->sc_chipset);
 		return (ENXIO);
diff --git a/sys/dev/qcom_gcc/qcom_gcc_msm8916.h b/sys/dev/qcom_gcc/qcom_gcc_msm8916.h
new file mode 100644
index 000000000000..10758b0744a4
--- /dev/null
+++ b/sys/dev/qcom_gcc/qcom_gcc_msm8916.h
@@ -0,0 +1,41 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2026 Adrian Chadd <adrian@FreeBSD.org>
+ *
+ * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ */
+
+#ifndef	__QCOM_GCC_MSM8916_H__
+#define	__QCOM_GCC_MSM8916_H__
+
+/*
+ * reset block
+ */
+extern	void qcom_gcc_msm8916_hwreset_init(struct qcom_gcc_softc *);
+
+/*
+ * clock block
+ */
+extern	void qcom_gcc_msm8916_clock_setup(struct qcom_gcc_softc *);
+
+#endif	/* __QCOM_GCC_MSM8916_H__ */
diff --git a/sys/dev/qcom_gcc/qcom_gcc_msm8916_clock.c b/sys/dev/qcom_gcc/qcom_gcc_msm8916_clock.c
new file mode 100644
index 000000000000..5c0e4afcc17f
--- /dev/null
+++ b/sys/dev/qcom_gcc/qcom_gcc_msm8916_clock.c
@@ -0,0 +1,84 @@
+/*-
+ * Copyright (c) 2018 Ruslan Bukin <br@bsdpad.com>
+ * All rights reserved.
+ *
+ * This software was developed by BAE Systems, the University of Cambridge
+ * Computer Laboratory, and Memorial University under DARPA/AFRL contract
+ * FA8650-15-C-7558 ("CADETS"), as part of the DARPA Transparent Computing
+ * (TC) research program.
+ *
+ * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kthread.h>
+#include <sys/rman.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <machine/bus.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include "qcom_gcc_var.h"
+#include "qcom_gcc_msm8916.h"
+
+#define	GCC_QDSS_BCR			0x29000
+#define	 GCC_QDSS_BCR_BLK_ARES		(1 << 0) /* Async software reset. */
+#define	GCC_QDSS_CFG_AHB_CBCR		0x29008
+#define	 AHB_CBCR_CLK_ENABLE		(1 << 0) /* AHB clk branch ctrl */
+#define	GCC_QDSS_ETR_USB_CBCR		0x29028
+#define	 ETR_USB_CBCR_CLK_ENABLE	(1 << 0) /* ETR USB clk branch ctrl */
+#define	GCC_QDSS_DAP_CBCR		0x29084
+#define	 DAP_CBCR_CLK_ENABLE		(1 << 0) /* DAP clk branch ctrl */
+
+/*
+ * Qualcomm Debug Subsystem (QDSS)
+ * block enabling routine.
+ */
+static void
+qcom_msm8916_qdss_enable(struct qcom_gcc_softc *sc)
+{
+
+	/* Put QDSS block to reset */
+	bus_write_4(sc->reg, GCC_QDSS_BCR, GCC_QDSS_BCR_BLK_ARES);
+
+	/* Enable AHB clock branch */
+	bus_write_4(sc->reg, GCC_QDSS_CFG_AHB_CBCR, AHB_CBCR_CLK_ENABLE);
+
+	/* Enable DAP clock branch */
+	bus_write_4(sc->reg, GCC_QDSS_DAP_CBCR, DAP_CBCR_CLK_ENABLE);
+
+	/* Enable ETR USB clock branch */
+	bus_write_4(sc->reg, GCC_QDSS_ETR_USB_CBCR, ETR_USB_CBCR_CLK_ENABLE);
+
+	/* Out of reset */
+	bus_write_4(sc->reg, GCC_QDSS_BCR, 0);
+}
+
+void
+qcom_gcc_msm8916_clock_setup(struct qcom_gcc_softc *sc)
+{
+	qcom_msm8916_qdss_enable(sc);
+}
diff --git a/sys/dev/qcom_gcc/qcom_gcc_msm8916_reset.c b/sys/dev/qcom_gcc/qcom_gcc_msm8916_reset.c
new file mode 100644
index 000000000000..c83fd3e981ab
--- /dev/null
+++ b/sys/dev/qcom_gcc/qcom_gcc_msm8916_reset.c
@@ -0,0 +1,71 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2026 Adrian Chadd <adrian@FreeBSD.org>
+ *
+ * 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 unmodified, 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/param.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/sglist.h>
+#include <sys/random.h>
+#include <sys/stdatomic.h>
+#include <sys/mutex.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/bus.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <dev/hwreset/hwreset.h>
+
+#include "hwreset_if.h"
+
+#include "qcom_gcc_var.h"
+#include "qcom_gcc_msm8916.h"
+
+static int
+qcom_gcc_msm8916_hwreset_assert(device_t dev, intptr_t id, bool reset)
+{
+	device_printf(dev, "%s: invalid id (%d)\n", __func__, (uint32_t) id);
+	return (EINVAL);
+}
+
+static int
+qcom_gcc_msm8916_hwreset_is_asserted(device_t dev, intptr_t id, bool *reset)
+{
+	device_printf(dev, "%s: invalid id (%d)\n", __func__, (uint32_t) id);
+	return (EINVAL);
+}
+
+void
+qcom_gcc_msm8916_hwreset_init(struct qcom_gcc_softc *sc)
+{
+	sc->sc_cb.hw_reset_assert = qcom_gcc_msm8916_hwreset_assert;
+	sc->sc_cb.hw_reset_is_asserted = qcom_gcc_msm8916_hwreset_is_asserted;
+}
diff --git a/sys/dev/qcom_gcc/qcom_gcc_var.h b/sys/dev/qcom_gcc/qcom_gcc_var.h
index 2d4e969e1134..e3796f0d5f0f 100644
--- a/sys/dev/qcom_gcc/qcom_gcc_var.h
+++ b/sys/dev/qcom_gcc/qcom_gcc_var.h
@@ -31,6 +31,7 @@
 typedef enum {
 	QCOM_GCC_CHIPSET_NONE = 0,
 	QCOM_GCC_CHIPSET_IPQ4018 = 1,
+	QCOM_GCC_CHIPSET_MSM8916 = 2,
 } qcom_gcc_chipset_t;
 
 struct qcom_gcc_reset_entry {