[PATCH v2 0/3] rockpi4: Add capsule update support
Changes since V1: * Move the capsule update related functions to a more common place under mach-rockchip to facilitate further reuse. * Split the board related declarations into a separate patch. * Split the enabling of the feature into a separate patch. * Enable config symbols needed access of EFI variables.
Sughosh Ganu (3): rockpi4: capsule: Add functions needed for supporting capsule updates rockpi4: board: Add firmware image information needed for capsule updates rockpi4: capsule: Enable UEFI capsule update on RockPi4 boards
arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/board.c | 185 +++++++++++++++++++++++++ board/rockchip/evb_rk3399/evb-rk3399.c | 14 ++ configs/rock-pi-4-rk3399_defconfig | 8 ++ configs/rock-pi-4c-rk3399_defconfig | 8 ++ include/configs/rk3399_common.h | 16 +++ 6 files changed, 232 insertions(+)
Add functions needed to support the UEFI capsule update feature on rockchip boards. Currently, the feature is being enabled on the RockPi4 boards with firmware images residing on GPT partitioned storage media.
Signed-off-by: Sughosh Ganu sughosh.ganu@linaro.org --- Changes since V1: * Move the capsule update related functions to a more common place under mach-rockchip to facilitate further reuse.
arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/board.c | 185 ++++++++++++++++++++++++++++++++ include/configs/rk3399_common.h | 16 +++ 3 files changed, 202 insertions(+)
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index c561a77e6a..7fac13c8ee 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -246,6 +246,7 @@ config ROCKCHIP_RK3399 select DM_PMIC select DM_REGULATOR_FIXED select BOARD_LATE_INIT + imply PARTITION_TYPE_GUID imply PRE_CONSOLE_BUFFER imply ROCKCHIP_COMMON_BOARD imply ROCKCHIP_SDRAM_COMMON diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index cbe00d646c..d35d6a5965 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -6,11 +6,15 @@ #include <clk.h> #include <cpu_func.h> #include <dm.h> +#include <efi_loader.h> #include <fastboot.h> #include <init.h> #include <log.h> +#include <mmc.h> +#include <part.h> #include <ram.h> #include <syscon.h> +#include <uuid.h> #include <asm/cache.h> #include <asm/global_data.h> #include <asm/io.h> @@ -22,8 +26,189 @@
DECLARE_GLOBAL_DATA_PTR;
+#if defined(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && defined(CONFIG_EFI_PARTITION) + +#define DFU_ALT_BUF_LEN SZ_1K +#define ROCKPI4_UPDATABLE_IMAGES 2 + +extern struct efi_fw_image fw_images[]; + +static bool board_is_rockpi_4b(void) +{ + return CONFIG_IS_ENABLED(TARGET_EVB_RK3399) && + of_machine_is_compatible("radxa,rockpi4b"); +} + +static bool board_is_rockpi_4c(void) +{ + return CONFIG_IS_ENABLED(TARGET_EVB_RK3399) && + of_machine_is_compatible("radxa,rockpi4c"); +} + +static bool updatable_image(struct disk_partition *info) +{ + int i; + bool ret = false; + efi_guid_t image_type_guid; + + uuid_str_to_bin(info->type_guid, image_type_guid.b, + UUID_STR_FORMAT_GUID); + + for (i = 0; i < ROCKPI4_UPDATABLE_IMAGES; i++) { + if (!guidcmp(&fw_images[i].image_type_id, &image_type_guid)) { + ret = true; + break; + } + } + + return ret; +} + +static void set_image_index(struct disk_partition *info, int index) +{ + int i; + efi_guid_t image_type_guid; + + uuid_str_to_bin(info->type_guid, image_type_guid.b, + UUID_STR_FORMAT_GUID); + + for (i = 0; i < ROCKPI4_UPDATABLE_IMAGES; i++) { + if (!guidcmp(&fw_images[i].image_type_id, &image_type_guid)) { + fw_images[i].image_index = index; + break; + } + } +} + +static int get_mmc_desc(struct blk_desc **desc) +{ + int ret; + struct mmc *mmc; + struct udevice *dev; + + /* + * For now the firmware images are assumed to + * be on the SD card + */ + ret = uclass_get_device(UCLASS_MMC, 1, &dev); + if (ret) + return -1; + + mmc = mmc_get_mmc_dev(dev); + if (!mmc) + return -ENODEV; + + if ((ret = mmc_init(mmc))) + return ret; + + *desc = mmc_get_blk_desc(mmc); + if (!*desc) + return -1; + + return 0; +} + +void set_dfu_alt_info(char *interface, char *devstr) +{ + const char *name; + bool first = true; + int p, len, devnum, ret; + char buf[DFU_ALT_BUF_LEN]; + struct disk_partition info; + struct blk_desc *desc = NULL; + + ret = get_mmc_desc(&desc); + if (ret) { + log_err("Unable to get mmc desc\n"); + return; + } + + memset(buf, 0, sizeof(buf)); + name = blk_get_if_type_name(desc->if_type); + devnum = desc->devnum; + len = strlen(buf); + + len += snprintf(buf + len, DFU_ALT_BUF_LEN - len, + "%s %d=", name, devnum); + + for (p = 1; p <= MAX_SEARCH_PARTITIONS; p++) { + if (part_get_info(desc, p, &info)) + continue; + + /* Add entry to dfu_alt_info only for updatable images */ + if (updatable_image(&info)) { + if (!first) + len += snprintf(buf + len, + DFU_ALT_BUF_LEN - len, ";"); + + len += snprintf(buf + len, DFU_ALT_BUF_LEN - len, + "%s%d_%s part %d %d", + name, devnum, info.name, devnum, p); + first = false; + } + } + + log_debug("dfu_alt_info => %s\n", buf); + env_set("dfu_alt_info", buf); +} + +static void gpt_capsule_update_setup(void) +{ + int p, i, ret; + struct disk_partition info; + struct blk_desc *desc = NULL; + + if (board_is_rockpi_4b()) { + efi_guid_t idbldr_image_type_guid = + ROCKPI_4B_IDBLOADER_IMAGE_GUID; + efi_guid_t uboot_image_type_guid = ROCKPI_4B_UBOOT_IMAGE_GUID; + + guidcpy(&fw_images[0].image_type_id, &idbldr_image_type_guid); + guidcpy(&fw_images[1].image_type_id, &uboot_image_type_guid); + + fw_images[0].fw_name = u"ROCKPI4B-IDBLOADER"; + fw_images[1].fw_name = u"ROCKPI4B-UBOOT"; + } else if (board_is_rockpi_4c()) { + efi_guid_t idbldr_image_type_guid = + ROCKPI_4C_IDBLOADER_IMAGE_GUID; + efi_guid_t uboot_image_type_guid = ROCKPI_4C_UBOOT_IMAGE_GUID; + + guidcpy(&fw_images[0].image_type_id, &idbldr_image_type_guid); + guidcpy(&fw_images[1].image_type_id, &uboot_image_type_guid); + + fw_images[0].fw_name = u"ROCKPI4C-IDBLOADER"; + fw_images[1].fw_name = u"ROCKPI4C-UBOOT"; + } + + ret = get_mmc_desc(&desc); + if (ret) { + log_err("Unable to get mmc desc\n"); + return; + } + + for (p = 1, i = 1; p <= MAX_SEARCH_PARTITIONS; p++) { + if (part_get_info(desc, p, &info)) + continue; + + /* + * Since we have a GPT partitioned device, the updatable + * images could be stored in any order. Populate the + * image_index at runtime. + */ + if (updatable_image(&info)) { + set_image_index(&info, i); + i++; + } + } +} +#endif /* CONFIG_EFI_HAVE_CAPSULE_SUPPORT && CONFIG_EFI_PARTITION */ + __weak int rk_board_late_init(void) { +#if defined(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && defined(CONFIG_EFI_PARTITION) + gpt_capsule_update_setup(); +#endif + return 0; }
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 2f9aee5819..f0a9ab8f83 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -24,6 +24,22 @@ #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xf8000000
+#define ROCKPI_4B_IDBLOADER_IMAGE_GUID \ + EFI_GUID(0x02f4d760, 0xcfd5, 0x43bd, 0x8e, 0x2d, \ + 0xa4, 0x2a, 0xcb, 0x33, 0xc6, 0x60) + +#define ROCKPI_4B_UBOOT_IMAGE_GUID \ + EFI_GUID(0x4ce292da, 0x1dd8, 0x428d, 0xa1, 0xc2, \ + 0x77, 0x74, 0x3e, 0xf8, 0xb9, 0x6e) + +#define ROCKPI_4C_IDBLOADER_IMAGE_GUID \ + EFI_GUID(0xfd68510c, 0x12d3, 0x4f0a, 0xb8, 0xd3, \ + 0xd8, 0x79, 0xe1, 0xd3, 0xa5, 0x40) + +#define ROCKPI_4C_UBOOT_IMAGE_GUID \ + EFI_GUID(0xb81fb4ae, 0xe4f3, 0x471b, 0x99, 0xb4, \ + 0x0b, 0x3d, 0xa5, 0x49, 0xce, 0x13) + #ifndef CONFIG_SPL_BUILD
#define ENV_MEM_LAYOUT_SETTINGS \
Hi Sughosh,
Small nit of the subject, it should substitute rockpi for rockchip: if the functions are generic.
Add functions needed to support the UEFI capsule update feature on rockchip boards. Currently, the feature is being enabled on the RockPi4 boards with firmware images residing on GPT partitioned storage media.
Signed-off-by: Sughosh Ganu sughosh.ganu@linaro.org
Changes since V1:
- Move the capsule update related functions to a more common place under mach-rockchip to facilitate further reuse.
arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/board.c | 185 ++++++++++++++++++++++++++++++++ include/configs/rk3399_common.h | 16 +++ 3 files changed, 202 insertions(+)
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index c561a77e6a..7fac13c8ee 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -246,6 +246,7 @@ config ROCKCHIP_RK3399 select DM_PMIC select DM_REGULATOR_FIXED select BOARD_LATE_INIT
imply PARTITION_TYPE_GUID imply PRE_CONSOLE_BUFFER imply ROCKCHIP_COMMON_BOARD imply ROCKCHIP_SDRAM_COMMONdiff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index cbe00d646c..d35d6a5965 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -6,11 +6,15 @@ #include <clk.h> #include <cpu_func.h> #include <dm.h> +#include <efi_loader.h> #include <fastboot.h> #include <init.h> #include <log.h> +#include <mmc.h> +#include <part.h> #include <ram.h> #include <syscon.h> +#include <uuid.h> #include <asm/cache.h> #include <asm/global_data.h> #include <asm/io.h> @@ -22,8 +26,189 @@
DECLARE_GLOBAL_DATA_PTR;
+#if defined(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && defined(CONFIG_EFI_PARTITION)
+#define DFU_ALT_BUF_LEN SZ_1K +#define ROCKPI4_UPDATABLE_IMAGES 2
The naming should be either made generic so it's suitable for all rockchip devices, or be in the device specific fills.
+extern struct efi_fw_image fw_images[];
+static bool board_is_rockpi_4b(void)
Same. Ultimately it looks like you've just moved the code from one location to another. The way I see it: * Generic functions with generic rockchip naming that are reusable across any rockchip device that wishes to use capsule updates * Board specific functions/variables etc in the board specific files.
+{
return CONFIG_IS_ENABLED(TARGET_EVB_RK3399) &&of_machine_is_compatible("radxa,rockpi4b");+}
+static bool board_is_rockpi_4c(void) +{
return CONFIG_IS_ENABLED(TARGET_EVB_RK3399) &&of_machine_is_compatible("radxa,rockpi4c");+}
+static bool updatable_image(struct disk_partition *info) +{
int i;bool ret = false;efi_guid_t image_type_guid;uuid_str_to_bin(info->type_guid, image_type_guid.b,UUID_STR_FORMAT_GUID);for (i = 0; i < ROCKPI4_UPDATABLE_IMAGES; i++) {if (!guidcmp(&fw_images[i].image_type_id, &image_type_guid)) {ret = true;break;}}return ret;+}
+static void set_image_index(struct disk_partition *info, int index) +{
int i;efi_guid_t image_type_guid;uuid_str_to_bin(info->type_guid, image_type_guid.b,UUID_STR_FORMAT_GUID);for (i = 0; i < ROCKPI4_UPDATABLE_IMAGES; i++) {if (!guidcmp(&fw_images[i].image_type_id, &image_type_guid)) {fw_images[i].image_index = index;break;}}+}
+static int get_mmc_desc(struct blk_desc **desc) +{
int ret;struct mmc *mmc;struct udevice *dev;/** For now the firmware images are assumed to* be on the SD card*/ret = uclass_get_device(UCLASS_MMC, 1, &dev);if (ret)return -1;mmc = mmc_get_mmc_dev(dev);if (!mmc)return -ENODEV;if ((ret = mmc_init(mmc)))return ret;*desc = mmc_get_blk_desc(mmc);if (!*desc)return -1;return 0;+}
+void set_dfu_alt_info(char *interface, char *devstr) +{
const char *name;bool first = true;int p, len, devnum, ret;char buf[DFU_ALT_BUF_LEN];struct disk_partition info;struct blk_desc *desc = NULL;ret = get_mmc_desc(&desc);if (ret) {log_err("Unable to get mmc desc\n");return;}memset(buf, 0, sizeof(buf));name = blk_get_if_type_name(desc->if_type);devnum = desc->devnum;len = strlen(buf);len += snprintf(buf + len, DFU_ALT_BUF_LEN - len,"%s %d=", name, devnum);for (p = 1; p <= MAX_SEARCH_PARTITIONS; p++) {if (part_get_info(desc, p, &info))continue;/* Add entry to dfu_alt_info only for updatable images */if (updatable_image(&info)) {if (!first)len += snprintf(buf + len,DFU_ALT_BUF_LEN - len, ";");len += snprintf(buf + len, DFU_ALT_BUF_LEN - len,"%s%d_%s part %d %d",name, devnum, info.name, devnum, p);first = false;}}log_debug("dfu_alt_info => %s\n", buf);env_set("dfu_alt_info", buf);+}
+static void gpt_capsule_update_setup(void) +{
int p, i, ret;struct disk_partition info;struct blk_desc *desc = NULL;if (board_is_rockpi_4b()) {efi_guid_t idbldr_image_type_guid =ROCKPI_4B_IDBLOADER_IMAGE_GUID;efi_guid_t uboot_image_type_guid = ROCKPI_4B_UBOOT_IMAGE_GUID;guidcpy(&fw_images[0].image_type_id, &idbldr_image_type_guid);guidcpy(&fw_images[1].image_type_id, &uboot_image_type_guid);fw_images[0].fw_name = u"ROCKPI4B-IDBLOADER";fw_images[1].fw_name = u"ROCKPI4B-UBOOT";} else if (board_is_rockpi_4c()) {efi_guid_t idbldr_image_type_guid =ROCKPI_4C_IDBLOADER_IMAGE_GUID;efi_guid_t uboot_image_type_guid = ROCKPI_4C_UBOOT_IMAGE_GUID;guidcpy(&fw_images[0].image_type_id, &idbldr_image_type_guid);guidcpy(&fw_images[1].image_type_id, &uboot_image_type_guid);fw_images[0].fw_name = u"ROCKPI4C-IDBLOADER";fw_images[1].fw_name = u"ROCKPI4C-UBOOT";}ret = get_mmc_desc(&desc);if (ret) {log_err("Unable to get mmc desc\n");return;}for (p = 1, i = 1; p <= MAX_SEARCH_PARTITIONS; p++) {if (part_get_info(desc, p, &info))continue;/** Since we have a GPT partitioned device, the updatable* images could be stored in any order. Populate the* image_index at runtime.*/if (updatable_image(&info)) {set_image_index(&info, i);i++;}}+} +#endif /* CONFIG_EFI_HAVE_CAPSULE_SUPPORT && CONFIG_EFI_PARTITION */
__weak int rk_board_late_init(void) { +#if defined(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && defined(CONFIG_EFI_PARTITION)
gpt_capsule_update_setup();+#endif
return 0;}
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 2f9aee5819..f0a9ab8f83 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -24,6 +24,22 @@ #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xf8000000
+#define ROCKPI_4B_IDBLOADER_IMAGE_GUID \
EFI_GUID(0x02f4d760, 0xcfd5, 0x43bd, 0x8e, 0x2d, \0xa4, 0x2a, 0xcb, 0x33, 0xc6, 0x60)+#define ROCKPI_4B_UBOOT_IMAGE_GUID \
EFI_GUID(0x4ce292da, 0x1dd8, 0x428d, 0xa1, 0xc2, \0x77, 0x74, 0x3e, 0xf8, 0xb9, 0x6e)+#define ROCKPI_4C_IDBLOADER_IMAGE_GUID \
EFI_GUID(0xfd68510c, 0x12d3, 0x4f0a, 0xb8, 0xd3, \0xd8, 0x79, 0xe1, 0xd3, 0xa5, 0x40)+#define ROCKPI_4C_UBOOT_IMAGE_GUID \
EFI_GUID(0xb81fb4ae, 0xe4f3, 0x471b, 0x99, 0xb4, \0x0b, 0x3d, 0xa5, 0x49, 0xce, 0x13)#ifndef CONFIG_SPL_BUILD
#define ENV_MEM_LAYOUT_SETTINGS \
2.34.1
hi Peter,
On Fri, 9 Sept 2022 at 18:07, Peter Robinson pbrobinson@gmail.com wrote:
Hi Sughosh,
Small nit of the subject, it should substitute rockpi for rockchip: if the functions are generic.
I will change it to rockchip.
Add functions needed to support the UEFI capsule update feature on rockchip boards. Currently, the feature is being enabled on the RockPi4 boards with firmware images residing on GPT partitioned storage media.
Signed-off-by: Sughosh Ganu sughosh.ganu@linaro.org
Changes since V1:
- Move the capsule update related functions to a more common place under mach-rockchip to facilitate further reuse.
arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/board.c | 185 ++++++++++++++++++++++++++++++++ include/configs/rk3399_common.h | 16 +++ 3 files changed, 202 insertions(+)
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index c561a77e6a..7fac13c8ee 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -246,6 +246,7 @@ config ROCKCHIP_RK3399 select DM_PMIC select DM_REGULATOR_FIXED select BOARD_LATE_INIT
imply PARTITION_TYPE_GUID imply PRE_CONSOLE_BUFFER imply ROCKCHIP_COMMON_BOARD imply ROCKCHIP_SDRAM_COMMONdiff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index cbe00d646c..d35d6a5965 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -6,11 +6,15 @@ #include <clk.h> #include <cpu_func.h> #include <dm.h> +#include <efi_loader.h> #include <fastboot.h> #include <init.h> #include <log.h> +#include <mmc.h> +#include <part.h> #include <ram.h> #include <syscon.h> +#include <uuid.h> #include <asm/cache.h> #include <asm/global_data.h> #include <asm/io.h> @@ -22,8 +26,189 @@
DECLARE_GLOBAL_DATA_PTR;
+#if defined(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && defined(CONFIG_EFI_PARTITION)
+#define DFU_ALT_BUF_LEN SZ_1K +#define ROCKPI4_UPDATABLE_IMAGES 2
The naming should be either made generic so it's suitable for all rockchip devices, or be in the device specific fills.
The above macro is not needed in this file. We can use num_image_type_guids instead of the macro. I will change this in the next version.
+extern struct efi_fw_image fw_images[];
+static bool board_is_rockpi_4b(void)
Same. Ultimately it looks like you've just moved the code from one location to another. The way I see it:
- Generic functions with generic rockchip naming that are reusable
across any rockchip device that wishes to use capsule updates
- Board specific functions/variables etc in the board specific files.
Okay. Based on your comments on V1, I was under the impression that you wanted me to move the code to a more generic location where it can be used by other rockchip boards. I have now moved the board specific bits to evb_rk3399.c keeping the computation of the image index and population of the dfu_alt_info in the board.c file. I will send the V3 shortly.
-sughosh
+{
return CONFIG_IS_ENABLED(TARGET_EVB_RK3399) &&of_machine_is_compatible("radxa,rockpi4b");+}
+static bool board_is_rockpi_4c(void) +{
return CONFIG_IS_ENABLED(TARGET_EVB_RK3399) &&of_machine_is_compatible("radxa,rockpi4c");+}
+static bool updatable_image(struct disk_partition *info) +{
int i;bool ret = false;efi_guid_t image_type_guid;uuid_str_to_bin(info->type_guid, image_type_guid.b,UUID_STR_FORMAT_GUID);for (i = 0; i < ROCKPI4_UPDATABLE_IMAGES; i++) {if (!guidcmp(&fw_images[i].image_type_id, &image_type_guid)) {ret = true;break;}}return ret;+}
+static void set_image_index(struct disk_partition *info, int index) +{
int i;efi_guid_t image_type_guid;uuid_str_to_bin(info->type_guid, image_type_guid.b,UUID_STR_FORMAT_GUID);for (i = 0; i < ROCKPI4_UPDATABLE_IMAGES; i++) {if (!guidcmp(&fw_images[i].image_type_id, &image_type_guid)) {fw_images[i].image_index = index;break;}}+}
+static int get_mmc_desc(struct blk_desc **desc) +{
int ret;struct mmc *mmc;struct udevice *dev;/** For now the firmware images are assumed to* be on the SD card*/ret = uclass_get_device(UCLASS_MMC, 1, &dev);if (ret)return -1;mmc = mmc_get_mmc_dev(dev);if (!mmc)return -ENODEV;if ((ret = mmc_init(mmc)))return ret;*desc = mmc_get_blk_desc(mmc);if (!*desc)return -1;return 0;+}
+void set_dfu_alt_info(char *interface, char *devstr) +{
const char *name;bool first = true;int p, len, devnum, ret;char buf[DFU_ALT_BUF_LEN];struct disk_partition info;struct blk_desc *desc = NULL;ret = get_mmc_desc(&desc);if (ret) {log_err("Unable to get mmc desc\n");return;}memset(buf, 0, sizeof(buf));name = blk_get_if_type_name(desc->if_type);devnum = desc->devnum;len = strlen(buf);len += snprintf(buf + len, DFU_ALT_BUF_LEN - len,"%s %d=", name, devnum);for (p = 1; p <= MAX_SEARCH_PARTITIONS; p++) {if (part_get_info(desc, p, &info))continue;/* Add entry to dfu_alt_info only for updatable images */if (updatable_image(&info)) {if (!first)len += snprintf(buf + len,DFU_ALT_BUF_LEN - len, ";");len += snprintf(buf + len, DFU_ALT_BUF_LEN - len,"%s%d_%s part %d %d",name, devnum, info.name, devnum, p);first = false;}}log_debug("dfu_alt_info => %s\n", buf);env_set("dfu_alt_info", buf);+}
+static void gpt_capsule_update_setup(void) +{
int p, i, ret;struct disk_partition info;struct blk_desc *desc = NULL;if (board_is_rockpi_4b()) {efi_guid_t idbldr_image_type_guid =ROCKPI_4B_IDBLOADER_IMAGE_GUID;efi_guid_t uboot_image_type_guid = ROCKPI_4B_UBOOT_IMAGE_GUID;guidcpy(&fw_images[0].image_type_id, &idbldr_image_type_guid);guidcpy(&fw_images[1].image_type_id, &uboot_image_type_guid);fw_images[0].fw_name = u"ROCKPI4B-IDBLOADER";fw_images[1].fw_name = u"ROCKPI4B-UBOOT";} else if (board_is_rockpi_4c()) {efi_guid_t idbldr_image_type_guid =ROCKPI_4C_IDBLOADER_IMAGE_GUID;efi_guid_t uboot_image_type_guid = ROCKPI_4C_UBOOT_IMAGE_GUID;guidcpy(&fw_images[0].image_type_id, &idbldr_image_type_guid);guidcpy(&fw_images[1].image_type_id, &uboot_image_type_guid);fw_images[0].fw_name = u"ROCKPI4C-IDBLOADER";fw_images[1].fw_name = u"ROCKPI4C-UBOOT";}ret = get_mmc_desc(&desc);if (ret) {log_err("Unable to get mmc desc\n");return;}for (p = 1, i = 1; p <= MAX_SEARCH_PARTITIONS; p++) {if (part_get_info(desc, p, &info))continue;/** Since we have a GPT partitioned device, the updatable* images could be stored in any order. Populate the* image_index at runtime.*/if (updatable_image(&info)) {set_image_index(&info, i);i++;}}+} +#endif /* CONFIG_EFI_HAVE_CAPSULE_SUPPORT && CONFIG_EFI_PARTITION */
__weak int rk_board_late_init(void) { +#if defined(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && defined(CONFIG_EFI_PARTITION)
gpt_capsule_update_setup();+#endif
return 0;}
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 2f9aee5819..f0a9ab8f83 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -24,6 +24,22 @@ #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xf8000000
+#define ROCKPI_4B_IDBLOADER_IMAGE_GUID \
EFI_GUID(0x02f4d760, 0xcfd5, 0x43bd, 0x8e, 0x2d, \0xa4, 0x2a, 0xcb, 0x33, 0xc6, 0x60)+#define ROCKPI_4B_UBOOT_IMAGE_GUID \
EFI_GUID(0x4ce292da, 0x1dd8, 0x428d, 0xa1, 0xc2, \0x77, 0x74, 0x3e, 0xf8, 0xb9, 0x6e)+#define ROCKPI_4C_IDBLOADER_IMAGE_GUID \
EFI_GUID(0xfd68510c, 0x12d3, 0x4f0a, 0xb8, 0xd3, \0xd8, 0x79, 0xe1, 0xd3, 0xa5, 0x40)+#define ROCKPI_4C_UBOOT_IMAGE_GUID \
EFI_GUID(0xb81fb4ae, 0xe4f3, 0x471b, 0x99, 0xb4, \0x0b, 0x3d, 0xa5, 0x49, 0xce, 0x13)#ifndef CONFIG_SPL_BUILD
#define ENV_MEM_LAYOUT_SETTINGS \
2.34.1
Add information that will be needed for enabling the UEFI capsule update feature on the RockPi4 boards. With the feature enabled, it would be possible to update the idbloader and u-boot.itb images on the RockPi4B and RockPi4C variants.
Signed-off-by: Sughosh Ganu sughosh.ganu@linaro.org --- Changes since V1: * Split the board related declarations into a separate patch.
board/rockchip/evb_rk3399/evb-rk3399.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c index abb76585cf..abb0580a8e 100644 --- a/board/rockchip/evb_rk3399/evb-rk3399.c +++ b/board/rockchip/evb_rk3399/evb-rk3399.c @@ -5,11 +5,25 @@
#include <common.h> #include <dm.h> +#include <efi_loader.h> #include <init.h> #include <log.h> #include <asm/arch-rockchip/periph.h> +#include <linux/kernel.h> #include <power/regulator.h>
+#define ROCKPI4_UPDATABLE_IMAGES 2 + +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +struct efi_fw_image fw_images[ROCKPI4_UPDATABLE_IMAGES] = {0}; + +struct efi_capsule_update_info update_info = { + .images = fw_images, +}; + +u8 num_image_type_guids = ARRAY_SIZE(fw_images); +#endif + #ifndef CONFIG_SPL_BUILD int board_early_init_f(void) {
On Tue, Sep 6, 2022 at 7:59 AM Sughosh Ganu sughosh.ganu@linaro.org wrote:
Add information that will be needed for enabling the UEFI capsule update feature on the RockPi4 boards. With the feature enabled, it would be possible to update the idbloader and u-boot.itb images on the RockPi4B and RockPi4C variants.
Signed-off-by: Sughosh Ganu sughosh.ganu@linaro.org
Changes since V1:
- Split the board related declarations into a separate patch.
board/rockchip/evb_rk3399/evb-rk3399.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c index abb76585cf..abb0580a8e 100644 --- a/board/rockchip/evb_rk3399/evb-rk3399.c +++ b/board/rockchip/evb_rk3399/evb-rk3399.c @@ -5,11 +5,25 @@
#include <common.h> #include <dm.h> +#include <efi_loader.h> #include <init.h> #include <log.h> #include <asm/arch-rockchip/periph.h> +#include <linux/kernel.h> #include <power/regulator.h>
+#define ROCKPI4_UPDATABLE_IMAGES 2
Any reason the above isn't defineable in the config file?
+#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +struct efi_fw_image fw_images[ROCKPI4_UPDATABLE_IMAGES] = {0};
+struct efi_capsule_update_info update_info = {
.images = fw_images,+};
+u8 num_image_type_guids = ARRAY_SIZE(fw_images); +#endif
#ifndef CONFIG_SPL_BUILD int board_early_init_f(void) { -- 2.34.1
hi Peter,
On Fri, 9 Sept 2022 at 18:12, Peter Robinson pbrobinson@gmail.com wrote:
On Tue, Sep 6, 2022 at 7:59 AM Sughosh Ganu sughosh.ganu@linaro.org wrote:
Add information that will be needed for enabling the UEFI capsule update feature on the RockPi4 boards. With the feature enabled, it would be possible to update the idbloader and u-boot.itb images on the RockPi4B and RockPi4C variants.
Signed-off-by: Sughosh Ganu sughosh.ganu@linaro.org
Changes since V1:
- Split the board related declarations into a separate patch.
board/rockchip/evb_rk3399/evb-rk3399.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c index abb76585cf..abb0580a8e 100644 --- a/board/rockchip/evb_rk3399/evb-rk3399.c +++ b/board/rockchip/evb_rk3399/evb-rk3399.c @@ -5,11 +5,25 @@
#include <common.h> #include <dm.h> +#include <efi_loader.h> #include <init.h> #include <log.h> #include <asm/arch-rockchip/periph.h> +#include <linux/kernel.h> #include <power/regulator.h>
+#define ROCKPI4_UPDATABLE_IMAGES 2
Any reason the above isn't defineable in the config file?
Do you mean through a Kconfig symbol? Currently, RockPi4 is the only board for which such a macro is needed. The rest of the boards which enable capsule updates define the fw_images array statically and the number of images can be computed without a need for a config symbol. So I did not want to add a Kconfig symbol when it won't be needed for a majority of the boards.
-sughosh
+#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +struct efi_fw_image fw_images[ROCKPI4_UPDATABLE_IMAGES] = {0};
+struct efi_capsule_update_info update_info = {
.images = fw_images,+};
+u8 num_image_type_guids = ARRAY_SIZE(fw_images); +#endif
#ifndef CONFIG_SPL_BUILD int board_early_init_f(void) { -- 2.34.1
Enable the UEFI capsule update functionality on the RockPi4B and RockPi4C boards. Support is being enabled for updating the idbloader and u-boot firmware images residing on GPT partitioned storage devices.
Signed-off-by: Sughosh Ganu sughosh.ganu@linaro.org --- Changes since V1: * Split the enabling of the feature into a separate patch. * Enable config symbols needed for access of EFI variables.
configs/rock-pi-4-rk3399_defconfig | 8 ++++++++ configs/rock-pi-4c-rk3399_defconfig | 8 ++++++++ 2 files changed, 16 insertions(+)
diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig index f8a57f6838..4e253196a3 100644 --- a/configs/rock-pi-4-rk3399_defconfig +++ b/configs/rock-pi-4-rk3399_defconfig @@ -30,6 +30,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 CONFIG_TPL=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_DFU=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y @@ -40,6 +41,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_DFU_MMC=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MISC=y @@ -84,3 +86,9 @@ CONFIG_VIDEO_ROCKCHIP=y CONFIG_DISPLAY_ROCKCHIP_HDMI=y CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y +CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_EFIDEBUG=y +CONFIG_TOOLS_MKEFICAPSULE=y +CONFIG_HEXDUMP=y +CONFIG_EFI_CAPSULE_ON_DISK=y +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y diff --git a/configs/rock-pi-4c-rk3399_defconfig b/configs/rock-pi-4c-rk3399_defconfig index 9aa7809bd0..ee500a7d58 100644 --- a/configs/rock-pi-4c-rk3399_defconfig +++ b/configs/rock-pi-4c-rk3399_defconfig @@ -30,6 +30,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 CONFIG_TPL=y CONFIG_CMD_BOOTZ=y +CONFIG_CMD_DFU=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y @@ -40,6 +41,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_DFU_MMC=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MISC=y @@ -84,3 +86,9 @@ CONFIG_VIDEO_ROCKCHIP=y CONFIG_DISPLAY_ROCKCHIP_HDMI=y CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y +CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_EFIDEBUG=y +CONFIG_TOOLS_MKEFICAPSULE=y +CONFIG_HEXDUMP=y +CONFIG_EFI_CAPSULE_ON_DISK=y +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
participants (2)
-
Peter Robinson -
Sughosh Ganu