From nobody Mon Jun 8 08:35:26 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2BF4D33A708; Sat, 30 May 2026 20:27:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780172852; cv=none; b=J9kSR9wW8f4a6DS5coT+XQoUMt/98vvzXk4th8goi+B+XFSvsvS86RAbxTWOJgS0FGOWMqCwwLKXAT0eBGG7Sv2J5//W9MZU6MKP7z6DF4M9K57CjcEOwRspDLl8HBwaz4z7ctCWeW8GVOMzB449bFEXYhAO6cGwDwnkxHkuKrw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780172852; c=relaxed/simple; bh=f2RaUagLKe+xfVkAqvt/wbomkEfiICjs/tU90dWsQR4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rS+3a6HrnHnW4H/UYcMkuoVyS7X2+nM+J2QTkTmntoGEHI3fIaoofFBoxogKgOxZz/qw3zboipwvB9An2MrseGp4hW3EQXHuqzSwZr4icajhRmGuYhF99LJTIG9luvRFVQfCWfddHp59PQ9/w8h+J0CySbVAvYfI7XrA6C+GDYM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JFdq+pMA; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JFdq+pMA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 242E21F00898; Sat, 30 May 2026 20:27:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780172850; bh=j6A9bVEZrw+Q4RLTCvGOyZc7SVKnqJM/5EtOOowi4ew=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JFdq+pMAuv4lovOukZ/xGmxL3qItmIDiKUgwFtNaWK12+oBul5Xf4RyLYMJKRcqC8 itHhkE1ckx3kGhyzzXbJiOL79eYeXzi7Ban58IJgPmxsGwjmizth4i1i0BuDN9sBqc Axmp9oVwPioWRPL1nucCQUEXHmxMJFYOacOV200rM4Z4GhCrHVAaBwsCmUGPtsCMux HQKrUIU22J7ec8M33+EzV6bnPC0KKptY96OgV7o4yOAJQ9Yj1yrWtwGOpxEBCAMrDj qw6/vHawdUJDfV3wYnOEWUu1Q3jArd9hvljFVCQuw7d+73U5iWxkKKP4HF8bA05zWA xn5RD9wYRgKsw== From: Eric Biggers To: linux-crypto@vger.kernel.org, Herbert Xu Cc: Olivia Mackall , Weili Qian , Wei Xu , Longfang Liu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Eric Biggers , stable@vger.kernel.org Subject: [PATCH 1/2] crypto: hisi-trng - Remove crypto_rng interface Date: Sat, 30 May 2026 13:26:23 -0700 Message-ID: <20260530202624.20768-2-ebiggers@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260530202624.20768-1-ebiggers@kernel.org> References: <20260530202624.20768-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" drivers/crypto/hisilicon/trng/trng.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, hisi_trng_generate() synchronizes with itself but not with hisi_trng_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. Fixes: e4d9d10ef4be ("crypto: hisilicon/trng - add support for PRNG") Cc: stable@vger.kernel.org Signed-off-by: Eric Biggers Acked-by: Longfang Liu --- drivers/crypto/hisilicon/Kconfig | 1 - drivers/crypto/hisilicon/trng/trng.c | 296 +-------------------------- 2 files changed, 2 insertions(+), 295 deletions(-) diff --git a/drivers/crypto/hisilicon/Kconfig b/drivers/crypto/hisilicon/Kc= onfig index 1e6d772f4bb6..8aa23c939775 100644 --- a/drivers/crypto/hisilicon/Kconfig +++ b/drivers/crypto/hisilicon/Kconfig @@ -78,8 +78,7 @@ config CRYPTO_DEV_HISI_HPRE =20 config CRYPTO_DEV_HISI_TRNG tristate "Support for HISI TRNG Driver" depends on ARM64 && ACPI select HW_RANDOM - select CRYPTO_RNG help Support for HiSilicon TRNG Driver. diff --git a/drivers/crypto/hisilicon/trng/trng.c b/drivers/crypto/hisilico= n/trng/trng.c index 5ca0b90859a8..6584ed051e09 100644 --- a/drivers/crypto/hisilicon/trng/trng.c +++ b/drivers/crypto/hisilicon/trng/trng.c @@ -1,236 +1,29 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2019 HiSilicon Limited. */ =20 -#include #include -#include #include #include #include #include #include -#include #include -#include #include #include =20 #define HISI_TRNG_REG 0x00F0 #define HISI_TRNG_BYTES 4 #define HISI_TRNG_QUALITY 512 -#define HISI_TRNG_VERSION 0x01B8 -#define HISI_TRNG_VER_V1 GENMASK(31, 0) #define SLEEP_US 10 #define TIMEOUT_US 10000 -#define SW_DRBG_NUM_SHIFT 2 -#define SW_DRBG_KEY_BASE 0x082C -#define SW_DRBG_SEED(n) (SW_DRBG_KEY_BASE - ((n) << SW_DRBG_NUM_SH= IFT)) -#define SW_DRBG_SEED_REGS_NUM 12 -#define SW_DRBG_SEED_SIZE 48 -#define SW_DRBG_BLOCKS 0x0830 -#define SW_DRBG_INIT 0x0834 -#define SW_DRBG_GEN 0x083c -#define SW_DRBG_STATUS 0x0840 -#define SW_DRBG_BLOCKS_NUM 4095 -#define SW_DRBG_DATA_BASE 0x0850 -#define SW_DRBG_DATA_NUM 4 -#define SW_DRBG_DATA(n) (SW_DRBG_DATA_BASE - ((n) << SW_DRBG_NUM_SHIFT)) -#define SW_DRBG_BYTES 16 -#define SW_DRBG_ENABLE_SHIFT 12 -#define SEED_SHIFT_24 24 -#define SEED_SHIFT_16 16 -#define SEED_SHIFT_8 8 -#define SW_MAX_RANDOM_BYTES 65520 - -struct hisi_trng_list { - struct mutex lock; - struct list_head list; - bool is_init; -}; =20 struct hisi_trng { void __iomem *base; - struct hisi_trng_list *trng_list; - struct list_head list; struct hwrng rng; - u32 ver; - u32 ctx_num; - /* The bytes of the random number generated since the last seeding. */ - u32 random_bytes; - struct mutex lock; -}; - -struct hisi_trng_ctx { - struct hisi_trng *trng; }; =20 -static atomic_t trng_active_devs; -static struct hisi_trng_list trng_devices; -static int hisi_trng_read(struct hwrng *rng, void *buf, size_t max, bool w= ait); - -static int hisi_trng_set_seed(struct hisi_trng *trng, const u8 *seed) -{ - u32 val, seed_reg, i; - int ret; - - writel(0x0, trng->base + SW_DRBG_BLOCKS); - - for (i =3D 0; i < SW_DRBG_SEED_SIZE; - i +=3D SW_DRBG_SEED_SIZE / SW_DRBG_SEED_REGS_NUM) { - val =3D seed[i] << SEED_SHIFT_24; - val |=3D seed[i + 1UL] << SEED_SHIFT_16; - val |=3D seed[i + 2UL] << SEED_SHIFT_8; - val |=3D seed[i + 3UL]; - - seed_reg =3D (i >> SW_DRBG_NUM_SHIFT) % SW_DRBG_SEED_REGS_NUM; - writel(val, trng->base + SW_DRBG_SEED(seed_reg)); - } - - writel(SW_DRBG_BLOCKS_NUM | (0x1 << SW_DRBG_ENABLE_SHIFT), - trng->base + SW_DRBG_BLOCKS); - writel(0x1, trng->base + SW_DRBG_INIT); - ret =3D readl_relaxed_poll_timeout(trng->base + SW_DRBG_STATUS, - val, val & BIT(0), SLEEP_US, TIMEOUT_US); - if (ret) { - pr_err("failed to init trng(%d)\n", ret); - return -EIO; - } - - trng->random_bytes =3D 0; - - return 0; -} - -static int hisi_trng_seed(struct crypto_rng *tfm, const u8 *seed, - unsigned int slen) -{ - struct hisi_trng_ctx *ctx =3D crypto_rng_ctx(tfm); - struct hisi_trng *trng =3D ctx->trng; - int ret; - - if (slen < SW_DRBG_SEED_SIZE) { - pr_err("slen(%u) is not matched with trng(%d)\n", slen, - SW_DRBG_SEED_SIZE); - return -EINVAL; - } - - mutex_lock(&trng->lock); - ret =3D hisi_trng_set_seed(trng, seed); - mutex_unlock(&trng->lock); - - return ret; -} - -static int hisi_trng_reseed(struct hisi_trng *trng) -{ - u8 seed[SW_DRBG_SEED_SIZE]; - int size; - - if (!trng->random_bytes) - return 0; - - size =3D hisi_trng_read(&trng->rng, seed, SW_DRBG_SEED_SIZE, false); - if (size !=3D SW_DRBG_SEED_SIZE) - return -EIO; - - return hisi_trng_set_seed(trng, seed); -} - -static int hisi_trng_get_bytes(struct hisi_trng *trng, u8 *dstn, unsigned = int dlen) -{ - u32 data[SW_DRBG_DATA_NUM]; - u32 currsize =3D 0; - u32 val =3D 0; - int ret; - u32 i; - - ret =3D hisi_trng_reseed(trng); - if (ret) - return ret; - - do { - ret =3D readl_relaxed_poll_timeout(trng->base + SW_DRBG_STATUS, - val, val & BIT(1), SLEEP_US, TIMEOUT_US); - if (ret) { - pr_err("failed to generate random number(%d)!\n", ret); - break; - } - - for (i =3D 0; i < SW_DRBG_DATA_NUM; i++) - data[i] =3D readl(trng->base + SW_DRBG_DATA(i)); - - if (dlen - currsize >=3D SW_DRBG_BYTES) { - memcpy(dstn + currsize, data, SW_DRBG_BYTES); - currsize +=3D SW_DRBG_BYTES; - } else { - memcpy(dstn + currsize, data, dlen - currsize); - currsize =3D dlen; - } - - trng->random_bytes +=3D SW_DRBG_BYTES; - writel(0x1, trng->base + SW_DRBG_GEN); - } while (currsize < dlen); - - return ret; -} - -static int hisi_trng_generate(struct crypto_rng *tfm, const u8 *src, - unsigned int slen, u8 *dstn, unsigned int dlen) -{ - struct hisi_trng_ctx *ctx =3D crypto_rng_ctx(tfm); - struct hisi_trng *trng =3D ctx->trng; - unsigned int currsize =3D 0; - unsigned int block_size; - int ret; - - if (!dstn || !dlen) { - pr_err("output is error, dlen %u!\n", dlen); - return -EINVAL; - } - - do { - block_size =3D min_t(unsigned int, dlen - currsize, SW_MAX_RANDOM_BYTES); - mutex_lock(&trng->lock); - ret =3D hisi_trng_get_bytes(trng, dstn + currsize, block_size); - mutex_unlock(&trng->lock); - if (ret) - return ret; - currsize +=3D block_size; - } while (currsize < dlen); - - return 0; -} - -static int hisi_trng_init(struct crypto_tfm *tfm) -{ - struct hisi_trng_ctx *ctx =3D crypto_tfm_ctx(tfm); - struct hisi_trng *trng; - u32 ctx_num =3D ~0; - - mutex_lock(&trng_devices.lock); - list_for_each_entry(trng, &trng_devices.list, list) { - if (trng->ctx_num < ctx_num) { - ctx_num =3D trng->ctx_num; - ctx->trng =3D trng; - } - } - ctx->trng->ctx_num++; - mutex_unlock(&trng_devices.lock); - - return 0; -} - -static void hisi_trng_exit(struct crypto_tfm *tfm) -{ - struct hisi_trng_ctx *ctx =3D crypto_tfm_ctx(tfm); - - mutex_lock(&trng_devices.lock); - ctx->trng->ctx_num--; - mutex_unlock(&trng_devices.lock); -} - static int hisi_trng_read(struct hwrng *rng, void *buf, size_t max, bool w= ait) { struct hisi_trng *trng; int currsize =3D 0; u32 val =3D 0; @@ -258,126 +51,41 @@ static int hisi_trng_read(struct hwrng *rng, void *bu= f, size_t max, bool wait) } while (currsize < max); =20 return currsize; } =20 -static struct rng_alg hisi_trng_alg =3D { - .generate =3D hisi_trng_generate, - .seed =3D hisi_trng_seed, - .seedsize =3D SW_DRBG_SEED_SIZE, - .base =3D { - .cra_name =3D "stdrng", - .cra_driver_name =3D "hisi_stdrng", - .cra_priority =3D 300, - .cra_ctxsize =3D sizeof(struct hisi_trng_ctx), - .cra_module =3D THIS_MODULE, - .cra_init =3D hisi_trng_init, - .cra_exit =3D hisi_trng_exit, - }, -}; - -static void hisi_trng_add_to_list(struct hisi_trng *trng) -{ - mutex_lock(&trng_devices.lock); - list_add_tail(&trng->list, &trng_devices.list); - mutex_unlock(&trng_devices.lock); -} - -static int hisi_trng_del_from_list(struct hisi_trng *trng) -{ - int ret =3D -EBUSY; - - mutex_lock(&trng_devices.lock); - if (!trng->ctx_num) { - list_del(&trng->list); - ret =3D 0; - } - mutex_unlock(&trng_devices.lock); - - return ret; -} - static int hisi_trng_probe(struct platform_device *pdev) { struct hisi_trng *trng; int ret; =20 trng =3D devm_kzalloc(&pdev->dev, sizeof(*trng), GFP_KERNEL); if (!trng) return -ENOMEM; =20 - platform_set_drvdata(pdev, trng); - trng->base =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(trng->base)) return PTR_ERR(trng->base); =20 - trng->ctx_num =3D 0; - trng->random_bytes =3D SW_MAX_RANDOM_BYTES; - mutex_init(&trng->lock); - trng->ver =3D readl(trng->base + HISI_TRNG_VERSION); - if (!trng_devices.is_init) { - INIT_LIST_HEAD(&trng_devices.list); - mutex_init(&trng_devices.lock); - trng_devices.is_init =3D true; - } - - hisi_trng_add_to_list(trng); - if (trng->ver !=3D HISI_TRNG_VER_V1 && - atomic_inc_return(&trng_active_devs) =3D=3D 1) { - ret =3D crypto_register_rng(&hisi_trng_alg); - if (ret) { - dev_err(&pdev->dev, - "failed to register crypto(%d)\n", ret); - atomic_dec_return(&trng_active_devs); - goto err_remove_from_list; - } - } - trng->rng.name =3D pdev->name; trng->rng.read =3D hisi_trng_read; trng->rng.quality =3D HISI_TRNG_QUALITY; + ret =3D devm_hwrng_register(&pdev->dev, &trng->rng); - if (ret) { + if (ret) dev_err(&pdev->dev, "failed to register hwrng: %d!\n", ret); - goto err_crypto_unregister; - } - - return ret; - -err_crypto_unregister: - if (trng->ver !=3D HISI_TRNG_VER_V1 && - atomic_dec_return(&trng_active_devs) =3D=3D 0) - crypto_unregister_rng(&hisi_trng_alg); - -err_remove_from_list: - hisi_trng_del_from_list(trng); return ret; } =20 -static void hisi_trng_remove(struct platform_device *pdev) -{ - struct hisi_trng *trng =3D platform_get_drvdata(pdev); - - /* Wait until the task is finished */ - while (hisi_trng_del_from_list(trng)) - ; - - if (trng->ver !=3D HISI_TRNG_VER_V1 && - atomic_dec_return(&trng_active_devs) =3D=3D 0) - crypto_unregister_rng(&hisi_trng_alg); -} - static const struct acpi_device_id hisi_trng_acpi_match[] =3D { { "HISI02B3", 0 }, { } }; MODULE_DEVICE_TABLE(acpi, hisi_trng_acpi_match); =20 static struct platform_driver hisi_trng_driver =3D { .probe =3D hisi_trng_probe, - .remove =3D hisi_trng_remove, .driver =3D { .name =3D "hisi-trng-v2", .acpi_match_table =3D ACPI_PTR(hisi_trng_acpi_match), }, }; --=20 2.54.0 From nobody Mon Jun 8 08:35:26 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78F4C33D6F7; Sat, 30 May 2026 20:27:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780172852; cv=none; b=Ydbhp5EKBnREByafAdi6CMtiCIiOxS9h3uo2R1Z0Nl6hY0fMO4cg1qUR31PDgDXFXlYAf7Z9b4GX/dGimLeWNTtpjgboTCPUvyyEDWLho/aZNN+M2NKSDYOosWB8MaiUhC79OrPpt/z9WUwY2E2IkJgu8gZarJLoZDYKHX+xDuk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780172852; c=relaxed/simple; bh=HOG8MRh1JSE3+YRjO2/kotlcNEhISK9YOayzZsv3e3k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TbXsWBD3noT10xIaADAfiowVGasqLYT41kUnix/EgGXAu3lbpyZ2P2c/2Gw58Tjrnj4Z4PIRuNm98/bkmhB7hAQZwFVM8M1WjqZLkCklBgqam5kiDrDou/pC62vNspzqG0oUv9dRaVUrour8M+Hujg30KK2R5TO9/qOALELQggI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jzZ/UslA; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jzZ/UslA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFC651F0089A; Sat, 30 May 2026 20:27:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780172851; bh=p6oN29nL23YBC9zeu+cS0xAdL1Tlq04Bva1hFovgT3k=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jzZ/UslAyfvjiwoMEHjMzBp7bf/x36lJJAT3m1Zf72griBVrViTTTUvepnPrHB61C VfnEMNs2tsq/+Bo5g+FPgJeznk+l088xtfcptDrC+nZq0EO8cQ0SsK6CNOOftWwtst KVzlTuW0VfRTnnHeM6ldHq5tZDK0/mk5g4qEsDdOeHdpZadaXwXVVCWO1/qVsVQiQ9 j2bN8I9FVaANvaNdTm1fh0FFXV/D5an24P5eg8bqXHrGiKm/7cmmMqchkymSBefYDj +8eKqoJoyWaNLXMCL9FlosCaxPCoM2IZG+b5nt+uK2zGZEMsuODWO5rNx+z8qgMn6s 1c/bjrJbHGBLQ== From: Eric Biggers To: linux-crypto@vger.kernel.org, Herbert Xu Cc: Olivia Mackall , Weili Qian , Wei Xu , Longfang Liu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Eric Biggers Subject: [PATCH 2/2] hwrng: hisi-trng - Move hisi-trng into drivers/char/hw_random/ Date: Sat, 30 May 2026 13:26:24 -0700 Message-ID: <20260530202624.20768-3-ebiggers@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260530202624.20768-1-ebiggers@kernel.org> References: <20260530202624.20768-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since this file just implements a hwrng driver, move it into drivers/char/hw_random/. Rename the kconfig option accordingly as well. Note that this moves the file back to its original location. Signed-off-by: Eric Biggers Acked-by: Longfang Liu --- MAINTAINERS | 2 +- arch/arm64/configs/defconfig | 2 +- drivers/char/hw_random/Kconfig | 10 ++++++++++ drivers/char/hw_random/Makefile | 1 + .../trng/trng.c =3D> char/hw_random/hisi-trng-v2.c} | 0 drivers/crypto/hisilicon/Kconfig | 7 ------- drivers/crypto/hisilicon/Makefile | 1 - drivers/crypto/hisilicon/trng/Makefile | 2 -- 8 files changed, 13 insertions(+), 12 deletions(-) rename drivers/{crypto/hisilicon/trng/trng.c =3D> char/hw_random/hisi-trng= -v2.c} (100%) delete mode 100644 drivers/crypto/hisilicon/trng/Makefile diff --git a/MAINTAINERS b/MAINTAINERS index 882214b0e7db..dcbbc56368be 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11703,11 +11703,11 @@ F: Documentation/devicetree/bindings/mfd/hisilico= n,hi6421-spmi-pmic.yaml F: drivers/mfd/hi6421-spmi-pmic.c =20 HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT M: Weili Qian S: Maintained -F: drivers/crypto/hisilicon/trng/trng.c +F: drivers/char/hw_random/hisi-trng-v2.c =20 HISILICON V3XX SPI NOR FLASH Controller Driver M: Yang Shen S: Maintained W: http://www.hisilicon.com diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index bb930cce7233..9aa62b675023 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -548,10 +548,11 @@ CONFIG_VIRTIO_CONSOLE=3Dy CONFIG_IPMI_HANDLER=3Dm CONFIG_IPMI_DEVICE_INTERFACE=3Dm CONFIG_IPMI_SI=3Dm CONFIG_HW_RANDOM=3Dy CONFIG_HW_RANDOM_VIRTIO=3Dy +CONFIG_HW_RANDOM_HISI_TRNG=3Dm CONFIG_HW_RANDOM_QCOM=3Dm CONFIG_TCG_TPM=3Dy CONFIG_TCG_TIS=3Dm CONFIG_TCG_TIS_SPI=3Dm CONFIG_TCG_TIS_SPI_CR50=3Dy @@ -1960,11 +1961,10 @@ CONFIG_CRYPTO_DEV_ZYNQMP_AES=3Dm CONFIG_CRYPTO_DEV_ZYNQMP_SHA3=3Dm CONFIG_CRYPTO_DEV_CCREE=3Dm CONFIG_CRYPTO_DEV_HISI_SEC2=3Dm CONFIG_CRYPTO_DEV_HISI_ZIP=3Dm CONFIG_CRYPTO_DEV_HISI_HPRE=3Dm -CONFIG_CRYPTO_DEV_HISI_TRNG=3Dm CONFIG_CRYPTO_DEV_SA2UL=3Dm CONFIG_DMA_RESTRICTED_POOL=3Dy CONFIG_CMA_SIZE_MBYTES=3D32 CONFIG_PRINTK_TIME=3Dy CONFIG_DEBUG_KERNEL=3Dy diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index 7102e03dcf0a..6d8012d55ac0 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -371,10 +371,20 @@ config HW_RANDOM_HISTB Generator hardware found on Hisilicon Hi37xx SoC. =20 To compile this driver as a module, choose M here: the module will be called histb-rng. =20 +config HW_RANDOM_HISI_TRNG + tristate "HiSilicon True Random Number Generator support" + depends on ARM64 && ACPI + help + This driver provides kernel-side support for the True Random Number + Generator hardware found on some HiSilicon SoCs. + + To compile this driver as a module, choose M here: the module will be + called hisi-trng-v2. + config HW_RANDOM_ST tristate "ST Microelectronics HW Random Number Generator support" depends on ARCH_STI || COMPILE_TEST help This driver provides kernel-side support for the Random Number diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makef= ile index 605ba8df5a8f..f2888524b6ef 100644 --- a/drivers/char/hw_random/Makefile +++ b/drivers/char/hw_random/Makefile @@ -29,10 +29,11 @@ obj-$(CONFIG_HW_RANDOM_OCTEON) +=3D octeon-rng.o obj-$(CONFIG_HW_RANDOM_NOMADIK) +=3D nomadik-rng.o obj-$(CONFIG_HW_RANDOM_PSERIES) +=3D pseries-rng.o obj-$(CONFIG_HW_RANDOM_POWERNV) +=3D powernv-rng.o obj-$(CONFIG_HW_RANDOM_HISI) +=3D hisi-rng.o obj-$(CONFIG_HW_RANDOM_HISTB) +=3D histb-rng.o +obj-$(CONFIG_HW_RANDOM_HISI_TRNG) +=3D hisi-trng-v2.o obj-$(CONFIG_HW_RANDOM_BCM2835) +=3D bcm2835-rng.o obj-$(CONFIG_HW_RANDOM_BCM74110) +=3D bcm74110-rng.o obj-$(CONFIG_HW_RANDOM_IPROC_RNG200) +=3D iproc-rng200.o obj-$(CONFIG_HW_RANDOM_ST) +=3D st-rng.o obj-$(CONFIG_HW_RANDOM_XGENE) +=3D xgene-rng.o diff --git a/drivers/crypto/hisilicon/trng/trng.c b/drivers/char/hw_random/= hisi-trng-v2.c similarity index 100% rename from drivers/crypto/hisilicon/trng/trng.c rename to drivers/char/hw_random/hisi-trng-v2.c diff --git a/drivers/crypto/hisilicon/Kconfig b/drivers/crypto/hisilicon/Kc= onfig index 8aa23c939775..aeff08ccbadd 100644 --- a/drivers/crypto/hisilicon/Kconfig +++ b/drivers/crypto/hisilicon/Kconfig @@ -73,12 +73,5 @@ config CRYPTO_DEV_HISI_HPRE select CRYPTO_RSA select CRYPTO_ECDH help Support for HiSilicon HPRE(High Performance RSA Engine) accelerator, which can accelerate RSA and DH algorithms. - -config CRYPTO_DEV_HISI_TRNG - tristate "Support for HISI TRNG Driver" - depends on ARM64 && ACPI - select HW_RANDOM - help - Support for HiSilicon TRNG Driver. diff --git a/drivers/crypto/hisilicon/Makefile b/drivers/crypto/hisilicon/M= akefile index 8595a5a5d228..e1068ee9f973 100644 --- a/drivers/crypto/hisilicon/Makefile +++ b/drivers/crypto/hisilicon/Makefile @@ -3,6 +3,5 @@ obj-$(CONFIG_CRYPTO_DEV_HISI_HPRE) +=3D hpre/ obj-$(CONFIG_CRYPTO_DEV_HISI_SEC) +=3D sec/ obj-$(CONFIG_CRYPTO_DEV_HISI_SEC2) +=3D sec2/ obj-$(CONFIG_CRYPTO_DEV_HISI_QM) +=3D hisi_qm.o hisi_qm-objs =3D qm.o sgl.o debugfs.o obj-$(CONFIG_CRYPTO_DEV_HISI_ZIP) +=3D zip/ -obj-$(CONFIG_CRYPTO_DEV_HISI_TRNG) +=3D trng/ diff --git a/drivers/crypto/hisilicon/trng/Makefile b/drivers/crypto/hisili= con/trng/Makefile deleted file mode 100644 index d909079f351c..000000000000 --- a/drivers/crypto/hisilicon/trng/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_CRYPTO_DEV_HISI_TRNG) +=3D hisi-trng-v2.o -hisi-trng-v2-objs =3D trng.o --=20 2.54.0