Page MenuHomeFreeBSD
Files F171076219

D59478.id.diff
No OneTemporary
Actions

D59478.id.diff
View Options

diff --git a/sys/dev/clk/starfive/jh7110_clk_sys.c.orig b/sys/dev/clk/starfive/jh7110_clk_sys.c
--- a/sys/dev/clk/starfive/jh7110_clk_sys.c.orig
+++ b/sys/dev/clk/starfive/jh7110_clk_sys.c
@@ -88,6 +88,10 @@
static const char *gmac1_tx_p[] = { "gmac1_gtxclk", "gmac1_rmii_rtx" };
static const char *gmac1_rx_p[] = { "gmac1_rgmii_rxin", "gmac1_rmii_rtx" };
static const char *gmac1_rx_inv_p[] = { "gmac1_rx" };
+static const char *temp_sensor_clk_apb_p[] = { "apb0" };
+static const char *temp_sensor_clk_core_p[] = { "osc" };
+static const char *pwmdac_clk_apb_p[] = { "apb0" };
+static const char *pwmdac_clk_core_p[] = { "osc" };
/* non-pll SYS clocks */
static const struct jh7110_clk_def sys_clks[] = {
@@ -154,6 +158,16 @@
JH7110_GATE(JH7110_SYSCLK_GMAC1_GTXC, "gmac1_gtxc", gmac1_gtxc_p),
JH7110_DIV(JH7110_SYSCLK_GMAC1_RMII_RTX, "gmac1_rmii_rtx",
gmac1_rmii_rtx_p, 30),
+
+ JH7110_GATE(JH7110_SYSCLK_TEMP_APB, "temp_sensor_clk_apb",
+ temp_sensor_clk_apb_p),
+ JH7110_GATE(JH7110_SYSCLK_TEMP_CORE, "temp_sensor_clk_core",
+ temp_sensor_clk_core_p),
+
+ JH7110_GATE(JH7110_SYSCLK_PWMDAC_APB, "pwmdac_clk_apb",
+ pwmdac_clk_apb_p),
+ JH7110_GATE(JH7110_SYSCLK_PWMDAC_CORE, "pwmdac_clk_core",
+ pwmdac_clk_core_p),
};
static int
diff --git a/sys/riscv/starfive/files.starfive.orig b/sys/riscv/starfive/files.starfive
--- a/sys/riscv/starfive/files.starfive.orig
+++ b/sys/riscv/starfive/files.starfive
@@ -12,3 +12,5 @@
riscv/starfive/jh7110_gpio.c standard
riscv/starfive/jh7110_pcie.c optional pci fdt
riscv/starfive/starfive_syscon.c standard
+riscv/starfive/jh7110_temp.c standard
+#riscv/starfive/jh7110_pwmdac.c optional sound fdt
diff --git a/sys/riscv/starfive/jh7110_temp.c.orig b/sys/riscv/starfive/jh7110_temp.c
--- a/sys/riscv/starfive/jh7110_temp.c.orig
+++ b/sys/riscv/starfive/jh7110_temp.c
@@ -0,0 +1,247 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2026 Brian Scott <bscott@bunyatech.com.au>
+ * Parts:
+ * Copyright (c) 2022 Mark Kettenis <kettenis@openbsd.org>
+ * Copyright (c) 2023/4 Jari Sihvola <jsihv@gmx.com>
+ */
+
+#include <sys/cdefs.h>
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+
+#include <sys/gpio.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/rman.h>
+#include <sys/sysctl.h>
+
+#include <machine/bus.h>
+#include <machine/intr.h>
+#include <machine/resource.h>
+
+#include <dev/clk/clk.h>
+#include <dev/gpio/gpiobusvar.h>
+#include <dev/hwreset/hwreset.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+/* Registers */
+#define TEMP 0x0000
+#define TEMP_PD (1 << 1)
+#define TEMP_RSTN (1 << 0)
+#define TEMP_RUN (1 << 2)
+#define TEMP_DOUT_MASK 0x0fff0000
+#define TEMP_DOUT_SHIFT 16
+
+struct jh7110_temp_softc {
+ device_t dev;
+ struct resource *res;
+ clk_t bus;
+ hwreset_t rst_bus;
+ clk_t sense;
+ hwreset_t rst_sense;
+};
+
+static struct ofw_compat_data compat_data[] = {
+ {"starfive,jh7110-temp", 1},
+ {NULL, 0}
+};
+
+static struct resource_spec jh7110_temp_spec[] = {
+ { SYS_RES_MEMORY, 0, RF_ACTIVE },
+ { -1, 0 }
+};
+
+#define RD4(sc, reg) bus_read_4((sc)->res, (reg))
+#define WR4(sc, reg, val) bus_write_4((sc)->res, (reg), (val))
+
+static int32_t
+jh7110_temp_get_temperature(struct jh7110_temp_softc *sc)
+{
+ int32_t value;
+
+ value = RD4(sc, TEMP);
+ value = (value & TEMP_DOUT_MASK) >> TEMP_DOUT_SHIFT;
+
+ /*
+ These calibration numbers are based on the openbsd driver.
+ The y intercept is -81.1C (192.05K). The slope is roughly 0.058012C/bit (expressed
+ so integer arrithmetic can work)
+ The result is in milliKelvin hence the numerator and offset being factored up by 1000.
+ The 4094 looks like an error (i.e. should be 4095) but could be an artifact from
+ the methods used to calculate the slope value.
+ */
+ return (value * 237500) / 4094 + 192050;
+}
+
+static int
+jh7110_temperature(SYSCTL_HANDLER_ARGS)
+{
+ struct jh7110_temp_softc *sc = arg1;
+ int val;
+ int err;
+ /* get realtime value */
+ val = jh7110_temp_get_temperature(sc);
+
+ err = sysctl_handle_int(oidp, &val, 0, req);
+ if (err || !req->newptr) /* error || read request */
+ return (err);
+
+ return (0);
+}
+
+static int
+jh7110_temp_probe(device_t dev)
+{
+ if (!ofw_bus_status_okay(dev))
+ return (ENXIO);
+
+ if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0)
+ return (ENXIO);
+
+ device_set_desc(dev, "StarFive JH7110 Temperature sensor");
+
+ return (BUS_PROBE_DEFAULT);
+}
+
+static int
+jh7110_temp_detach(device_t dev)
+{
+ struct jh7110_temp_softc *sc;
+
+ sc = device_get_softc(dev);
+
+ bus_release_resources(dev, jh7110_temp_spec, &sc->res);
+ if (sc->bus != NULL)
+ clk_release(sc->bus);
+ if (sc->sense != NULL)
+ clk_release(sc->sense);
+ if (sc->rst_bus != NULL)
+ hwreset_release(sc->rst_bus);
+ if (sc->rst_sense != NULL)
+ hwreset_release(sc->rst_sense);
+
+ return (0);
+}
+
+static int
+jh7110_temp_attach(device_t dev)
+{
+ struct jh7110_temp_softc *sc;
+ device_t cpu;
+ struct sysctl_ctx_list *ctx;
+ int rv;
+
+ sc = device_get_softc(dev);
+ sc->dev = dev;
+
+ if ((rv = bus_alloc_resources(dev, jh7110_temp_spec, &sc->res)) != 0) {
+ device_printf(dev, "Could not allocate resources: %d\n",rv);
+ bus_release_resources(dev, jh7110_temp_spec, &sc->res);
+ return (ENXIO);
+ }
+
+ /* Find the clocks and set them up */
+ if ((rv = clk_get_by_ofw_name(dev, 0, "bus", &sc->bus)) != 0) {
+ device_printf(dev, "Cannot get bus clock: %d\n",rv);
+ jh7110_temp_detach(dev);
+ return (ENXIO);
+ }
+ if ((rv = clk_enable(sc->bus)) != 0) {
+ device_printf(dev, "Could not enable bus clock %s: %d\n",
+ clk_get_name(sc->bus),rv);
+ jh7110_temp_detach(dev);
+ return (ENXIO);
+ }
+
+ if ((rv = clk_get_by_ofw_name(dev, 0, "sense", &sc->sense)) != 0) {
+ device_printf(dev, "Cannot get sense clock: %d\n",rv);
+ jh7110_temp_detach(dev);
+ return (ENXIO);
+ }
+ if ((rv = clk_enable(sc->sense)) != 0) {
+ device_printf(dev, "Could not enable sense clock %s: %d\n",
+ clk_get_name(sc->sense),rv);
+ jh7110_temp_detach(dev);
+ return (ENXIO);
+ }
+
+ /* Find the clock resets and de-assert them */
+ if ((rv = hwreset_get_by_ofw_name(dev, 0, "bus", &sc->rst_bus)) != 0) {
+ device_printf(sc->dev, "cannot get 'rst_bus' reset: %d\n",rv);
+ jh7110_temp_detach(dev);
+ return (ENXIO);
+ }
+ if ((rv = hwreset_deassert(sc->rst_bus)) != 0) {
+ device_printf(sc->dev, "cannot deassert 'bus' reset: %d\n",rv);
+ jh7110_temp_detach(dev);
+ return (ENXIO);
+ }
+ if ((rv = hwreset_get_by_ofw_name(dev, 0, "sense", &sc->rst_sense)) != 0) {
+ device_printf(sc->dev, "cannot get 'rst_sense' reset: %d\n",rv);
+ jh7110_temp_detach(dev);
+ return (ENXIO);
+ }
+ if ((rv = hwreset_deassert(sc->rst_sense)) != 0) {
+ device_printf(sc->dev, "cannot deassert 'sense' reset: %d\n",rv);
+ jh7110_temp_detach(dev);
+ return (ENXIO);
+ }
+
+ /* (uncritically) from the openbsd driver */
+
+ /* Power down */
+ WR4(sc, TEMP, TEMP_PD);
+ DELAY(1);
+
+ /* Power up with reset asserted */
+ WR4(sc, TEMP, 0);
+ DELAY(60);
+
+ /* Deassert reset */
+ WR4(sc, TEMP, TEMP_RSTN);
+ DELAY(1);
+
+ /* Start measuring */
+ WR4(sc, TEMP, TEMP_RSTN | TEMP_RUN);
+
+ /* add human readable temperature to dev.cpu node */
+ ctx = device_get_sysctl_ctx(dev);
+ SYSCTL_ADD_PROC(ctx,
+ SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
+ "temperature",
+ CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, sc, 0,
+ jh7110_temperature, "IK3",
+ "Current SoC temperature");
+ /* Make a copy where the raspberry pi puts the temperature */
+ cpu = device_lookup_by_name("cpu0");
+ if (cpu != NULL) {
+ ctx = device_get_sysctl_ctx(cpu);
+ SYSCTL_ADD_PROC(ctx,
+ SYSCTL_CHILDREN(device_get_sysctl_tree(cpu)), OID_AUTO,
+ "temperature",
+ CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, sc, 0,
+ jh7110_temperature, "IK3",
+ "Current SoC temperature");
+ }
+
+ return (0);
+}
+
+static device_method_t jh7110_temp_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, jh7110_temp_probe),
+ DEVMETHOD(device_attach, jh7110_temp_attach),
+ DEVMETHOD(device_detach, jh7110_temp_detach),
+
+ DEVMETHOD_END
+};
+
+DEFINE_CLASS(jh7110_temp, jh7110_temp_methods, sizeof(struct jh7110_temp_softc));
+DRIVER_MODULE(jh7110_temp, simplebus, jh7110_temp_class, NULL, NULL);

File Metadata

Mime Type
text/plain
Expires
Wed, Sep 9, 1:41 PM (7 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38514361
Default Alt Text
D59478.id.diff (8 KB)

Event Timeline