Source-Changes-HG archive

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

[src/trunk]: src/sys/arch Add ACPI support.



details:   https://anonhg.NetBSD.org/src/rev/adf687872395
branches:  trunk
changeset: 970654:adf687872395
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Mar 31 12:23:17 2020 +0000

description:
Add ACPI support.

diffstat:

 sys/arch/arm/broadcom/bcm2835_bsc.c      |  175 +--------------------------
 sys/arch/arm/broadcom/bcm2835_bsc_acpi.c |  189 +++++++++++++++++++++++++++++++
 sys/arch/arm/broadcom/bcm2835_bsc_fdt.c  |  142 +++++++++++++++++++++++
 sys/arch/arm/broadcom/files.bcm2835      |    9 +-
 sys/arch/evbarm/conf/GENERIC64           |    3 +-
 5 files changed, 351 insertions(+), 167 deletions(-)

diffs (truncated from 617 to 300 lines):

diff -r 309e266667b3 -r adf687872395 sys/arch/arm/broadcom/bcm2835_bsc.c
--- a/sys/arch/arm/broadcom/bcm2835_bsc.c       Tue Mar 31 07:50:42 2020 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_bsc.c       Tue Mar 31 12:23:17 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcm2835_bsc.c,v 1.14 2019/12/22 23:24:56 thorpej Exp $ */
+/*     $NetBSD: bcm2835_bsc.c,v 1.15 2020/03/31 12:23:17 jmcneill Exp $        */
 
 /*
  * Copyright (c) 2019 Jason R. Thorpe
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc.c,v 1.14 2019/12/22 23:24:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc.c,v 1.15 2020/03/31 12:23:17 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -42,64 +42,7 @@
 
 #include <arm/broadcom/bcm2835reg.h>
 #include <arm/broadcom/bcm2835_bscreg.h>
-
-#include <dev/fdt/fdtvar.h>
-
-typedef enum {
-       BSC_EXEC_STATE_IDLE             = 0,
-       BSC_EXEC_STATE_SEND_ADDR        = 1,
-       BSC_EXEC_STATE_SEND_CMD         = 2,
-       BSC_EXEC_STATE_SEND_DATA        = 3,
-       BSC_EXEC_STATE_RECV_DATA        = 4,
-       BSC_EXEC_STATE_DONE             = 5,
-       BSC_EXEC_STATE_ERROR            = 6,
-} bsc_exec_state_t;
-
-#define        BSC_EXEC_STATE_SENDING(sc)      \
-       ((sc)->sc_exec_state >= BSC_EXEC_STATE_SEND_ADDR && \
-        (sc)->sc_exec_state <= BSC_EXEC_STATE_SEND_DATA)
-
-#define        BSC_EXEC_STATE_RECEIVING(sc)    \
-       ((sc)->sc_exec_state == BSC_EXEC_STATE_RECV_DATA)
-
-struct bsciic_softc {
-       device_t sc_dev;
-       bus_space_tag_t sc_iot;
-       bus_space_handle_t sc_ioh;
-       struct i2c_controller sc_i2c;
-       void *sc_inth;
-
-       struct clk *sc_clk;
-       u_int sc_frequency;
-       u_int sc_clkrate;
-
-       kmutex_t sc_intr_lock;
-       kcondvar_t sc_intr_wait;
-
-       struct {
-               i2c_op_t op;
-               i2c_addr_t addr;
-               const void *cmdbuf;
-               size_t cmdlen;
-               void *databuf;
-               size_t datalen;
-               int flags;
-       } sc_exec;
-
-       /*
-        * Everything below here protected by the i2c controller lock
-        * /and/ sc_intr_lock (if we're using interrupts).
-        */
-
-       bsc_exec_state_t sc_exec_state;
-
-       uint8_t *sc_buf;
-       size_t sc_bufpos;
-       size_t sc_buflen;
-
-       uint32_t sc_c_bits;
-       bool sc_expecting_interrupt;
-};
+#include <arm/broadcom/bcm2835_bscvar.h>
 
 static void    bsciic_exec_func_idle(struct bsciic_softc * const);
 static void    bsciic_exec_func_send_addr(struct bsciic_softc * const);
@@ -143,84 +86,13 @@
        },
 };
 
-static int bsciic_match(device_t, cfdata_t, void *);
-static void bsciic_attach(device_t, device_t, void *);
-
-static int  bsciic_acquire_bus(void *, int);
-static void bsciic_release_bus(void *, int);
-static int  bsciic_exec(void *, i2c_op_t, i2c_addr_t, const void *, size_t,
-                       void *, size_t, int);
-
-static int bsciic_intr(void *);
-
 int    bsciic_debug = 0;
 
-CFATTACH_DECL_NEW(bsciic, sizeof(struct bsciic_softc),
-    bsciic_match, bsciic_attach, NULL, NULL);
-
-static int
-bsciic_match(device_t parent, cfdata_t match, void *aux)
-{
-       const char * const compatible[] = { "brcm,bcm2835-i2c", NULL };
-       struct fdt_attach_args * const faa = aux;
-
-       return of_match_compatible(faa->faa_phandle, compatible);
-}
-
-static void
-bsciic_attach(device_t parent, device_t self, void *aux)
+void
+bsciic_attach(struct bsciic_softc *sc)
 {
-       struct bsciic_softc * const sc = device_private(self);
-       struct fdt_attach_args * const faa = aux;
-       const int phandle = faa->faa_phandle;
-       prop_dictionary_t prop = device_properties(self);
-       bool disable = false;
-
-       bus_addr_t addr;
-       bus_size_t size;
-
-       sc->sc_dev = self;
-       sc->sc_iot = faa->faa_bst;
-
-       int error = fdtbus_get_reg(phandle, 0, &addr, &size);
-       if (error) {
-               aprint_error(": unable to get device registers\n");
-               return;
-       }
-
-       prop_dictionary_get_bool(prop, "disable", &disable);
-       if (disable) {
-               aprint_naive(": disabled\n");
-               aprint_normal(": disabled\n");
-               return;
-       }
-
-       /* Enable clock */
-       sc->sc_clk = fdtbus_clock_get_index(phandle, 0);
-       if (sc->sc_clk == NULL) {
-               aprint_error(": couldn't acquire clock\n");
-               return;
-       }
-
-       if (clk_enable(sc->sc_clk) != 0) {
-               aprint_error(": failed to enable clock\n");
-               return;
-       }
-
-       sc->sc_frequency = clk_get_rate(sc->sc_clk);
-
-       if (of_getprop_uint32(phandle, "clock-frequency",
-           &sc->sc_clkrate) != 0) {
-               sc->sc_clkrate = 100000;
-       }
-
-       if (bus_space_map(sc->sc_iot, addr, size, 0, &sc->sc_ioh)) {
-               aprint_error(": unable to map device\n");
-               return;
-       }
-
-       aprint_naive("\n");
-       aprint_normal(": Broadcom Serial Controller\n");
+       mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_VM);
+       cv_init(&sc->sc_intr_wait, device_xname(sc->sc_dev));
 
        /* clear FIFO, disable controller */
        bus_space_write_4(sc->sc_iot, sc->sc_ioh, BSC_C, BSC_C_CLEAR_CLEAR);
@@ -231,34 +103,9 @@
        u_int divider = howmany(sc->sc_frequency, sc->sc_clkrate);
        bus_space_write_4(sc->sc_iot, sc->sc_ioh, BSC_DIV,
           __SHIFTIN(divider, BSC_DIV_CDIV));
-
-       mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_VM);
-       cv_init(&sc->sc_intr_wait, device_xname(self));
-
-       char intrstr[128];
-       if (!fdtbus_intr_str(phandle, 0, intrstr, sizeof(intrstr))) {
-               aprint_error_dev(sc->sc_dev, "failed to decode interrupt\n");
-               return;
-       }
-       sc->sc_inth = fdtbus_intr_establish(phandle, 0, IPL_VM,
-           FDT_INTR_MPSAFE, bsciic_intr, sc);
-       if (sc->sc_inth == NULL) {
-               aprint_error_dev(sc->sc_dev,
-                   "failed to establish interrupt %s\n", intrstr);
-               return;
-       }
-       aprint_normal_dev(sc->sc_dev, "interrupting on %s\n", intrstr);
-
-       iic_tag_init(&sc->sc_i2c);
-       sc->sc_i2c.ic_cookie = sc;
-       sc->sc_i2c.ic_acquire_bus = bsciic_acquire_bus;
-       sc->sc_i2c.ic_release_bus = bsciic_release_bus;
-       sc->sc_i2c.ic_exec = bsciic_exec;
-
-       fdtbus_attach_i2cbus(self, phandle, &sc->sc_i2c, iicbus_print);
 }
 
-static int
+int
 bsciic_acquire_bus(void *v, int flags)
 {
        struct bsciic_softc * const sc = v;
@@ -274,7 +121,7 @@
        return 0;
 }
 
-static void
+void
 bsciic_release_bus(void *v, int flags)
 {
        struct bsciic_softc * const sc = v;
@@ -391,7 +238,7 @@
        bsciic_phase_done(sc);
 }
 
-static int
+int
 bsciic_intr(void *v)
 {
        struct bsciic_softc * const sc = v;
@@ -590,7 +437,7 @@
        bsciic_signal(sc);
 }
 
-static int
+int
 bsciic_exec(void *v, i2c_op_t op, i2c_addr_t addr, const void *cmdbuf,
     size_t cmdlen, void *databuf, size_t datalen, int flags)
 {
diff -r 309e266667b3 -r adf687872395 sys/arch/arm/broadcom/bcm2835_bsc_acpi.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c  Tue Mar 31 12:23:17 2020 +0000
@@ -0,0 +1,189 @@
+/* $NetBSD: bcm2835_bsc_acpi.c,v 1.1 2020/03/31 12:23:17 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2020 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_acpi.c,v 1.1 2020/03/31 12:23:17 jmcneill Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+
+#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
+#include <dev/acpi/acpi_intr.h>
+#include <dev/acpi/acpi_i2c.h>
+
+#include <arm/broadcom/bcm2835var.h>
+#include <arm/broadcom/bcm2835_mbox.h>
+#include <arm/broadcom/bcm2835_bscvar.h>
+
+#include <evbarm/rpi/vcio.h>
+#include <evbarm/rpi/vcpm.h>
+#include <evbarm/rpi/vcprop.h>
+
+static int     bsciic_acpi_match(device_t, cfdata_t, void *);
+static void    bsciic_acpi_attach(device_t, device_t, void *);
+
+static u_int   bsciic_acpi_vpu_clock_rate(void);
+
+CFATTACH_DECL_NEW(bsciic_acpi, sizeof(struct bsciic_softc), bsciic_acpi_match, bsciic_acpi_attach, NULL, NULL);
+
+static const char * const compatible[] = {
+       "BCM2841",
+       NULL
+};



Home | Main Index | Thread Index | Old Index