| Message ID | 1436946847-10909-2-git-send-email-miaoqing@qca.qualcomm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Kalle Valo |
| Headers | show |
Hi all, i did rngtest on top of this patch. The results are incredibly bad, right now it is more a pattern generator not random number generator. Is it possible to fix it? /home/lex# cat /dev/hwrng | rngtest -c 1000 rngtest 5 Copyright (c) 2004 by Henrique de Moraes Holschuh This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. rngtest: starting FIPS tests... rngtest: bits received from input: 20000032 rngtest: FIPS 140-2 successes: 0 rngtest: FIPS 140-2 failures: 1000 rngtest: FIPS 140-2(2001-10-10) Monobit: 27 rngtest: FIPS 140-2(2001-10-10) Poker: 1000 rngtest: FIPS 140-2(2001-10-10) Runs: 1000 rngtest: FIPS 140-2(2001-10-10) Long run: 2 rngtest: FIPS 140-2(2001-10-10) Continuous run: 0 rngtest: input channel speed: (min=1.879; avg=871.897; max=19531250.000)Kibits/s rngtest: FIPS tests speed: (min=19.443; avg=48.374; max=70.123)Mibits/s rngtest: Program run time: 23423736 microseconds Am 15.07.2015 um 09:54 schrieb miaoqing@qti.qualcomm.com: > From: Miaoqing Pan <miaoqing@qca.qualcomm.com> > > We measured the FFT-based entropy in 3 ways, Shannon entropy, > collision entropy, and directly measured min-entropy. Just to > be conservative, we recommend the estimated min-Entropy to be > 10 bits per 16-bit value. > > Analysis was done by Jacobson,David(djacobso@qti.qualcomm.com). > > Signed-off-by: Miaoqing Pan <miaoqing@qca.qualcomm.com> > --- > drivers/net/wireless/ath/ath9k/Kconfig | 7 +++ > drivers/net/wireless/ath/ath9k/Makefile | 1 + > drivers/net/wireless/ath/ath9k/ath9k.h | 23 ++++++++++ > drivers/net/wireless/ath/ath9k/main.c | 4 ++ > drivers/net/wireless/ath/ath9k/rng.c | 75 +++++++++++++++++++++++++++++++++ > 5 files changed, 110 insertions(+) > create mode 100644 drivers/net/wireless/ath/ath9k/rng.c > > diff --git a/drivers/net/wireless/ath/ath9k/Kconfig b/drivers/net/wireless/ath/ath9k/Kconfig > index fee0cad..bde62ec9 100644 > --- a/drivers/net/wireless/ath/ath9k/Kconfig > +++ b/drivers/net/wireless/ath/ath9k/Kconfig > @@ -176,3 +176,10 @@ 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--- > + Provides a hardware random number generator to the kernel. > diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile > index ecda613..76f9dc3 100644 > --- a/drivers/net/wireless/ath/ath9k/Makefile > +++ b/drivers/net/wireless/ath/ath9k/Makefile > @@ -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 > > diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h > index a7a81b3..45596e5 100644 > --- a/drivers/net/wireless/ath/ath9k/ath9k.h > +++ b/drivers/net/wireless/ath/ath9k/ath9k.h > @@ -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" > @@ -1041,6 +1042,12 @@ struct ath_softc { > u32 wow_intr_before_sleep; > bool force_wow; > #endif > + > +#ifdef CONFIG_ATH9K_HWRNG > + struct hwrng rng; > + bool rng_initialized; > + u32 rng_last; > +#endif > }; > > /********/ > @@ -1063,6 +1070,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_register(struct ath_softc *sc); > +void ath9k_rng_unregister(struct ath_softc *sc); > +#else > +static inline void ath9k_rng_register(struct ath_softc *sc) > +{ > +} > + > +static inline void ath9k_rng_unregister(struct ath_softc *sc) > +{ > +} > +#endif > + > static inline void ath_read_cachesize(struct ath_common *common, int *csz) > { > common->bus_ops->read_cachesize(common, csz); > diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c > index cfd45cb..5916ab2 100644 > --- a/drivers/net/wireless/ath/ath9k/main.c > +++ b/drivers/net/wireless/ath/ath9k/main.c > @@ -739,6 +739,8 @@ static int ath9k_start(struct ieee80211_hw *hw) > > ath9k_ps_restore(sc); > > + ath9k_rng_register(sc); > + > return 0; > } > > @@ -828,6 +830,8 @@ static void ath9k_stop(struct ieee80211_hw *hw) > > ath9k_deinit_channel_context(sc); > > + ath9k_rng_unregister(sc); > + > mutex_lock(&sc->mutex); > > ath_cancel_work(sc); > diff --git a/drivers/net/wireless/ath/ath9k/rng.c b/drivers/net/wireless/ath/ath9k/rng.c > new file mode 100644 > index 0000000..d8fa7a5 > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/rng.c > @@ -0,0 +1,75 @@ > +/* > + * Copyright (c) 2015 Qualcomm Atheros, Inc. > + * > + * Permission to use, copy, modify, and/or distribute this software for any > + * purpose with or without fee is hereby granted, provided that the above > + * copyright notice and this permission notice appear in all copies. > + * > + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES > + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF > + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR > + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES > + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN > + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF > + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. > + */ > + > +#include "ath9k.h" > +#include "hw.h" > +#include "ar9003_phy.h" > + > +static int ath9k_rng_data_read(struct hwrng *rng, u32 *data) > +{ > + u32 v1, v2; > + struct ath_softc *sc = (struct ath_softc *)rng->priv; > + struct ath_hw *ah = sc->sc_ah; > + > + ath9k_ps_wakeup(sc); > + > + REG_RMW_FIELD(ah, AR_PHY_TEST, AR_PHY_TEST_BBB_OBS_SEL, 5); > + REG_CLR_BIT(ah, AR_PHY_TEST, AR_PHY_TEST_RX_OBS_SEL_BIT5); > + REG_RMW_FIELD(ah, AR_PHY_TEST_CTL_STATUS, AR_PHY_TEST_CTL_RX_OBS_SEL, 0); > + > + v1 = REG_READ(ah, AR_PHY_TST_ADC); > + v2 = REG_READ(ah, AR_PHY_TST_ADC); > + > + ath9k_ps_restore(sc); > + > + /* wait for data ready */ > + if (v1 && v2 && sc->rng_last != v1 && v1 != v2) { > + *data = (v1 & 0xffff) | (v2 << 16); > + sc->rng_last = v2; > + > + return sizeof(u32); > + } > + > + sc->rng_last = v2; > + > + return 0; > +} > + > +void ath9k_rng_register(struct ath_softc *sc) > +{ > + struct ath_hw *ah = sc->sc_ah; > + > + if (WARN_ON(sc->rng_initialized)) > + return; > + > + if (!AR_SREV_9300_20_OR_LATER(ah)) > + return; > + > + sc->rng.name = "ath9k"; > + sc->rng.data_read = ath9k_rng_data_read; > + sc->rng.priv = (unsigned long)sc; > + > + if (!hwrng_register(&sc->rng)) > + sc->rng_initialized = true; > +} > + > +void ath9k_rng_unregister(struct ath_softc *sc) > +{ > + if (sc->rng_initialized) { > + hwrng_unregister(&sc->rng); > + sc->rng_initialized = false; > + } > +} >
IOKAnGZpcHNfcnVuX3JuZ190ZXN04oCdICBpcyBsZWdhY3kgY29kZSwgcmVjb21tZW5kIHRvIGRp c2FibGUgJ0ZJUFMgMTQwLTInIHRlc3QgaWYgdG8gdXNlICdybmdkLXRvb2xz4oCZLg0KDQotTWlh b3FpbmcNCg0KLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCkZyb206IE9sZWtzaWogUmVtcGVs IFttYWlsdG86bGludXhAcmVtcGVsLXByaXZhdC5kZV0gDQpTZW50OiBTdW5kYXksIEp1bHkgMjYs IDIwMTUgMzo0MSBQTQ0KVG86IFBhbiwgTWlhb3Fpbmc7IGxpbnZpbGxlQHR1eGRyaXZlci5jb20N CkNjOiBsaW51eC13aXJlbGVzc0B2Z2VyLmtlcm5lbC5vcmc7IGF0aDlrLWRldmVsDQpTdWJqZWN0 OiBSZTogW1BBVENIIDIvMl0gYXRoOWs6IGV4cG9ydCBIVyByYW5kb20gbnVtYmVyIGdlbmVyYXRv cg0KDQpIaSBhbGwsDQoNCmkgZGlkIHJuZ3Rlc3Qgb24gdG9wIG9mIHRoaXMgcGF0Y2guIFRoZSBy ZXN1bHRzIGFyZSBpbmNyZWRpYmx5IGJhZCwgcmlnaHQgbm93IGl0IGlzIG1vcmUgYSBwYXR0ZXJu IGdlbmVyYXRvciBub3QgcmFuZG9tIG51bWJlciBnZW5lcmF0b3IuIElzIGl0IHBvc3NpYmxlIHRv IGZpeCBpdD8NCg0KL2hvbWUvbGV4IyBjYXQgL2Rldi9od3JuZyB8IHJuZ3Rlc3QgLWMgMTAwMCBy bmd0ZXN0IDUgQ29weXJpZ2h0IChjKSAyMDA0IGJ5IEhlbnJpcXVlIGRlIE1vcmFlcyBIb2xzY2h1 aCBUaGlzIGlzIGZyZWUgc29mdHdhcmU7IHNlZSB0aGUgc291cmNlIGZvciBjb3B5aW5nIGNvbmRp dGlvbnMuICBUaGVyZSBpcyBOTyB3YXJyYW50eTsgbm90IGV2ZW4gZm9yIE1FUkNIQU5UQUJJTElU WSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4NCg0Kcm5ndGVzdDogc3RhcnRp bmcgRklQUyB0ZXN0cy4uLg0Kcm5ndGVzdDogYml0cyByZWNlaXZlZCBmcm9tIGlucHV0OiAyMDAw MDAzMg0Kcm5ndGVzdDogRklQUyAxNDAtMiBzdWNjZXNzZXM6IDANCnJuZ3Rlc3Q6IEZJUFMgMTQw LTIgZmFpbHVyZXM6IDEwMDANCnJuZ3Rlc3Q6IEZJUFMgMTQwLTIoMjAwMS0xMC0xMCkgTW9ub2Jp dDogMjcNCnJuZ3Rlc3Q6IEZJUFMgMTQwLTIoMjAwMS0xMC0xMCkgUG9rZXI6IDEwMDANCnJuZ3Rl c3Q6IEZJUFMgMTQwLTIoMjAwMS0xMC0xMCkgUnVuczogMTAwMA0Kcm5ndGVzdDogRklQUyAxNDAt MigyMDAxLTEwLTEwKSBMb25nIHJ1bjogMg0Kcm5ndGVzdDogRklQUyAxNDAtMigyMDAxLTEwLTEw KSBDb250aW51b3VzIHJ1bjogMA0Kcm5ndGVzdDogaW5wdXQgY2hhbm5lbCBzcGVlZDogKG1pbj0x Ljg3OTsgYXZnPTg3MS44OTc7IG1heD0xOTUzMTI1MC4wMDApS2liaXRzL3MNCnJuZ3Rlc3Q6IEZJ UFMgdGVzdHMgc3BlZWQ6IChtaW49MTkuNDQzOyBhdmc9NDguMzc0OyBtYXg9NzAuMTIzKU1pYml0 cy9zDQpybmd0ZXN0OiBQcm9ncmFtIHJ1biB0aW1lOiAyMzQyMzczNiBtaWNyb3NlY29uZHMNCg0K DQoNCkFtIDE1LjA3LjIwMTUgdW0gMDk6NTQgc2NocmllYiBtaWFvcWluZ0BxdGkucXVhbGNvbW0u Y29tOg0KPiBGcm9tOiBNaWFvcWluZyBQYW4gPG1pYW9xaW5nQHFjYS5xdWFsY29tbS5jb20+DQo+ IA0KPiBXZSBtZWFzdXJlZCB0aGUgRkZULWJhc2VkIGVudHJvcHkgaW4gMyB3YXlzLCBTaGFubm9u IGVudHJvcHksIA0KPiBjb2xsaXNpb24gZW50cm9weSwgYW5kIGRpcmVjdGx5IG1lYXN1cmVkIG1p bi1lbnRyb3B5LiBKdXN0IHRvIGJlIA0KPiBjb25zZXJ2YXRpdmUsIHdlIHJlY29tbWVuZCB0aGUg ZXN0aW1hdGVkIG1pbi1FbnRyb3B5IHRvIGJlDQo+IDEwIGJpdHMgcGVyIDE2LWJpdCB2YWx1ZS4N Cj4gDQo+IEFuYWx5c2lzIHdhcyBkb25lIGJ5IEphY29ic29uLERhdmlkKGRqYWNvYnNvQHF0aS5x dWFsY29tbS5jb20pLg0KPiANCj4gU2lnbmVkLW9mZi1ieTogTWlhb3FpbmcgUGFuIDxtaWFvcWlu Z0BxY2EucXVhbGNvbW0uY29tPg0KPiAtLS0NCj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9h dGg5ay9LY29uZmlnICB8ICA3ICsrKyAgDQo+IGRyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg5 ay9NYWtlZmlsZSB8ICAxICsgIA0KPiBkcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoOWsvYXRo OWsuaCAgfCAyMyArKysrKysrKysrDQo+ICBkcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoOWsv bWFpbi5jICAgfCAgNCArKw0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDlrL3JuZy5j ICAgIHwgNzUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrDQo+ICA1IGZpbGVzIGNo YW5nZWQsIDExMCBpbnNlcnRpb25zKCspDQo+ICBjcmVhdGUgbW9kZSAxMDA2NDQgZHJpdmVycy9u ZXQvd2lyZWxlc3MvYXRoL2F0aDlrL3JuZy5jDQo+IA0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9u ZXQvd2lyZWxlc3MvYXRoL2F0aDlrL0tjb25maWcgDQo+IGIvZHJpdmVycy9uZXQvd2lyZWxlc3Mv YXRoL2F0aDlrL0tjb25maWcNCj4gaW5kZXggZmVlMGNhZC4uYmRlNjJlYzkgMTAwNjQ0DQo+IC0t LSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg5ay9LY29uZmlnDQo+ICsrKyBiL2RyaXZl cnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg5ay9LY29uZmlnDQo+IEBAIC0xNzYsMyArMTc2LDEwIEBA IGNvbmZpZyBBVEg5S19IVENfREVCVUdGUw0KPiAgCWRlcGVuZHMgb24gQVRIOUtfSFRDICYmIERF QlVHX0ZTDQo+ICAJLS0taGVscC0tLQ0KPiAgCSAgU2F5IFksIGlmIHlvdSBuZWVkIGFjY2VzcyB0 byBhdGg5a19odGMncyBzdGF0aXN0aWNzLg0KPiArDQo+ICtjb25maWcgQVRIOUtfSFdSTkcNCj4g Kwlib29sICJSYW5kb20gbnVtYmVyIGdlbmVyYXRvciBzdXBwb3J0Ig0KPiArCWRlcGVuZHMgb24g QVRIOUsgJiYgKEhXX1JBTkRPTSA9IHkgfHwgSFdfUkFORE9NID0gQVRIOUspDQo+ICsJZGVmYXVs dCB5DQo+ICsJLS0taGVscC0tLQ0KPiArCSAgUHJvdmlkZXMgYSBoYXJkd2FyZSByYW5kb20gbnVt YmVyIGdlbmVyYXRvciB0byB0aGUga2VybmVsLg0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9uZXQv d2lyZWxlc3MvYXRoL2F0aDlrL01ha2VmaWxlIA0KPiBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0 aC9hdGg5ay9NYWtlZmlsZQ0KPiBpbmRleCBlY2RhNjEzLi43NmY5ZGMzIDEwMDY0NA0KPiAtLS0g YS9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoOWsvTWFrZWZpbGUNCj4gKysrIGIvZHJpdmVy cy9uZXQvd2lyZWxlc3MvYXRoL2F0aDlrL01ha2VmaWxlDQo+IEBAIC0xNSw2ICsxNSw3IEBAIGF0 aDlrLSQoQ09ORklHX0FUSDlLX0RGU19ERUJVR0ZTKSArPSBkZnNfZGVidWcubw0KPiAgYXRoOWst JChDT05GSUdfQVRIOUtfREZTX0NFUlRJRklFRCkgKz0gZGZzLm8NCj4gIGF0aDlrLSQoQ09ORklH X0FUSDlLX1RYOTkpICs9IHR4OTkubw0KPiAgYXRoOWstJChDT05GSUdfQVRIOUtfV09XKSArPSB3 b3cubw0KPiArYXRoOWstJChDT05GSUdfQVRIOUtfSFdSTkcpICs9IHJuZy5vDQo+ICANCj4gIGF0 aDlrLSQoQ09ORklHX0FUSDlLX0RFQlVHRlMpICs9IGRlYnVnLm8NCj4gIA0KPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDlrL2F0aDlrLmggDQo+IGIvZHJpdmVycy9u ZXQvd2lyZWxlc3MvYXRoL2F0aDlrL2F0aDlrLmgNCj4gaW5kZXggYTdhODFiMy4uNDU1OTZlNSAx MDA2NDQNCj4gLS0tIGEvZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDlrL2F0aDlrLmgNCj4g KysrIGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDlrL2F0aDlrLmgNCj4gQEAgLTIzLDYg KzIzLDcgQEANCj4gICNpbmNsdWRlIDxsaW51eC9sZWRzLmg+DQo+ICAjaW5jbHVkZSA8bGludXgv Y29tcGxldGlvbi5oPg0KPiAgI2luY2x1ZGUgPGxpbnV4L3RpbWUuaD4NCj4gKyNpbmNsdWRlIDxs aW51eC9od19yYW5kb20uaD4NCj4gIA0KPiAgI2luY2x1ZGUgImNvbW1vbi5oIg0KPiAgI2luY2x1 ZGUgImRlYnVnLmgiDQo+IEBAIC0xMDQxLDYgKzEwNDIsMTIgQEAgc3RydWN0IGF0aF9zb2Z0YyB7 DQo+ICAJdTMyIHdvd19pbnRyX2JlZm9yZV9zbGVlcDsNCj4gIAlib29sIGZvcmNlX3dvdzsNCj4g ICNlbmRpZg0KPiArDQo+ICsjaWZkZWYgQ09ORklHX0FUSDlLX0hXUk5HDQo+ICsJc3RydWN0IGh3 cm5nIHJuZzsNCj4gKwlib29sIHJuZ19pbml0aWFsaXplZDsNCj4gKwl1MzIgcm5nX2xhc3Q7DQo+ ICsjZW5kaWYNCj4gIH07DQo+ICANCj4gIC8qKioqKioqKi8NCj4gQEAgLTEwNjMsNiArMTA3MCwy MiBAQCBzdGF0aWMgaW5saW5lIGludCBhdGg5a190eDk5X3NlbmQoc3RydWN0IA0KPiBhdGhfc29m dGMgKnNjLCAgfSAgI2VuZGlmIC8qIENPTkZJR19BVEg5S19UWDk5ICovDQo+ICANCj4gKy8qKioq KioqKioqKioqKioqKioqKioqKioqKiovDQo+ICsvKiBSYW5kb20gTnVtYmVyIEdlbmVyYXRvciAq Lw0KPiArLyoqKioqKioqKioqKioqKioqKioqKioqKioqKi8NCj4gKyNpZmRlZiBDT05GSUdfQVRI OUtfSFdSTkcNCj4gK3ZvaWQgYXRoOWtfcm5nX3JlZ2lzdGVyKHN0cnVjdCBhdGhfc29mdGMgKnNj KTsgdm9pZCANCj4gK2F0aDlrX3JuZ191bnJlZ2lzdGVyKHN0cnVjdCBhdGhfc29mdGMgKnNjKTsg I2Vsc2Ugc3RhdGljIGlubGluZSB2b2lkIA0KPiArYXRoOWtfcm5nX3JlZ2lzdGVyKHN0cnVjdCBh dGhfc29mdGMgKnNjKSB7IH0NCj4gKw0KPiArc3RhdGljIGlubGluZSB2b2lkIGF0aDlrX3JuZ191 bnJlZ2lzdGVyKHN0cnVjdCBhdGhfc29mdGMgKnNjKSB7IH0gDQo+ICsjZW5kaWYNCj4gKw0KPiAg c3RhdGljIGlubGluZSB2b2lkIGF0aF9yZWFkX2NhY2hlc2l6ZShzdHJ1Y3QgYXRoX2NvbW1vbiAq Y29tbW9uLCBpbnQgDQo+ICpjc3opICB7DQo+ICAJY29tbW9uLT5idXNfb3BzLT5yZWFkX2NhY2hl c2l6ZShjb21tb24sIGNzeik7IGRpZmYgLS1naXQgDQo+IGEvZHJpdmVycy9uZXQvd2lyZWxlc3Mv YXRoL2F0aDlrL21haW4uYyANCj4gYi9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoOWsvbWFp bi5jDQo+IGluZGV4IGNmZDQ1Y2IuLjU5MTZhYjIgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbmV0 L3dpcmVsZXNzL2F0aC9hdGg5ay9tYWluLmMNCj4gKysrIGIvZHJpdmVycy9uZXQvd2lyZWxlc3Mv YXRoL2F0aDlrL21haW4uYw0KPiBAQCAtNzM5LDYgKzczOSw4IEBAIHN0YXRpYyBpbnQgYXRoOWtf c3RhcnQoc3RydWN0IGllZWU4MDIxMV9odyAqaHcpDQo+ICANCj4gIAlhdGg5a19wc19yZXN0b3Jl KHNjKTsNCj4gIA0KPiArCWF0aDlrX3JuZ19yZWdpc3RlcihzYyk7DQo+ICsNCj4gIAlyZXR1cm4g MDsNCj4gIH0NCj4gIA0KPiBAQCAtODI4LDYgKzgzMCw4IEBAIHN0YXRpYyB2b2lkIGF0aDlrX3N0 b3Aoc3RydWN0IGllZWU4MDIxMV9odyAqaHcpDQo+ICANCj4gIAlhdGg5a19kZWluaXRfY2hhbm5l bF9jb250ZXh0KHNjKTsNCj4gIA0KPiArCWF0aDlrX3JuZ191bnJlZ2lzdGVyKHNjKTsNCj4gKw0K PiAgCW11dGV4X2xvY2soJnNjLT5tdXRleCk7DQo+ICANCj4gIAlhdGhfY2FuY2VsX3dvcmsoc2Mp Ow0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDlrL3JuZy5jIA0K PiBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg5ay9ybmcuYw0KPiBuZXcgZmlsZSBtb2Rl IDEwMDY0NA0KPiBpbmRleCAwMDAwMDAwLi5kOGZhN2E1DQo+IC0tLSAvZGV2L251bGwNCj4gKysr IGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDlrL3JuZy5jDQo+IEBAIC0wLDAgKzEsNzUg QEANCj4gKy8qDQo+ICsgKiBDb3B5cmlnaHQgKGMpIDIwMTUgUXVhbGNvbW0gQXRoZXJvcywgSW5j Lg0KPiArICoNCj4gKyAqIFBlcm1pc3Npb24gdG8gdXNlLCBjb3B5LCBtb2RpZnksIGFuZC9vciBk aXN0cmlidXRlIHRoaXMgc29mdHdhcmUgDQo+ICtmb3IgYW55DQo+ICsgKiBwdXJwb3NlIHdpdGgg b3Igd2l0aG91dCBmZWUgaXMgaGVyZWJ5IGdyYW50ZWQsIHByb3ZpZGVkIHRoYXQgdGhlIA0KPiAr YWJvdmUNCj4gKyAqIGNvcHlyaWdodCBub3RpY2UgYW5kIHRoaXMgcGVybWlzc2lvbiBub3RpY2Ug YXBwZWFyIGluIGFsbCBjb3BpZXMuDQo+ICsgKg0KPiArICogVEhFIFNPRlRXQVJFIElTIFBST1ZJ REVEICJBUyBJUyIgQU5EIFRIRSBBVVRIT1IgRElTQ0xBSU1TIEFMTCANCj4gK1dBUlJBTlRJRVMN Cj4gKyAqIFdJVEggUkVHQVJEIFRPIFRISVMgU09GVFdBUkUgSU5DTFVESU5HIEFMTCBJTVBMSUVE IFdBUlJBTlRJRVMgT0YNCj4gKyAqIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUy4gSU4gTk8g RVZFTlQgU0hBTEwgVEhFIEFVVEhPUiBCRSANCj4gK0xJQUJMRSBGT1INCj4gKyAqIEFOWSBTUEVD SUFMLCBESVJFQ1QsIElORElSRUNULCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgT1IgQU5ZIA0K PiArREFNQUdFUw0KPiArICogV0hBVFNPRVZFUiBSRVNVTFRJTkcgRlJPTSBMT1NTIE9GIFVTRSwg REFUQSBPUiBQUk9GSVRTLCBXSEVUSEVSIElOIA0KPiArQU4NCj4gKyAqIEFDVElPTiBPRiBDT05U UkFDVCwgTkVHTElHRU5DRSBPUiBPVEhFUiBUT1JUSU9VUyBBQ1RJT04sIEFSSVNJTkcgDQo+ICtP VVQgT0YNCj4gKyAqIE9SIElOIENPTk5FQ1RJT04gV0lUSCBUSEUgVVNFIE9SIFBFUkZPUk1BTkNF IE9GIFRISVMgU09GVFdBUkUuDQo+ICsgKi8NCj4gKw0KPiArI2luY2x1ZGUgImF0aDlrLmgiDQo+ ICsjaW5jbHVkZSAiaHcuaCINCj4gKyNpbmNsdWRlICJhcjkwMDNfcGh5LmgiDQo+ICsNCj4gK3N0 YXRpYyBpbnQgYXRoOWtfcm5nX2RhdGFfcmVhZChzdHJ1Y3QgaHdybmcgKnJuZywgdTMyICpkYXRh KSB7DQo+ICsJdTMyIHYxLCB2MjsNCj4gKwlzdHJ1Y3QgYXRoX3NvZnRjICpzYyA9IChzdHJ1Y3Qg YXRoX3NvZnRjICopcm5nLT5wcml2Ow0KPiArCXN0cnVjdCBhdGhfaHcgKmFoID0gc2MtPnNjX2Fo Ow0KPiArDQo+ICsJYXRoOWtfcHNfd2FrZXVwKHNjKTsNCj4gKw0KPiArCVJFR19STVdfRklFTEQo YWgsIEFSX1BIWV9URVNULCBBUl9QSFlfVEVTVF9CQkJfT0JTX1NFTCwgNSk7DQo+ICsJUkVHX0NM Ul9CSVQoYWgsIEFSX1BIWV9URVNULCBBUl9QSFlfVEVTVF9SWF9PQlNfU0VMX0JJVDUpOw0KPiAr CVJFR19STVdfRklFTEQoYWgsIEFSX1BIWV9URVNUX0NUTF9TVEFUVVMsIA0KPiArQVJfUEhZX1RF U1RfQ1RMX1JYX09CU19TRUwsIDApOw0KPiArDQo+ICsJdjEgPSBSRUdfUkVBRChhaCwgQVJfUEhZ X1RTVF9BREMpOw0KPiArCXYyID0gUkVHX1JFQUQoYWgsIEFSX1BIWV9UU1RfQURDKTsNCj4gKw0K PiArCWF0aDlrX3BzX3Jlc3RvcmUoc2MpOw0KPiArDQo+ICsJLyogd2FpdCBmb3IgZGF0YSByZWFk eSAqLw0KPiArCWlmICh2MSAmJiB2MiAmJiBzYy0+cm5nX2xhc3QgIT0gdjEgJiYgdjEgIT0gdjIp IHsNCj4gKwkJKmRhdGEgPSAodjEgJiAweGZmZmYpIHwgKHYyIDw8IDE2KTsNCj4gKwkJc2MtPnJu Z19sYXN0ID0gdjI7DQo+ICsNCj4gKwkJcmV0dXJuIHNpemVvZih1MzIpOw0KPiArCX0NCj4gKw0K PiArCXNjLT5ybmdfbGFzdCA9IHYyOw0KPiArDQo+ICsJcmV0dXJuIDA7DQo+ICt9DQo+ICsNCj4g K3ZvaWQgYXRoOWtfcm5nX3JlZ2lzdGVyKHN0cnVjdCBhdGhfc29mdGMgKnNjKSB7DQo+ICsJc3Ry dWN0IGF0aF9odyAqYWggPSBzYy0+c2NfYWg7DQo+ICsNCj4gKwlpZiAoV0FSTl9PTihzYy0+cm5n X2luaXRpYWxpemVkKSkNCj4gKwkJcmV0dXJuOw0KPiArDQo+ICsJaWYgKCFBUl9TUkVWXzkzMDBf MjBfT1JfTEFURVIoYWgpKQ0KPiArCQlyZXR1cm47DQo+ICsNCj4gKwlzYy0+cm5nLm5hbWUgPSAi YXRoOWsiOw0KPiArCXNjLT5ybmcuZGF0YV9yZWFkID0gYXRoOWtfcm5nX2RhdGFfcmVhZDsNCj4g KwlzYy0+cm5nLnByaXYgPSAodW5zaWduZWQgbG9uZylzYzsNCj4gKw0KPiArCWlmICghaHdybmdf cmVnaXN0ZXIoJnNjLT5ybmcpKQ0KPiArCQlzYy0+cm5nX2luaXRpYWxpemVkID0gdHJ1ZTsNCj4g K30NCj4gKw0KPiArdm9pZCBhdGg5a19ybmdfdW5yZWdpc3RlcihzdHJ1Y3QgYXRoX3NvZnRjICpz Yykgew0KPiArCWlmIChzYy0+cm5nX2luaXRpYWxpemVkKSB7DQo+ICsJCWh3cm5nX3VucmVnaXN0 ZXIoJnNjLT5ybmcpOw0KPiArCQlzYy0+cm5nX2luaXRpYWxpemVkID0gZmFsc2U7DQo+ICsJfQ0K PiArfQ0KPiANCg0KDQotLQ0KUmVnYXJkcywNCk9sZWtzaWoNCg0K -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Am 27.07.2015 um 08:50 schrieb Pan, Miaoqing: > “fips_run_rng_test” is legacy code, recommend to disable 'FIPS 140-2' test if to use 'rngd-tools’. Ok, lets try simple compression. will it find enough pattern to do compression? Here what i get on my system: output from /dev/random -rw-rw-r-- 1 lex lex 2501678 Jul 27 12:01 random.out -rw-rw-r-- 1 lex lex 2512892 Jul 27 12:01 random.out.bz2 after compression we got bigger file. i would expect it since we need to store bzip header somewhere. output from /dev/hwrng -rw-rw-r-- 1 lex lex 2564096 Jul 27 11:36 hwrng.out -rw-rw-r-- 1 lex lex 2468394 Jul 27 11:36 hwrng.out.bz2 Do i understand it correctly, in case of hwrng bzip was able to find enough pattern to compressed the data? Even with format overhead? I'm no an expert, help of an expert would be welcome, added some more people to CC > -Miaoqing > > -----Original Message----- > From: Oleksij Rempel [mailto:linux@rempel-privat.de] > Sent: Sunday, July 26, 2015 3:41 PM > To: Pan, Miaoqing; linville@tuxdriver.com > Cc: linux-wireless@vger.kernel.org; ath9k-devel > Subject: Re: [PATCH 2/2] ath9k: export HW random number generator > > Hi all, > > i did rngtest on top of this patch. The results are incredibly bad, right now it is more a pattern generator not random number generator. Is it possible to fix it? > > /home/lex# cat /dev/hwrng | rngtest -c 1000 rngtest 5 Copyright (c) 2004 by Henrique de Moraes Holschuh This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. > > rngtest: starting FIPS tests... > rngtest: bits received from input: 20000032 > rngtest: FIPS 140-2 successes: 0 > rngtest: FIPS 140-2 failures: 1000 > rngtest: FIPS 140-2(2001-10-10) Monobit: 27 > rngtest: FIPS 140-2(2001-10-10) Poker: 1000 > rngtest: FIPS 140-2(2001-10-10) Runs: 1000 > rngtest: FIPS 140-2(2001-10-10) Long run: 2 > rngtest: FIPS 140-2(2001-10-10) Continuous run: 0 > rngtest: input channel speed: (min=1.879; avg=871.897; max=19531250.000)Kibits/s > rngtest: FIPS tests speed: (min=19.443; avg=48.374; max=70.123)Mibits/s > rngtest: Program run time: 23423736 microseconds > > > > Am 15.07.2015 um 09:54 schrieb miaoqing@qti.qualcomm.com: >> From: Miaoqing Pan <miaoqing@qca.qualcomm.com> >> >> We measured the FFT-based entropy in 3 ways, Shannon entropy, >> collision entropy, and directly measured min-entropy. Just to be >> conservative, we recommend the estimated min-Entropy to be >> 10 bits per 16-bit value. >> >> Analysis was done by Jacobson,David(djacobso@qti.qualcomm.com). >> >> Signed-off-by: Miaoqing Pan <miaoqing@qca.qualcomm.com> >> --- >> drivers/net/wireless/ath/ath9k/Kconfig | 7 +++ >> drivers/net/wireless/ath/ath9k/Makefile | 1 + >> drivers/net/wireless/ath/ath9k/ath9k.h | 23 ++++++++++ >> drivers/net/wireless/ath/ath9k/main.c | 4 ++ >> drivers/net/wireless/ath/ath9k/rng.c | 75 +++++++++++++++++++++++++++++++++ >> 5 files changed, 110 insertions(+) >> create mode 100644 drivers/net/wireless/ath/ath9k/rng.c >> >> diff --git a/drivers/net/wireless/ath/ath9k/Kconfig >> b/drivers/net/wireless/ath/ath9k/Kconfig >> index fee0cad..bde62ec9 100644 >> --- a/drivers/net/wireless/ath/ath9k/Kconfig >> +++ b/drivers/net/wireless/ath/ath9k/Kconfig >> @@ -176,3 +176,10 @@ 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--- >> + Provides a hardware random number generator to the kernel. >> diff --git a/drivers/net/wireless/ath/ath9k/Makefile >> b/drivers/net/wireless/ath/ath9k/Makefile >> index ecda613..76f9dc3 100644 >> --- a/drivers/net/wireless/ath/ath9k/Makefile >> +++ b/drivers/net/wireless/ath/ath9k/Makefile >> @@ -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 >> >> diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h >> b/drivers/net/wireless/ath/ath9k/ath9k.h >> index a7a81b3..45596e5 100644 >> --- a/drivers/net/wireless/ath/ath9k/ath9k.h >> +++ b/drivers/net/wireless/ath/ath9k/ath9k.h >> @@ -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" >> @@ -1041,6 +1042,12 @@ struct ath_softc { >> u32 wow_intr_before_sleep; >> bool force_wow; >> #endif >> + >> +#ifdef CONFIG_ATH9K_HWRNG >> + struct hwrng rng; >> + bool rng_initialized; >> + u32 rng_last; >> +#endif >> }; >> >> /********/ >> @@ -1063,6 +1070,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_register(struct ath_softc *sc); void >> +ath9k_rng_unregister(struct ath_softc *sc); #else static inline void >> +ath9k_rng_register(struct ath_softc *sc) { } >> + >> +static inline void ath9k_rng_unregister(struct ath_softc *sc) { } >> +#endif >> + >> static inline void ath_read_cachesize(struct ath_common *common, int >> *csz) { >> common->bus_ops->read_cachesize(common, csz); diff --git >> a/drivers/net/wireless/ath/ath9k/main.c >> b/drivers/net/wireless/ath/ath9k/main.c >> index cfd45cb..5916ab2 100644 >> --- a/drivers/net/wireless/ath/ath9k/main.c >> +++ b/drivers/net/wireless/ath/ath9k/main.c >> @@ -739,6 +739,8 @@ static int ath9k_start(struct ieee80211_hw *hw) >> >> ath9k_ps_restore(sc); >> >> + ath9k_rng_register(sc); >> + >> return 0; >> } >> >> @@ -828,6 +830,8 @@ static void ath9k_stop(struct ieee80211_hw *hw) >> >> ath9k_deinit_channel_context(sc); >> >> + ath9k_rng_unregister(sc); >> + >> mutex_lock(&sc->mutex); >> >> ath_cancel_work(sc); >> diff --git a/drivers/net/wireless/ath/ath9k/rng.c >> b/drivers/net/wireless/ath/ath9k/rng.c >> new file mode 100644 >> index 0000000..d8fa7a5 >> --- /dev/null >> +++ b/drivers/net/wireless/ath/ath9k/rng.c >> @@ -0,0 +1,75 @@ >> +/* >> + * Copyright (c) 2015 Qualcomm Atheros, Inc. >> + * >> + * Permission to use, copy, modify, and/or distribute this software >> +for any >> + * purpose with or without fee is hereby granted, provided that the >> +above >> + * copyright notice and this permission notice appear in all copies. >> + * >> + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL >> +WARRANTIES >> + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF >> + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE >> +LIABLE FOR >> + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY >> +DAMAGES >> + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN >> +AN >> + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING >> +OUT OF >> + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. >> + */ >> + >> +#include "ath9k.h" >> +#include "hw.h" >> +#include "ar9003_phy.h" >> + >> +static int ath9k_rng_data_read(struct hwrng *rng, u32 *data) { >> + u32 v1, v2; >> + struct ath_softc *sc = (struct ath_softc *)rng->priv; >> + struct ath_hw *ah = sc->sc_ah; >> + >> + ath9k_ps_wakeup(sc); >> + >> + REG_RMW_FIELD(ah, AR_PHY_TEST, AR_PHY_TEST_BBB_OBS_SEL, 5); >> + REG_CLR_BIT(ah, AR_PHY_TEST, AR_PHY_TEST_RX_OBS_SEL_BIT5); >> + REG_RMW_FIELD(ah, AR_PHY_TEST_CTL_STATUS, >> +AR_PHY_TEST_CTL_RX_OBS_SEL, 0); >> + >> + v1 = REG_READ(ah, AR_PHY_TST_ADC); >> + v2 = REG_READ(ah, AR_PHY_TST_ADC); >> + >> + ath9k_ps_restore(sc); >> + >> + /* wait for data ready */ >> + if (v1 && v2 && sc->rng_last != v1 && v1 != v2) { >> + *data = (v1 & 0xffff) | (v2 << 16); >> + sc->rng_last = v2; >> + >> + return sizeof(u32); >> + } >> + >> + sc->rng_last = v2; >> + >> + return 0; >> +} >> + >> +void ath9k_rng_register(struct ath_softc *sc) { >> + struct ath_hw *ah = sc->sc_ah; >> + >> + if (WARN_ON(sc->rng_initialized)) >> + return; >> + >> + if (!AR_SREV_9300_20_OR_LATER(ah)) >> + return; >> + >> + sc->rng.name = "ath9k"; >> + sc->rng.data_read = ath9k_rng_data_read; >> + sc->rng.priv = (unsigned long)sc; >> + >> + if (!hwrng_register(&sc->rng)) >> + sc->rng_initialized = true; >> +} >> + >> +void ath9k_rng_unregister(struct ath_softc *sc) { >> + if (sc->rng_initialized) { >> + hwrng_unregister(&sc->rng); >> + sc->rng_initialized = false; >> + } >> +} >> > > > -- > Regards, > Oleksij >
Am Montag, 27. Juli 2015, 12:45:29 schrieb Oleksij Rempel: Hi Oleksij, >Am 27.07.2015 um 08:50 schrieb Pan, Miaoqing: >> “fips_run_rng_test” is legacy code, recommend to disable 'FIPS 140-2' >> test if to use 'rngd-tools’. >Ok, lets try simple compression. will it find enough pattern to do >compression? >Here what i get on my system: >output from /dev/random >-rw-rw-r-- 1 lex lex 2501678 Jul 27 12:01 random.out >-rw-rw-r-- 1 lex lex 2512892 Jul 27 12:01 random.out.bz2 > >after compression we got bigger file. i would expect it since we need to >store bzip header somewhere. > >output from /dev/hwrng >-rw-rw-r-- 1 lex lex 2564096 Jul 27 11:36 hwrng.out >-rw-rw-r-- 1 lex lex 2468394 Jul 27 11:36 hwrng.out.bz2 > >Do i understand it correctly, in case of hwrng bzip was able to find >enough pattern to compressed the data? Even with format overhead? > >I'm no an expert, help of an expert would be welcome, added some more >people to CC This one does not look good for a claim that the RNG produces white noise. An RNG that is wired up to /dev/hwrng should produce white noise. Either by having an appropriate noise source or by conditioning the output of the noise source. When conditioning the output, you have to be careful about the entropy claim. For example, you cannot state that the data stream from your noise source has close to one bit of entropy for each obtained bit. Thus, the conditioner must ensure that the data from the noise source is collected and its entropy is maintained and accumulated. However, the hwrandom framework does not provide any conditioning logic. And I would say that such conditioner logic should not reside in a driver either. I would say that the discussed RNG does not seem fit for hooking it up with the hwrandom framework. Ciao Stephan -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jul 27, 2015 at 7:01 AM, Stephan Mueller <smueller@chronox.de> wrote: > This one does not look good for a claim that the RNG produces white noise. An > RNG that is wired up to /dev/hwrng should produce white noise. Either by > having an appropriate noise source or by conditioning the output of the noise > source. Yes. > When conditioning the output, you have to be careful about the entropy claim. A very good analysis of how to deal with this is in Denker's Turbid paper: http://www.av8n.com/turbid/ In particular, see section 4.2 on Saturation > However, the hwrandom framework does not provide any conditioning logic. At first sight, this sounds like a blunder to me, but I have not looked at hwrandom at all. Is there a rationale? For example, not building conditioning into that driver would make perfect sense if the output were just being fed into the random(4) which does plenty of mixing. The only problem then would be to make sure of giving random(4) reasonable entropy estimates. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Am Dienstag, 28. Juli 2015, 13:41:57 schrieb Sandy Harris: Hi Sandy, > >> However, the hwrandom framework does not provide any conditioning logic. > >At first sight, this sounds like a blunder to me, but I have not >looked at hwrandom at all. Is there a rationale? I think hwrandom is solely a framework to hook up RNG devices to user space. There is no massaging of data coming from the HW RNGs. Usually those HW RNGs all have their own conditioner and there is no need to do a conditioning again. > >For example, not building conditioning into that driver would make >perfect sense if the output were just being fed into the random(4) >which does plenty of mixing. The only problem then would be to make >sure of giving random(4) reasonable entropy estimates. hwrandom *may* be used to feed into the entropy pools. But there is no technical guarantee for that. Furthermore, I have seen use cases where the output of hwrandom is used for other purposes. Ciao Stephan -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Stephan Mueller <smueller@chronox.de> writes: >>-rw-rw-r-- 1 lex lex 2564096 Jul 27 11:36 hwrng.out >>-rw-rw-r-- 1 lex lex 2468394 Jul 27 11:36 hwrng.out.bz2 >> >>Do i understand it correctly, in case of hwrng bzip was able to find >>enough pattern to compressed the data? Even with format overhead? >> >>I'm no an expert, help of an expert would be welcome, added some more >>people to CC > > This one does not look good for a claim that the RNG produces white noise. An > RNG that is wired up to /dev/hwrng should produce white noise. Either by > having an appropriate noise source or by conditioning the output of the noise > source. > > When conditioning the output, you have to be careful about the entropy claim. > For example, you cannot state that the data stream from your noise source has > close to one bit of entropy for each obtained bit. Thus, the conditioner must > ensure that the data from the noise source is collected and its entropy is > maintained and accumulated. > > However, the hwrandom framework does not provide any conditioning logic. And I > would say that such conditioner logic should not reside in a driver either. I > would say that the discussed RNG does not seem fit for hooking it up with the > hwrandom framework. Based on the discussion I'm going to revert this patch, at least for now.
+Pouyan & David. -----Original Message----- From: Kalle Valo [mailto:kvalo@codeaurora.org] Sent: Friday, July 31, 2015 3:09 PM To: Stephan Mueller Cc: Oleksij Rempel; Pan, Miaoqing; linville@tuxdriver.com; linux-wireless@vger.kernel.org; Theodore Ts'o; linux-crypto@vger.kernel.org; nhorman@tuxdriver.com Subject: Re: [PATCH 2/2] ath9k: export HW random number generator Stephan Mueller <smueller@chronox.de> writes: >>-rw-rw-r-- 1 lex lex 2564096 Jul 27 11:36 hwrng.out >>-rw-rw-r-- 1 lex lex 2468394 Jul 27 11:36 hwrng.out.bz2 >> >>Do i understand it correctly, in case of hwrng bzip was able to find >>enough pattern to compressed the data? Even with format overhead? >> >>I'm no an expert, help of an expert would be welcome, added some more >>people to CC > > This one does not look good for a claim that the RNG produces white > noise. An RNG that is wired up to /dev/hwrng should produce white > noise. Either by having an appropriate noise source or by conditioning > the output of the noise source. > > When conditioning the output, you have to be careful about the entropy claim. > For example, you cannot state that the data stream from your noise > source has close to one bit of entropy for each obtained bit. Thus, > the conditioner must ensure that the data from the noise source is > collected and its entropy is maintained and accumulated. > > However, the hwrandom framework does not provide any conditioning > logic. And I would say that such conditioner logic should not reside > in a driver either. I would say that the discussed RNG does not seem > fit for hooking it up with the hwrandom framework. Based on the discussion I'm going to revert this patch, at least for now. -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello all, That was partially my intention too when I submitted 2aa56cca3571fd08c0c38f3e2d4bb0bfb3def3c5 which mixes FFT measurements to the entropy pool without providing any estimation on entropy (entropy estimation is the wrong approach, read the papers on fortuna for more information on that). I believe that this approach is better than mine because FFT data is too much (high throughput) and may have a negative impact on the pool when mixed like this (even without the entropy count) so Kale please revert my patch also (I was about to submit a request for reverting it and writing something similar when this thread came up). I believe that exporting the card as a hw rng and letting a userspace helper do the whitening and the post processing is the proper approach. The idea behind exposing a device as a hw random number generator is not that it's output is ready to be used. It's just an entropy source. Almost every entropy source has some bias and no it's not always expected from a hw rng to do whitening on it's own, it's actually more secure to get the raw data and perform the whitening yourself because if what you get from the hw rng is already being post-processed then there is no way to know if someone has hidden a backdoor there (that was the big discussion about Intel's RDRAND and the possibility of an NSA backdoor in there -it could just be AES on CTR mode with a known key/iv-, we get whitened data so we don't know if we can trust them). A userspace helper is needed for proper whitening and statistical analysis (and no fips is not enough, try dieharder and ent and then go for more custom stuff) because we should keep the kernel clean. That's what rngd was supposed to do (do the whitening on userspace and then submit it back to the kernel's pool). What's wrong with exporting the atheros cards as a hw random number generator ? Is the recently added jitter RNG (currently exposed as an RNG through the CryptoAPI) any better ? Does it have stronger entropy claims ? It just passes the statistical tests, it doesn't mean it has good "randomness" (let me remind you hpa's comments on HAVEGEd on LinuxCon 2012), a CPU is a deterministic system, the fact that there are many parameters on this system -not on all CPUs by the way, not everything out there is a cisc with branch prediction etc- turns it to a very complex system to analyze (chaotic behavior) which is good enough for what we want but it doesn't compare to an actual physical phenomenon such as E/M noise (btw a type of "jitter" is already mixed on the /dev/random's entropy pool since 2013 when I submitted this http://lkml.iu.edu/hypermail/linux/kernel/1211.2/00863.html -again with no entropy estimation and only by using timers- but it's not random in any way, it's just "too complicated to analyze" -that's what hpa also told about HAVEGEd and I totally agree with him-). The truth is that it's very hard to get good quality entropy in a way that's guaranteed e.g. even in the atheros's case an attacker can bias the RNG by hitting the card with a sine wave signal on the IF, only quantum phenomena such as photon detection -e.g. through radioactive decay- or even better measurements of the void based on Heisenberg's uncertainty principle can be truly classified as random and not always, we still have Bell's correlations such as entanglement -so e.g. something that seems random to us locally might not be random to the attacker, our system might be entangled with the attacker's system-. Even the current hw rngs supported by the framework might provide non-random data in case of hw failure (think of an RNG based on avalanche effect with a broken diode), that's why we should always do extensive post-processing and kernel is not the place for that. Some more comments here: I see people trusting HAVEGEd and entropy from sound cards, video cards etc and even provide some "proof" about how good that is. It's all wrong ! First of all there is no definition of randomness, if we could define randomness it wouldn't be random any more (we 'd have some information about it), there is only the uncertainty principle. Second you can't have claims on entropy bounds because such systems behave differently under different circumstances or different configurations. HAVEGEd for example gathers entropy based on the assumption that we have context switching and a complex CPU so that it's too complicated to guess what's running on the system (again no strong claims on entropy bounds it's just "it's messy enough, it passes the tests, so it's ok"). Try running it on a real-time system with a single process and you can say goodbye to any entropy claims. Sound cards ? If you don't properly configure your sound card (even in the case of having nothing connected on the mic, just gathering thermal noise from the resistor) you 'll end up with no entropy at all ! Most sound cards have a noise cancellation system or they have a volume threshold so they won't give anything below that (all zeroes, no entropy), others will "loop" the signal when you raise the volume enough and while you think that you get something random, you actually get the same signal "looped" multiple times due to interference between the input and output (so again no entropy claims can be made). Video cards or web cams ? It depends on what they see, put a strong light on them and again your entropy claims are invalid. Trying to estimate the entropy is also very hard because you can only measure the entropy from your point of view, not the attacker's. Take a simple AES on CTR mode with a known key/iv to the attacker. You can get its output, run your entropy estimator and find it full of entropy but what looks random to you it won't be random to the attacker and that's why we care about "high quality" randomness right ? It's for cryptographic / security purposes, otherwise /dev/urandom is more than enough (actually is good enough for crypto most of the times too). So please let's stop arguing about what is random, more random, higher quality random etc. We have an entropy source here, let's use it. We'll never be able to know how good it is anyway. 2015-07-31 3:39 GMT-05:00 Pan, Miaoqing <miaoqing@qti.qualcomm.com>: > +Pouyan & David. > > -----Original Message----- > From: Kalle Valo [mailto:kvalo@codeaurora.org] > Sent: Friday, July 31, 2015 3:09 PM > To: Stephan Mueller > Cc: Oleksij Rempel; Pan, Miaoqing; linville@tuxdriver.com; linux-wireless@vger.kernel.org; Theodore Ts'o; linux-crypto@vger.kernel.org; nhorman@tuxdriver.com > Subject: Re: [PATCH 2/2] ath9k: export HW random number generator > > Stephan Mueller <smueller@chronox.de> writes: > >>>-rw-rw-r-- 1 lex lex 2564096 Jul 27 11:36 hwrng.out >>>-rw-rw-r-- 1 lex lex 2468394 Jul 27 11:36 hwrng.out.bz2 >>> >>>Do i understand it correctly, in case of hwrng bzip was able to find >>>enough pattern to compressed the data? Even with format overhead? >>> >>>I'm no an expert, help of an expert would be welcome, added some more >>>people to CC >> >> This one does not look good for a claim that the RNG produces white >> noise. An RNG that is wired up to /dev/hwrng should produce white >> noise. Either by having an appropriate noise source or by conditioning >> the output of the noise source. >> >> When conditioning the output, you have to be careful about the entropy claim. >> For example, you cannot state that the data stream from your noise >> source has close to one bit of entropy for each obtained bit. Thus, >> the conditioner must ensure that the data from the noise source is >> collected and its entropy is maintained and accumulated. >> >> However, the hwrandom framework does not provide any conditioning >> logic. And I would say that such conditioner logic should not reside >> in a driver either. I would say that the discussed RNG does not seem >> fit for hooking it up with the hwrandom framework. > > Based on the discussion I'm going to revert this patch, at least for now. > > -- > Kalle Valo > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
Just a question to the Qualcomm devs: You are reading the TEST_DAC register after switching the PHY to test mode or something. How would that affect the card's behavior (e.g. if it gets called very frequently) ? Is it possible to have packet loss or disconnections because of that ? Also I notice that you read the register twice ? What's the format of the data you get ? My approach right now is to get FFT samples from the spectral scan feature on "background" mode (when the card is scanning) so I get much more throughput out of that (it's not MMIO, it's dma) and it's more passive because it's data the card already gathers as part of its radar detection loop. However I grab the data through debugfs (through the current interface we have for spectral scan), I'd like to expose this as a hw rng but I 'm still looking on the proper way of doing it without having to buffer all this data of put them somewhere until a consumer comes up. Maybe we could combine the two, provide high throughput FFT samples (the raw data, without the formatting) when a spectral scan is happening and when there are no spectral data -and if your approach doesn't affect the card's operation- we could use that for backup. 2015-11-07 17:39 GMT-06:00 Nick Kossifidis <mickflemm@gmail.com>: > Hello all, > > That was partially my intention too when I submitted > 2aa56cca3571fd08c0c38f3e2d4bb0bfb3def3c5 which mixes FFT measurements > to the entropy pool without providing any estimation on entropy > (entropy estimation is the wrong approach, read the papers on fortuna > for more information on that). I believe that this approach is better > than mine because FFT data is too much (high throughput) and may have > a negative impact on the pool when mixed like this (even without the > entropy count) so Kale please revert my patch also (I was about to > submit a request for reverting it and writing something similar when > this thread came up). I believe that exporting the card as a hw rng > and letting a userspace helper do the whitening and the post > processing is the proper approach. > > The idea behind exposing a device as a hw random number generator is > not that it's output is ready to be used. It's just an entropy source. > Almost every entropy source has some bias and no it's not always > expected from a hw rng to do whitening on it's own, it's actually more > secure to get the raw data and perform the whitening yourself because > if what you get from the hw rng is already being post-processed then > there is no way to know if someone has hidden a backdoor there (that > was the big discussion about Intel's RDRAND and the possibility of an > NSA backdoor in there -it could just be AES on CTR mode with a known > key/iv-, we get whitened data so we don't know if we can trust them). > A userspace helper is needed for proper whitening and statistical > analysis (and no fips is not enough, try dieharder and ent and then go > for more custom stuff) because we should keep the kernel clean. That's > what rngd was supposed to do (do the whitening on userspace and then > submit it back to the kernel's pool). > > What's wrong with exporting the atheros cards as a hw random number > generator ? Is the recently added jitter RNG (currently exposed as an > RNG through the CryptoAPI) any better ? Does it have stronger entropy > claims ? It just passes the statistical tests, it doesn't mean it has > good "randomness" (let me remind you hpa's comments on HAVEGEd on > LinuxCon 2012), a CPU is a deterministic system, the fact that there > are many parameters on this system -not on all CPUs by the way, not > everything out there is a cisc with branch prediction etc- turns it to > a very complex system to analyze (chaotic behavior) which is good > enough for what we want but it doesn't compare to an actual physical > phenomenon such as E/M noise (btw a type of "jitter" is already mixed > on the /dev/random's entropy pool since 2013 when I submitted this > http://lkml.iu.edu/hypermail/linux/kernel/1211.2/00863.html -again > with no entropy estimation and only by using timers- but it's not > random in any way, it's just "too complicated to analyze" -that's what > hpa also told about HAVEGEd and I totally agree with him-). > > The truth is that it's very hard to get good quality entropy in a way > that's guaranteed e.g. even in the atheros's case an attacker can bias > the RNG by hitting the card with a sine wave signal on the IF, only > quantum phenomena such as photon detection -e.g. through radioactive > decay- or even better measurements of the void based on Heisenberg's > uncertainty principle can be truly classified as random and not > always, we still have Bell's correlations such as entanglement -so > e.g. something that seems random to us locally might not be random to > the attacker, our system might be entangled with the attacker's > system-. Even the current hw rngs supported by the framework might > provide non-random data in case of hw failure (think of an RNG based > on avalanche effect with a broken diode), that's why we should always > do extensive post-processing and kernel is not the place for that. > > Some more comments here: I see people trusting HAVEGEd and entropy > from sound cards, video cards etc and even provide some "proof" about > how good that is. It's all wrong ! First of all there is no definition > of randomness, if we could define randomness it wouldn't be random any > more (we 'd have some information about it), there is only the > uncertainty principle. Second you can't have claims on entropy bounds > because such systems behave differently under different circumstances > or different configurations. HAVEGEd for example gathers entropy based > on the assumption that we have context switching and a complex CPU so > that it's too complicated to guess what's running on the system (again > no strong claims on entropy bounds it's just "it's messy enough, it > passes the tests, so it's ok"). Try running it on a real-time system > with a single process and you can say goodbye to any entropy claims. > Sound cards ? If you don't properly configure your sound card (even in > the case of having nothing connected on the mic, just gathering > thermal noise from the resistor) you 'll end up with no entropy at all > ! Most sound cards have a noise cancellation system or they have a > volume threshold so they won't give anything below that (all zeroes, > no entropy), others will "loop" the signal when you raise the volume > enough and while you think that you get something random, you actually > get the same signal "looped" multiple times due to interference > between the input and output (so again no entropy claims can be made). > Video cards or web cams ? It depends on what they see, put a strong > light on them and again your entropy claims are invalid. > > Trying to estimate the entropy is also very hard because you can only > measure the entropy from your point of view, not the attacker's. Take > a simple AES on CTR mode with a known key/iv to the attacker. You can > get its output, run your entropy estimator and find it full of entropy > but what looks random to you it won't be random to the attacker and > that's why we care about "high quality" randomness right ? It's for > cryptographic / security purposes, otherwise /dev/urandom is more than > enough (actually is good enough for crypto most of the times too). > > So please let's stop arguing about what is random, more random, higher > quality random etc. We have an entropy source here, let's use it. > We'll never be able to know how good it is anyway. > > > 2015-07-31 3:39 GMT-05:00 Pan, Miaoqing <miaoqing@qti.qualcomm.com>: >> +Pouyan & David. >> >> -----Original Message----- >> From: Kalle Valo [mailto:kvalo@codeaurora.org] >> Sent: Friday, July 31, 2015 3:09 PM >> To: Stephan Mueller >> Cc: Oleksij Rempel; Pan, Miaoqing; linville@tuxdriver.com; linux-wireless@vger.kernel.org; Theodore Ts'o; linux-crypto@vger.kernel.org; nhorman@tuxdriver.com >> Subject: Re: [PATCH 2/2] ath9k: export HW random number generator >> >> Stephan Mueller <smueller@chronox.de> writes: >> >>>>-rw-rw-r-- 1 lex lex 2564096 Jul 27 11:36 hwrng.out >>>>-rw-rw-r-- 1 lex lex 2468394 Jul 27 11:36 hwrng.out.bz2 >>>> >>>>Do i understand it correctly, in case of hwrng bzip was able to find >>>>enough pattern to compressed the data? Even with format overhead? >>>> >>>>I'm no an expert, help of an expert would be welcome, added some more >>>>people to CC >>> >>> This one does not look good for a claim that the RNG produces white >>> noise. An RNG that is wired up to /dev/hwrng should produce white >>> noise. Either by having an appropriate noise source or by conditioning >>> the output of the noise source. >>> >>> When conditioning the output, you have to be careful about the entropy claim. >>> For example, you cannot state that the data stream from your noise >>> source has close to one bit of entropy for each obtained bit. Thus, >>> the conditioner must ensure that the data from the noise source is >>> collected and its entropy is maintained and accumulated. >>> >>> However, the hwrandom framework does not provide any conditioning >>> logic. And I would say that such conditioner logic should not reside >>> in a driver either. I would say that the discussed RNG does not seem >>> fit for hooking it up with the hwrandom framework. >> >> Based on the discussion I'm going to revert this patch, at least for now. >> >> -- >> Kalle Valo >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > > > -- > GPG ID: 0xEE878588 > As you read this post global entropy rises. Have Fun ;-) > Nick
Nick Kossifidis <mickflemm@gmail.com> writes: > That was partially my intention too when I submitted > 2aa56cca3571fd08c0c38f3e2d4bb0bfb3def3c5 which mixes FFT measurements > to the entropy pool without providing any estimation on entropy > (entropy estimation is the wrong approach, read the papers on fortuna > for more information on that). I believe that this approach is better > than mine because FFT data is too much (high throughput) and may have > a negative impact on the pool when mixed like this (even without the > entropy count) so Kale please revert my patch also (I was about to > submit a request for reverting it and writing something similar when > this thread came up). Could you submit the revert as a patch and with the explonation in the commit log, please?
diff --git a/drivers/net/wireless/ath/ath9k/Kconfig b/drivers/net/wireless/ath/ath9k/Kconfig index fee0cad..bde62ec9 100644 --- a/drivers/net/wireless/ath/ath9k/Kconfig +++ b/drivers/net/wireless/ath/ath9k/Kconfig @@ -176,3 +176,10 @@ 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--- + Provides a hardware random number generator to the kernel. diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile index ecda613..76f9dc3 100644 --- a/drivers/net/wireless/ath/ath9k/Makefile +++ b/drivers/net/wireless/ath/ath9k/Makefile @@ -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 diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index a7a81b3..45596e5 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h @@ -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" @@ -1041,6 +1042,12 @@ struct ath_softc { u32 wow_intr_before_sleep; bool force_wow; #endif + +#ifdef CONFIG_ATH9K_HWRNG + struct hwrng rng; + bool rng_initialized; + u32 rng_last; +#endif }; /********/ @@ -1063,6 +1070,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_register(struct ath_softc *sc); +void ath9k_rng_unregister(struct ath_softc *sc); +#else +static inline void ath9k_rng_register(struct ath_softc *sc) +{ +} + +static inline void ath9k_rng_unregister(struct ath_softc *sc) +{ +} +#endif + static inline void ath_read_cachesize(struct ath_common *common, int *csz) { common->bus_ops->read_cachesize(common, csz); diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index cfd45cb..5916ab2 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -739,6 +739,8 @@ static int ath9k_start(struct ieee80211_hw *hw) ath9k_ps_restore(sc); + ath9k_rng_register(sc); + return 0; } @@ -828,6 +830,8 @@ static void ath9k_stop(struct ieee80211_hw *hw) ath9k_deinit_channel_context(sc); + ath9k_rng_unregister(sc); + mutex_lock(&sc->mutex); ath_cancel_work(sc); diff --git a/drivers/net/wireless/ath/ath9k/rng.c b/drivers/net/wireless/ath/ath9k/rng.c new file mode 100644 index 0000000..d8fa7a5 --- /dev/null +++ b/drivers/net/wireless/ath/ath9k/rng.c @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2015 Qualcomm Atheros, Inc. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include "ath9k.h" +#include "hw.h" +#include "ar9003_phy.h" + +static int ath9k_rng_data_read(struct hwrng *rng, u32 *data) +{ + u32 v1, v2; + struct ath_softc *sc = (struct ath_softc *)rng->priv; + struct ath_hw *ah = sc->sc_ah; + + ath9k_ps_wakeup(sc); + + REG_RMW_FIELD(ah, AR_PHY_TEST, AR_PHY_TEST_BBB_OBS_SEL, 5); + REG_CLR_BIT(ah, AR_PHY_TEST, AR_PHY_TEST_RX_OBS_SEL_BIT5); + REG_RMW_FIELD(ah, AR_PHY_TEST_CTL_STATUS, AR_PHY_TEST_CTL_RX_OBS_SEL, 0); + + v1 = REG_READ(ah, AR_PHY_TST_ADC); + v2 = REG_READ(ah, AR_PHY_TST_ADC); + + ath9k_ps_restore(sc); + + /* wait for data ready */ + if (v1 && v2 && sc->rng_last != v1 && v1 != v2) { + *data = (v1 & 0xffff) | (v2 << 16); + sc->rng_last = v2; + + return sizeof(u32); + } + + sc->rng_last = v2; + + return 0; +} + +void ath9k_rng_register(struct ath_softc *sc) +{ + struct ath_hw *ah = sc->sc_ah; + + if (WARN_ON(sc->rng_initialized)) + return; + + if (!AR_SREV_9300_20_OR_LATER(ah)) + return; + + sc->rng.name = "ath9k"; + sc->rng.data_read = ath9k_rng_data_read; + sc->rng.priv = (unsigned long)sc; + + if (!hwrng_register(&sc->rng)) + sc->rng_initialized = true; +} + +void ath9k_rng_unregister(struct ath_softc *sc) +{ + if (sc->rng_initialized) { + hwrng_unregister(&sc->rng); + sc->rng_initialized = false; + } +}