5a75fc4b11
loaderdev variable works correctly. The uboot_devdesc struct is variously cast back and forth between uboot_devdesc and disk_devdesc as pointers are handed off through various opaque interfaces. uboot_devdesc attempted to mimic the layout of disk_devdesc by having a devdesc struct, followed by a union of some device-specific stuff that included a struct that contains the same fields as a disk_devdesc. However, one of those fields inside the struct is 64-bit which causes the entire union to be 64-bit aligned -- 32 bits of padding is added between the struct devdesc and the union, so the whole mess ends up NOT properly mimicking a disk_devdesc after all. (In disk_devdesc there is also 32 bits of padding, but it shows up immediately before the d_offset field, rather than before the whole collection of d_* fields.) This fixes the problem by using an anonymous union to overlay the devdesc field uboot network devices need with the disk_devdesc that uboot storage devices need. This is a different solution than the one contributed with the PR (so if anything goes wrong, the blame goes to me), but 95% of the credit for this fix goes to Pawel Worach and Manuel Stuhn who analyzed the problem and proposed a fix. PR: 233097
77 lines
2.5 KiB
C
77 lines
2.5 KiB
C
/*-
|
|
* Copyright (C) 2000 Benno Rice.
|
|
* Copyright (C) 2007 Semihalf, Rafal Jaworowski <raj@semihalf.com>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#include <disk.h>
|
|
|
|
struct uboot_devdesc {
|
|
union {
|
|
struct devdesc dd;
|
|
struct disk_devdesc d_disk;
|
|
};
|
|
};
|
|
|
|
/*
|
|
* Default network packet alignment in memory. On arm arches packets must be
|
|
* aligned to cacheline boundaries.
|
|
*/
|
|
#if defined(__aarch64__)
|
|
#define PKTALIGN 128
|
|
#elif defined(__arm__)
|
|
#define PKTALIGN 64
|
|
#else
|
|
#define PKTALIGN 32
|
|
#endif
|
|
|
|
int uboot_getdev(void **vdev, const char *devspec, const char **path);
|
|
char *uboot_fmtdev(void *vdev);
|
|
int uboot_setcurrdev(struct env_var *ev, int flags, const void *value);
|
|
|
|
extern int devs_no;
|
|
extern struct netif_driver uboot_net;
|
|
extern struct devsw uboot_storage;
|
|
|
|
extern uintptr_t uboot_heap_start;
|
|
extern uintptr_t uboot_heap_end;
|
|
|
|
uint64_t uboot_loadaddr(u_int type, void *data, uint64_t addr);
|
|
ssize_t uboot_copyin(const void *src, vm_offset_t dest, const size_t len);
|
|
ssize_t uboot_copyout(const vm_offset_t src, void *dest, const size_t len);
|
|
ssize_t uboot_readin(const int fd, vm_offset_t dest, const size_t len);
|
|
extern int uboot_autoload(void);
|
|
|
|
struct preloaded_file;
|
|
struct file_format;
|
|
|
|
extern struct file_format uboot_elf;
|
|
|
|
void reboot(void);
|
|
|
|
int uboot_diskgetunit(int type, int type_unit);
|
|
|