ath9k: feeding entropy in kernel from ADC capture
PATCH 1/1 ath9k: feeding entropy in kernel from ADC capture
From: Miaoqing Pan <[email protected]>
This patch is derived from
commit 6301566e0b2d ("ath9k: export HW random number generator"),
We evaluated the entropy of the ADC data on QCA9531, QCA9561, QCA955x, and AR9340, and it has sufficient quality random data (at least 10 bits and up to 22 bits of min-entropy for a 32-bit value). We conservatively assume the min-entropy is 10 bits out of 32 bits. Thus, ATH9K_RNG_BUF_SIZE is set to 320 (u32) i.e., 1.25 kilobytes of data is inserted to fill up the pool as soon as the entropy counter becomes 896/4096 (set by random.c). Since ADC was not designed to be a dedicated HW RNG, we do not want to bind it to /dev/hwrng framework directly. This patch feeds the entropy directly from the WiFi driver to the input pool. The ADC register output is only used as a seed for the Linux entropy pool. No conditioning is needed, since all the conditioning is performed by the pool itself.
--- drivers/net/wireless/ath/ath9k/Kconfig | 11 ++++ drivers/net/wireless/ath/ath9k/Makefile | 1 + drivers/net/wireless/ath/ath9k/ath9k.h | 22 +++++++ drivers/net/wireless/ath/ath9k/main.c | 4 ++ drivers/net/wireless/ath/ath9k/rng.c | 106 ++++++++++++++++++++++++++++++++ 5 files changed, 144 insertions(+) create mode 100644 drivers/net/wireless/ath/ath9k/rng.c
drivers/net/wireless/ath/ath9k/Kconfig +11 -0
@@ -176,3 +176,14 @@ config ATH9K_HTC_DEBUGFS depends on ATH9K_HTC && DEBUG_FS ---help--- Say Y, if you need access to ath9k_htc's statistics. + +config ATH9K_HWRNG + bool "Random number generator support" + depends on ATH9K && (HW_RANDOM = y || HW_RANDOM = ATH9K) + default y + ---help--- + This option incorporates the ADC register output as a source of + randomness into Linux entropy pool (/dev/urandom and /dev/random) + + Say Y, feeds the entropy directly from the WiFi driver to the input + pool.
drivers/net/wireless/ath/ath9k/Makefile +1 -0
@@ -15,6 +15,7 @@ ath9k-$(CONFIG_ATH9K_DFS_DEBUGFS) += dfs_debug.o ath9k-$(CONFIG_ATH9K_DFS_CERTIFIED) += dfs.o ath9k-$(CONFIG_ATH9K_TX99) += tx99.o ath9k-$(CONFIG_ATH9K_WOW) += wow.o +ath9k-$(CONFIG_ATH9K_HWRNG) += rng.o ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o
drivers/net/wireless/ath/ath9k/ath9k.h +22 -0
@@ -23,6 +23,7 @@#include <linux/leds.h> #include <linux/completion.h> #include <linux/time.h> +#include <linux/hw_random.h> #include "common.h" #include "debug.h"
@@ -1039,6 +1040,11 @@ struct ath_softc {u32 wow_intr_before_sleep;bool force_wow;#endif + +#ifdef CONFIG_ATH9K_HWRNG +u32 rng_last; +struct task_struct *rng_task; +#endif };/********/
@@ -1061,6 +1067,22 @@ static inline int ath9k_tx99_send(struct ath_softc *sc, }#endif /* CONFIG_ATH9K_TX99 */ +/***************************/ +/* Random Number Generator */ +/***************************/ +#ifdef CONFIG_ATH9K_HWRNG +void ath9k_rng_start (struct ath_softc *sc); +void ath9k_rng_stop (struct ath_softc *sc); +#else +static inline void ath9k_rng_start (struct ath_softc *sc) +{ +} + +static inline void ath9k_rng_stop (struct ath_softc *sc) +{ +} +#endif +static inline void ath_read_cachesize (struct ath_common *common,int *csz) { common->bus_ops->read_cachesize (common, csz);
drivers/net/wireless/ath/ath9k/main.c +4 -0
@@ -739,6 +739,8 @@ static int ath9k_start(struct ieee80211_hw *hw)ath9k_ps_restore (sc); +ath9k_rng_start (sc); +return 0 ; }
@@ -828,6 +830,8 @@ static void ath9k_stop(struct ieee80211_hw *hw)ath9k_deinit_channel_context (sc); +ath9k_rng_stop (sc); +mutex_lock (&sc->mutex);ath_cancel_work (sc);
drivers/net/wireless/ath/ath9k/rng.c new file +106 -0
106 lines not on this page · raw message
Signature · 1 line
1.9.1
kbuild test robot
build botconfig: tile-allyesconfig (attached as .config) reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git…
Hi Miaoqing,
[auto build test results on v4.3-rc3 -- if it's inappropriate base, please ignore]
config: tile-allyesconfig (attached as .config)
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
git checkout 220286596260e48c3c25675309d3c7d4f0875198
# save the attached .config to linux build tree make.cross ARCH=tile
Note: it may well be a FALSE warning. FWIW you are at least aware of it now.
http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings
All warnings (new ones prefixed by >>):
drivers/net/wireless/ath/ath9k/rng.c: In function 'ath9k_rng_data_read.constprop.0':
>> drivers/net/wireless/ath/ath9k/rng.c:53:15: warning: 'v2' may be used uninitialized in this function [-Wuninitialized]
vim +/v2 +53 drivers/net/wireless/ath/ath9k/rng.c
37 REG_RMW_FIELD(ah, AR_PHY_TEST_CTL_STATUS, AR_PHY_TEST_CTL_RX_OBS_SEL, 0);
38
39 for (i = 0, j = 0; i < buf_size; i++) {
40 v1 = REG_READ(ah, AR_PHY_TST_ADC) & 0xffff;
41 v2 = REG_READ(ah, AR_PHY_TST_ADC) & 0xffff;
42
43 /* wait for data ready */
44 if (v1 && v2 && rng_last != v1 && v1 != v2 && v1 != 0xffff &&
45 v2 != 0xffff)
46 buf[j++] = (v1 << 16) | v2;
47
48 rng_last = v2;
49 }
50
51 ath9k_ps_restore(sc);
52
> 53 sc->rng_last = v2;
54
55 return j << 2;
56 }
57
58 static int ath9k_rng_kthread(void *data)
59 {
60 int bytes_read;
61 struct ath_softc *sc = data;---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation