Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Add driver for ARM Motherboard Express uATX system ...



details:   https://anonhg.NetBSD.org/src/rev/76520aa1ce9a
branches:  trunk
changeset: 824363:76520aa1ce9a
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Jun 02 21:16:42 2017 +0000

description:
Add driver for ARM Motherboard Express uATX system control registers. Use
this to make "poweroff" DTRT in qemu (and hopefully on real hardware too).

diffstat:

 sys/arch/arm/vexpress/files.vexpress    |    6 +-
 sys/arch/arm/vexpress/vexpress_sysreg.c |  130 ++++++++++++++++++++++++++++++++
 sys/arch/evbarm/conf/VEXPRESS_A15       |    4 +-
 3 files changed, 138 insertions(+), 2 deletions(-)

diffs (170 lines):

diff -r bb7ba682af12 -r 76520aa1ce9a sys/arch/arm/vexpress/files.vexpress
--- a/sys/arch/arm/vexpress/files.vexpress      Fri Jun 02 20:16:05 2017 +0000
+++ b/sys/arch/arm/vexpress/files.vexpress      Fri Jun 02 21:16:42 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.vexpress,v 1.1 2017/06/02 15:22:47 jmcneill Exp $
+#      $NetBSD: files.vexpress,v 1.2 2017/06/02 21:16:42 jmcneill Exp $
 #
 # Configuration info for ARM Ltd. Versatile Express peripherals
 #
@@ -16,3 +16,7 @@
 file   arch/arm/arm/bus_space_a4x.S
 
 file   arch/arm/vexpress/vexpress_platform.c
+
+device vxsysreg
+attach vxsysreg at fdt with vexpress_sysreg
+file   arch/arm/vexpress/vexpress_sysreg.c     vexpress_sysreg 
diff -r bb7ba682af12 -r 76520aa1ce9a sys/arch/arm/vexpress/vexpress_sysreg.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/vexpress/vexpress_sysreg.c   Fri Jun 02 21:16:42 2017 +0000
@@ -0,0 +1,130 @@
+/* $NetBSD: vexpress_sysreg.c,v 1.1 2017/06/02 21:16:42 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: vexpress_sysreg.c,v 1.1 2017/06/02 21:16:42 jmcneill Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+
+#include <dev/fdt/fdtvar.h>
+
+#define        SYS_CFGDATA     0x00a0
+#define        SYS_CFGCTRL     0x00a4
+#define         SYS_CFGCTRL_START      __BIT(31)
+#define         SYS_CFGCTRL_WRITE      __BIT(30)
+#define         SYS_CFGCTRL_FUNCTION   __BITS(25,20)
+#define          SYS_CFGCTRL_FUNCTION_SHUTDOWN 8
+#define          SYS_CFGCTRL_FUNCTION_REBOOT   9
+#define         SYS_CFGCTRL_SITE       __BITS(17,16)
+#define          SYS_CFGCTRL_SITE_MB           0
+#define        SYS_CFGSTAT     0x00a8
+
+static int     vexpress_sysreg_match(device_t, cfdata_t, void *);
+static void    vexpress_sysreg_attach(device_t, device_t, void *);
+
+static const char * const compatible[] = { "arm,vexpress-sysreg", NULL };
+
+struct vexpress_sysreg_softc {
+       device_t                sc_dev;
+       bus_space_tag_t         sc_bst;
+       bus_space_handle_t      sc_bsh;
+};
+
+CFATTACH_DECL_NEW(vexpress_sysreg, sizeof(struct vexpress_sysreg_softc),
+       vexpress_sysreg_match, vexpress_sysreg_attach, NULL, NULL);
+
+static void
+vexpress_sysreg_write(device_t dev, u_int func, u_int site)
+{
+       struct vexpress_sysreg_softc * const sc = device_private(dev);
+
+       const uint32_t cfgctrl = SYS_CFGCTRL_START | SYS_CFGCTRL_WRITE |
+           __SHIFTIN(func, SYS_CFGCTRL_FUNCTION) |
+           __SHIFTIN(site, SYS_CFGCTRL_SITE);
+
+       bus_space_write_4(sc->sc_bst, sc->sc_bsh, SYS_CFGSTAT, 0);
+       bus_space_write_4(sc->sc_bst, sc->sc_bsh, SYS_CFGDATA, 0);
+       bus_space_write_4(sc->sc_bst, sc->sc_bsh, SYS_CFGCTRL, cfgctrl);
+}
+
+static void
+vexpress_sysreg_reset(device_t dev)
+{
+       vexpress_sysreg_write(dev, SYS_CFGCTRL_FUNCTION_REBOOT, SYS_CFGCTRL_SITE_MB);
+}
+
+static void
+vexpress_sysreg_poweroff(device_t dev)
+{
+       vexpress_sysreg_write(dev, SYS_CFGCTRL_FUNCTION_SHUTDOWN, SYS_CFGCTRL_SITE_MB);
+}
+
+static struct fdtbus_power_controller_func vexpress_sysreg_power_funcs = {
+       .reset = vexpress_sysreg_reset,
+       .poweroff = vexpress_sysreg_poweroff,
+};
+
+static int
+vexpress_sysreg_match(device_t parent, cfdata_t cf, void *aux)
+{
+       struct fdt_attach_args * const faa = aux;
+
+       return of_compatible(faa->faa_phandle, compatible) >= 0;
+}
+
+static void
+vexpress_sysreg_attach(device_t parent, device_t self, void *aux)
+{
+       struct vexpress_sysreg_softc * const sc = device_private(self);
+       struct fdt_attach_args * const faa = aux;
+       const int phandle = faa->faa_phandle;
+       bus_addr_t addr;
+       bus_size_t size;
+
+       if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
+               aprint_error(": missing 'reg' property\n");
+               return;
+       }
+
+       sc->sc_dev = self;
+       sc->sc_bst = faa->faa_bst;
+       if (bus_space_map(faa->faa_bst, addr, size, 0, &sc->sc_bsh)) {
+               aprint_error(": couldn't map device\n");
+               return;
+       }
+
+       aprint_naive("\n");
+       aprint_normal("\n");
+
+       fdtbus_register_power_controller(self, phandle,
+           &vexpress_sysreg_power_funcs);
+}
diff -r bb7ba682af12 -r 76520aa1ce9a sys/arch/evbarm/conf/VEXPRESS_A15
--- a/sys/arch/evbarm/conf/VEXPRESS_A15 Fri Jun 02 20:16:05 2017 +0000
+++ b/sys/arch/evbarm/conf/VEXPRESS_A15 Fri Jun 02 21:16:42 2017 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: VEXPRESS_A15,v 1.9 2017/06/02 20:16:05 jmcneill Exp $
+#      $NetBSD: VEXPRESS_A15,v 1.10 2017/06/02 21:16:42 jmcneill Exp $
 #
 #      ARM Versatile Express A15
 #
@@ -44,6 +44,8 @@
 gic*           at fdt? pass 1          # GIC
 armgic0                at gic?
 
+# ARM Motherboard Express uATX system registers
+vxsysreg*      at fdt?
 
 # Ethernet
 smsh*          at fdt?                 # SMSC LAN9118



Home | Main Index | Thread Index | Old Index