OpenBIOS August 2009

openbios@openbios.org

14 participants
81 discussions

r570 - in trunk/openbios-devel: arch/ppc/qemu modules
by svn＠openbios.org 29 Aug '09

29 Aug '09

Author: laurent Date: 2009-08-29 17:24:49 +0200 (Sat, 29 Aug 2009) New Revision: 570 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/modules/mac-parts.c Log: For mac-parts, when no partition number is provided, open the first HFS partition (type is "Apple_HFS"). Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-23 12:40:24 UTC (rev 569) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-29 15:24:49 UTC (rev 570) @@ -126,11 +126,11 @@ path++; if (!*path) - return 0; + return -1; path++; if (!strchr(path, ',')) /* check if there is a ',' */ - return 0; + return -1; return atol(path); } @@ -177,10 +177,16 @@ char path[1024]; phandle_t chosen_ph = find_dev("/chosen"); char *filename, *directory; + int partition; filename = get_filename(spec, &directory); - snprintf(path, sizeof(path), "%s:%d,%s\\%s", get_device(spec), - get_partition(spec), directory, filename); + partition = get_partition(spec); + if (partition == -1) + snprintf(path, sizeof(path), "%s:,%s\\%s", get_device(spec), + directory, filename); + else + snprintf(path, sizeof(path), "%s:%d,%s\\%s", get_device(spec), + partition, directory, filename); ELF_DPRINTF("bootpath %s bootargs %s\n", path, args); set_property( chosen_ph, "bootpath", path, strlen(spec)+1 ); @@ -240,8 +246,12 @@ /* read boot script */ - snprintf(bootscript, sizeof(bootscript), "%s:%d,%s", - device, partition, script_path); + if (partition == -1) + snprintf(bootscript, sizeof(bootscript), "%s:,%s", + device, script_path); + else + snprintf(bootscript, sizeof(bootscript), "%s:%d,%s", + device, partition, script_path); CHRP_DPRINTF("Trying %s\n", bootscript); if ((fd = open_io(bootscript)) == -1) { @@ -287,7 +297,10 @@ strcpy(bootscript + scriptlen, device); scriptlen += strlen(device); } else if (strcasecmp(tagbuf, "partition") == 0) { - sprintf(bootscript + scriptlen, "%d", partition); + if (partition != -1) + sprintf(bootscript + scriptlen, "%d", partition); + else + *(bootscript + scriptlen) = 0; scriptlen = strlen(bootscript); } else if (strcasecmp(tagbuf, "directory") == 0) { strcpy(bootscript + scriptlen, directory); @@ -409,11 +422,11 @@ uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); switch (boot_device) { case 'c': - path = strdup("hd:0"); + path = strdup("hd:"); break; default: case 'd': - path = strdup("cd:0"); + path = strdup("cd:"); break; } for( i=0; i < sizeof(chrp_paths) / sizeof(chrp_paths[0]); i++ ) { Modified: trunk/openbios-devel/modules/mac-parts.c =================================================================== --- trunk/openbios-devel/modules/mac-parts.c 2009-08-23 12:40:24 UTC (rev 569) +++ trunk/openbios-devel/modules/mac-parts.c 2009-08-29 15:24:49 UTC (rev 570) @@ -90,6 +90,7 @@ goto out; if (parnum == -1) { + int firstHFS = -1; /* search a bootable partition */ /* see PowerPC Microprocessor CHRP bindings */ @@ -101,6 +102,10 @@ !par.pmPartBlkCnt ) goto out; + if (firstHFS == -1 && + strcmp(par.pmPartType, "Apple_HFS") == 0) + firstHFS = parnum; + if( (par.pmPartStatus & kPartitionAUXIsBootValid) && (par.pmPartStatus & kPartitionAUXIsValid) && (par.pmPartStatus & kPartitionAUXIsAllocated) && @@ -120,6 +125,10 @@ parnum++; } /* not found */ + if (firstHFS != -1) { + parnum = firstHFS; + goto found; + } ret = 0; goto out; } @@ -135,6 +144,7 @@ if( parnum > par.pmMapBlkCnt) goto out; +found: SEEK( (bs * parnum) ); READ( &par, sizeof(par) ); if( par.pmSig != DESC_PART_SIGNATURE || !par.pmPartBlkCnt )

1 0

Re: [OpenBIOS] Looking for a printf like function
by G 3 26 Aug '09

26 Aug '09

On Aug 26, 2009, at 6:00 AM, openbios-request(a)openbios.org wrote: > Date: Tue, 25 Aug 2009 21:37:30 +0300 > From: Blue Swirl <blauwirbel(a)gmail.com> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] Looking for a printf like function > Message-ID: > <f43fc5580908251137q57ed4205na6402bdddcc44db9(a)mail.gmail.com> > Content-Type: text/plain; charset=UTF-8 > > On Tue, Aug 25, 2009 at 8:11 PM, G 3<programmingkidx(a)gmail.com> wrote: >> I would like to print messages to the console. What function should I >> use to do this? > > printk() from C, from Forth normal Forth words. > >> Background information: >> Building OpenBIOS for Qemu. Emulated Computer: Macintosh. > > PPC or x86? What type? PPC. I am hoping to be able to make Mac OS X run in Qemu one day. > > Is the device tree available, like these: > http://penguinppc.org/historical/dev-trees-html/trees-index.html > ? I don't have any information about the device tree. I just use this command to start qemu: qemu-system-ppc -L qemu-bios -cdrom ~/mac.iso - boot d Thank you for helping.

1 0

Looking for a printf like function
by G 3 25 Aug '09

25 Aug '09

I would like to print messages to the console. What function should I use to do this? Background information: Building OpenBIOS for Qemu. Emulated Computer: Macintosh.

2 1

feature request
by G 3 25 Aug '09

25 Aug '09

I ask that a 'dir' word be added to OpenBIOS. This word is what allows the user to view the files on various disc using OpenBIOS command prompt.

1 0

r569 - trunk/openbios-devel/fs/grubfs
by svn＠openbios.org 23 Aug '09

23 Aug '09

Author: blueswirl Date: 2009-08-23 14:40:24 +0200 (Sun, 23 Aug 2009) New Revision: 569 Modified: trunk/openbios-devel/fs/grubfs/build.xml Log: Use -fno-strict-aliasing flag for all filesystems imported from GRUB. Otherwise, they won't compile with gcc 4.4. Fixing the code would require massive changes, which is not practical for the code taken from another project. Author: Pavel Roskin <proski(a)gnu.org> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/fs/grubfs/build.xml =================================================================== --- trunk/openbios-devel/fs/grubfs/build.xml 2009-08-23 12:40:22 UTC (rev 568) +++ trunk/openbios-devel/fs/grubfs/build.xml 2009-08-23 12:40:24 UTC (rev 569) @@ -1,17 +1,17 @@ <build> <library name="fs" type="static" target="target"> <object source="grubfs_fs.c"/> - <object source="fsys_ext2fs.c" condition="FSYS_EXT2FS" flags="-DFSYS_EXT2FS"/> - <object source="fsys_fat.c" condition="FSYS_FAT" flags="-DFSYS_FAT"/> - <object source="fsys_jfs.c" condition="FSYS_JFS" flags="-DFSYS_JFS"/> - <object source="fsys_minix.c" condition="FSYS_MINIX" flags="-DFSYS_MINIX"/> - <object source="fsys_reiserfs.c" condition="FSYS_REISERFS" flags="-DFSYS_REISERFS"/> - <object source="fsys_xfs.c" condition="FSYS_XFS" flags="-DFSYS_XFS"/> - <object source="fsys_ufs.c" condition="FSYS_UFS" flags="-DFSYS_UFS"/> - <object source="fsys_ffs.c" condition="FSYS_FFS" flags="-DFSYS_FFS"/> - <object source="fsys_vstafs.c" condition="FSYS_VSTAFS" flags="-DFSYS_VSTAFS"/> - <object source="fsys_iso9660.c" condition="FSYS_ISO9660" flags="-DFSYS_ISO9660"/> - <object source="fsys_ntfs.c" condition="FSYS_NTFS" flags="-DFSYS_NTFS"/> - <object source="fsys_affs.c" condition="FSYS_AFFS" flags="-DFSYS_AFFS"/> + <object source="fsys_ext2fs.c" condition="FSYS_EXT2FS" flags="-DFSYS_EXT2FS -fno-strict-aliasing"/> + <object source="fsys_fat.c" condition="FSYS_FAT" flags="-DFSYS_FAT -fno-strict-aliasing"/> + <object source="fsys_jfs.c" condition="FSYS_JFS" flags="-DFSYS_JFS -fno-strict-aliasing"/> + <object source="fsys_minix.c" condition="FSYS_MINIX" flags="-DFSYS_MINIX -fno-strict-aliasing"/> + <object source="fsys_reiserfs.c" condition="FSYS_REISERFS" flags="-DFSYS_REISERFS -fno-strict-aliasing"/> + <object source="fsys_xfs.c" condition="FSYS_XFS" flags="-DFSYS_XFS -fno-strict-aliasing"/> + <object source="fsys_ufs.c" condition="FSYS_UFS" flags="-DFSYS_UFS -fno-strict-aliasing"/> + <object source="fsys_ffs.c" condition="FSYS_FFS" flags="-DFSYS_FFS -fno-strict-aliasing"/> + <object source="fsys_vstafs.c" condition="FSYS_VSTAFS" flags="-DFSYS_VSTAFS -fno-strict-aliasing"/> + <object source="fsys_iso9660.c" condition="FSYS_ISO9660" flags="-DFSYS_ISO9660 -fno-strict-aliasing"/> + <object source="fsys_ntfs.c" condition="FSYS_NTFS" flags="-DFSYS_NTFS -fno-strict-aliasing"/> + <object source="fsys_affs.c" condition="FSYS_AFFS" flags="-DFSYS_AFFS -fno-strict-aliasing"/> </library> </build>

1 0

r568 - in trunk/openbios-devel: drivers modules
by svn＠openbios.org 23 Aug '09

23 Aug '09

Author: blueswirl Date: 2009-08-23 14:40:22 +0200 (Sun, 23 Aug 2009) New Revision: 568 Modified: trunk/openbios-devel/drivers/fw_cfg.c trunk/openbios-devel/modules/pc-parts.c Log: Fix gcc 4.4 warnings about strict aliasing Rather than cast char arrays to other types, use correct types and cast them to char pointers when needed. Author: Pavel Roskin <proski(a)gnu.org> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/fw_cfg.c =================================================================== --- trunk/openbios-devel/drivers/fw_cfg.c 2009-08-23 12:40:20 UTC (rev 567) +++ trunk/openbios-devel/drivers/fw_cfg.c 2009-08-23 12:40:22 UTC (rev 568) @@ -34,31 +34,31 @@ uint64_t fw_cfg_read_i64(uint16_t cmd) { - char buf[sizeof(uint64_t)]; + uint64_t buf; - fw_cfg_read(cmd, buf, sizeof(uint64_t)); + fw_cfg_read(cmd, (char *)&buf, sizeof(uint64_t)); - return __le64_to_cpu(*(uint64_t *)buf); + return __le64_to_cpu(buf); } uint32_t fw_cfg_read_i32(uint16_t cmd) { - char buf[sizeof(uint32_t)]; + uint32_t buf; - fw_cfg_read(cmd, buf, sizeof(uint32_t)); + fw_cfg_read(cmd, (char *)&buf, sizeof(uint32_t)); - return __le32_to_cpu(*(uint32_t *)buf); + return __le32_to_cpu(buf); } uint16_t fw_cfg_read_i16(uint16_t cmd) { - char buf[sizeof(uint16_t)]; + uint16_t buf; - fw_cfg_read(cmd, buf, sizeof(uint16_t)); + fw_cfg_read(cmd, (char *)&buf, sizeof(uint16_t)); - return __le16_to_cpu(*(uint16_t *)buf); + return __le16_to_cpu(buf); } void Modified: trunk/openbios-devel/modules/pc-parts.c =================================================================== --- trunk/openbios-devel/modules/pc-parts.c 2009-08-23 12:40:20 UTC (rev 567) +++ trunk/openbios-devel/modules/pc-parts.c 2009-08-23 12:40:22 UTC (rev 568) @@ -58,8 +58,8 @@ unsigned char e_head; unsigned char e_sector; unsigned char e_cyl; - unsigned char start_sect[4]; /* unaligned little endian */ - unsigned char nr_sects[4]; /* ditto */ + u32 start_sect; /* unaligned little endian */ + u32 nr_sects; /* ditto */ } *p; unsigned char buf[512]; @@ -96,11 +96,11 @@ printk("partition %d does not exist\n", parnum+1 ); RET( 0 ); } - di->offs = (llong)(__le32_to_cpu(*((u32 *)p->start_sect))) * bs; - di->size = (llong)(__le32_to_cpu(*((u32 *)p->nr_sects))) * bs; + di->offs = (llong)(__le32_to_cpu(p->start_sect)) * bs; + di->size = (llong)(__le32_to_cpu(p->nr_sects)) * bs; /* printk("Primary partition at sector %x\n", - __le32_to_cpu(*((u32 *)p->start_sect))); */ + __le32_to_cpu(p->start_sect)); */ RET( -1 ); } else { @@ -123,7 +123,7 @@ printk("Extended partition at %d\n", i+1); /* Visit each logical partition labels */ - ext_start = __le32_to_cpu(*((u32 *)p[i].start_sect)); + ext_start = __le32_to_cpu(p[i].start_sect); cur_table = ext_start; cur_part = 4; @@ -147,8 +147,8 @@ RET( 0 ); } di->offs = - (llong)(cur_table+__le32_to_cpu(*((u32 *)p->start_sect))) * bs; - di->size = (llong)__le32_to_cpu(*((u32 *)p->nr_sects)) * bs; + (llong)(cur_table+__le32_to_cpu(p->start_sect)) * bs; + di->size = (llong)__le32_to_cpu(p->nr_sects) * bs; RET ( -1 ); } @@ -157,7 +157,7 @@ printk("no link\n"); break; } - cur_table = ext_start + __le32_to_cpu(*((u32 *)p[1].start_sect)); + cur_table = ext_start + __le32_to_cpu(p[1].start_sect); cur_part++; }

1 0

r567 - trunk/openbios-devel
by svn＠openbios.org 23 Aug '09

23 Aug '09

Author: blueswirl Date: 2009-08-23 14:40:20 +0200 (Sun, 23 Aug 2009) New Revision: 567 Modified: trunk/openbios-devel/Makefile.target Log: Show version.fs and openbios-version.h generation Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/Makefile.target =================================================================== --- trunk/openbios-devel/Makefile.target 2009-08-22 06:04:00 UTC (rev 566) +++ trunk/openbios-devel/Makefile.target 2009-08-23 12:40:20 UTC (rev 567) @@ -32,6 +32,8 @@ INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS+= -g +quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) + # # pre rules # @@ -41,12 +43,14 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: + $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: + $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; ) \ @@ -65,6 +69,4 @@ build: all -quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) - include rules.mak

1 0

[patch 0/6] sparc64 zero virtual memory page fixes
by Igor Kovalenko 22 Aug '09

22 Aug '09

Hi! This series do clean up several issues with openbios implementation trying to access zero virtual memory page. These changes are needed to prevent corrupting low memory space, albeit it is hard to verify without corresponding change to qemu which moves pci memory space above low 32bit space. Qemu part is not completed yet, so I use workaround for testing purposes. Change to package.fs dealing with NULL instance or package handles should be visible even witout changes to qemu (meaning more issues are probably there, to be fixed). I think timer handler currently fails into this problematic category as well, so related change postponing timer initialization is here as well. Since timer event handling requires trap table support, I added corresponding entry which does nothing but rearms timer at the moment. Signed-off-by: igor.v.kovalenko(a)gmail.com -- Kind regards, Igor V. Kovalenko

3 15

[patch 0/1] corrected softint handler v1
by Igor Kovalenko 22 Aug '09

22 Aug '09

corrected version v1 removed extra instructions Signed-off-by: igor.v.kovalenko(a)gmail.com -- Kind regards, Igor V. Kovalenko

2 2

r566 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 22 Aug '09

22 Aug '09

Author: blueswirl Date: 2009-08-22 08:04:00 +0200 (Sat, 22 Aug 2009) New Revision: 566 Modified: trunk/openbios-devel/arch/sparc64/vectors.S Log: v1 Preliminary support for softint handler with trap to bug on other irqs v0->v1: removed extra instructions Signed-off-by: igor.v.kovalenko(a)gmail.com Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/vectors.S =================================================================== --- trunk/openbios-devel/arch/sparc64/vectors.S 2009-08-22 06:03:40 UTC (rev 565) +++ trunk/openbios-devel/arch/sparc64/vectors.S 2009-08-22 06:04:00 UTC (rev 566) @@ -29,11 +29,13 @@ #define ASI_BP ASI_PHYS_BYPASS_EC_E #define PROM_ADDR 0x1fff0000000 #define SER_ADDR 0x1fe020003f8 +#define TICK_INT_DIS 0x8000000000000000 +#define TICK_INTERVAL 10*1000*1000 .section ".text.vectors", "ax" .align 16384 /* Sparc64 trap table */ - .globl trap_table, __divide_error + .globl trap_table, __divide_error, softint_irq, softint_irq_tl1 .register %g2, #scratch .register %g3, #scratch .register %g6, #scratch @@ -96,7 +98,7 @@ nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; #define TRAP_IRQ(routine, level) \ - ba routine; nop; nop; nop; nop; nop; nop; nop; + ba routine; mov level, %g1; nop; nop; nop; nop; nop; nop; #define BTRAP(lvl) \ ba bug; mov lvl, %g1; nop; nop; nop; nop; nop; nop; #define BTRAPTL1(lvl) BTRAP(lvl) @@ -119,7 +121,6 @@ CLEAN_WINDOW ! 24-27 BTRAPS(0x28) BTRAPS(0x30) BTRAPS(0x38) -#if 0 BTRAP(0x40) BTRAP(0x41) BTRAP(0x42) BTRAP(0x43) tl0_irq4: TRAP_IRQ(handler_irq, 4) tl0_irq5: TRAP_IRQ(handler_irq, 5) TRAP_IRQ(handler_irq, 6) @@ -127,11 +128,8 @@ tl0_irq9: TRAP_IRQ(handler_irq, 9) TRAP_IRQ(handler_irq, 10) tl0_irq11: TRAP_IRQ(handler_irq, 11) TRAP_IRQ(handler_irq, 12) tl0_irq13: TRAP_IRQ(handler_irq, 13) -tl0_irq14: TRAP_IRQ(handler_irq, 14) +tl0_irq14: TRAP_IRQ(softint_irq, 14) tl0_irq15: TRAP_IRQ(handler_irq, 15) -#else - BTRAPS(0x40) BTRAPS(0x48) -#endif BTRAPS(0x50) BTRAPS(0x58) BTRAPS4(0x60) TRAP_HANDLER(reload_IMMU_tlb) ! 0x64 : instruction_access_MMU_miss @@ -196,6 +194,9 @@ #undef BTRAPS #define BTRAPS(x) BTRAPTL1(x) BTRAPTL1(x+1) BTRAPTL1(x+2) BTRAPTL1(x+3) BTRAPTL1(x+4) BTRAPTL1(x+5) BTRAPTL1(x+6) BTRAPTL1(x+7) +#define SKIP_IRQ(routine, level) \ + retry; nop; nop; nop; nop; nop; nop; nop; + sparc64_ttable_tl1: BTRAPS(0x00) BTRAPS(0x08) BTRAPS(0x10) BTRAPS(0x18) @@ -203,7 +204,6 @@ CLEAN_WINDOW ! 24-27 BTRAPS(0x28) BTRAPS(0x30) BTRAPS(0x38) -#if 0 BTRAPTL1(0x40) BTRAPTL1(0x41) BTRAPTL1(0x42) BTRAPTL1(0x43) tl1_irq4: TRAP_IRQ(handler_irq, 4) tl1_irq5: TRAP_IRQ(handler_irq, 5) TRAP_IRQ(handler_irq, 6) @@ -211,11 +211,8 @@ tl1_irq9: TRAP_IRQ(handler_irq, 9) TRAP_IRQ(handler_irq, 10) tl1_irq11: TRAP_IRQ(handler_irq, 11) TRAP_IRQ(handler_irq, 12) tl1_irq13: TRAP_IRQ(handler_irq, 13) -tl1_irq14: TRAP_IRQ(handler_irq, 14) +tl1_irq14: SKIP_IRQ(softint_irq, 14) tl1_irq15: TRAP_IRQ(handler_irq, 15) -#else - BTRAPS(0x40) BTRAPS(0x48) -#endif BTRAPS(0x50) BTRAPS(0x58) BTRAPS4(0x60) TRAP_HANDLER(reload_IMMU_tlb) ! 0x64 : instruction_access_MMU_miss @@ -400,6 +397,28 @@ retry +softint_irq_tl1: +softint_irq: + mov 1, %g2 + /* clear tick interrupt */ + wr %g2, 0x0, %clear_softint + sll %g2, %g1, %g2 + sra %g2, 0, %g2 + /* clear softint interrupt */ + wr %g2, 0x0, %clear_softint + + setx TICK_INT_DIS, %g2, %g1 + rd %tick, %g2 + and %g1, %g2, %g1 + brnz,pn %g1, tick_compare_disabled + nop + set TICK_INTERVAL, %g1 + add %g1, %g2, %g1 + wr %g1, 0, %tick_cmpr +tick_compare_disabled: + retry + +handler_irq: __divide_error: bug: /* Dump the exception and its context */

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →