Virtualization/openbios
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/openbios.git synced 2024-02-13 08:34:06 +08:00
Code Issues Projects Releases Wiki Activity

Sparc64: use firmware configuration device for command line storage

Browse Source 
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@663 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
Blue Swirl
2010-01-09 21:28:28 +00:00
parent 592138f390
commit a40a92653f
2 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/sparc64/openbios.c
View File

@@ -280,7 +280,6 @@ void arch_nvram_get(char *data)
uint32_t clock_frequency; uint32_t clock_frequency;
uint16_t machine_id; uint16_t machine_id;
const char *stdin_path, *stdout_path; const char *stdin_path, *stdout_path;
const char *kernel_cmdline;
fw_cfg_init(); fw_cfg_init();
@@ -302,12 +301,12 @@ void arch_nvram_get(char *data)
kernel_size = fw_cfg_read_i32(FW_CFG_KERNEL_SIZE); kernel_size = fw_cfg_read_i32(FW_CFG_KERNEL_SIZE);
if (kernel_size) if (kernel_size)
kernel_image = fw_cfg_read_i64(FW_CFG_KERNEL_ADDR); kernel_image = fw_cfg_read_i64(FW_CFG_KERNEL_ADDR);
kernel_cmdline = (const char *) fw_cfg_read_i64(FW_CFG_KERNEL_CMDLINE);
if (kernel_cmdline) { size = fw_cfg_read_i32(FW_CFG_CMDLINE_SIZE);
size = strlen(kernel_cmdline); if (size > OBIO_CMDLINE_MAX - 1)
if (size > OBIO_CMDLINE_MAX - 1) size = OBIO_CMDLINE_MAX - 1;
size = OBIO_CMDLINE_MAX - 1; if (size) {
memcpy(&obio_cmdline, kernel_cmdline, size); fw_cfg_read(FW_CFG_CMDLINE_DATA, obio_cmdline, size);
} }
obio_cmdline[size] = '\0'; obio_cmdline[size] = '\0';
qemu_cmdline = (uint64_t)obio_cmdline; qemu_cmdline = (uint64_t)obio_cmdline;

47
include/openbios/fw_cfg.h
View File

@@ -14,7 +14,23 @@
#define FW_CFG_INITRD_ADDR 0x0a #define FW_CFG_INITRD_ADDR 0x0a
#define FW_CFG_INITRD_SIZE 0x0b #define FW_CFG_INITRD_SIZE 0x0b
#define FW_CFG_BOOT_DEVICE 0x0c #define FW_CFG_BOOT_DEVICE 0x0c
#define FW_CFG_MAX_ENTRY 0x10 #define FW_CFG_NUMA 0x0d
#define FW_CFG_BOOT_MENU 0x0e
#define FW_CFG_MAX_CPUS 0x0f
#define FW_CFG_KERNEL_ENTRY 0x10
#define FW_CFG_KERNEL_DATA 0x11
#define FW_CFG_INITRD_DATA 0x12
#define FW_CFG_CMDLINE_ADDR 0x13
#define FW_CFG_CMDLINE_SIZE 0x14
#define FW_CFG_CMDLINE_DATA 0x15
#define FW_CFG_SETUP_ADDR 0x16
#define FW_CFG_SETUP_SIZE 0x17
#define FW_CFG_SETUP_DATA 0x18
#define FW_CFG_FILE_DIR 0x19
#define FW_CFG_FILE_FIRST 0x20
#define FW_CFG_FILE_SLOTS 0x10
#define FW_CFG_MAX_ENTRY (FW_CFG_FILE_FIRST+FW_CFG_FILE_SLOTS)
#define FW_CFG_WRITE_CHANNEL 0x4000 #define FW_CFG_WRITE_CHANNEL 0x4000
#define FW_CFG_ARCH_LOCAL 0x8000 #define FW_CFG_ARCH_LOCAL 0x8000
@@ -23,16 +39,31 @@
#define FW_CFG_INVALID 0xffff #define FW_CFG_INVALID 0xffff
#ifndef NO_QEMU_PROTOS #ifndef NO_QEMU_PROTOS
typedef struct FWCfgFile {
uint32_t size; /* file size */
uint16_t select; /* write this to 0x510 to read it */
uint16_t reserved;
char name[56];
} FWCfgFile;
typedef struct FWCfgFiles {
uint32_t count;
FWCfgFile f[];
} FWCfgFiles;
typedef void (*FWCfgCallback)(void *opaque, uint8_t *data); typedef void (*FWCfgCallback)(void *opaque, uint8_t *data);
int fw_cfg_add_bytes(void *opaque, uint16_t key, uint8_t *data, uint16_t len); typedef struct _FWCfgState FWCfgState;
int fw_cfg_add_i16(void *opaque, uint16_t key, uint16_t value); int fw_cfg_add_bytes(FWCfgState *s, uint16_t key, uint8_t *data, uint32_t len);
int fw_cfg_add_i32(void *opaque, uint16_t key, uint32_t value); int fw_cfg_add_i16(FWCfgState *s, uint16_t key, uint16_t value);
int fw_cfg_add_i64(void *opaque, uint16_t key, uint64_t value); int fw_cfg_add_i32(FWCfgState *s, uint16_t key, uint32_t value);
int fw_cfg_add_callback(void *opaque, uint16_t key, FWCfgCallback callback, int fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value);
int fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback,
void *callback_opaque, uint8_t *data, size_t len); void *callback_opaque, uint8_t *data, size_t len);
void *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, int fw_cfg_add_file(FWCfgState *s, const char *dir, const char *filename,
target_phys_addr_t crl_addr, target_phys_addr_t data_addr); uint8_t *data, uint32_t len);
FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port,
target_phys_addr_t crl_addr, target_phys_addr_t data_addr);
#endif /* NO_QEMU_PROTOS */ #endif /* NO_QEMU_PROTOS */