Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Jul 2019 08:47:18 +0000 (UTC)
From:      Ganbold Tsagaankhuu <ganbold@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r349596 - head/sys/dev/fdt
Message-ID:  <201907020847.x628lIAW066141@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ganbold
Date: Tue Jul  2 08:47:18 2019
New Revision: 349596
URL: https://svnweb.freebsd.org/changeset/base/349596

Log:
  Extend simple_mfd driver to expose a syscon interface if
  that node is also compatible with syscon. For instance,
  Rockchip RK3399's GRF (General Register Files) is compatible
  with simple-mfd as well as syscon and has devices like
  usb2-phy, emmc-phy and pcie-phy etc. under it.
  
  Reviewed by:	manu

Added:
  head/sys/dev/fdt/simple_mfd.h   (contents, props changed)
Modified:
  head/sys/dev/fdt/simple_mfd.c

Modified: head/sys/dev/fdt/simple_mfd.c
==============================================================================
--- head/sys/dev/fdt/simple_mfd.c	Tue Jul  2 07:47:11 2019	(r349595)
+++ head/sys/dev/fdt/simple_mfd.c	Tue Jul  2 08:47:18 2019	(r349596)
@@ -33,7 +33,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/rman.h>
 
 #include <machine/bus.h>
 
@@ -42,15 +45,88 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-struct simple_mfd_softc {
-	struct simplebus_softc	sc;
-};
+#include <dev/fdt/simple_mfd.h>
 
 device_t simple_mfd_add_device(device_t dev, phandle_t node, u_int order,
     const char *name, int unit, struct simplebus_devinfo *di);
 struct simplebus_devinfo *simple_mfd_setup_dinfo(device_t dev, phandle_t node, struct simplebus_devinfo *di);
 
+#include "syscon_if.h"
+#include <dev/extres/syscon/syscon.h>
+
+MALLOC_DECLARE(M_SYSCON);
+
+static uint32_t simple_mfd_syscon_read_4(struct syscon *syscon, bus_size_t offset);
+static int simple_mfd_syscon_write_4(struct syscon *syscon, bus_size_t offset,
+    uint32_t val);
+static int simple_mfd_syscon_modify_4(struct syscon *syscon, bus_size_t offset,
+    uint32_t clear_bits, uint32_t set_bits);
+
+#define	SYSCON_LOCK(_sc)		mtx_lock_spin(&(_sc)->mtx)
+#define	SYSCON_UNLOCK(_sc)		mtx_unlock_spin(&(_sc)->mtx)
+#define	SYSCON_LOCK_INIT(_sc)		mtx_init(&(_sc)->mtx,	\
+    device_get_nameunit((_sc)->dev), "syscon", MTX_SPIN)
+#define	SYSCON_LOCK_DESTROY(_sc)	mtx_destroy(&(_sc)->mtx);
+#define	SYSCON_ASSERT_LOCKED(_sc)	mtx_assert(&(_sc)->mtx, MA_OWNED);
+#define	SYSCON_ASSERT_UNLOCKED(_sc)	mtx_assert(&(_sc)->mtx, MA_NOTOWNED);
+
+static syscon_method_t simple_mfd_syscon_methods[] = {
+	SYSCONMETHOD(syscon_read_4,	simple_mfd_syscon_read_4),
+	SYSCONMETHOD(syscon_write_4,	simple_mfd_syscon_write_4),
+	SYSCONMETHOD(syscon_modify_4,	simple_mfd_syscon_modify_4),
+
+	SYSCONMETHOD_END
+};
+DEFINE_CLASS_1(simple_mfd_syscon, simple_mfd_syscon_class,
+    simple_mfd_syscon_methods, 0, syscon_class);
+
+static uint32_t
+simple_mfd_syscon_read_4(struct syscon *syscon, bus_size_t offset)
+{
+	struct simple_mfd_softc *sc;
+	uint32_t val;
+
+	sc = device_get_softc(syscon->pdev);
+
+	SYSCON_LOCK(sc);
+	val = bus_read_4(sc->mem_res, offset);
+	SYSCON_UNLOCK(sc);
+	return (val);
+}
+
 static int
+simple_mfd_syscon_write_4(struct syscon *syscon, bus_size_t offset,
+    uint32_t val)
+{
+	struct simple_mfd_softc *sc;
+
+	sc = device_get_softc(syscon->pdev);
+
+	SYSCON_LOCK(sc);
+	bus_write_4(sc->mem_res, offset, val);
+	SYSCON_UNLOCK(sc);
+	return (0);
+}
+
+static int
+simple_mfd_syscon_modify_4(struct syscon *syscon, bus_size_t offset,
+    uint32_t clear_bits, uint32_t set_bits)
+{
+	struct simple_mfd_softc *sc;
+	uint32_t val;
+
+	sc = device_get_softc(syscon->pdev);
+
+	SYSCON_LOCK(sc);
+	val = bus_read_4(sc->mem_res, offset);
+	val &= ~clear_bits;
+	val |= set_bits;
+	bus_write_4(sc->mem_res, offset, val);
+	SYSCON_UNLOCK(sc);
+	return (0);
+}
+
+static int
 simple_mfd_probe(device_t dev)
 {
 
@@ -70,10 +146,14 @@ simple_mfd_attach(device_t dev)
 	struct simple_mfd_softc *sc;
 	phandle_t node, child;
 	device_t cdev;
+	int rid;
 
 	sc = device_get_softc(dev);
 	node = ofw_bus_get_node(dev);
 
+	sc->dev = dev;
+	rid = 0;
+
 	/* Parse address-cells and size-cells from the parent node as a fallback */
 	if (OF_getencprop(node, "#address-cells", &sc->sc.acells,
 	    sizeof(sc->sc.acells)) == -1) {
@@ -105,9 +185,48 @@ simple_mfd_attach(device_t dev)
 			device_probe_and_attach(cdev);
 	}
 
+	if (ofw_bus_is_compatible(dev, "syscon")) {
+		sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+		    RF_ACTIVE);
+		if (sc->mem_res == NULL) {
+			device_printf(dev,
+			    "Cannot allocate memory resource\n");
+			return (ENXIO);
+		}
+
+		SYSCON_LOCK_INIT(sc);
+		sc->syscon = syscon_create_ofw_node(dev,
+		    &simple_mfd_syscon_class, ofw_bus_get_node(dev));
+		if (sc->syscon == NULL) {
+			device_printf(dev,
+			    "Failed to create/register syscon\n");
+			return (ENXIO);
+		}
+	}
 	return (bus_generic_attach(dev));
 }
 
+static int
+simple_mfd_detach(device_t dev)
+{
+	struct simple_mfd_softc *sc;
+
+	sc = device_get_softc(dev);
+	if (ofw_bus_is_compatible(dev, "syscon")) {
+		if (sc->syscon != NULL) {
+			syscon_unregister(sc->syscon);
+			free(sc->syscon, M_SYSCON);
+		}
+
+		SYSCON_LOCK_DESTROY(sc);
+
+		if (sc->mem_res != NULL)
+			bus_release_resource(dev, SYS_RES_MEMORY, 0,
+			    sc->mem_res);
+	}
+	return (0);
+}
+
 struct simplebus_devinfo *
 simple_mfd_setup_dinfo(device_t dev, phandle_t node,
     struct simplebus_devinfo *di)
@@ -162,6 +281,7 @@ static device_method_t simple_mfd_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		simple_mfd_probe),
 	DEVMETHOD(device_attach,	simple_mfd_attach),
+	DEVMETHOD(device_detach,	simple_mfd_detach),
 
 	DEVMETHOD_END
 };

Added: head/sys/dev/fdt/simple_mfd.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/dev/fdt/simple_mfd.h	Tue Jul  2 08:47:18 2019	(r349596)
@@ -0,0 +1,44 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2019 Ganbold Tsagaankhuu <ganbold@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 ``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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef DEV_SIMPLE_MFD_H
+#define	DEV_SIMPLE_MFD_H
+
+#include <dev/fdt/simplebus.h>
+
+struct simple_mfd_softc {
+	struct simplebus_softc  sc;
+	device_t                dev;
+	struct syscon           *syscon;
+	struct resource         *mem_res;
+	struct mtx              mtx;
+};
+
+DECLARE_CLASS(simple_mfd_driver);
+
+#endif /* DEV_SIMPLE_MFD_H */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907020847.x628lIAW066141>