[PATCH v2 0/2] xilinx: Update the kaslr-seed property
Update the kaslr-seed property and enable the config CONFIG_OF_BOARD_SETUP.
Changes in v2: - Created macro for size variable. - Removed malloc and created array for rng buffer. - Added debug logs for all the apis.
Venkatesh Yadav Abbarapu (2): xilinx: board: Update the kaslr-seed property configs: zynqmp_kria: Enable CONFIG_OF_BOARD_SETUP
board/xilinx/common/board.c | 50 ++++++++++++++++++++++++++++ configs/xilinx_zynqmp_kria_defconfig | 1 + 2 files changed, 51 insertions(+)
Create a ft_board_setup() api that gets called as part of bootm/booti before jumping to kernel. In this ft_board_setup() callback that will inspect the DTB and insert the device tree blob with the "kaslr-seed" property.
Signed-off-by: Michal Simek michal.simek@amd.com Signed-off-by: Venkatesh Yadav Abbarapu venkatesh.abbarapu@amd.com --- board/xilinx/common/board.c | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 12a877c715..2796d45351 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -25,6 +25,7 @@ #include <i2c_eeprom.h> #include <net.h> #include <generated/dt.h> +#include <rng.h> #include <slre.h> #include <soc.h> #include <linux/ctype.h> @@ -682,3 +683,52 @@ phys_addr_t board_get_usable_ram_top(phys_size_t total_size) return reg + size; } #endif + +#ifdef CONFIG_OF_BOARD_SETUP +#define MAX_RAND_SIZE 8 +int ft_board_setup(void *blob, struct bd_info *bd) +{ + size_t n = MAX_RAND_SIZE; + struct udevice *dev; + u8 buf[MAX_RAND_SIZE]; + int nodeoffset; + int ret; + + if (uclass_get_device(UCLASS_RNG, 0, &dev) || !dev) { + debug("No RNG device\n"); + return -EINVAL; + } + + if (dm_rng_read(dev, buf, n)) { + debug("Reading RNG failed\n"); + return -EINVAL; + } + + if (!blob) { + debug("No FDT memory address configured. Please configure\n" + "the FDT address via "fdt addr <address>" command.\n" + "Aborting!\n"); + return -EINVAL; + } + + ret = fdt_check_header(blob); + if (ret < 0) { + debug("fdt_chosen: %s\n", fdt_strerror(ret)); + return -EINVAL; + } + + nodeoffset = fdt_find_or_add_subnode(blob, 0, "chosen"); + if (nodeoffset < 0) { + debug("Reading chosen node failed\n"); + return -EINVAL; + } + + ret = fdt_setprop(blob, nodeoffset, "kaslr-seed", buf, sizeof(buf)); + if (ret < 0) { + debug("Unable to set kaslr-seed on chosen node: %s\n", fdt_strerror(ret)); + return -EINVAL; + } + + return ret; +} +#endif
On 1/16/24 05:50, Venkatesh Yadav Abbarapu wrote:
Create a ft_board_setup() api that gets called as part of bootm/booti before jumping to kernel. In this ft_board_setup() callback that will inspect the DTB and insert the device tree blob with the "kaslr-seed" property.
Signed-off-by: Michal Simek michal.simek@amd.com Signed-off-by: Venkatesh Yadav Abbarapu venkatesh.abbarapu@amd.com
board/xilinx/common/board.c | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 12a877c715..2796d45351 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -25,6 +25,7 @@ #include <i2c_eeprom.h> #include <net.h> #include <generated/dt.h> +#include <rng.h> #include <slre.h> #include <soc.h> #include <linux/ctype.h> @@ -682,3 +683,52 @@ phys_addr_t board_get_usable_ram_top(phys_size_t total_size) return reg + size; } #endif
+#ifdef CONFIG_OF_BOARD_SETUP +#define MAX_RAND_SIZE 8 +int ft_board_setup(void *blob, struct bd_info *bd) +{
- size_t n = MAX_RAND_SIZE;
- struct udevice *dev;
- u8 buf[MAX_RAND_SIZE];
- int nodeoffset;
- int ret;
put it on the same line.
- if (uclass_get_device(UCLASS_RNG, 0, &dev) || !dev) {
debug("No RNG device\n");return -EINVAL;
Why did you changed it from 0?
Pretty much this change breaks all current SOMs with saved variables because most of them doesn't really start TPM.
I would say return 0 here.
- }
- if (dm_rng_read(dev, buf, n)) {
debug("Reading RNG failed\n");return -EINVAL;
return 0 here.
- }
- if (!blob) {
debug("No FDT memory address configured. Please configure\n""the FDT address via \"fdt addr <address>\" command.\n""Aborting!\n");return -EINVAL;
return 0
- }
- ret = fdt_check_header(blob);
- if (ret < 0) {
debug("fdt_chosen: %s\n", fdt_strerror(ret));return -EINVAL;
no reason to make own return code
return ret;
- }
- nodeoffset = fdt_find_or_add_subnode(blob, 0, "chosen");
- if (nodeoffset < 0) {
debug("Reading chosen node failed\n");return -EINVAL;
return ret;
- }
- ret = fdt_setprop(blob, nodeoffset, "kaslr-seed", buf, sizeof(buf));
- if (ret < 0) {
debug("Unable to set kaslr-seed on chosen node: %s\n", fdt_strerror(ret));return -EINVAL;
return ret;
- }
- return ret;
return 0;
+} +#endif
M
Enable CONFIG_OF_BOARD_SETUP, so we could use ft_board_setup() to enable the kaslr-seed and pass to kernel.
Signed-off-by: Michal Simek michal.simek@amd.com Signed-off-by: Venkatesh Yadav Abbarapu venkatesh.abbarapu@amd.com --- configs/xilinx_zynqmp_kria_defconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/configs/xilinx_zynqmp_kria_defconfig b/configs/xilinx_zynqmp_kria_defconfig index a65a59c1ae..86741f1773 100644 --- a/configs/xilinx_zynqmp_kria_defconfig +++ b/configs/xilinx_zynqmp_kria_defconfig @@ -33,6 +33,7 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000 CONFIG_SYS_BOOTM_LEN=0x6400000 CONFIG_DISTRO_DEFAULTS=y +CONFIG_OF_BOARD_SETUP=y # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_USE_PREBOOT=y CONFIG_SYS_PBSIZE=2073
participants (2)
-
Michal Simek -
Venkatesh Yadav Abbarapu