qcom-rng fixes and cleanups
Subsystems (9)
v2 cover qcom-rng fixes and cleanups
This series fixes several bugs in qcom-rng, including failure to enable the clock before accessing the hardware, generating biased random numbers, and generating duplicate or non-random numbers due to missing locking. To fix the latter bug, it drops the support for the duplicative crypto_rng interface, which isn't used in practice, leaving just hwrng which is the one that actually matters.
This series is targeting cryptodev/master
Changed in v2:
- Changed patch 3 to make the driver continue to be bound even when hwrng is unsupported.
- Added blank line in patch 2
- Added Reviewed-by
Eric Biggers (4):
crypto: qcom-rng - Enable clock in hwrng case
crypto: qcom-rng - Allow zero as a random number
crypto: qcom-rng - Remove crypto_rng interface
hwrng: qcom - Move qcom-rng.c into drivers/char/hw_random/
arch/arm/configs/multi_v7_defconfig | 2 +-
arch/arm/configs/qcom_defconfig | 2 +-
arch/arm64/configs/defconfig | 2 +-
drivers/char/hw_random/Kconfig | 11 ++
drivers/char/hw_random/Makefile | 1 +
drivers/{crypto => char/hw_random}/qcom-rng.c | 156 +++---------------
drivers/crypto/Kconfig | 12 --
drivers/crypto/Makefile | 1 -
drivers/gpu/drm/ci/arm64.config | 2 +-
9 files changed, 41 insertions(+), 148 deletions(-)
rename drivers/{crypto => char/hw_random}/qcom-rng.c (53%)base-commit: 79bbe453e5bfa6e1c6aa2e8329bfc8f152b81c9b
Signature · 1 line
2.54.0.1064.gd145956f57-goog
PATCH v2 1/4 crypto: qcom-rng - Enable clock in hwrng case
Fix qcom-rng.c to enable the clock before accessing the hardware.
--- drivers/crypto/qcom-rng.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/crypto/qcom-rng.c +16 -0
@@ -111,17 +111,31 @@ static int qcom_rng_seed(struct crypto_rng *tfm, const u8 *seed, unsigned int slen) {return 0 ; } +static int qcom_hwrng_init (struct hwrng *hwrng) +{ + struct qcom_rng *qrng = container_of(hwrng, struct qcom_rng, hwrng); + +return clk_prepare_enable (qrng->clk); +} +static int qcom_hwrng_read (struct hwrng *hwrng,void *data,size_t max,bool wait) { struct qcom_rng *qrng = container_of(hwrng, struct qcom_rng, hwrng);return qcom_rng_read (qrng, data, max); } +static void qcom_hwrng_cleanup (struct hwrng *hwrng) +{ + struct qcom_rng *qrng = container_of(hwrng, struct qcom_rng, hwrng); + +clk_disable_unprepare (qrng->clk); +} +static int qcom_rng_enable (struct qcom_rng *rng) {u32 val;int ret;
@@ -206,11 +220,13 @@ static int qcom_rng_probe(struct platform_device *pdev)return ret; }if (rng->match_data->hwrng_support) { rng->hwrng.name ="qcom_hwrng" ; + rng->hwrng.init = qcom_hwrng_init; rng->hwrng.read = qcom_hwrng_read; + rng->hwrng.cleanup = qcom_hwrng_cleanup; rng->hwrng.quality =QCOM_TRNG_QUALITY ; ret =devm_hwrng_register (&pdev->dev, &rng->hwrng);if (ret) {dev_err (&pdev->dev,"Register hwrng failed: %d\n" , ret); qcom_rng_dev =NULL ;
Signature · 1 line
2.54.0.1064.gd145956f57-goog
PATCH v2 2/4 crypto: qcom-rng - Allow zero as a random number
In reply to Eric BiggersZero is a valid random number and needs to be allowed. Otherwise the output is distinguishable from random.
--- drivers/crypto/qcom-rng.c | 2 -- 1 file changed, 2 deletions(-)
drivers/crypto/qcom-rng.c +0 -2
@@ -63,12 +63,10 @@ static int qcom_rng_read(struct qcom_rng *rng, u8 *data, unsigned int max) 200, 10000);if (ret)return ret; val =readl_relaxed (rng->base +PRNG_DATA_OUT ); -if (!val) -return -EINVAL ;if ((max - currsize) >=WORD_SZ ) {memcpy (data, &val,WORD_SZ ); data +=WORD_SZ ; currsize +=WORD_SZ ;
Signature · 1 line
2.54.0.1064.gd145956f57-goog
PATCH v2 3/4 crypto: qcom-rng - Remove crypto_rng interface
In reply to Eric Biggersqcom-rng.c exposes the same hardware through two completely separate interfaces, crypto_rng and hwrng. However, the implementation of this is buggy because it permits generation operations from these interfaces to run concurrently with each other, accessing the same registers. That is, qcom_rng_generate() synchronizes with itself but not with qcom_hwrng_read(). This results in potential repetition of output from the RNG, output of non-random values, etc.
Fortunately, there's actually no point in hardware RNG drivers implementing the crypto_rng interface. It's not actually used by anything besides the "rng" algorithm type of AF_ALG, which in turn is not actually used in practice. Other crypto_rng hardware drivers are likewise being phased out, leaving just the hwrng support.
Thus, remove it to simplify the code and avoid conflict (and confusion) with the hwrng interface which is the one that actually matters.
--- drivers/crypto/Kconfig | 1 - drivers/crypto/qcom-rng.c | 158 +++++--------------------------------- 2 files changed, 19 insertions(+), 140 deletions(-)
drivers/crypto/Kconfig +0 -1
@@ -658,11 +658,10 @@ config CRYPTO_DEV_QCE_SW_MAX_LEN config CRYPTO_DEV_QCOM_RNG tristate "Qualcomm Random Number Generator Driver" depends on ARCH_QCOM || COMPILE_TEST depends on HW_RANDOM - select CRYPTO_RNG help This driver provides support for the Random Number Generator hardware found on Qualcomm SoCs. To compile this driver as a module, choose M here. The
drivers/crypto/qcom-rng.c +19 -139
248 lines not on this page · raw message
Signature · 1 line
2.54.0.1064.gd145956f57-goog
Re: [PATCH v2 3/4] crypto: qcom-rng - Remove crypto_rng interface
Quoted 17 lines · Eric Biggers
qcom-rng.cexposes the same hardware through two completely separate interfaces,crypto_rngand hwrng. However, the implementation of this is buggy because it permits generation operations from these interfaces to run concurrently with each other, accessing the same registers. That is,qcom_rng_generate()synchronizes with itself but not withqcom_hwrng_read(). This results in potential repetition of output from the RNG, output of non-random values, etc.Fortunately, there's actually no point in hardware RNG drivers implementing the
crypto_rnginterface. It's not actually used by anything besides the "rng" algorithm type ofAF_ALG, which in turn is not actually used in practice. Othercrypto_rnghardware drivers are likewise being phased out, leaving just the hwrng support.Thus, remove it to simplify the code and avoid conflict (and confusion) with the hwrng interface which is the one that actually matters.
Quoted 8 lines
Fixes f29cd5bb64c2 ("crypto: qcom-rng - Add hw_random interface support")Signed-off-by Eric Biggers <[email protected]>--- drivers/crypto/Kconfig | 1 - drivers/crypto/qcom-rng.c | 158 +++++--------------------------------- 2 files changed, 19 insertions(+), 140 deletions(-)
Signature · 2 lines
With best wishes Dmitry
PATCH v2 4/4 hwrng: qcom - Move qcom-rng.c into drivers/char/hw_random/
In reply to Eric BiggersSince this file just implements a hwrng driver, move it into drivers/char/hw_random/. Rename the kconfig option accordingly as well.
---
arch/arm/configs/multi_v7_defconfig | 2 +-
arch/arm/configs/qcom_defconfig | 2 +-
arch/arm64/configs/defconfig | 2 +-
drivers/char/hw_random/Kconfig | 11 +++++++++++
drivers/char/hw_random/Makefile | 1 +
drivers/{crypto => char/hw_random}/qcom-rng.c | 0
drivers/crypto/Kconfig | 11 -----------
drivers/crypto/Makefile | 1 -
drivers/gpu/drm/ci/arm64.config | 2 +-
9 files changed, 16 insertions(+), 16 deletions(-)
rename drivers/{crypto => char/hw_random}/qcom-rng.c (100%)arch/arm/configs/multi_v7_defconfig +1 -1
@@ -404,10 +404,11 @@ CONFIG_SERIAL_DEV_BUS=y CONFIG_VIRTIO_CONSOLE=y CONFIG_ASPEED_KCS_IPMI_BMC=m CONFIG_ASPEED_BT_IPMI_BMC=m CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_ST=y +CONFIG_HW_RANDOM_QCOM=m CONFIG_TCG_TPM=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_I2C_CHARDEV=y CONFIG_I2C_ARB_GPIO_CHALLENGE=m CONFIG_I2C_MUX_GPIO=y
@@ -1334,11 +1335,10 @@ CONFIG_CRYPTO_DEV_S5P=m CONFIG_CRYPTO_DEV_ATMEL_AES=m CONFIG_CRYPTO_DEV_ATMEL_TDES=m CONFIG_CRYPTO_DEV_ATMEL_SHA=m CONFIG_CRYPTO_DEV_MARVELL_CESA=m CONFIG_CRYPTO_DEV_QCE=m -CONFIG_CRYPTO_DEV_QCOM_RNG=m CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_CRYPTO_DEV_STM32_HASH=m CONFIG_CRYPTO_DEV_STM32_CRYP=m CONFIG_CMA_SIZE_MBYTES=64 CONFIG_PRINTK_TIME=y
arch/arm/configs/qcom_defconfig +1 -1
@@ -115,10 +115,11 @@ CONFIG_SERIO_LIBPS2=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_QCOM=m CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_QUP=y CONFIG_SPI=y CONFIG_SPI_QUP=y
@@ -309,11 +310,10 @@ CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_USER_API=m CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_AEAD=m -CONFIG_CRYPTO_DEV_QCOM_RNG=m CONFIG_DMA_CMA=y CONFIG_CMA_SIZE_MBYTES=64 CONFIG_PRINTK_TIME=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
arch/arm64/configs/defconfig +1 -1
@@ -548,10 +548,11 @@ CONFIG_VIRTIO_CONSOLE=y CONFIG_IPMI_HANDLER=m CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_HW_RANDOM_QCOM=m CONFIG_TCG_TPM=y CONFIG_TCG_TIS=m CONFIG_TCG_TIS_SPI=m CONFIG_TCG_TIS_SPI_CR50=y CONFIG_TCG_TIS_I2C_CR50=m
@@ -1951,11 +1952,10 @@ CONFIG_CRYPTO_AES_ARM64_BS=m CONFIG_CRYPTO_AES_ARM64_CE_CCM=y CONFIG_CRYPTO_DEV_SUN8I_CE=m CONFIG_CRYPTO_DEV_FSL_CAAM=m CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m CONFIG_CRYPTO_DEV_QCE=m -CONFIG_CRYPTO_DEV_QCOM_RNG=m CONFIG_CRYPTO_DEV_TEGRA=m CONFIG_CRYPTO_DEV_XILINX_TRNG=m CONFIG_CRYPTO_DEV_ZYNQMP_AES=m CONFIG_CRYPTO_DEV_ZYNQMP_SHA3=m CONFIG_CRYPTO_DEV_CCREE=m
drivers/char/hw_random/Kconfig +11 -0
@@ -613,10 +613,21 @@ config HW_RANDOM_ROCKCHIP To compile this driver as a module, choose M here: the module will be called rockchip-rng. If unsure, say Y. +config HW_RANDOM_QCOM + tristate "Qualcomm True Random Number Generator Driver" + depends on ARCH_QCOM || COMPILE_TEST + depends on HW_RANDOM + help + This driver provides support for the True Random Number + Generator hardware found on some Qualcomm SoCs. + + To compile this driver as a module, choose M here. The + module will be called qcom-rng. If unsure, say N. + endif # HW_RANDOM config UML_RANDOM depends on UML select HW_RANDOM
drivers/char/hw_random/Makefile +1 -0
@@ -50,5 +50,6 @@ obj-$(CONFIG_HW_RANDOM_XIPHERA) += xiphera-trng.o obj-$(CONFIG_HW_RANDOM_ARM_SMCCC_TRNG) += arm_smccc_trng.o obj-$(CONFIG_HW_RANDOM_CN10K) += cn10k-rng.o obj-$(CONFIG_HW_RANDOM_POLARFIRE_SOC) += mpfs-rng.o obj-$(CONFIG_HW_RANDOM_ROCKCHIP) += rockchip-rng.o obj-$(CONFIG_HW_RANDOM_JH7110) += jh7110-trng.o +obj-$(CONFIG_HW_RANDOM_QCOM) += qcom-rng.o
drivers/char/hw_random/qcom-rng.c renamed from drivers/crypto/qcom-rng.c +0 -0
drivers/crypto/Kconfig +0 -11
@@ -654,21 +654,10 @@ config CRYPTO_DEV_QCE_SW_MAX_LEN Note that 192-bit keys are not supported by the hardware and are always processed by the software fallback, and all DES requests are done by the hardware. -config CRYPTO_DEV_QCOM_RNG - tristate "Qualcomm Random Number Generator Driver" - depends on ARCH_QCOM || COMPILE_TEST - depends on HW_RANDOM - help - This driver provides support for the Random Number - Generator hardware found on Qualcomm SoCs. - - To compile this driver as a module, choose M here. The - module will be called qcom-rng. If unsure, say N. - config CRYPTO_DEV_IMGTEC_HASH tristate "Imagination Technologies hardware hash accelerator" depends on MIPS || COMPILE_TEST select CRYPTO_MD5 select CRYPTO_SHA1
drivers/crypto/Makefile +0 -1
@@ -26,11 +26,10 @@ obj-$(CONFIG_CRYPTO_DEV_OMAP_DES) += omap-des.o obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += omap-sham.o obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o obj-$(CONFIG_CRYPTO_DEV_PPC4XX) += amcc/ obj-$(CONFIG_CRYPTO_DEV_QCE) += qce/ -obj-$(CONFIG_CRYPTO_DEV_QCOM_RNG) += qcom-rng.o obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP) += rockchip/ obj-$(CONFIG_CRYPTO_DEV_S5P) += s5p-sss.o obj-$(CONFIG_CRYPTO_DEV_SA2UL) += sa2ul.o obj-$(CONFIG_CRYPTO_DEV_SAHARA) += sahara.o obj-$(CONFIG_CRYPTO_DEV_SL3516) += gemini/
drivers/gpu/drm/ci/arm64.config +1 -1
@@ -76,11 +76,10 @@ CONFIG_INTERCONNECT_QCOM_SDM845=y CONFIG_INTERCONNECT_QCOM_MSM8916=y CONFIG_INTERCONNECT_QCOM_MSM8996=y CONFIG_INTERCONNECT_QCOM_OSM_L3=y CONFIG_INTERCONNECT_QCOM_SC7180=y CONFIG_INTERCONNECT_QCOM_SM8350=y -CONFIG_CRYPTO_DEV_QCOM_RNG=y CONFIG_SC_DISPCC_7180=y CONFIG_SC_GPUCC_7180=y CONFIG_SM_GPUCC_8350=y CONFIG_QCOM_SPMI_ADC5=y CONFIG_QCOM_SPMI_VADC=y
@@ -187,10 +186,11 @@ CONFIG_PWM_MEDIATEK=y CONFIG_DRM_MEDIATEK_HDMI=y CONFIG_GNSS=y CONFIG_GNSS_MTK_SERIAL=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_MTK=y +CONFIG_HW_RANDOM_QCOM=y CONFIG_MTK_DEVAPC=y CONFIG_PWM_MTK_DISP=y CONFIG_MTK_CMDQ=y CONFIG_REGULATOR_DA9211=y CONFIG_DRM_ANALOGIX_ANX7625=y
Signature · 1 line
2.54.0.1064.gd145956f57-goog
Herbert Xu
maintainerQuoted 31 lines · Eric Biggers
This series fixes several bugs in qcom-rng, including failure to enable the clock before accessing the hardware, generating biased random numbers, and generating duplicate or non-random numbers due to missing locking. To fix the latter bug, it drops the support for the duplicative
crypto_rnginterface, which isn't used in practice, leaving just hwrng which is the one that actually matters.This series is targeting cryptodev/master
Changed in v2:
- Changed patch 3 to make the driver continue to be bound even when hwrng is unsupported.
- Added blank line in patch 2
- Added Reviewed-byEric Biggers (4):
crypto: qcom-rng - Enable clock in hwrng case
crypto: qcom-rng - Allow zero as a random number
crypto: qcom-rng - Removecrypto_rnginterface
hwrng: qcom - Moveqcom-rng.cintodrivers/char/hw_random/arch/arm/configs/multi_v7_defconfig | 2 +- arch/arm/configs/qcom_defconfig | 2 +- arch/arm64/configs/defconfig | 2 +- drivers/char/hw_random/Kconfig | 11 ++ drivers/char/hw_random/Makefile | 1 + drivers/{crypto => char/hw_random}/qcom-rng.c | 156 +++--------------- drivers/crypto/Kconfig | 12 -- drivers/crypto/Makefile | 1 - drivers/gpu/drm/ci/arm64.config | 2 +- 9 files changed, 41 insertions(+), 148 deletions(-)
Quoted 4 lines
rename
drivers/{crypto=>char/hw_random}/qcom-rng.c(53%)base-commit:
79bbe453e5bfa6e1c6aa2e8329bfc8f152b81c9b
All applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt