diff options
Diffstat (limited to 'sys/dev/random/fenestrasX/fx_pool.c')
| -rw-r--r-- | sys/dev/random/fenestrasX/fx_pool.c | 21 | 
1 files changed, 14 insertions, 7 deletions
diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index f4ad1e295d54..b6ffc202769e 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -127,7 +127,7 @@ static const struct fxrng_ent_cls fxrng_garbage = {   */  static const struct fxrng_ent_char {  	const struct fxrng_ent_cls	*entc_cls; -} fxrng_ent_char[ENTROPYSOURCE] = { +} fxrng_ent_char[/*ENTROPYSOURCE*/] = {  	[RANDOM_CACHED] = {  		.entc_cls = &fxrng_hi_push,  	}, @@ -167,21 +167,18 @@ static const struct fxrng_ent_char {  	[RANDOM_RANDOMDEV] = {  		.entc_cls = &fxrng_lo_push,  	}, -	[RANDOM_PURE_OCTEON] = { -		.entc_cls = &fxrng_hi_push,	/* Could be made pull. */ -	},  	[RANDOM_PURE_SAFE] = {  		.entc_cls = &fxrng_hi_push,  	},  	[RANDOM_PURE_GLXSB] = {  		.entc_cls = &fxrng_hi_push,  	}, -	[RANDOM_PURE_HIFN] = { -		.entc_cls = &fxrng_hi_push, -	},  	[RANDOM_PURE_RDRAND] = {  		.entc_cls = &fxrng_hi_pull,  	}, +	[RANDOM_PURE_RDSEED] = { +		.entc_cls = &fxrng_hi_pull, +	},  	[RANDOM_PURE_NEHEMIAH] = {  		.entc_cls = &fxrng_hi_pull,  	}, @@ -206,7 +203,17 @@ static const struct fxrng_ent_char {  	[RANDOM_PURE_VMGENID] = {  		.entc_cls = &fxrng_hi_push,  	}, +	[RANDOM_PURE_QUALCOMM] = { +		.entc_cls = &fxrng_hi_pull, +	}, +	[RANDOM_PURE_ARMV8] = { +		.entc_cls = &fxrng_hi_pull, +	}, +	[RANDOM_PURE_ARM_TRNG] = { +		.entc_cls = &fxrng_hi_pull, +	},  }; +CTASSERT(nitems(fxrng_ent_char) == ENTROPYSOURCE);  /* Useful for single-bit-per-source state. */  BITSET_DEFINE(fxrng_bits, ENTROPYSOURCE);  | 
