Module Name: src
Committed By: riastradh
Date: Sat Mar 19 11:36:43 UTC 2022
Modified Files:
src/sys/arch/arm/amlogic: meson_rng.c
Log Message:
meson_rng(4): No need for lock -- delete it.
We only ever read a single register at a time; no exclusive access or
serialization needed.
XXX This driver should have some kind of hardware-specific health
test -- is there documentation anywhere for what this RNG actually
is?
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/amlogic/meson_rng.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/amlogic/meson_rng.c
diff -u src/sys/arch/arm/amlogic/meson_rng.c:1.4 src/sys/arch/arm/amlogic/meson_rng.c:1.5
--- src/sys/arch/arm/amlogic/meson_rng.c:1.4 Wed Jan 27 03:10:18 2021
+++ src/sys/arch/arm/amlogic/meson_rng.c Sat Mar 19 11:36:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_rng.c,v 1.4 2021/01/27 03:10:18 thorpej Exp $ */
+/* $NetBSD: meson_rng.c,v 1.5 2022/03/19 11:36:43 riastradh Exp $ */
/*-
* Copyright (c) 2015-2019 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_rng.c,v 1.4 2021/01/27 03:10:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_rng.c,v 1.5 2022/03/19 11:36:43 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -49,7 +49,6 @@ struct meson_rng_softc {
bus_space_tag_t sc_bst;
bus_space_handle_t sc_bsh;
- kmutex_t sc_lock;
krndsource_t sc_rndsource;
};
@@ -91,8 +90,6 @@ meson_rng_attach(device_t parent, device
return;
}
- mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_VM);
-
/* Core clock is optional */
clk = fdtbus_clock_get(phandle, "core");
if (clk != NULL && clk_enable(clk) != 0) {
@@ -114,7 +111,6 @@ meson_rng_get(size_t bytes_wanted, void
struct meson_rng_softc * const sc = priv;
uint32_t data;
- mutex_spin_enter(&sc->sc_lock);
while (bytes_wanted) {
data = bus_space_read_4(sc->sc_bst, sc->sc_bsh, 0);
rnd_add_data_sync(&sc->sc_rndsource, &data, sizeof(data),
@@ -122,5 +118,4 @@ meson_rng_get(size_t bytes_wanted, void
bytes_wanted -= MIN(bytes_wanted, sizeof(data));
}
explicit_memset(&data, 0, sizeof(data));
- mutex_spin_exit(&sc->sc_lock);
}
