Re: [OpenBIOS] [Qemu-devel] svn 6658 broke powerpc.
by Rob Landley
On Saturday 21 March 2009 04:32:30 Blue Swirl wrote:
> I accidentally (by using a wrong variable in a more complex patch)
> found out a workaround for the bug, now -nographic boot works. But
> still the other nodes have the same problem as before and the
> workaround removes the "reg" node which is present on real tree.
>
> Now the escc node doesn't have the address appended:
> 1bfac /pci@80000000/mac-io@4/nvram@0 (nvram)
> 1c1c0 /pci@80000000/mac-io@4/escc (escc)
> 1c2ac /pci@80000000/mac-io@4/escc/ch-a@13020 (serial)
> 1c52c /pci@80000000/mac-io@4/escc/ch-b@13000 (serial)
>
> Maybe nodes under /pci/mac-io should use custom
> encode-unit/decode-unit methods instead of PCI ones?
My workaround at this end is to just revert openbios-ppc to the earlier
version.
I still think that bisecting to find the specific commit that broke it would
be informative, but your repository's move to /trunk at commit 470 essentially
wiped all repository history before that. Your development page doesn't say
how to download the old versions, just the ones under "trunk":
http://www.openfirmware.info/OpenBIOS
Nor does your repository viewer view anything before 470 from the little pull-
down menu:
http://tracker.coreboot.org/trac/openbios/browser/trunk/openbios-devel?re...
http://tracker.coreboot.org/trac/openbios/browser/trunk/openbios-devel?re...
I guessed how to get the repository viewer to show me the earlier versions:
http://tracker.coreboot.org/trac/openbios/browser/openbios-devel?rev=469
But this doesn't work:
$ svn co -r 469 svn://openbios.org/openbios/openbios-devel
svn: File not found: revision 480, path '/openbios-devel'
Then again, I can always bisect by downloading tarballs from your repository
viewer... Eh, why not.
For easy cut and pasting, my build reproduction sequence is:
chmod +x config/scripts/switch-arch
config/scripts/switch-arch cross-ppc
PATH=~/firmware/firmware/build/cross-compiler-powerpc/bin:$PATH \
make TARGET=powerpc-
sudo cp obj-ppc/openbios-qemu.elf /usr/local/share/qemu/openbios-ppc
469 exhibits the bug, so it's before that. I believe 450 is the "known good"
version, so let's try 460... Bug. 455... Bug. 452... Bug. 451... Works.
So the bug was introduced (or at least triggered) by revision 452:
http://tracker.coreboot.org/trac/openbios/changeset/452/openbios-devel
Anything in there look broken to you?
Rob
P.S. Please at least put up a link to this on your development page:
http://tracker.coreboot.org/trac/openbios/browser/openbios-devel?rev=469
Right now earlier versions of your repository are completely inaccessible to
newbies like me...
10 years, 8 months
- 4
- 9
r482 - in trunk/openbios-devel: arch/ppc/qemu drivers fs/grubfs modules
by svn＠openbios.org
Author: blueswirl
Date: 2009-03-28 15:28:16 +0100 (Sat, 28 Mar 2009)
New Revision: 482
Modified:
trunk/openbios-devel/arch/ppc/qemu/main.c
trunk/openbios-devel/drivers/escc.c
trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c
trunk/openbios-devel/fs/grubfs/fsys_iso9660.c
trunk/openbios-devel/modules/console_common.c
Log:
Delete some unused macros detected with -Wp,-Wunused-macros use
Modified: trunk/openbios-devel/arch/ppc/qemu/main.c
===================================================================
--- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-03-22 16:49:34 UTC (rev 481)
+++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-03-28 14:28:16 UTC (rev 482)
@@ -34,10 +34,6 @@
#define ELF_DPRINTF(fmt, args...) do { } while (0)
#endif
-#define NVRAM_ADDR_LO 0x74
-#define NVRAM_ADDR_HI 0x75
-#define NVRAM_DATA 0x77
-
static void
transfer_control_to_elf( ulong elf_entry )
{
Modified: trunk/openbios-devel/drivers/escc.c
===================================================================
--- trunk/openbios-devel/drivers/escc.c 2009-03-22 16:49:34 UTC (rev 481)
+++ trunk/openbios-devel/drivers/escc.c 2009-03-28 14:28:16 UTC (rev 482)
@@ -23,7 +23,6 @@
/* Conversion routines to/from brg time constants from/to bits
* per second.
*/
-#define BRG_TO_BPS(brg, freq) ((freq) / 2 / ((brg) + 2))
#define BPS_TO_BRG(bps, freq) ((((freq) + (bps)) / (2 * (bps))) - 2)
#ifdef CONFIG_DRIVER_ESCC_SUN
Modified: trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c
===================================================================
--- trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c 2009-03-22 16:49:34 UTC (rev 481)
+++ trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c 2009-03-28 14:28:16 UTC (rev 482)
@@ -170,9 +170,6 @@
osd2; /* OS dependent 2 */
};
-/* linux/limits.h */
-#define NAME_MAX 255 /* # chars in a file name */
-
/* linux/posix_type.h */
typedef long linux_off_t;
@@ -187,18 +184,6 @@
char name[EXT2_NAME_LEN]; /* File name */
};
-/* linux/ext2fs.h */
-/*
- * EXT2_DIR_PAD defines the directory entries boundaries
- *
- * NOTE: It must be a multiple of 4
- */
-#define EXT2_DIR_PAD 4
-#define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1)
-#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \
- ~EXT2_DIR_ROUND)
-
-
/* ext2/super.c */
#define EXT2_SUPER_MAGIC 0xEF53 /* include/linux/ext2_fs.h */
#define EXT2_ROOT_INO 2 /* include/linux/ext2_fs.h */
Modified: trunk/openbios-devel/fs/grubfs/fsys_iso9660.c
===================================================================
--- trunk/openbios-devel/fs/grubfs/fsys_iso9660.c 2009-03-22 16:49:34 UTC (rev 481)
+++ trunk/openbios-devel/fs/grubfs/fsys_iso9660.c 2009-03-28 14:28:16 UTC (rev 482)
@@ -40,7 +40,6 @@
#include "shared.h"
#include "filesys.h"
#include "iso9660.h"
-#define DEBUG_THIS 1
#include "debug.h"
#if defined(__sparc__) || defined(__PPC__)
Modified: trunk/openbios-devel/modules/console_common.c
===================================================================
--- trunk/openbios-devel/modules/console_common.c 2009-03-22 16:49:34 UTC (rev 481)
+++ trunk/openbios-devel/modules/console_common.c 2009-03-28 14:28:16 UTC (rev 482)
@@ -18,8 +18,6 @@
#include "video_subr.h"
#define FONT_ADJ_HEIGHT (FONT_HEIGHT + 2)
-#define NCOLS 80
-#define NROWS 48
// Warning: will hang on purpose when encountering unknown codes
//#define DEBUG_CONSOLE
10 years, 8 months
- 1
- 0
r481 - trunk/openbios-devel/drivers
by svn＠openbios.org
Author: blueswirl
Date: 2009-03-22 17:49:34 +0100 (Sun, 22 Mar 2009)
New Revision: 481
Modified:
trunk/openbios-devel/drivers/pci.c
Log:
Fix PPC nographic mode
Modified: trunk/openbios-devel/drivers/pci.c
===================================================================
--- trunk/openbios-devel/drivers/pci.c 2009-03-19 17:51:02 UTC (rev 480)
+++ trunk/openbios-devel/drivers/pci.c 2009-03-22 16:49:34 UTC (rev 481)
@@ -36,7 +36,8 @@
/* DECLARE data structures for the nodes. */
-DECLARE_UNNAMED_NODE( ob_pci_node, INSTALL_OPEN, 2*sizeof(int) );
+DECLARE_UNNAMED_NODE( ob_pci_bus_node, INSTALL_OPEN, 2*sizeof(int) );
+DECLARE_UNNAMED_NODE( ob_pci_simple_node, INSTALL_OPEN, 2*sizeof(int) );
const pci_arch_t *arch;
@@ -156,7 +157,7 @@
push_str(buf);
}
-NODE_METHODS(ob_pci_node) = {
+NODE_METHODS(ob_pci_bus_node) = {
{ NULL, ob_pci_initialize },
{ "open", ob_pci_open },
{ "close", ob_pci_close },
@@ -164,6 +165,12 @@
{ "encode-unit", ob_pci_encode_unit },
};
+NODE_METHODS(ob_pci_simple_node) = {
+ { NULL, ob_pci_initialize },
+ { "open", ob_pci_open },
+ { "close", ob_pci_close },
+};
+
static void pci_set_bus_range(const pci_config_t *config)
{
phandle_t dev = get_cur_dev();
@@ -737,7 +744,12 @@
#endif
config.dev = addr & 0x00FFFFFF;
- REGISTER_NAMED_NODE(ob_pci_node, config.path);
+ if (class == PCI_BASE_CLASS_BRIDGE &&
+ (subclass == PCI_SUBCLASS_BRIDGE_HOST ||
+ subclass == PCI_SUBCLASS_BRIDGE_PCI))
+ REGISTER_NAMED_NODE(ob_pci_bus_node, config.path);
+ else
+ REGISTER_NAMED_NODE(ob_pci_simple_node, config.path);
activate_device(config.path);
10 years, 8 months
- 1
- 0
Diagnostics support
by Robert Reif
How much diagnostics support is already in OpenBIOS and what would it
take to add something like sun's OBDiag.
Has anyone ever tried running a sparc32 OpenBIOS image on real hardware?
10 years, 8 months
- 2
- 2
Re: [OpenBIOS] [Qemu-devel] svn 6658 broke powerpc.
by Blue Swirl
On 3/18/09, Rob Landley <rob(a)landley.net> wrote:
> On Wednesday 18 March 2009 03:41:05 Alexander Graf wrote:
> > On 18.03.2009, at 00:57, Rob Landley wrote:
> > > Up through svn 6657, I could boot a powerpc kernel with -kernel.
> > > That commit
> > > changed it so now it says:
> > > invalid/unsupported opcode: 00 - 00 - 00 (00000000) fff18f00 1
> > > invalid/unsupported opcode: 00 - 00 - 00 (00000000) fff18f04 1
> > > invalid/unsupported opcode: 00 - 0c - 06 (00009198) 00009214 0
> > >
> > > And dies.
> > >
> > > You can grab a test kernel from http://landley.net/zImage-powerpc
> > > and try
> > > booting it (out of the qemu source directory, this is assuming
> > > you've built it
> > > but haven't installed it yet) via:
> > >
> > > ppc-softmmu/qemu-system-ppc -kernel zImage-powerpc \
> > > -append "console=ttyS0 panic=1" -nographic -no-reboot -L pc-bios
> > >
> > > With svn 6657, it works. (You get kernel boot messages up until it
> > > panics and
> > > dies because it can't find the root filesystem). With 6658 it dies
> > > immediately with the above error message.
> > >
> > > Unfortunately, this means that the 0.10.0 release doesn't work for
> > > powerpc for
> > > me, but svn a couple days _before_ the release did.
> >
> > That specific commit shouldn't have changed anything with respect to
> > ppc32 emulation. The one where your command broken is the openBIOS
> > update.
>
>
> The commit I pointed to is the openbios update, yes.
>
>
> > Please try again without -nographic.
>
>
> It does indeed work without nographic. (It doesn't do anything _useful_ for
> me without nographic, since I'm scripting the emulated kernel's behavior
> through stdin and stdout, but allowing it to pop up an SDL window does make it
> out of openbios and into the kernel.)
The kernel makes the equivalent of the following calls to OF interface:
finddevice("/") = 0x11d5c
finddevice("/chosen") = 0x1197c
finddevice("/openprom") = 0x11b3c
getprop(0x11b3c, "model", 0x78efeb0, 0x40) = 0xf
getprop(0x11d5c, "stdout", 0x78efea0, 0x4) = 0x4
instance-to-path(0x86ea0, 0x12ad0dc, 0xff) where it crashes because
memmove overwrites all memory.
But where does this 0x86ea0 come from?
10 years, 8 months
- 2
- 4
r480 - trunk/openbios-devel
by svn＠openbios.org
Author: blueswirl
Date: 2009-03-19 18:51:02 +0100 (Thu, 19 Mar 2009)
New Revision: 480
Modified:
trunk/openbios-devel/Makefile
Log:
Fix build error log problem, spotted by Rob Landley
Modified: trunk/openbios-devel/Makefile
===================================================================
--- trunk/openbios-devel/Makefile 2009-03-08 09:45:25 UTC (rev 479)
+++ trunk/openbios-devel/Makefile 2009-03-19 17:51:02 UTC (rev 480)
@@ -21,7 +21,7 @@
@printf "Building..."
@for dir in $(ODIRS); do \
$(MAKE) -C $$dir > $$dir/build.log 2>&1 && echo "ok." || \
- ( echo "error:"; tail -15 $$$dir/build.log; exit 1 ) \
+ ( echo "error:"; tail -15 $$dir/build.log; exit 1 ) \
done
build-verbose:
10 years, 8 months
- 1
- 0
Re: [OpenBIOS] r470 - / trunk
by Stefan Reinauer
On 08.03.2009 8:51 Uhr, svn(a)openbios.org wrote:
> Author: blueswirl
> Date: 2009-03-08 08:51:18 +0100 (Sun, 08 Mar 2009)
> New Revision: 470
>
> Added:
> trunk/openbios-devel/
> Removed:
> openbios-devel/
> Log:
> Move openbios-devel under /trunk
>
>
Thank you, blueswirl, for cleaning up the repository.
A small hint for anyone with existing modified trees: When you want to
bring over your checked-out openbios-devel repository, you can do:
$ cd openbios-devel
$ svn switch svn://openbios.org/openbios/trunk/openbios-devel .
Stefan
--
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: info(a)coresystems.de • http://www.coresystems.de/
Registergericht: Amtsgericht Freiburg • HRB 7656
Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866
10 years, 9 months
- 1
- 0
r479 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc64 drivers include/openbios
by svn＠openbios.org
Author: blueswirl
Date: 2009-03-08 10:45:25 +0100 (Sun, 08 Mar 2009)
New Revision: 479
Removed:
trunk/openbios-devel/include/openbios/firmware_abi.h
Modified:
trunk/openbios-devel/arch/ppc/qemu/main.c
trunk/openbios-devel/arch/sparc64/openbios.c
trunk/openbios-devel/drivers/obio.c
Log:
Use firmware configuration instead of NVRAM (initial patch by Aurelien Jarno)
Use firmware configuration device for boot device, kernel, initrd and
kernel command line parameters on PPC, Sparc32 and Sparc64.
Modified: trunk/openbios-devel/arch/ppc/qemu/main.c
===================================================================
--- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-03-08 09:39:53 UTC (rev 478)
+++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-03-08 09:45:25 UTC (rev 479)
@@ -22,6 +22,8 @@
#include "libc/vsprintf.h"
#include "kernel.h"
#include "ofmem.h"
+#define NO_QEMU_PROTOS
+#include "openbios/fw_cfg.h"
//#define DEBUG_ELF
@@ -319,24 +321,6 @@
close_io( fd );
}
-static uint8_t nvram_read(uint16_t offset)
-{
- outb(offset & 0xff, NVRAM_ADDR_LO);
- outb(offset >> 8, NVRAM_ADDR_HI);
- return inb(NVRAM_DATA);
-}
-
-static uint32_t nvram_read_be32(uint16_t offset)
-{
- uint32_t ret;
-
- ret = nvram_read(offset) << 24;
- ret |= nvram_read(offset + 1) << 16;
- ret |= nvram_read(offset + 2) << 8;
- ret |= nvram_read(offset + 3);
- return ret;
-}
-
#define QUIK_SECOND_BASEADDR 0x3e0000
#define QUIK_FIRST_BASEADDR 0x3f4000
#define QUIK_SECOND_SIZE (QUIK_FIRST_BASEADDR - QUIK_SECOND_BASEADDR)
@@ -446,8 +430,7 @@
try_path(path, param);
try_bootinfo(path, param);
} else {
- char boot_device = nvram_read(0x34);
-
+ uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE);
switch (boot_device) {
case 'c':
path = strdup("hd:0");
@@ -474,21 +457,22 @@
{
unsigned long kernel_image, kernel_size;
unsigned long initrd_image, initrd_size;
- unsigned long cmdline, cmdline_len;
+ const char * kernel_cmdline;
- kernel_size = nvram_read_be32(0x3c);
+ kernel_size = fw_cfg_read_i32(FW_CFG_KERNEL_SIZE);
if (kernel_size) {
- kernel_image = nvram_read_be32(0x38);
- cmdline = nvram_read_be32(0x40);
- cmdline_len = nvram_read_be32(0x44);
- initrd_image = nvram_read_be32(0x48);
- initrd_size = nvram_read_be32(0x4c);
+ kernel_image = fw_cfg_read_i32(FW_CFG_KERNEL_ADDR);
+ kernel_cmdline = (const char *) fw_cfg_read_i32(FW_CFG_KERNEL_CMDLINE);
+ initrd_image = fw_cfg_read_i32(FW_CFG_INITRD_ADDR);
+ initrd_size = fw_cfg_read_i32(FW_CFG_INITRD_SIZE);
printk("[ppc] Kernel already loaded (0x%8.8lx + 0x%8.8lx) "
"(initrd 0x%8.8lx + 0x%8.8lx)\n",
kernel_image, kernel_size, initrd_image, initrd_size);
- if (cmdline_len > 0) {
- phandle_t ph = find_dev("/chosen");
- set_property(ph, "bootargs", strdup((char *)cmdline), cmdline_len + 1);
+ if (kernel_cmdline) {
+ phandle_t ph;
+ printk("[ppc] Kernel command line: %s\n", kernel_cmdline);
+ ph = find_dev("/chosen");
+ set_property(ph, "bootargs", strdup(kernel_cmdline), strlen(kernel_cmdline) + 1);
}
call_elf(initrd_image, initrd_size, kernel_image);
}
@@ -501,7 +485,8 @@
void
boot( void )
{
- char boot_device = nvram_read(0x34);
+ uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE);
+
fword("update-chosen");
if (boot_device == 'm') {
check_preloaded_kernel();
Modified: trunk/openbios-devel/arch/sparc64/openbios.c
===================================================================
--- trunk/openbios-devel/arch/sparc64/openbios.c 2009-03-08 09:39:53 UTC (rev 478)
+++ trunk/openbios-devel/arch/sparc64/openbios.c 2009-03-08 09:45:25 UTC (rev 479)
@@ -15,9 +15,6 @@
#include "openbios.h"
#include "openbios/pci.h"
#include "asm/pci.h"
-#include "libc/byteorder.h"
-#define cpu_to_be16(x) __cpu_to_be16(x)
-#include "openbios/firmware_abi.h"
#include "boot.h"
#include "../../drivers/timer.h" // XXX
#define NO_QEMU_PROTOS
@@ -42,11 +39,9 @@
#define NVRAM_SIZE 0x2000
#define NVRAM_IDPROM 0x1fd8
#define NVRAM_IDPROM_SIZE 32
-#define NVRAM_OB_START (sizeof(ohwcfg_v3_t) + sizeof(struct sparc_arch_cfg))
+#define NVRAM_OB_START (0)
#define NVRAM_OB_SIZE ((0x1fd0 - NVRAM_OB_START) & ~15)
-static ohwcfg_v3_t nv_info;
-
#define OBIO_CMDLINE_MAX 256
static char obio_cmdline[OBIO_CMDLINE_MAX];
@@ -275,7 +270,7 @@
void arch_nvram_get(char *data)
{
- uint32_t size;
+ uint32_t size = 0;
const struct cpudef *cpu;
const char *bootpath;
char buf[256];
@@ -284,9 +279,8 @@
uint32_t clock_frequency;
uint16_t machine_id;
const char *stdin_path, *stdout_path;
+ const char *kernel_cmdline;
- nvram_read(0, (char *)&nv_info, sizeof(ohwcfg_v3_t));
-
fw_cfg_init();
fw_cfg_read(FW_CFG_SIGNATURE, buf, 4);
@@ -304,16 +298,20 @@
for(;;);
}
- kernel_image = nv_info.kernel_image;
- kernel_size = nv_info.kernel_size;
- size = nv_info.cmdline_size;
- if (size > OBIO_CMDLINE_MAX - 1)
- size = OBIO_CMDLINE_MAX - 1;
- memcpy(&obio_cmdline, (void *)(long)nv_info.cmdline, size);
+ 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);
+ }
obio_cmdline[size] = '\0';
qemu_cmdline = (uint64_t)obio_cmdline;
cmdline_size = size;
- boot_device = nv_info.boot_devices[0];
+ boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE);
if (kernel_size)
printk("kernel addr %llx size %llx\n", kernel_image, kernel_size);
@@ -372,7 +370,7 @@
push_str("/chosen");
fword("find-device");
- if (nv_info.boot_devices[0] == 'c')
+ if (boot_device == 'c')
bootpath = "disk:a";
else
bootpath = "cdrom:a";
Modified: trunk/openbios-devel/drivers/obio.c
===================================================================
--- trunk/openbios-devel/drivers/obio.c 2009-03-08 09:39:53 UTC (rev 478)
+++ trunk/openbios-devel/drivers/obio.c 2009-03-08 09:45:25 UTC (rev 479)
@@ -20,8 +20,6 @@
#include "openbios/nvram.h"
#include "ofmem.h"
#include "obio.h"
-#define cpu_to_be16(x) __cpu_to_be16(x)
-#include "openbios/firmware_abi.h"
#define NO_QEMU_PROTOS
#include "openbios/fw_cfg.h"
#include "escc.h"
@@ -157,9 +155,8 @@
}
static unsigned char *nvram;
-static ohwcfg_v3_t nv_info;
-#define NVRAM_OB_START (sizeof(ohwcfg_v3_t) + sizeof(struct sparc_arch_cfg))
+#define NVRAM_OB_START (0)
#define NVRAM_OB_SIZE ((NVRAM_IDPROM - NVRAM_OB_START) & ~15)
void
@@ -654,14 +651,14 @@
const char *stdin, *stdout;
unsigned int i;
char nographic;
- uint32_t size;
+ uint32_t size = 0;
uint16_t machine_id;
const struct cpudef *cpu;
const struct machdef *mach;
- ohwcfg_v3_t *header;
char buf[256];
uint32_t temp;
phandle_t chosen;
+ const char *kernel_cmdline;
ob_new_obio_device("eeprom", NULL);
@@ -694,23 +691,21 @@
for(;;);
}
- memcpy(&nv_info, nvram, sizeof(nv_info));
- kernel_image = nv_info.kernel_image;
- kernel_size = nv_info.kernel_size;
- size = nv_info.cmdline_size;
- if (size > OBIO_CMDLINE_MAX - 1)
- size = OBIO_CMDLINE_MAX - 1;
- memcpy(&obio_cmdline, (void *)(long)nv_info.cmdline, size);
+ kernel_size = fw_cfg_read_i32(FW_CFG_KERNEL_SIZE);
+ if (kernel_size)
+ kernel_image = fw_cfg_read_i32(FW_CFG_KERNEL_ADDR);
+ kernel_cmdline = (const char *) fw_cfg_read_i32(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);
+ }
obio_cmdline[size] = '\0';
qemu_cmdline = (uint32_t) &obio_cmdline;
cmdline_size = size;
- header = (ohwcfg_v3_t *)nvram;
- header->kernel_image = 0;
- header->kernel_size = 0;
- header->cmdline_size = 0;
- header->crc = OHW_compute_crc(header, 0x00, 0xF8);
+ boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE);
- boot_device = nv_info.boot_devices[0];
fw_cfg_read(FW_CFG_NOGRAPHIC, &nographic, 1);
graphic_depth = fw_cfg_read_i16(FW_CFG_SUN4M_DEPTH);
Deleted: trunk/openbios-devel/include/openbios/firmware_abi.h
===================================================================
--- trunk/openbios-devel/include/openbios/firmware_abi.h 2009-03-08 09:39:53 UTC (rev 478)
+++ trunk/openbios-devel/include/openbios/firmware_abi.h 2009-03-08 09:45:25 UTC (rev 479)
@@ -1,198 +0,0 @@
-#ifndef FIRMWARE_ABI_H
-#define FIRMWARE_ABI_H
-
-#ifndef __ASSEMBLY__
-/* Open Hack'Ware NVRAM configuration structure */
-
-/* Version 3 */
-typedef struct ohwcfg_v3_t ohwcfg_v3_t;
-struct ohwcfg_v3_t {
- /* 0x00: structure identifier */
- uint8_t struct_ident[0x10];
- /* 0x10: structure version and NVRAM description */
- uint32_t struct_version;
- uint16_t nvram_size;
- uint16_t pad0;
- uint16_t nvram_arch_ptr;
- uint16_t nvram_arch_size;
- uint16_t nvram_arch_crc;
- uint8_t pad1[0x02];
- /* 0x20: host architecture */
- uint8_t arch[0x10];
- /* 0x30: RAM/ROM description */
- uint64_t RAM0_base;
- uint64_t RAM0_size;
- uint64_t RAM1_base;
- uint64_t RAM1_size;
- uint64_t RAM2_base;
- uint64_t RAM2_size;
- uint64_t RAM3_base;
- uint64_t RAM3_size;
- uint64_t ROM_base;
- uint64_t ROM_size;
- /* 0x80: Kernel description */
- uint64_t kernel_image;
- uint64_t kernel_size;
- /* 0x90: Kernel command line */
- uint64_t cmdline;
- uint64_t cmdline_size;
- /* 0xA0: Kernel boot image */
- uint64_t initrd_image;
- uint64_t initrd_size;
- /* 0xB0: NVRAM image */
- uint64_t NVRAM_image;
- uint8_t pad2[8];
- /* 0xC0: graphic configuration */
- uint16_t width;
- uint16_t height;
- uint16_t depth;
- uint16_t graphic_flags;
- /* 0xC8: CPUs description */
- uint8_t nb_cpus;
- uint8_t boot_cpu;
- uint8_t nboot_devices;
- uint8_t pad3[5];
- /* 0xD0: boot devices */
- uint8_t boot_devices[0x10];
- /* 0xE0 */
- uint8_t pad4[0x1C]; /* 28 */
- /* 0xFC: checksum */
- uint16_t crc;
- uint8_t pad5[0x02];
-} __attribute__ (( packed ));
-
-#define OHW_GF_NOGRAPHICS 0x0001
-
-static inline uint16_t
-OHW_crc_update (uint16_t prev, uint16_t value)
-{
- uint16_t tmp;
- uint16_t pd, pd1, pd2;
-
- tmp = prev >> 8;
- pd = prev ^ value;
- pd1 = pd & 0x000F;
- pd2 = ((pd >> 4) & 0x000F) ^ pd1;
- tmp ^= (pd1 << 3) | (pd1 << 8);
- tmp ^= pd2 | (pd2 << 7) | (pd2 << 12);
-
- return tmp;
-}
-
-static inline uint16_t
-OHW_compute_crc (ohwcfg_v3_t *header, uint32_t start, uint32_t count)
-{
- uint32_t i;
- uint16_t crc = 0xFFFF;
- uint8_t *ptr = (uint8_t *)header;
- int odd;
-
- odd = count & 1;
- count &= ~1;
- for (i = 0; i != count; i++) {
- crc = OHW_crc_update(crc, (ptr[start + i] << 8) | ptr[start + i + 1]);
- }
- if (odd) {
- crc = OHW_crc_update(crc, ptr[start + i] << 8);
- }
-
- return crc;
-}
-
-/* Sparc32 runtime NVRAM structure for SMP CPU boot */
-struct sparc_arch_cfg {
- uint32_t smp_ctx;
- uint32_t smp_ctxtbl;
- uint32_t smp_entry;
- uint8_t valid;
- uint8_t unused[51];
-};
-
-/* OpenBIOS NVRAM partition */
-struct OpenBIOS_nvpart_v1 {
- uint8_t signature;
- uint8_t checksum;
- uint16_t len; // BE, length divided by 16
- char name[12];
-};
-
-#define OPENBIOS_PART_SYSTEM 0x70
-#define OPENBIOS_PART_FREE 0x7f
-
-static inline void
-OpenBIOS_finish_partition(struct OpenBIOS_nvpart_v1 *header, uint32_t size)
-{
- unsigned int i, sum;
- uint8_t *tmpptr;
-
- // Length divided by 16
- header->len = cpu_to_be16(size >> 4);
-
- // Checksum
- tmpptr = (uint8_t *)header;
- sum = *tmpptr;
- for (i = 0; i < 14; i++) {
- sum += tmpptr[2 + i];
- sum = (sum + ((sum & 0xff00) >> 8)) & 0xff;
- }
- header->checksum = sum & 0xff;
-}
-
-static inline uint32_t
-OpenBIOS_set_var(uint8_t *nvram, uint32_t addr, const char *str)
-{
- uint32_t len;
-
- len = strlen(str) + 1;
- memcpy(&nvram[addr], str, len);
-
- return addr + len;
-}
-
-/* Sun IDPROM structure at the end of NVRAM */
-struct Sun_nvram {
- uint8_t type;
- uint8_t machine_id;
- uint8_t macaddr[6];
- uint8_t unused[7];
- uint8_t checksum;
-};
-
-static inline void
-Sun_init_header(struct Sun_nvram *header, const uint8_t *macaddr, int machine_id)
-{
- uint8_t tmp, *tmpptr;
- unsigned int i;
-
- header->type = 1;
- header->machine_id = machine_id & 0xff;
- memcpy(&header->macaddr, macaddr, 6);
- /* Calculate checksum */
- tmp = 0;
- tmpptr = (uint8_t *)header;
- for (i = 0; i < 15; i++)
- tmp ^= tmpptr[i];
-
- header->checksum = tmp;
-}
-
-#else /* __ASSEMBLY__ */
-
-/* Structure offsets for asm use */
-
-/* Open Hack'Ware NVRAM configuration structure */
-#define OHW_ARCH_PTR 0x18
-#define OHW_RAM_SIZE 0x38
-#define OHW_BOOT_CPU 0xC9
-
-/* Sparc32 runtime NVRAM structure for SMP CPU boot */
-#define SPARC_SMP_CTX 0x0
-#define SPARC_SMP_CTXTBL 0x4
-#define SPARC_SMP_ENTRY 0x8
-#define SPARC_SMP_VALID 0xc
-
-/* Sun IDPROM structure at the end of NVRAM */
-#define SPARC_MACHINE_ID 0x1fd9
-
-#endif /* __ASSEMBLY__ */
-#endif /* FIRMWARE_ABI_H */
10 years, 9 months
- 1
- 0
r478 - trunk/openbios-devel/include/openbios
by svn＠openbios.org
Author: blueswirl
Date: 2009-03-08 10:39:53 +0100 (Sun, 08 Mar 2009)
New Revision: 478
Modified:
trunk/openbios-devel/include/openbios/fw_cfg.h
Log:
Add new entries to firmware configuration device
Signed-off-by: Aurelien Jarno <aurelien(a)aurel32.net>
Modified: trunk/openbios-devel/include/openbios/fw_cfg.h
===================================================================
--- trunk/openbios-devel/include/openbios/fw_cfg.h 2009-03-08 08:17:55 UTC (rev 477)
+++ trunk/openbios-devel/include/openbios/fw_cfg.h 2009-03-08 09:39:53 UTC (rev 478)
@@ -8,6 +8,12 @@
#define FW_CFG_NOGRAPHIC 0x04
#define FW_CFG_NB_CPUS 0x05
#define FW_CFG_MACHINE_ID 0x06
+#define FW_CFG_KERNEL_ADDR 0x07
+#define FW_CFG_KERNEL_SIZE 0x08
+#define FW_CFG_KERNEL_CMDLINE 0x09
+#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_WRITE_CHANNEL 0x4000
10 years, 9 months
- 1
- 0
r477 - tags
by svn＠openbios.org
Author: blueswirl
Date: 2009-03-08 09:17:55 +0100 (Sun, 08 Mar 2009)
New Revision: 477
Added:
tags/fcode-utils-1.0.2/
Log:
Add tag for fcode-utils release 1.0.2 (r197)
10 years, 9 months
- 1
- 0