Source-Changes-HG archive

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

[src/netbsd-7]: src/sys/arch/arm/amlogic Pull up following revision(s) (reque...



details:   https://anonhg.NetBSD.org/src/rev/e00e54bb7c27
branches:  netbsd-7
changeset: 799169:e00e54bb7c27
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Apr 06 01:43:31 2015 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #658):
        sys/arch/arm/amlogic/amlogic_board.c: revision 1.11
        sys/arch/arm/amlogic/amlogic_crureg.h: revision 1.8
        sys/arch/arm/amlogic/amlogic_rng.c: revision 1.2
Use a callback (with ugly lock dance from bcm2835_rng) instead of callout.
Make sure the ring oscillator is enabled as well.

diffstat:

 sys/arch/arm/amlogic/amlogic_board.c  |  12 ++--
 sys/arch/arm/amlogic/amlogic_crureg.h |   7 ++-
 sys/arch/arm/amlogic/amlogic_rng.c    |  76 +++++++++++++++++++++++++++-------
 3 files changed, 72 insertions(+), 23 deletions(-)

diffs (183 lines):

diff -r d3b6a437d2c8 -r e00e54bb7c27 sys/arch/arm/amlogic/amlogic_board.c
--- a/sys/arch/arm/amlogic/amlogic_board.c      Mon Apr 06 01:41:50 2015 +0000
+++ b/sys/arch/arm/amlogic/amlogic_board.c      Mon Apr 06 01:43:31 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_board.c,v 1.9.2.2 2015/03/21 08:51:17 snj Exp $ */
+/* $NetBSD: amlogic_board.c,v 1.9.2.3 2015/04/06 01:43:31 snj Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "opt_amlogic.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.9.2.2 2015/03/21 08:51:17 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.9.2.3 2015/04/06 01:43:31 snj Exp $");
 
 #define        _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
@@ -191,10 +191,10 @@
 void
 amlogic_rng_init(void)
 {
-       CBUS_WRITE(EE_CLK_GATING0_REG,
-           CBUS_READ(EE_CLK_GATING0_REG) | EE_CLK_GATING0_RNG);
-       CBUS_WRITE(EE_CLK_GATING3_REG,
-           CBUS_READ(EE_CLK_GATING3_REG) | EE_CLK_GATING3_RNG);
+       CBUS_SET_CLEAR(EE_CLK_GATING0_REG, EE_CLK_GATING0_RNG, 0);
+       CBUS_SET_CLEAR(EE_CLK_GATING3_REG, EE_CLK_GATING3_RNG, 0);
+       CBUS_SET_CLEAR(AM_RING_OSC_REG,
+           AM_RING_OSC_ENABLE | AM_RING_OSC_HF_MODE, 0);
 }
 
 void
diff -r d3b6a437d2c8 -r e00e54bb7c27 sys/arch/arm/amlogic/amlogic_crureg.h
--- a/sys/arch/arm/amlogic/amlogic_crureg.h     Mon Apr 06 01:41:50 2015 +0000
+++ b/sys/arch/arm/amlogic/amlogic_crureg.h     Mon Apr 06 01:43:31 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_crureg.h,v 1.7.2.2 2015/03/21 08:51:17 snj Exp $ */
+/* $NetBSD: amlogic_crureg.h,v 1.7.2.3 2015/04/06 01:43:31 snj Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -107,6 +107,11 @@
 #define PAD_PULL_UP_EN_5_REG           CBUS_REG(0x204d)
 #define PAD_PULL_UP_EN_6_REG           CBUS_REG(0x204e)
 
+#define AM_RING_OSC_REG                        CBUS_REG(0x207f)
+
+#define AM_RING_OSC_ENABLE             __BIT(0)
+#define AM_RING_OSC_HF_MODE            __BIT(1)
+
 #define PREI_USB_PHY_A_CFG_REG         CBUS_REG(0x2200)
 #define PREI_USB_PHY_A_CTRL_REG                CBUS_REG(0x2201)
 #define PREI_USB_PHY_A_ADP_BC_REG      CBUS_REG(0x2203)
diff -r d3b6a437d2c8 -r e00e54bb7c27 sys/arch/arm/amlogic/amlogic_rng.c
--- a/sys/arch/arm/amlogic/amlogic_rng.c        Mon Apr 06 01:41:50 2015 +0000
+++ b/sys/arch/arm/amlogic/amlogic_rng.c        Mon Apr 06 01:43:31 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_rng.c,v 1.1.2.2 2015/03/21 08:51:17 snj Exp $ */
+/* $NetBSD: amlogic_rng.c,v 1.1.2.3 2015/04/06 01:43:31 snj Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_rng.c,v 1.1.2.2 2015/03/21 08:51:17 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_rng.c,v 1.1.2.3 2015/04/06 01:43:31 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -43,10 +43,14 @@
 #include <arm/amlogic/amlogic_reg.h>
 #include <arm/amlogic/amlogic_var.h>
 
+struct amlogic_rng_softc;
+
 static int     amlogic_rng_match(device_t, cfdata_t, void *);
 static void    amlogic_rng_attach(device_t, device_t, void *);
 
-static void    amlogic_rng_callout(void *);
+static void    amlogic_rng_get(struct amlogic_rng_softc *);
+static void    amlogic_rng_get_intr(void *);
+static void    amlogic_rng_get_cb(size_t, void *);
 
 struct amlogic_rng_softc {
        device_t                sc_dev;
@@ -55,9 +59,11 @@
 
        void *                  sc_sih;
 
-       callout_t               sc_tick;
        krndsource_t            sc_rndsource;
        size_t                  sc_bytes_wanted;
+
+       kmutex_t                sc_intr_lock;
+       kmutex_t                sc_rnd_lock;
 };
 
 CFATTACH_DECL_NEW(amlogic_rng, sizeof(struct amlogic_rng_softc),
@@ -81,31 +87,69 @@
        bus_space_subregion(aio->aio_core_bst, aio->aio_bsh,
            loc->loc_offset, loc->loc_size, &sc->sc_bsh);
 
-       callout_init(&sc->sc_tick, CALLOUT_MPSAFE);
-       callout_setfunc(&sc->sc_tick, amlogic_rng_callout, sc);
-
+       mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SERIAL);
+       mutex_init(&sc->sc_rnd_lock, MUTEX_DEFAULT, IPL_SERIAL);
+       
        amlogic_rng_init();
 
        aprint_naive("\n");
        aprint_normal("\n");
 
+       sc->sc_sih = softint_establish(SOFTINT_SERIAL|SOFTINT_MPSAFE,
+           amlogic_rng_get_intr, sc);
+       if (sc->sc_sih == NULL) {
+               aprint_error_dev(self, "couldn't establish softint\n");
+               return;
+       }
+
+       rndsource_setcb(&sc->sc_rndsource, amlogic_rng_get_cb, sc);
        rnd_attach_source(&sc->sc_rndsource, device_xname(self), RND_TYPE_RNG,
-           RND_FLAG_COLLECT_VALUE);
+           RND_FLAG_COLLECT_VALUE|RND_FLAG_HASCB);
 
-       amlogic_rng_callout(sc);
+       amlogic_rng_get_cb(RND_POOLBITS / NBBY, sc);
 }
 
 static void
-amlogic_rng_callout(void *priv)
+amlogic_rng_get(struct amlogic_rng_softc *sc)
 {
-       struct amlogic_rng_softc * const sc = priv;
        uint32_t data[2];
 
-       bus_space_read_region_4(sc->sc_bst, sc->sc_bsh, 0, data, 2);
-       rnd_add_data(&sc->sc_rndsource, data, sizeof(data),
-           sizeof(data) * NBBY);
+       mutex_spin_enter(&sc->sc_intr_lock);
+       while (sc->sc_bytes_wanted) {
+               bus_space_read_region_4(sc->sc_bst, sc->sc_bsh, 0, data, 2);
+               mutex_spin_exit(&sc->sc_intr_lock);
+               mutex_spin_enter(&sc->sc_rnd_lock);
+               rnd_add_data(&sc->sc_rndsource, data, sizeof(data),
+                   sizeof(data) * NBBY);
+               mutex_spin_exit(&sc->sc_rnd_lock);
+               mutex_spin_enter(&sc->sc_intr_lock);
+               sc->sc_bytes_wanted -= MIN(sc->sc_bytes_wanted, sizeof(data));
+       }
+       explicit_memset(data, 0, sizeof(data));
+       mutex_spin_exit(&sc->sc_intr_lock);
+}
+
+static void
+amlogic_rng_get_cb(size_t bytes_wanted, void *priv)
+{
+       struct amlogic_rng_softc * const sc = priv;
 
-       explicit_memset(data, 0, sizeof(data));
+       mutex_spin_enter(&sc->sc_intr_lock);
+       if (sc->sc_bytes_wanted == 0) {
+               softint_schedule(sc->sc_sih);
+       }
+       if (bytes_wanted > (UINT_MAX - sc->sc_bytes_wanted)) {
+               sc->sc_bytes_wanted = UINT_MAX;
+       } else {
+               sc->sc_bytes_wanted += bytes_wanted;
+       }
+       mutex_spin_exit(&sc->sc_intr_lock);
+}
 
-       callout_schedule(&sc->sc_tick, 1);
+static void
+amlogic_rng_get_intr(void *priv)
+{
+       struct amlogic_rng_softc * const sc = priv;
+
+       amlogic_rng_get(sc);
 }



Home | Main Index | Thread Index | Old Index