mirror of
https://github.com/opnsense/src.git
synced 2026-05-28 04:12:45 -04:00
Fix the bug I introduced in r247045.
After digging through more carefully, it looks like there's no real need to have the DTB in the module directory. So we can simplify a lot: Just copy DTB into local heap for "fdt addr" and U-Boot integration, drop all the extra COPYIN() calls. I've left one final COPYIN() to update the in-kernel DTB for consistency with how this code used to work, but I'm no longer convinced it's appropriate here. I've also remove the mem_load_raw() utility that I added to boot/common/module.c with r247045 since it's no longer necessary.
This commit is contained in:
Tim Kientzle
parent
c6344d08bb
commit
6d4a620eba
3 changed files with 30 additions and 66 deletions
|
|
@ -237,8 +237,6 @@ void file_discard(struct preloaded_file *fp);
|
|||
void file_addmetadata(struct preloaded_file *fp, int type, size_t size, void *p);
|
||||
int file_addmodule(struct preloaded_file *fp, char *modname, int version,
|
||||
struct kernel_module **newmp);
|
||||
/* Load from a buffer in memory. */
|
||||
struct preloaded_file *mem_load_raw(char *type, char *name, const void *p, size_t len);
|
||||
|
||||
/* MI module loaders */
|
||||
#ifdef __elfN
|
||||
|
|
|
|||
|
|
@ -421,42 +421,6 @@ file_loadraw(char *type, char *name)
|
|||
return(CMD_OK);
|
||||
}
|
||||
|
||||
/*
|
||||
* Load a chunk of data as if it had been read from a file.
|
||||
*/
|
||||
struct preloaded_file *
|
||||
mem_load_raw(char *type, char *name, const void *p, size_t len)
|
||||
{
|
||||
struct preloaded_file *fp;
|
||||
|
||||
/* We can't load first */
|
||||
if ((file_findfile(NULL, NULL)) == NULL) {
|
||||
command_errmsg = "can't load file before kernel";
|
||||
return(NULL);
|
||||
}
|
||||
|
||||
if (archsw.arch_loadaddr != NULL)
|
||||
loadaddr = archsw.arch_loadaddr(LOAD_RAW, name, loadaddr);
|
||||
archsw.arch_copyin(p, loadaddr, len);
|
||||
|
||||
/* Looks OK so far; create & populate control structure */
|
||||
fp = file_alloc();
|
||||
fp->f_name = strdup(name);
|
||||
fp->f_type = strdup(type);
|
||||
fp->f_args = NULL;
|
||||
fp->f_metadata = NULL;
|
||||
fp->f_loader = -1;
|
||||
fp->f_addr = loadaddr;
|
||||
fp->f_size = len;
|
||||
|
||||
/* recognise space consumption */
|
||||
loadaddr += len;
|
||||
|
||||
/* Add to the list of loaded files */
|
||||
file_insert_tail(fp);
|
||||
return fp;
|
||||
}
|
||||
|
||||
/*
|
||||
* Load the module (name), pass it (argc),(argv), add container file
|
||||
* to the list of loaded files.
|
||||
|
|
|
|||
|
|
@ -63,12 +63,16 @@ __FBSDID("$FreeBSD$");
|
|||
#define CMD_REQUIRES_BLOB 0x01
|
||||
|
||||
/* Location of FDT yet to be loaded. */
|
||||
/* This may be in read-only memory, so can't be manipulated directly. */
|
||||
static struct fdt_header *fdt_to_load = NULL;
|
||||
/* Local copy of FDT on heap. */
|
||||
/* Location of FDT on heap. */
|
||||
/* This is the copy we actually manipulate. */
|
||||
static struct fdt_header *fdtp = NULL;
|
||||
/* Size of FDT blob */
|
||||
static size_t fdtp_size = 0;
|
||||
/* Location of FDT in kernel or module */
|
||||
/* Location of FDT in kernel or module. */
|
||||
/* This won't be set if FDT is loaded from disk or memory. */
|
||||
/* If it is set, we'll update it when fdt_copy() gets called. */
|
||||
static vm_offset_t fdtp_va = 0;
|
||||
|
||||
static int fdt_load_dtb(vm_offset_t va);
|
||||
|
|
@ -191,7 +195,6 @@ fdt_find_static_dtb()
|
|||
fdt_start = (vm_offset_t)sym.st_value + offs;
|
||||
free(strp);
|
||||
}
|
||||
printf("fdt_start: 0x%08jX\n", (intmax_t)fdt_start);
|
||||
return (fdt_start);
|
||||
}
|
||||
|
||||
|
|
@ -239,14 +242,19 @@ fdt_load_dtb(vm_offset_t va)
|
|||
static int
|
||||
fdt_load_dtb_addr(struct fdt_header *header)
|
||||
{
|
||||
struct preloaded_file *bfp;
|
||||
|
||||
bfp = mem_load_raw("dtb", "memory.dtb", header, fdt_totalsize(header));
|
||||
if (bfp == NULL) {
|
||||
command_errmsg = "unable to copy DTB into module directory";
|
||||
// TODO: Verify that there really is an FDT at
|
||||
// the specified location.
|
||||
fdtp_size = fdt_totalsize(header);
|
||||
free(fdtp);
|
||||
if ((fdtp = malloc(fdtp_size)) == NULL) {
|
||||
command_errmsg = "can't allocate memory for device tree copy";
|
||||
return (1);
|
||||
}
|
||||
return fdt_load_dtb(bfp->f_addr);
|
||||
|
||||
fdtp_va = 0; // Don't write this back into module or kernel.
|
||||
bcopy(header, fdtp, fdtp_size);
|
||||
return (0);
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
@ -339,7 +347,7 @@ _fdt_strtovect(char *str, void *cellbuf, int lim, unsigned char cellsize,
|
|||
|
||||
#define TMP_MAX_ETH 8
|
||||
|
||||
void
|
||||
static void
|
||||
fixup_ethernet(const char *env, char *ethstr, int *eth_no, int len)
|
||||
{
|
||||
char *end, *str;
|
||||
|
|
@ -376,7 +384,7 @@ fixup_ethernet(const char *env, char *ethstr, int *eth_no, int len)
|
|||
*eth_no = n + 1;
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
fixup_cpubusfreqs(unsigned long cpufreq, unsigned long busfreq)
|
||||
{
|
||||
int lo, o = 0, o2, maxo = 0, depth;
|
||||
|
|
@ -424,7 +432,7 @@ fixup_cpubusfreqs(unsigned long cpufreq, unsigned long busfreq)
|
|||
}
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
fdt_reg_valid(uint32_t *reg, int len, int addr_cells, int size_cells)
|
||||
{
|
||||
int cells_in_tuple, i, tuples, tuple_size;
|
||||
|
|
@ -456,7 +464,7 @@ fdt_reg_valid(uint32_t *reg, int len, int addr_cells, int size_cells)
|
|||
return (0);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
fixup_memory(struct sys_info *si)
|
||||
{
|
||||
struct mem_region *curmr;
|
||||
|
|
@ -611,7 +619,7 @@ fixup_memory(struct sys_info *si)
|
|||
free(sb);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
fixup_stdout(const char *env)
|
||||
{
|
||||
const char *str;
|
||||
|
|
@ -664,7 +672,7 @@ fixup_stdout(const char *env)
|
|||
/*
|
||||
* Locate the blob, fix it up and return its location.
|
||||
*/
|
||||
static vm_offset_t
|
||||
static int
|
||||
fdt_fixup(void)
|
||||
{
|
||||
const char *env;
|
||||
|
|
@ -692,7 +700,7 @@ fdt_fixup(void)
|
|||
|
||||
/* Value assigned to fixup-applied does not matter. */
|
||||
if (fdt_getprop(fdtp, chosen, "fixup-applied", NULL))
|
||||
goto success;
|
||||
return (1);
|
||||
|
||||
/* Acquire sys_info */
|
||||
si = ub_get_sys_info();
|
||||
|
|
@ -735,15 +743,11 @@ fdt_fixup(void)
|
|||
fixup_memory(si);
|
||||
|
||||
fdt_setprop(fdtp, chosen, "fixup-applied", NULL, 0);
|
||||
|
||||
success:
|
||||
/* Overwrite the FDT with the fixed version. */
|
||||
COPYIN(fdtp, fdtp_va, fdtp_size);
|
||||
return (fdtp_va);
|
||||
return (1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Copy DTB blob to specified location and its return size
|
||||
* Copy DTB blob to specified location and return size
|
||||
*/
|
||||
int
|
||||
fdt_copy(vm_offset_t va)
|
||||
|
|
@ -761,6 +765,11 @@ fdt_copy(vm_offset_t va)
|
|||
if (fdt_fixup() == 0)
|
||||
return (0);
|
||||
|
||||
if (fdtp_va != 0) {
|
||||
/* Overwrite the FDT with the fixed version. */
|
||||
/* XXX Is this really appropriate? */
|
||||
COPYIN(fdtp, fdtp_va, fdtp_size);
|
||||
}
|
||||
COPYIN(fdtp, va, fdtp_size);
|
||||
return (fdtp_size);
|
||||
}
|
||||
|
|
@ -1334,8 +1343,6 @@ fdt_modprop(int nodeoff, char *propname, void *value, char mode)
|
|||
else
|
||||
sprintf(command_errbuf,
|
||||
"Could not add/modify property!\n");
|
||||
} else {
|
||||
COPYIN(fdtp, fdtp_va, fdtp_size);
|
||||
}
|
||||
return (rv);
|
||||
}
|
||||
|
|
@ -1520,7 +1527,6 @@ fdt_cmd_mkprop(int argc, char *argv[])
|
|||
if (fdt_modprop(o, propname, value, 1))
|
||||
return (CMD_ERROR);
|
||||
|
||||
COPYIN(fdtp, fdtp_va, fdtp_size);
|
||||
return (CMD_OK);
|
||||
}
|
||||
|
||||
|
|
@ -1557,8 +1563,6 @@ fdt_cmd_rm(int argc, char *argv[])
|
|||
if (rv) {
|
||||
sprintf(command_errbuf, "could not delete node");
|
||||
return (CMD_ERROR);
|
||||
} else {
|
||||
COPYIN(fdtp, fdtp_va, fdtp_size);
|
||||
}
|
||||
return (CMD_OK);
|
||||
}
|
||||
|
|
@ -1589,8 +1593,6 @@ fdt_cmd_mknode(int argc, char *argv[])
|
|||
sprintf(command_errbuf,
|
||||
"Could not add node!\n");
|
||||
return (CMD_ERROR);
|
||||
} else {
|
||||
COPYIN(fdtp, fdtp_va, fdtp_size);
|
||||
}
|
||||
return (CMD_OK);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue