OpenBIOS January 2010

openbios@openbios.org

15 participants
34 discussions

Some encountered issues when compiling openbios on a ppc64 host
by Zhiyong Wu 23 Jan '10

23 Jan '10

HI, openbios guys, Today i compiled openbios on my ppc64 box, encoutered some questions: [root@945n03 openbios]# uname -a Linux 945n03 2.6.31.5-127.fc12.ppc64 #1 SMP Sat Nov 7 20:58:24 EST 2009 ppc64 ppc64 ppc64 GNU/Linux [root@945n03 openbios]# rpm -qa | grep glibc glibc-2.11-2.ppc glibc-2.11-2.ppc64 glibc-devel-2.11-2.ppc glibc-common-2.11-2.ppc glibc-headers-2.11-2.ppc [root@945n03 openbios]# rpm -qa | grep gcc libgcc-4.4.2-7.fc12.ppc64 gcc-4.4.2-7.fc12.ppc libgcc-4.4.2-7.fc12.ppc gcc-c++-4.4.2-7.fc12.ppc gcc-gfortran-4.4.2-7.fc12.ppc [root@945n03 openbios]# gcc -v Using built-in specs. Target: ppc64-redhat-linux Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk --disable-dssi --enable-plugin --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre --enable-libgcj-multifile --enable-java-maintainer-mode --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --disable-libjava-multilib --with-ppl --with-cloog --enable-secureplt --with-long-double-128 --build=ppc64-redhat-linux --target=ppc64-redhat-linux --with-cpu=default32 Thread model: posix gcc version 4.4.2 20091027 (Red Hat 4.4.2-7) (GCC) [root@945n03 openbios]# ./config/scripts/switch-arch ppc Configuring OpenBIOS on ppc64 for ppc ERROR: no powerpc cross-compiler found ! When i run "setarch 32 bash", "switch-arch" can work well, but it fails to run "make" [root@945n03 openbios]# uname -a Linux 945n03 2.6.31.5-127.fc12.ppc64 #1 SMP Sat Nov 7 20:58:24 EST 2009 ppc ppc ppc GNU/Linux [root@945n03 openbios]# ./config/scripts/switch-arch ppc Configuring OpenBIOS on ppc for ppc Initializing build tree obj-ppc...ok. Creating target Makefile...ok. Creating config files...ok. Building OpenBIOS for ppc Building...error: /kvm/openbios/obj-ppc/../libc/string.c:499: undefined reference to `_restgpr_31_x' liblibc.a(vsprintf.o): In function `number': /kvm/openbios/obj-ppc/../libc/vsprintf.c:55: undefined reference to `_savegpr_19' /kvm/openbios/obj-ppc/../libc/vsprintf.c:145: undefined reference to `_restgpr_19_x' liblibc.a(vsprintf.o): In function `vsnprintf': /kvm/openbios/obj-ppc/../libc/vsprintf.c:158: undefined reference to `_savegpr_22' /kvm/openbios/obj-ppc/../libc/vsprintf.c:388: undefined reference to `_restgpr_22_x' libgcc.a(__divdi3.o): In function `__divdi3': /kvm/openbios/obj-ppc/../libgcc/__divdi3.c:8: undefined reference to `_savegpr_31' /kvm/openbios/obj-ppc/../libgcc/__divdi3.c:26: undefined reference to `_restgpr_31_x' libgcc.a(__udivmoddi4.o): In function `__udivmoddi4': /kvm/openbios/obj-ppc/../libgcc/__udivmoddi4.c:4: undefined reference to `_savegpr_26' /kvm/openbios/obj-ppc/../libgcc/__udivmoddi4.c:31: undefined reference to `_restgpr_26_x' make[1]: *** [openbios-qemu.elf] Error 1 make[1]: Leaving directory `/kvm/openbios/obj-ppc' make: *** [build] Error 1 Who can give me some advices? Cheers, Zhiyong Wu

6 10

Re: [OpenBIOS] r667 - trunk/openbios-devel/include/sparc64
by Nick Couchman 23 Jan '10

23 Jan '10

>>> On 2010/01/22 at 11:50, <svn(a)openbios.org> wrote: > Author: blueswirl > Date: 2010-01-22 19:50:54 +0100 (Fri, 22 Jan 2010) > New Revision: 667 > > Modified: > trunk/openbios-devel/include/sparc64/pci.h > Log: > Sparc64: use correct PCI probe mechanism > > Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> > Output after updating to this revision: OpenBIOS for Sparc64 Cannot manage 'multimedia device' PCI device type '<NULL>': 8e10 50 (4 6 0) Cannot manage 'multimedia device' PCI device type '<NULL>': 8e10 50 (4 6 0) Cannot manage 'undefined' PCI device type '<NULL>': 3412 1111 (0 3 0) set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle Cannot manage 'invalid PCI device' PCI device type 'invalid': 8e10 10 (80 6 0) Cannot manage 'undefined' PCI device type '<NULL>': ec10 2980 (0 2 0) set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle Cannot manage 'IDE controller' PCI device type 'ide': 9510 4606 (1 1 8f) Configuration device id QEMU version 1 machine id 0 kernel cmdline CPUs: 1 x SUNW,UltraSPARC-II UUID: 00000000-0000-0000-0000-000000000000 $call-method: instance method not found $call-method: instance method not found Input device ttya not found. Output device ttya not found. Output device ttya not found. Input device ttya not found. Output device screen not found. Type 'help' for detailed information [sparc64] Booting file 'cdrom' with parameters '' $call-method: instance method not found 0 > nick@nick0:~/Temp/qemu> -Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

2 2

r668 - trunk/openbios-devel/arch/unix
by svn＠openbios.org 23 Jan '10

23 Jan '10

Author: blueswirl Date: 2010-01-23 15:43:02 +0100 (Sat, 23 Jan 2010) New Revision: 668 Modified: trunk/openbios-devel/arch/unix/unix.c Log: Sparc64: fix native Unix version build Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/unix/unix.c =================================================================== --- trunk/openbios-devel/arch/unix/unix.c 2010-01-22 18:50:54 UTC (rev 667) +++ trunk/openbios-devel/arch/unix/unix.c 2010-01-23 14:43:02 UTC (rev 668) @@ -35,6 +35,7 @@ #include "openbios-version.h" #include "blk.h" +#include "ofmem.h" #define MEMORY_SIZE (4*1024*1024) /* 4M ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256k for the dictionary */ @@ -67,6 +68,12 @@ int errno_int; /* implement for fs drivers, needed to build on Mac OS X */ +ucell ofmem_claim(ucell addr, ucell size, ucell align) +{ + return 0; +} + + #if 0 static void write_dictionary(char *filename) {

1 0

r667 - trunk/openbios-devel/include/sparc64
by svn＠openbios.org 22 Jan '10

22 Jan '10

Author: blueswirl Date: 2010-01-22 19:50:54 +0100 (Fri, 22 Jan 2010) New Revision: 667 Modified: trunk/openbios-devel/include/sparc64/pci.h Log: Sparc64: use correct PCI probe mechanism Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/include/sparc64/pci.h =================================================================== --- trunk/openbios-devel/include/sparc64/pci.h 2010-01-16 10:35:58 UTC (rev 666) +++ trunk/openbios-devel/include/sparc64/pci.h 2010-01-22 18:50:54 UTC (rev 667) @@ -12,55 +12,53 @@ /* PCI Configuration Mechanism #1 */ #define PCI_ADDR(bus, dev, fn) \ - ((pci_addr) (arch->cfg_base \ - | (uint32_t) (bus) << 16 \ + (((pci_addr) (uint32_t) (bus) << 16 \ | (uint32_t) (dev) << 11 \ | (uint32_t) (fn) << 8)) -#define PCI_BUS(pcidev) ((uint8_t) ((pcidev) >> 16)) +#define PCI_BUS(pcidev) ((uint8_t) ((pcidev) >> 16) & 0xff) #define PCI_DEV(pcidev) ((uint8_t) ((pcidev) >> 11) & 0x1f) #define PCI_FN(pcidev) ((uint8_t) ((pcidev) >> 8) & 7) +#define PCI_CONFIG(dev) (arch->cfg_addr \ + + (unsigned long)PCI_ADDR(PCI_BUS(dev), \ + PCI_DEV(dev), \ + PCI_FN(dev))) + static inline uint8_t pci_config_read8(pci_addr dev, uint8_t reg) { uint8_t res; - out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); - res = in_8((unsigned char*)(arch->cfg_data + (reg & 3))); + res = in_8((unsigned char*)(PCI_CONFIG(dev) + reg)); return res; } static inline uint16_t pci_config_read16(pci_addr dev, uint8_t reg) { uint16_t res; - out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); - res = in_le16((unsigned short*)(arch->cfg_data + (reg & 2))); + res = in_le16((uint16_t *)(PCI_CONFIG(dev) + reg)); return res; } static inline uint32_t pci_config_read32(pci_addr dev, uint8_t reg) { uint32_t res; - out_le32((unsigned *)arch->cfg_addr, dev | reg); - res = in_le32((unsigned *)(arch->cfg_data + reg)); + res = in_le32((uint32_t *)(PCI_CONFIG(dev) + reg)); return res; } static inline void pci_config_write8(pci_addr dev, uint8_t reg, uint8_t val) { - out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); - out_8((unsigned char*)(arch->cfg_data + (reg & 3)), val); + out_8((unsigned char*)(PCI_CONFIG(dev) + reg), val); } static inline void pci_config_write16(pci_addr dev, uint8_t reg, uint16_t val) { - out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); - out_le16((unsigned short *)(arch->cfg_data + (reg & 2)), val); + out_le16((uint16_t *)(PCI_CONFIG(dev) + reg), val); } static inline void pci_config_write32(pci_addr dev, uint8_t reg, uint32_t val) { - out_le32((unsigned *)arch->cfg_addr, dev | reg); - out_le32((unsigned *)(arch->cfg_data + reg), val); + out_le32((uint32_t *)(PCI_CONFIG(dev) + reg), val); } #else /* !PCI_CONFIG_1 */ #error PCI Configuration Mechanism is not specified or implemented

1 0

adding words to open bios
by G 3 18 Jan '10

18 Jan '10

I'm having a lot of difficulty trying to add my own words to OpenBIOS. I though it would be easy as defining the word and saving it in one of the .fs files. Here is my simple word : testword ." this is a test word" ; I tried adding this word to start.fs, but when I try to compile OpenBIOS r666, I receive this error: john@iBook:~/openbios-devel$ make Building OpenBIOS for ppc Building...error: make[1]: Entering directory `/home/john/openbios-devel/obj-ppc' GEN bootstrap.dict panic: segmentation violation at (nil) dict=0x48131008 here=0x48136624(dict+0x561c) pc=0x4813380c(dict+0x2804) dstackcnt=4 rstackcnt=5 instruction=481312ec dstack: 0x0 0x0 0x0 0x0 0x22 rstack: 0x0 0x48133b6c 0x48133b78 0x481338ac 0x0 0x0 Writing dictionary core file make[1]: *** [bootstrap.dict] Error 1 make[1]: Leaving directory `/home/john/openbios-devel/obj-ppc' make: *** [build] Error 1 Could someone point me into the right direction?

2 1

r666 - trunk/openbios-devel/drivers
by svn＠openbios.org 16 Jan '10

16 Jan '10

Author: blueswirl Date: 2010-01-16 11:35:58 +0100 (Sat, 16 Jan 2010) New Revision: 666 Modified: trunk/openbios-devel/drivers/esp.c Log: ESP: fix breakage by r667, status getting erased by interrupt register read Reading the interrupt status register clears also status register, therefore the interrupt status must be read only after reading the status. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/esp.c =================================================================== --- trunk/openbios-devel/drivers/esp.c 2010-01-16 08:47:39 UTC (rev 665) +++ trunk/openbios-devel/drivers/esp.c 2010-01-16 10:35:58 UTC (rev 666) @@ -101,12 +101,11 @@ esp->ll->regs[ESP_CMD] = ESP_CMD_SELA | ESP_CMD_DMA; // Wait for DMA to complete. Can this fail? while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0) /* no-op */; + // Check status + status = esp->ll->regs[ESP_STATUS]; // Clear interrupts to avoid guests seeing spurious interrupts (void)esp->ll->regs[ESP_INTRPT]; - // Check status - status = esp->ll->regs[ESP_STATUS]; - DPRINTF("do_command: id %d, cmd[0] 0x%x, status 0x%x\n", sd->id, esp->buffer[0], status); // Target didn't want all command data or went to status phase @@ -127,13 +126,11 @@ esp->ll->regs[ESP_CMD] = ESP_CMD_TI | ESP_CMD_DMA; // Wait for DMA to complete while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0) /* no-op */; - + // Check status + status = esp->ll->regs[ESP_STATUS]; // Clear interrupts to avoid guests seeing spurious interrupts (void)esp->ll->regs[ESP_INTRPT]; - // Check status - status = esp->ll->regs[ESP_STATUS]; - DPRINTF("do_command_reply: status 0x%x\n", status); if ((status & ESP_STAT_TCNT) != ESP_STAT_TCNT)

1 0

r665 - trunk/openbios-devel/drivers
by svn＠openbios.org 16 Jan '10

16 Jan '10

Author: blueswirl Date: 2010-01-16 09:47:39 +0100 (Sat, 16 Jan 2010) New Revision: 665 Modified: trunk/openbios-devel/drivers/esp.c Log: ESP: fix spurious guest interrupts during boot Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/esp.c =================================================================== --- trunk/openbios-devel/drivers/esp.c 2010-01-10 18:26:34 UTC (rev 664) +++ trunk/openbios-devel/drivers/esp.c 2010-01-16 08:47:39 UTC (rev 665) @@ -101,6 +101,9 @@ esp->ll->regs[ESP_CMD] = ESP_CMD_SELA | ESP_CMD_DMA; // Wait for DMA to complete. Can this fail? while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0) /* no-op */; + // Clear interrupts to avoid guests seeing spurious interrupts + (void)esp->ll->regs[ESP_INTRPT]; + // Check status status = esp->ll->regs[ESP_STATUS]; @@ -124,6 +127,10 @@ esp->ll->regs[ESP_CMD] = ESP_CMD_TI | ESP_CMD_DMA; // Wait for DMA to complete while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0) /* no-op */; + + // Clear interrupts to avoid guests seeing spurious interrupts + (void)esp->ll->regs[ESP_INTRPT]; + // Check status status = esp->ll->regs[ESP_STATUS];

1 0

Re: [OpenBIOS] [Qemu-devel] [PATCH 0/9] PPC NewWorld fixery v3
by Blue Swirl 13 Jan '10

13 Jan '10

On Tue, Jan 12, 2010 at 11:58 AM, Alexander Graf <agraf(a)suse.de> wrote: > I'm trying to get the PPC64 system emulation target working finally. > While doing so, I ran into several issues, all related to PCI this time. > > This patchset fixes all the PCI config space access and PCI interrupt > mapping issues I've found on PPC64. Using this and a patched OpenBIOS > version, I can successfully access IDE devices and was booting a guest > into the shell from IDE using serial console. > > To leverage this patch, you also need a few patches to OpenBIOS. I'll > present them to the OpenBIOS list, but in general getting patches into > Qemu is harder than getting them into OpenBIOS. So I want to wait for > the review process here first. > > Find the OpenBIOS patch at: http://alex.csgraf.de/openbios-ppc-u3.patch About the OpenBIOS patch, could you move the PCI_INT_MAP defines to a PPC-specific header and make pci_host_set_interrupt_map() contents surrounded by #ifdef CONFIG_PPC (to make it empty function for other arches)?

2 7

r664 - trunk/openbios-devel/drivers
by svn＠openbios.org 10 Jan '10

10 Jan '10

Author: blueswirl Date: 2010-01-10 19:26:34 +0100 (Sun, 10 Jan 2010) New Revision: 664 Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci_database.c trunk/openbios-devel/drivers/pci_database.h Log: Sparc64: fix Sabre properties Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci.c =================================================================== --- trunk/openbios-devel/drivers/pci.c 2010-01-09 21:28:28 UTC (rev 663) +++ trunk/openbios-devel/drivers/pci.c 2010-01-10 18:26:34 UTC (rev 664) @@ -348,6 +348,63 @@ return 0; } +int sabre_config_cb(const pci_config_t *config) +{ + phandle_t dev = get_cur_dev(); + uint32_t props[28]; + + props[0] = 0x00000000; + props[1] = 0x00000003; + set_property(dev, "bus-range", (char *)props, 2 * sizeof(props[0])); + props[0] = 0x000001fe; + props[1] = 0x00000000; + props[2] = 0x00000000; + props[3] = 0x00010000; + props[4] = 0x000001fe; + props[5] = 0x01000000; + props[6] = 0x00000000; + props[7] = 0x00000100; + set_property(dev, "reg", (char *)props, 8 * sizeof(props[0])); + props[0] = 0x00000000; + props[1] = 0x00000000; + props[2] = 0x00000000; + props[3] = 0x000001fe; + props[4] = 0x01000000; + props[5] = 0x00000000; + props[6] = 0x01000000; + props[7] = 0x01000000; + props[8] = 0x00000000; + props[9] = 0x00000000; + props[10] = 0x000001fe; + props[11] = 0x02000000; + props[12] = 0x00000000; + props[13] = 0x01000000; + props[14] = 0x02000000; + props[15] = 0x00000000; + props[16] = 0x00000000; + props[17] = 0x000001ff; + props[18] = 0x00000000; + props[19] = 0x00000001; + props[20] = 0x00000000; + props[21] = 0x03000000; + props[22] = 0x00000000; + props[23] = 0x00000000; + props[24] = 0x000001ff; + props[25] = 0x00000000; + props[26] = 0x00000001; + props[27] = 0x00000000; + set_property(dev, "ranges", (char *)props, 28 * sizeof(props[0])); + props[0] = 0xc0000000; + props[1] = 0x20000000; + set_property(dev, "virtual-dma", (char *)props, 2 * sizeof(props[0])); + props[0] = 1; + set_property(dev, "#virtual-dma-size-cells", (char *)props, + sizeof(props[0])); + set_property(dev, "#virtual-dma-addr-cells", (char *)props, + sizeof(props[0])); + return 0; +} + int bridge_config_cb(const pci_config_t *config) { phandle_t aliases; Modified: trunk/openbios-devel/drivers/pci_database.c =================================================================== --- trunk/openbios-devel/drivers/pci_database.c 2010-01-09 21:28:28 UTC (rev 663) +++ trunk/openbios-devel/drivers/pci_database.c 2010-01-10 18:26:34 UTC (rev 664) @@ -313,7 +313,7 @@ PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_SABRE, NULL, "pci", "SUNW,sabre", "pci108e,a000\0pciclass,0\0", 3, 2, 1, - host_config_cb, NULL, + sabre_config_cb, NULL, }, { 0xFFFF, 0xFFFF, Modified: trunk/openbios-devel/drivers/pci_database.h =================================================================== --- trunk/openbios-devel/drivers/pci_database.h 2010-01-09 21:28:28 UTC (rev 663) +++ trunk/openbios-devel/drivers/pci_database.h 2010-01-10 18:26:34 UTC (rev 664) @@ -31,6 +31,7 @@ extern int macio_keylargo_config_cb(const pci_config_t *config); extern int vga_config_cb(const pci_config_t *config); extern int host_config_cb(const pci_config_t *config); +extern int sabre_config_cb(const pci_config_t *config); extern int bridge_config_cb(const pci_config_t *config); extern int ebus_config_cb(const pci_config_t *config);

1 0

r663 - in trunk/openbios-devel: arch/sparc64 include/openbios
by svn＠openbios.org 09 Jan '10

09 Jan '10

Author: blueswirl Date: 2010-01-09 22:28:28 +0100 (Sat, 09 Jan 2010) New Revision: 663 Modified: trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/include/openbios/fw_cfg.h Log: Sparc64: use firmware configuration device for command line storage Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/openbios.c =================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c 2010-01-05 20:49:50 UTC (rev 662) +++ trunk/openbios-devel/arch/sparc64/openbios.c 2010-01-09 21:28:28 UTC (rev 663) @@ -280,7 +280,6 @@ uint32_t clock_frequency; uint16_t machine_id; const char *stdin_path, *stdout_path; - const char *kernel_cmdline; fw_cfg_init(); @@ -302,12 +301,12 @@ kernel_size = fw_cfg_read_i32(FW_CFG_KERNEL_SIZE); if (kernel_size) 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 = strlen(kernel_cmdline); - if (size > OBIO_CMDLINE_MAX - 1) - size = OBIO_CMDLINE_MAX - 1; - memcpy(&obio_cmdline, kernel_cmdline, size); + + size = fw_cfg_read_i32(FW_CFG_CMDLINE_SIZE); + if (size > OBIO_CMDLINE_MAX - 1) + size = OBIO_CMDLINE_MAX - 1; + if (size) { + fw_cfg_read(FW_CFG_CMDLINE_DATA, obio_cmdline, size); } obio_cmdline[size] = '\0'; qemu_cmdline = (uint64_t)obio_cmdline; Modified: trunk/openbios-devel/include/openbios/fw_cfg.h =================================================================== --- trunk/openbios-devel/include/openbios/fw_cfg.h 2010-01-05 20:49:50 UTC (rev 662) +++ trunk/openbios-devel/include/openbios/fw_cfg.h 2010-01-09 21:28:28 UTC (rev 663) @@ -14,8 +14,24 @@ #define FW_CFG_INITRD_ADDR 0x0a #define FW_CFG_INITRD_SIZE 0x0b #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_ARCH_LOCAL 0x8000 #define FW_CFG_ENTRY_MASK ~(FW_CFG_WRITE_CHANNEL | FW_CFG_ARCH_LOCAL) @@ -23,16 +39,31 @@ #define FW_CFG_INVALID 0xffff #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); -int fw_cfg_add_bytes(void *opaque, uint16_t key, uint8_t *data, uint16_t len); -int fw_cfg_add_i16(void *opaque, uint16_t key, uint16_t value); -int fw_cfg_add_i32(void *opaque, uint16_t key, uint32_t value); -int fw_cfg_add_i64(void *opaque, uint16_t key, uint64_t value); -int fw_cfg_add_callback(void *opaque, uint16_t key, FWCfgCallback callback, +typedef struct _FWCfgState FWCfgState; +int fw_cfg_add_bytes(FWCfgState *s, uint16_t key, uint8_t *data, uint32_t len); +int fw_cfg_add_i16(FWCfgState *s, uint16_t key, uint16_t value); +int fw_cfg_add_i32(FWCfgState *s, uint16_t key, uint32_t value); +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 *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, - target_phys_addr_t crl_addr, target_phys_addr_t data_addr); +int fw_cfg_add_file(FWCfgState *s, const char *dir, const char *filename, + 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 */

1 0