Merge tag 'efi-2020-04-rc4-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-04-rc4 (3)
This pull request provides the hardware RNG driver for Amlogic systems needed
for the EFI_RNG_PROTOCOL.
Furthermore bug fixes are provided:
* correct an error message in the efidebug command
* correct an error in the 'efidebug rm' command
* remove an unnecessary assignment in efi_queue_event()
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index 21dfd44..8c3681c 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -649,7 +649,7 @@
int id, i;
char *endp;
char var_name[9];
- u16 var_name16[9];
+ u16 var_name16[9], *p;
efi_status_t ret;
if (argc == 1)
@@ -662,11 +662,12 @@
return CMD_RET_FAILURE;
sprintf(var_name, "Boot%04X", id);
- utf8_utf16_strncpy((u16 **)&var_name16, var_name, 9);
+ p = var_name16;
+ utf8_utf16_strncpy(&p, var_name, 9);
ret = EFI_CALL(RT->set_variable(var_name16, &guid, 0, 0, NULL));
if (ret) {
- printf("Cannot remove Boot%04X", id);
+ printf("Cannot remove %ls\n", var_name16);
return CMD_RET_FAILURE;
}
}
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index d1c94b6..71a4d7f 100644
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -169,7 +169,6 @@
CONFIG_DM_RESET=y
CONFIG_SANDBOX_RESET=y
CONFIG_DM_RNG=y
-CONFIG_RNG_SANDBOX=y
CONFIG_DM_RTC=y
CONFIG_RTC_RV8803=y
CONFIG_SANDBOX_SERIAL=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 45b5475..f96891e 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -189,7 +189,6 @@
CONFIG_DM_RESET=y
CONFIG_SANDBOX_RESET=y
CONFIG_DM_RNG=y
-CONFIG_RNG_SANDBOX=y
CONFIG_DM_RTC=y
CONFIG_RTC_RV8803=y
CONFIG_DEBUG_UART_SANDBOX=y
diff --git a/drivers/rng/Kconfig b/drivers/rng/Kconfig
index 893b89d..edb6152 100644
--- a/drivers/rng/Kconfig
+++ b/drivers/rng/Kconfig
@@ -6,16 +6,29 @@
This interface is used to initialise the rng device and to
read the random seed from the device.
+if DM_RNG
+
+config RNG_MESON
+ bool "Amlogic Meson Random Number Generator support"
+ depends on ARCH_MESON
+ default y
+ help
+ Enable support for hardware random number generator
+ of Amlogic Meson SoCs.
+
config RNG_SANDBOX
bool "Sandbox random number generator"
- depends on SANDBOX && DM_RNG
+ depends on SANDBOX
+ default y
help
Enable random number generator for sandbox. This is an
emulation of a rng device.
config RNG_STM32MP1
bool "Enable random number generator for STM32MP1"
- depends on ARCH_STM32MP && DM_RNG
+ depends on ARCH_STM32MP
default n
help
Enable STM32MP1 rng driver.
+
+endif
diff --git a/drivers/rng/Makefile b/drivers/rng/Makefile
index 3517005..6a8a667 100644
--- a/drivers/rng/Makefile
+++ b/drivers/rng/Makefile
@@ -4,5 +4,6 @@
#
obj-$(CONFIG_DM_RNG) += rng-uclass.o
+obj-$(CONFIG_RNG_MESON) += meson-rng.o
obj-$(CONFIG_RNG_SANDBOX) += sandbox_rng.o
obj-$(CONFIG_RNG_STM32MP1) += stm32mp1_rng.o
diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c
new file mode 100644
index 0000000..4b81a62
--- /dev/null
+++ b/drivers/rng/meson-rng.c
@@ -0,0 +1,120 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright 2020, Heinrich Schuchardt <xypron.glpk@gmx.de>
+ *
+ * Driver for Amlogic hardware random number generator
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <dm.h>
+#include <rng.h>
+#include <asm/io.h>
+
+struct meson_rng_platdata {
+ fdt_addr_t base;
+ struct clk clk;
+};
+
+/**
+ * meson_rng_read() - fill buffer with random bytes
+ *
+ * @buffer: buffer to receive data
+ * @size: size of buffer
+ *
+ * Return: 0
+ */
+static int meson_rng_read(struct udevice *dev, void *data, size_t len)
+{
+ struct meson_rng_platdata *pdata = dev_get_platdata(dev);
+ char *buffer = (char *)data;
+
+ while (len) {
+ u32 rand = readl(pdata->base);
+ size_t step;
+
+ if (len >= 4)
+ step = 4;
+ else
+ step = len;
+ memcpy(buffer, &rand, step);
+ buffer += step;
+ len -= step;
+ }
+ return 0;
+}
+
+/**
+ * meson_rng_probe() - probe rng device
+ *
+ * @dev: device
+ * Return: 0 if ok
+ */
+static int meson_rng_probe(struct udevice *dev)
+{
+ struct meson_rng_platdata *pdata = dev_get_platdata(dev);
+ int err;
+
+ err = clk_enable(&pdata->clk);
+ if (err)
+ return err;
+
+ return 0;
+}
+
+/**
+ * meson_rng_remove() - deinitialize rng device
+ *
+ * @dev: device
+ * Return: 0 if ok
+ */
+static int meson_rng_remove(struct udevice *dev)
+{
+ struct meson_rng_platdata *pdata = dev_get_platdata(dev);
+
+ return clk_disable(&pdata->clk);
+}
+
+/**
+ * meson_rng_ofdata_to_platdata() - transfer device tree data to plaform data
+ *
+ * @dev: device
+ * Return: 0 if ok
+ */
+static int meson_rng_ofdata_to_platdata(struct udevice *dev)
+{
+ struct meson_rng_platdata *pdata = dev_get_platdata(dev);
+ int err;
+
+ pdata->base = dev_read_addr(dev);
+ if (!pdata->base)
+ return -ENODEV;
+
+ err = clk_get_by_name(dev, "core", &pdata->clk);
+ if (err)
+ return err;
+
+ return 0;
+}
+
+static const struct dm_rng_ops meson_rng_ops = {
+ .read = meson_rng_read,
+};
+
+static const struct udevice_id meson_rng_match[] = {
+ {
+ .compatible = "amlogic,meson-rng",
+ },
+ {},
+};
+
+U_BOOT_DRIVER(meson_rng) = {
+ .name = "meson-rng",
+ .id = UCLASS_RNG,
+ .of_match = meson_rng_match,
+ .ops = &meson_rng_ops,
+ .probe = meson_rng_probe,
+ .remove = meson_rng_remove,
+ .platdata_auto_alloc_size = sizeof(struct meson_rng_platdata),
+ .ofdata_to_platdata = meson_rng_ofdata_to_platdata,
+};
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 1f598b3..e533a18 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -208,7 +208,7 @@
*/
static void efi_queue_event(struct efi_event *event)
{
- struct efi_event *item = NULL;
+ struct efi_event *item;
if (!event->notify_function)
return;
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index 89adf20..97d90f0 100644
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -627,18 +627,18 @@
*memory_map_size = map_size;
- if (provided_map_size < map_size)
- return EFI_BUFFER_TOO_SMALL;
-
- if (!memory_map)
- return EFI_INVALID_PARAMETER;
-
if (descriptor_size)
*descriptor_size = sizeof(struct efi_mem_desc);
if (descriptor_version)
*descriptor_version = EFI_MEMORY_DESCRIPTOR_VERSION;
+ if (provided_map_size < map_size)
+ return EFI_BUFFER_TOO_SMALL;
+
+ if (!memory_map)
+ return EFI_INVALID_PARAMETER;
+
/* Copy list into array */
/* Return the list in ascending order */
memory_map = &memory_map[map_entries - 1];