colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boot: Update extlinux pxe_getfile_func() to include type

Browse Source 
Add a file-type parameter to this function and update all users. Add a
proper comment to the function which we are here.

This will allow tracking of the file types loaded by the extlinux
bootmeth.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2024-11-15 16:19:19 -07:00
committed by Tom Rini
parent ea7f88f313
commit 3ed218e2ff
6 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
boot/bootmeth_extlinux.c
View File

@@ -68,7 +68,8 @@ static int extlinux_get_state_desc(struct udevice *dev, char *buf, int maxsize)
} }
static int extlinux_getfile(struct pxe_context *ctx, const char *file_path, static int extlinux_getfile(struct pxe_context *ctx, const char *file_path,
char *file_addr, ulong *sizep) char *file_addr, enum bootflow_img_t type,
ulong *sizep)
{ {
struct extlinux_info *info = ctx->userdata; struct extlinux_info *info = ctx->userdata;
ulong addr; ulong addr;
@@ -79,7 +80,7 @@ static int extlinux_getfile(struct pxe_context *ctx, const char *file_path,
/* Allow up to 1GB */ /* Allow up to 1GB */
*sizep = 1 << 30; *sizep = 1 << 30;
ret = bootmeth_read_file(info->dev, info->bflow, file_path, addr, ret = bootmeth_read_file(info->dev, info->bflow, file_path, addr,
(enum bootflow_img_t)IH_TYPE_INVALID, sizep); type, sizep);
if (ret) if (ret)
return log_msg_ret("read", ret); return log_msg_ret("read", ret);

5
boot/bootmeth_pxe.c
View File

@@ -23,7 +23,8 @@
#include <pxe_utils.h> #include <pxe_utils.h>
static int extlinux_pxe_getfile(struct pxe_context *ctx, const char *file_path, static int extlinux_pxe_getfile(struct pxe_context *ctx, const char *file_path,
char *file_addr, ulong *sizep) char *file_addr, enum bootflow_img_t type,
ulong *sizep)
{ {
struct extlinux_info *info = ctx->userdata; struct extlinux_info *info = ctx->userdata;
ulong addr; ulong addr;
@@ -34,7 +35,7 @@ static int extlinux_pxe_getfile(struct pxe_context *ctx, const char *file_path,
/* Allow up to 1GB */ /* Allow up to 1GB */
*sizep = 1 << 30; *sizep = 1 << 30;
ret = bootmeth_read_file(info->dev, info->bflow, file_path, addr, ret = bootmeth_read_file(info->dev, info->bflow, file_path, addr,
IH_TYPE_INVALID, sizep); type, sizep);
if (ret) if (ret)
return log_msg_ret("read", ret); return log_msg_ret("read", ret);

26
boot/pxe_utils.c
View File

@@ -6,6 +6,7 @@
#define LOG_CATEGORY LOGC_BOOT #define LOG_CATEGORY LOGC_BOOT
#include <bootflow.h>
#include <command.h> #include <command.h>
#include <dm.h> #include <dm.h>
#include <env.h> #include <env.h>
@@ -97,7 +98,8 @@ int format_mac_pxe(char *outbuf, size_t outbuf_len)
* Returns 1 for success, or < 0 on error * Returns 1 for success, or < 0 on error
*/ */
static int get_relfile(struct pxe_context *ctx, const char *file_path, static int get_relfile(struct pxe_context *ctx, const char *file_path,
unsigned long file_addr, ulong *filesizep) unsigned long file_addr, enum bootflow_img_t type,
ulong *filesizep)
{ {
size_t path_len; size_t path_len;
char relfile[MAX_TFTP_PATH_LEN + 1]; char relfile[MAX_TFTP_PATH_LEN + 1];
@@ -124,7 +126,7 @@ static int get_relfile(struct pxe_context *ctx, const char *file_path,
sprintf(addr_buf, "%lx", file_addr); sprintf(addr_buf, "%lx", file_addr);
ret = ctx->getfile(ctx, relfile, addr_buf, &size); ret = ctx->getfile(ctx, relfile, addr_buf, type, &size);
if (ret < 0) if (ret < 0)
return log_msg_ret("get", ret); return log_msg_ret("get", ret);
if (filesizep) if (filesizep)
@@ -140,7 +142,8 @@ int get_pxe_file(struct pxe_context *ctx, const char *file_path,
int err; int err;
char *buf; char *buf;
err = get_relfile(ctx, file_path, file_addr, &size); err = get_relfile(ctx, file_path, file_addr, BFI_EXTLINUX_CFG,
&size);
if (err < 0) if (err < 0)
return err; return err;
@@ -189,13 +192,15 @@ int get_pxelinux_path(struct pxe_context *ctx, const char *file,
* @file_path: File path to read (relative to the PXE file) * @file_path: File path to read (relative to the PXE file)
* @envaddr_name: Name of environment variable which contains the address to * @envaddr_name: Name of environment variable which contains the address to
* load to * load to
* @type: File type
* @filesizep: Returns the file size in bytes * @filesizep: Returns the file size in bytes
* Returns 1 on success, -ENOENT if @envaddr_name does not exist as an * Returns 1 on success, -ENOENT if @envaddr_name does not exist as an
* environment variable, -EINVAL if its format is not valid hex, or other * environment variable, -EINVAL if its format is not valid hex, or other
* value < 0 on other error * value < 0 on other error
*/ */
static int get_relfile_envaddr(struct pxe_context *ctx, const char *file_path, static int get_relfile_envaddr(struct pxe_context *ctx, const char *file_path,
const char *envaddr_name, ulong *filesizep) const char *envaddr_name,
enum bootflow_img_t type, ulong *filesizep)
{ {
unsigned long file_addr; unsigned long file_addr;
char *envaddr; char *envaddr;
@@ -207,7 +212,7 @@ static int get_relfile_envaddr(struct pxe_context *ctx, const char *file_path,
if (strict_strtoul(envaddr, 16, &file_addr) < 0) if (strict_strtoul(envaddr, 16, &file_addr) < 0)
return -EINVAL; return -EINVAL;
return get_relfile(ctx, file_path, file_addr, filesizep); return get_relfile(ctx, file_path, file_addr, type, filesizep);
} }
/** /**
@@ -395,6 +400,7 @@ static void label_boot_fdtoverlay(struct pxe_context *ctx,
/* Load overlay file */ /* Load overlay file */
err = get_relfile_envaddr(ctx, overlayfile, "fdtoverlay_addr_r", err = get_relfile_envaddr(ctx, overlayfile, "fdtoverlay_addr_r",
(enum bootflow_img_t)IH_TYPE_FLATDT,
NULL); NULL);
if (err < 0) { if (err < 0) {
printf("Failed loading overlay %s\n", overlayfile); printf("Failed loading overlay %s\n", overlayfile);
@@ -480,7 +486,8 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
} }
if (get_relfile_envaddr(ctx, label->kernel, "kernel_addr_r", if (get_relfile_envaddr(ctx, label->kernel, "kernel_addr_r",
NULL) < 0) { (enum bootflow_img_t)IH_TYPE_KERNEL, NULL)
< 0) {
printf("Skipping %s for failure retrieving kernel\n", printf("Skipping %s for failure retrieving kernel\n",
label->name); label->name);
return 1; return 1;
@@ -506,6 +513,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
} else if (label->initrd) { } else if (label->initrd) {
ulong size; ulong size;
if (get_relfile_envaddr(ctx, label->initrd, "ramdisk_addr_r", if (get_relfile_envaddr(ctx, label->initrd, "ramdisk_addr_r",
(enum bootflow_img_t)IH_TYPE_RAMDISK,
&size) < 0) { &size) < 0) {
printf("Skipping %s for failure retrieving initrd\n", printf("Skipping %s for failure retrieving initrd\n",
label->name); label->name);
@@ -651,7 +659,8 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
if (fdtfile) { if (fdtfile) {
int err = get_relfile_envaddr(ctx, fdtfile, int err = get_relfile_envaddr(ctx, fdtfile,
"fdt_addr_r", NULL); "fdt_addr_r",
(enum bootflow_img_t)IH_TYPE_FLATDT, NULL);
free(fdtfilefree); free(fdtfilefree);
if (err < 0) { if (err < 0) {
@@ -1538,7 +1547,8 @@ void handle_pxe_menu(struct pxe_context *ctx, struct pxe_menu *cfg)
if (IS_ENABLED(CONFIG_CMD_BMP)) { if (IS_ENABLED(CONFIG_CMD_BMP)) {
/* display BMP if available */ /* display BMP if available */
if (cfg->bmp) { if (cfg->bmp) {
if (get_relfile(ctx, cfg->bmp, image_load_addr, NULL)) { if (get_relfile(ctx, cfg->bmp, image_load_addr,
BFI_LOGO, NULL)) {
#if defined(CONFIG_VIDEO) #if defined(CONFIG_VIDEO)
struct udevice *dev; struct udevice *dev;

2
cmd/pxe.c
View File

@@ -27,7 +27,7 @@ const char *pxe_default_paths[] = {
}; };
static int do_get_tftp(struct pxe_context *ctx, const char *file_path, static int do_get_tftp(struct pxe_context *ctx, const char *file_path,
char *file_addr, ulong *sizep) char *file_addr, enum bootflow_img_t type, ulong *sizep)
{ {
char *tftp_argv[] = {"tftp", NULL, NULL, NULL}; char *tftp_argv[] = {"tftp", NULL, NULL, NULL};
int ret; int ret;

6
cmd/sysboot.c
View File

@@ -23,7 +23,8 @@ struct sysboot_info {
}; };
static int sysboot_read_file(struct pxe_context *ctx, const char *file_path, static int sysboot_read_file(struct pxe_context *ctx, const char *file_path,
char *file_addr, ulong *sizep) char *file_addr, enum bootflow_img_t type,
ulong *sizep)
{ {
struct sysboot_info *info = ctx->userdata; struct sysboot_info *info = ctx->userdata;
loff_t len_read; loff_t len_read;
@@ -110,7 +111,8 @@ static int do_sysboot(struct cmd_tbl *cmdtp, int flag, int argc,
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
} }
if (get_pxe_file(&ctx, filename, pxefile_addr_r) < 0) { if (get_pxe_file(&ctx, filename, pxefile_addr_r)
< 0) {
printf("Error reading config file\n"); printf("Error reading config file\n");
pxe_destroy_ctx(&ctx); pxe_destroy_ctx(&ctx);
return 1; return 1;

14
include/pxe_utils.h
View File

@@ -3,6 +3,7 @@
#ifndef __PXE_UTILS_H #ifndef __PXE_UTILS_H
#define __PXE_UTILS_H #define __PXE_UTILS_H
#include <bootflow.h>
#include <linux/list.h> #include <linux/list.h>
/* /*
@@ -82,8 +83,19 @@ struct pxe_menu {
}; };
struct pxe_context; struct pxe_context;
/**
* Read a file
*
* @ctx: PXE context
* @file_path: Full path to filename to read
* @file_addr: String containing the to which to read the file
* @type: File type
* @fileszeip: Returns file size
*/
typedef int (*pxe_getfile_func)(struct pxe_context *ctx, const char *file_path, typedef int (*pxe_getfile_func)(struct pxe_context *ctx, const char *file_path,
char *file_addr, ulong *filesizep); char *file_addr, enum bootflow_img_t type,
ulong *filesizep);
/** /**
* struct pxe_context - context information for PXE parsing * struct pxe_context - context information for PXE parsing