svn commit: r294661 - in head/sys: conf dev/extres/hwreset
Michal Meloun
mmel at FreeBSD.org
Sun Jan 24 11:03:36 UTC 2016
Author: mmel
Date: Sun Jan 24 11:03:35 2016
New Revision: 294661
URL: https://svnweb.freebsd.org/changeset/base/294661
Log:
Add reset framework, a second part of new 'extended resources' family of
support frameworks (i.e. regulators/phy/tsensors/fuses...).
It provides simple unified consumers interface for manipulations with
on-chip resets.
Reviewed by: ian, imp (paritaly)
Added:
head/sys/dev/extres/hwreset/
head/sys/dev/extres/hwreset/hwreset.c (contents, props changed)
head/sys/dev/extres/hwreset/hwreset.h (contents, props changed)
head/sys/dev/extres/hwreset/hwreset_if.m (contents, props changed)
Modified:
head/sys/conf/files
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Sun Jan 24 11:00:38 2016 (r294660)
+++ head/sys/conf/files Sun Jan 24 11:03:35 2016 (r294661)
@@ -1417,6 +1417,8 @@ dev/extres/clk/clk_div.c optional ext_re
dev/extres/clk/clk_fixed.c optional ext_resources clk
dev/extres/clk/clk_gate.c optional ext_resources clk
dev/extres/clk/clk_mux.c optional ext_resources clk
+dev/extres/hwreset/hwreset.c optional ext_resources hwreset
+dev/extres/hwreset/hwreset_if.m optional ext_resources hwreset
dev/fatm/if_fatm.c optional fatm pci
dev/fb/fbd.c optional fbd | vt
dev/fb/fb_if.m standard
Added: head/sys/dev/extres/hwreset/hwreset.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/extres/hwreset/hwreset.c Sun Jan 24 11:03:35 2016 (r294661)
@@ -0,0 +1,186 @@
+/*-
+ * Copyright 2016 Michal Meloun <mmel at FreeBSD.org>
+ * 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 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.
+ *
+ * $FreeBSD$
+ */
+#include "opt_platform.h"
+#include <sys/cdefs.h>
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/kobj.h>
+#include <sys/malloc.h>
+#include <sys/systm.h>
+
+#ifdef FDT
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+#endif
+
+#include <dev/extres/hwreset/hwreset.h>
+
+#include "hwreset_if.h"
+
+struct hwreset {
+ device_t consumer_dev; /* consumer device*/
+ device_t provider_dev; /* provider device*/
+ int rst_id; /* reset id */
+};
+
+MALLOC_DEFINE(M_HWRESET, "hwreset", "Reset framework");
+
+int
+hwreset_assert(hwreset_t rst)
+{
+
+ return (HWRESET_ASSERT(rst->provider_dev, rst->rst_id, true));
+}
+
+int
+hwreset_deassert(hwreset_t rst)
+{
+
+ return (HWRESET_ASSERT(rst->provider_dev, rst->rst_id, false));
+}
+
+int
+hwreset_is_asserted(hwreset_t rst, bool *value)
+{
+
+ return (HWRESET_IS_ASSERTED(rst->provider_dev, rst->rst_id, value));
+}
+
+void
+hwreset_release(hwreset_t rst)
+{
+ free(rst, M_HWRESET);
+}
+
+int
+hwreset_get_by_id(device_t consumer_dev, device_t provider_dev, intptr_t id,
+ hwreset_t *rst_out)
+{
+ hwreset_t rst;
+
+ /* Create handle */
+ rst = malloc(sizeof(struct hwreset), M_HWRESET,
+ M_WAITOK | M_ZERO);
+ rst->consumer_dev = consumer_dev;
+ rst->provider_dev = provider_dev;
+ rst->rst_id = id;
+ *rst_out = rst;
+ return (0);
+}
+
+#ifdef FDT
+int
+hwreset_default_ofw_map(device_t provider_dev, phandle_t xref, int ncells,
+ pcell_t *cells, intptr_t *id)
+{
+ if (ncells == 0)
+ *id = 1;
+ else if (ncells == 1)
+ *id = cells[0];
+ else
+ return (ERANGE);
+
+ return (0);
+}
+
+int
+hwreset_get_by_ofw_idx(device_t consumer_dev, int idx, hwreset_t *rst)
+{
+ phandle_t cnode, xnode;
+ pcell_t *cells;
+ device_t rstdev;
+ int ncells, rv;
+ intptr_t id;
+
+ cnode = ofw_bus_get_node(consumer_dev);
+ if (cnode <= 0) {
+ device_printf(consumer_dev,
+ "%s called on not ofw based device\n", __func__);
+ return (ENXIO);
+ }
+
+ rv = ofw_bus_parse_xref_list_alloc(cnode, "resets", "#reset-cells",
+ idx, &xnode, &ncells, &cells);
+ if (rv != 0)
+ return (rv);
+
+ /* Tranlate provider to device */
+ rstdev = OF_device_from_xref(xnode);
+ if (rstdev == NULL) {
+ free(cells, M_OFWPROP);
+ return (ENODEV);
+ }
+ /* Map reset to number */
+ rv = HWRESET_MAP(rstdev, xnode, ncells, cells, &id);
+ free(cells, M_OFWPROP);
+ if (rv != 0)
+ return (rv);
+
+ return (hwreset_get_by_id(consumer_dev, rstdev, id, rst));
+}
+
+int
+hwreset_get_by_ofw_name(device_t consumer_dev, char *name, hwreset_t *rst)
+{
+ int rv, idx;
+ phandle_t cnode;
+
+ cnode = ofw_bus_get_node(consumer_dev);
+ if (cnode <= 0) {
+ device_printf(consumer_dev,
+ "%s called on not ofw based device\n", __func__);
+ return (ENXIO);
+ }
+ rv = ofw_bus_find_string_index(cnode, "reset-names", name, &idx);
+ if (rv != 0)
+ return (rv);
+ return (hwreset_get_by_ofw_idx(consumer_dev, idx, rst));
+}
+
+void
+hwreset_register_ofw_provider(device_t provider_dev)
+{
+ phandle_t xref, node;
+
+ node = ofw_bus_get_node(provider_dev);
+ if (node <= 0)
+ panic("%s called on not ofw based device.\n", __func__);
+
+ xref = OF_xref_from_node(node);
+ OF_device_register_xref(xref, provider_dev);
+}
+
+void
+hwreset_unregister_ofw_provider(device_t provider_dev)
+{
+ phandle_t xref;
+
+ xref = OF_xref_from_device(provider_dev);
+ OF_device_register_xref(xref, NULL);
+}
+#endif
Added: head/sys/dev/extres/hwreset/hwreset.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/extres/hwreset/hwreset.h Sun Jan 24 11:03:35 2016 (r294661)
@@ -0,0 +1,67 @@
+/*-
+ * Copyright 2016 Michal Meloun <mmel at FreeBSD.org>
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef DEV_EXTRES_HWRESET_HWRESET_H
+#define DEV_EXTRES_HWRESET_HWRESET_H
+
+#include "opt_platform.h"
+#include <sys/types.h>
+#ifdef FDT
+#include <dev/ofw/ofw_bus.h>
+#endif
+
+typedef struct hwreset *hwreset_t;
+
+/*
+ * Provider interface
+ */
+#ifdef FDT
+int hwreset_default_ofw_map(device_t provider_dev, phandle_t xref, int ncells,
+ pcell_t *cells, intptr_t *id);
+void hwreset_register_ofw_provider(device_t provider_dev);
+void hwreset_unregister_ofw_provider(device_t provider_dev);
+#endif
+
+/*
+ * Consumer interface
+ */
+int hwreset_get_by_id(device_t consumer_dev, device_t provider_dev, intptr_t id,
+ hwreset_t *rst);
+void hwreset_release(hwreset_t rst);
+
+int hwreset_assert(hwreset_t rst);
+int hwreset_deassert(hwreset_t rst);
+int hwreset_is_asserted(hwreset_t rst, bool *value);
+
+#ifdef FDT
+int hwreset_get_by_ofw_name(device_t consumer_dev, char *name, hwreset_t *rst);
+int hwreset_get_by_ofw_idx(device_t consumer_dev, int idx, hwreset_t *rst);
+#endif
+
+
+
+#endif /* DEV_EXTRES_HWRESET_HWRESET_H */
Added: head/sys/dev/extres/hwreset/hwreset_if.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/extres/hwreset/hwreset_if.m Sun Jan 24 11:03:35 2016 (r294661)
@@ -0,0 +1,72 @@
+#-
+# Copyright 2016 Michal Meloun <mmel at FreeBSD.org>
+# 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 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.
+#
+# $FreeBSD$
+#
+
+#ifdef FDT
+#include <sys/types.h>
+#include <dev/ofw/ofw_bus.h>
+#endif
+
+INTERFACE hwreset;
+
+#ifdef FDT
+HEADER {
+int hwreset_default_ofw_map(device_t , phandle_t, int, pcell_t *, intptr_t *);
+}
+
+#
+# map fdt property cells to reset id
+# Returns 0 on success or a standard errno value.
+#
+METHOD int map {
+ device_t provider_dev;
+ phandle_t xref;
+ int ncells;
+ pcell_t *cells;
+ intptr_t *id;
+} DEFAULT hwreset_default_ofw_map;
+#endif
+
+#
+# Assert/deassert given reset.
+# Returns 0 on success or a standard errno value.
+#
+METHOD int assert {
+ device_t provider_dev;
+ intptr_t id;
+ bool value;
+};
+
+#
+# Get actual status of given reset.
+# Returns 0 on success or a standard errno value.
+#
+METHOD int is_asserted {
+ device_t provider_dev;
+ intptr_t id;
+ bool *value;
+};
More information about the svn-src-all
mailing list