Unverified Commit 9db52615 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3126 [OLK-6.6] Driver for Zhaoxin HW Random Number Generator

Merge Pull Request from: @leoliu-oc 
 
This driver provides kernel-side support for the Random Number Generator hardware found on Zhaoxin based motherboards.

### Issue
https://gitee.com/openeuler/kernel/issues/I8WXB4

### Default config Change
CONFIG_HW_RANDOM_ZHAOXIN=m

### Test
Pass: The module is installed and functions operate correctly 
 
Link:https://gitee.com/openeuler/kernel/pulls/3126

 

Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 836f43a8 70400b0b
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -3806,6 +3806,7 @@ CONFIG_HW_RANDOM_INTEL=m
CONFIG_HW_RANDOM_AMD=m
# CONFIG_HW_RANDOM_BA431 is not set
CONFIG_HW_RANDOM_VIA=m
CONFIG_HW_RANDOM_ZHAOXIN=m
CONFIG_HW_RANDOM_VIRTIO=y
# CONFIG_HW_RANDOM_XIPHERA is not set
# CONFIG_APPLICOM is not set
+13 −0
Original line number Diff line number Diff line
@@ -152,6 +152,19 @@ config HW_RANDOM_VIA

	  If unsure, say Y.

config HW_RANDOM_ZHAOXIN
	tristate "Zhaoxin HW Random Number Generator support"
	depends on X86
	default HW_RANDOM
	help
	  This driver provides kernel-side support for the Random Number
	  Generator hardware found on Zhaoxin based motherboards.

	  To compile this driver as a module, choose M here: the
	  module will be called zhaoxin-rng.

	  If unsure, say Y.

config HW_RANDOM_IXP4XX
	tristate "Intel IXP4xx NPU HW Pseudo-Random Number Generator support"
	depends on ARCH_IXP4XX || COMPILE_TEST
+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ obj-$(CONFIG_HW_RANDOM_GEODE) += geode-rng.o
obj-$(CONFIG_HW_RANDOM_N2RNG) += n2-rng.o
n2-rng-y := n2-drv.o n2-asm.o
obj-$(CONFIG_HW_RANDOM_VIA) += via-rng.o
obj-$(CONFIG_HW_RANDOM_ZHAOXIN) += zhaoxin-rng.o
obj-$(CONFIG_HW_RANDOM_EXYNOS) += exynos-trng.o
obj-$(CONFIG_HW_RANDOM_IXP4XX) += ixp4xx-rng.o
obj-$(CONFIG_HW_RANDOM_OMAP) += omap-rng.o
+10 −13
Original line number Diff line number Diff line
@@ -35,9 +35,6 @@
#include <asm/cpufeature.h>
#include <asm/fpu/api.h>




enum {
	VIA_STRFILT_CNT_SHIFT	= 16,
	VIA_STRFILT_FAIL	= (1 << 15),
@@ -135,7 +132,7 @@ static int via_rng_init(struct hwrng *rng)
	 * is always enabled if CPUID rng_en is set.  There is no
	 * RNG configuration like it used to be the case in this
	 * register */
	if (((c->x86 == 6) && (c->x86_model >= 0x0f))  || (c->x86 > 6)){
	if ((c->x86 == 6) && (c->x86_model >= 0x0f)) {
		if (!boot_cpu_has(X86_FEATURE_XSTORE_EN)) {
			pr_err(PFX "can't enable hardware RNG "
				"if XSTORE is not enabled\n");
@@ -191,19 +188,25 @@ static struct hwrng via_rng = {
	.data_read	= via_rng_data_read,
};

static const struct x86_cpu_id via_rng_cpu_ids[] = {
	X86_MATCH_VENDOR_FAM_FEATURE(CENTAUR, 6, X86_FEATURE_XSTORE, NULL),
	{}
};
MODULE_DEVICE_TABLE(x86cpu, via_rng_cpu_ids);

static int __init via_rng_mod_init(void)
{
	int err;

	if (!boot_cpu_has(X86_FEATURE_XSTORE))
	if (!x86_match_cpu(via_rng_cpu_ids)) {
		pr_err(PFX "The CPU isn't support XSTORE.\n");
		return -ENODEV;
	}

	pr_info("VIA RNG detected\n");
	err = hwrng_register(&via_rng);
	if (err) {
		pr_err(PFX "RNG registering failed (%d)\n",
		       err);
		pr_err(PFX "RNG registering failed (%d)\n", err);
		goto out;
	}
out:
@@ -217,11 +220,5 @@ static void __exit via_rng_mod_exit(void)
}
module_exit(via_rng_mod_exit);

static struct x86_cpu_id __maybe_unused via_rng_cpu_id[] = {
	X86_MATCH_FEATURE(X86_FEATURE_XSTORE, NULL),
	{}
};
MODULE_DEVICE_TABLE(x86cpu, via_rng_cpu_id);

MODULE_DESCRIPTION("H/W RNG driver for VIA CPU with PadLock");
MODULE_LICENSE("GPL");
+95 −0
Original line number Diff line number Diff line
// SPDX-License-Identifier: GPL-2.0
/*
 * RNG driver for Zhaoxin RNGs
 *
 * Copyright 2023 (c) Zhaoxin Semiconductor Co., Ltd
 */

#include <crypto/padlock.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/hw_random.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/cpufeature.h>
#include <asm/cpu_device_id.h>
#include <asm/fpu/api.h>

enum {
	ZHAOXIN_RNG_CHUNK_8		= 0x00, /* 64 rand bits, 64 stored bits */
	ZHAOXIN_RNG_CHUNK_4		= 0x01, /* 32 rand bits, 32 stored bits */
	ZHAOXIN_RNG_CHUNK_2		= 0x02, /* 16 rand bits, 32 stored bits */
	ZHAOXIN_RNG_CHUNK_1		= 0x03, /*  8 rand bits, 32 stored bits */
	ZHAOXIN_RNG_MAX_SIZE	= (128 * 1024),
};

static int zhaoxin_rng_init(struct hwrng *rng)
{
	if (!boot_cpu_has(X86_FEATURE_XSTORE_EN)) {
		pr_err(PFX "can't enable hardware RNG if XSTORE is not enabled\n");
		return -ENODEV;
	}

	return 0;
}

static inline int rep_xstore(size_t size, size_t factor, void *result)
{
	asm(".byte 0xf3, 0x0f, 0xa7, 0xc0"
		: "=m"(*(size_t *)result), "+c"(size), "+d"(factor), "+D"(result));

	return 0;
}

static int zhaoxin_rng_read(struct hwrng *rng, void *data, size_t max, bool wait)
{
	if (max > ZHAOXIN_RNG_MAX_SIZE)
		max = ZHAOXIN_RNG_MAX_SIZE;

	rep_xstore(max, ZHAOXIN_RNG_CHUNK_1, data);

	return max;
}

static struct hwrng zhaoxin_rng = {
	.name = "zhaoxin",
	.init = zhaoxin_rng_init,
	.read = zhaoxin_rng_read,
};

static const struct x86_cpu_id zhaoxin_rng_cpu_ids[] = {
	X86_MATCH_VENDOR_FAM_FEATURE(ZHAOXIN, 6, X86_FEATURE_XSTORE, NULL),
	X86_MATCH_VENDOR_FAM_FEATURE(ZHAOXIN, 7, X86_FEATURE_XSTORE, NULL),
	X86_MATCH_VENDOR_FAM_FEATURE(CENTAUR, 7, X86_FEATURE_XSTORE, NULL),
	{}
};
MODULE_DEVICE_TABLE(x86cpu, zhaoxin_rng_cpu_ids);

static int __init zhaoxin_rng_mod_init(void)
{
	int err;

	if (!x86_match_cpu(zhaoxin_rng_cpu_ids)) {
		pr_err(PFX "The CPU isn't support XSTORE.\n");
		return -ENODEV;
	}

	pr_info("Zhaoxin RNG detected\n");

	err = hwrng_register(&zhaoxin_rng);
	if (err)
		pr_err(PFX "RNG registering failed (%d)\n", err);

	return err;
}
module_init(zhaoxin_rng_mod_init);

static void __exit zhaoxin_rng_mod_exit(void)
{
	hwrng_unregister(&zhaoxin_rng);
}
module_exit(zhaoxin_rng_mod_exit);

MODULE_DESCRIPTION("H/W RNG driver for Zhaoxin CPUs");
MODULE_AUTHOR("YunShen@zhaoxin.com");
MODULE_LICENSE("GPL");