summaryrefslogtreecommitdiff
path: root/cmd/extension_board.c
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/extension_board.c')
-rw-r--r--cmd/extension_board.c183
1 files changed, 83 insertions, 100 deletions
diff --git a/cmd/extension_board.c b/cmd/extension_board.c
index 317b260bf36..86e4795ba8a 100644
--- a/cmd/extension_board.c
+++ b/cmd/extension_board.c
@@ -4,75 +4,107 @@
* Köry Maincent, Bootlin, <kory.maincent@bootlin.com>
*/
-#include <bootdev.h>
+#include <alist.h>
+#include <exports.h>
#include <command.h>
-#include <dm.h>
#include <env.h>
-#include <malloc.h>
#include <extension_board.h>
-#include <mapmem.h>
-#include <linux/libfdt.h>
-#include <fdt_support.h>
-static LIST_HEAD(extension_list);
-
-static int extension_apply(struct extension *extension)
+static int
+cmd_extension_load_overlay_from_env(const struct extension *extension,
+ ulong *filesize)
{
+ ulong size, overlay_addr;
char *overlay_cmd;
- ulong extrasize, overlay_addr;
- struct fdt_header *blob;
-
- if (!working_fdt) {
- printf("No FDT memory address configured. Please configure\n"
- "the FDT address via \"fdt addr <address>\" command.\n");
- return CMD_RET_FAILURE;
- }
+ int ret;
overlay_cmd = env_get("extension_overlay_cmd");
if (!overlay_cmd) {
printf("Environment extension_overlay_cmd is missing\n");
- return CMD_RET_FAILURE;
+ return -EINVAL;
}
overlay_addr = env_get_hex("extension_overlay_addr", 0);
if (!overlay_addr) {
printf("Environment extension_overlay_addr is missing\n");
- return CMD_RET_FAILURE;
+ return -EINVAL;
}
env_set("extension_overlay_name", extension->overlay);
- if (run_command(overlay_cmd, 0) != 0)
- return CMD_RET_FAILURE;
+ ret = run_command(overlay_cmd, 0);
+ if (ret)
+ return ret;
- extrasize = env_get_hex("filesize", 0);
- if (!extrasize)
- return CMD_RET_FAILURE;
+ size = env_get_hex("filesize", 0);
+ if (!size)
+ return -EINVAL;
- fdt_shrink_to_minimum(working_fdt, extrasize);
+ *filesize = size;
+ return 0;
+}
- blob = map_sysmem(overlay_addr, 0);
- if (!fdt_valid(&blob))
- return CMD_RET_FAILURE;
+static int cmd_extension_apply(int extension_num)
+{
+ struct alist *extension_list = extension_get_list();
+ const struct extension *extension;
+ ulong size;
+ int ret;
- /* apply method prints messages on error */
- if (fdt_overlay_apply_verbose(working_fdt, blob))
- return CMD_RET_FAILURE;
+ if (!extension_list)
+ return -ENODEV;
- return CMD_RET_SUCCESS;
+ extension = alist_get(extension_list, extension_num,
+ struct extension);
+ if (!extension) {
+ printf("Wrong extension number\n");
+ return -ENODEV;
+ }
+
+ ret = cmd_extension_load_overlay_from_env(extension, &size);
+ if (ret)
+ return ret;
+
+ return extension_apply(working_fdt, size);
+}
+
+static int cmd_extension_apply_all(void)
+{
+ struct alist *extension_list = extension_get_list();
+ const struct extension *extension;
+ int ret;
+
+ if (!extension_list)
+ return -ENODEV;
+
+ alist_for_each(extension, extension_list) {
+ ulong size;
+
+ ret = cmd_extension_load_overlay_from_env(extension, &size);
+ if (ret)
+ return ret;
+
+ ret = extension_apply(working_fdt, size);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
}
static int do_extension_list(struct cmd_tbl *cmdtp, int flag,
int argc, char *const argv[])
{
- int i = 0;
+ struct alist *extension_list;
struct extension *extension;
+ int i = 0;
- if (list_empty(&extension_list)) {
+ extension_list = extension_get_list();
+ if (!alist_get_ptr(extension_list, 0)) {
printf("No extension registered - Please run \"extension scan\"\n");
return CMD_RET_SUCCESS;
}
- list_for_each_entry(extension, &extension_list, list) {
+ alist_for_each(extension, extension_list) {
printf("Extension %d: %s\n", i++, extension->name);
printf("\tManufacturer: \t\t%s\n", extension->owner);
printf("\tVersion: \t\t%s\n", extension->version);
@@ -82,71 +114,45 @@ static int do_extension_list(struct cmd_tbl *cmdtp, int flag,
return CMD_RET_SUCCESS;
}
-static int extension_scan(bool show)
-{
- struct extension *extension, *next;
- int extension_num;
-
- list_for_each_entry_safe(extension, next, &extension_list, list) {
- list_del(&extension->list);
- free(extension);
- }
- extension_num = extension_board_scan(&extension_list);
- if (show && extension_num >= 0)
- printf("Found %d extension board(s).\n", extension_num);
-
- /* either the number of extensions, or -ve for error */
- return extension_num;
-}
-
static int do_extension_scan(struct cmd_tbl *cmdtp, int flag,
int argc, char *const argv[])
{
int extension_num;
- extension_num = extension_scan(true);
- if (extension_num < 0)
+ extension_num = extension_scan();
+ if (extension_num == -ENODEV)
+ extension_num = 0;
+ else if (extension_num < 0)
return CMD_RET_FAILURE;
+ printf("Found %d extension board(s).\n", extension_num);
return CMD_RET_SUCCESS;
}
static int do_extension_apply(struct cmd_tbl *cmdtp, int flag,
int argc, char *const argv[])
{
- struct extension *extension = NULL;
- struct list_head *entry;
- int i = 0, extension_id, ret;
+ int extension_id;
if (argc < 2)
return CMD_RET_USAGE;
+ if (!working_fdt) {
+ printf("No FDT memory address configured. Please configure\n"
+ "the FDT address via \"fdt addr <address>\" command.\n");
+ return -EINVAL;
+ }
+
if (strcmp(argv[1], "all") == 0) {
- ret = CMD_RET_FAILURE;
- list_for_each_entry(extension, &extension_list, list) {
- ret = extension_apply(extension);
- if (ret != CMD_RET_SUCCESS)
- break;
- }
+ if (cmd_extension_apply_all())
+ return CMD_RET_FAILURE;
} else {
extension_id = simple_strtol(argv[1], NULL, 10);
- list_for_each(entry, &extension_list) {
- if (i == extension_id) {
- extension = list_entry(entry, struct extension, list);
- break;
- }
- i++;
- }
-
- if (!extension) {
- printf("Wrong extension number\n");
+ if (cmd_extension_apply(extension_id))
return CMD_RET_FAILURE;
- }
-
- ret = extension_apply(extension);
}
- return ret;
+ return CMD_RET_SUCCESS;
}
static struct cmd_tbl cmd_extension[] = {
@@ -177,26 +183,3 @@ U_BOOT_CMD(extension, 3, 1, do_extensionops,
"extension list - lists available extension(s) board(s)\n"
"extension apply <extension number|all> - applies DT overlays corresponding to extension boards\n"
);
-
-static int extension_bootdev_hunt(struct bootdev_hunter *info, bool show)
-{
- int ret;
-
- ret = env_set_hex("extension_overlay_addr",
- env_get_hex("fdtoverlay_addr_r", 0));
- if (ret)
- return log_msg_ret("env", ret);
-
- ret = extension_scan(show);
- if (ret < 0)
- return log_msg_ret("ext", ret);
-
- return 0;
-}
-
-/* extensions should have a uclass - for now we use UCLASS_SIMPLE_BUS uclass */
-BOOTDEV_HUNTER(extension_bootdev_hunter) = {
- .prio = BOOTDEVP_1_PRE_SCAN,
- .uclass = UCLASS_SIMPLE_BUS,
- .hunt = extension_bootdev_hunt,
-};
generated by cgit v1.2.3 (git 2.0.4) at 2025-11-26 02:16:10 +0000