OpenBIOS May 2009

openbios@openbios.org

13 participants
28 discussions

r495 - in trunk/openbios-devel: forth/device kernel
by svn＠openbios.org 23 May '09

23 May '09

Author: blueswirl Date: 2009-05-23 17:31:31 +0200 (Sat, 23 May 2009) New Revision: 495 Modified: trunk/openbios-devel/forth/device/table.fs trunk/openbios-devel/kernel/bootstrap.c Log: Implement /x FCode (Mark Cave-Ayland) Modified: trunk/openbios-devel/forth/device/table.fs =================================================================== --- trunk/openbios-devel/forth/device/table.fs 2009-05-22 17:15:48 UTC (rev 494) +++ trunk/openbios-devel/forth/device/table.fs 2009-05-23 15:31:31 UTC (rev 495) @@ -397,6 +397,8 @@ ['], byte-load ['], set-args ['], left-parse-string \ 240 + 7 n['], reserved-fcode \ 241-247 (Part of IEEE1275 64-bit draft standard) + ['], /x here fcode-master-table - constant fcode-master-table-size Modified: trunk/openbios-devel/kernel/bootstrap.c =================================================================== --- trunk/openbios-devel/kernel/bootstrap.c 2009-05-22 17:15:48 UTC (rev 494) +++ trunk/openbios-devel/kernel/bootstrap.c 2009-05-23 15:31:31 UTC (rev 495) @@ -723,6 +723,7 @@ buildconstant("/w", sizeof(u16)); buildconstant("/l", sizeof(u32)); buildconstant("/n", sizeof(ucell)); + buildconstant("/x", sizeof(u64)); reveal(); printk("Dictionary initialization finished.\n");

1 0

[PATCH] forth: add more pockets
by Igor Kovalenko 22 May '09

22 May '09

This changes pocket index calculation to support more than two pockets. As an example default number of pockets is set to 4. This should ease nesting more than two levels using pockets as temporary storage. Signed-off-by: Igor Kovalenko <igor.v.kovalenko(a)gmail.com> -- Kind regards, Igor V. Kovalenko

3 3

r494 - trunk/openbios-devel/forth/bootstrap
by svn＠openbios.org 22 May '09

22 May '09

Author: blueswirl Date: 2009-05-22 19:15:48 +0200 (Fri, 22 May 2009) New Revision: 494 Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs Log: forth: add more pockets This changes pocket index calculation to support more than two pockets. As an example default number of pockets is set to 4. This should ease nesting more than two levels using pockets as temporary storage. Signed-off-by: Igor Kovalenko <igor.v.kovalenko(a)gmail.com> Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs =================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-05-22 17:14:10 UTC (rev 493) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-05-22 17:15:48 UTC (rev 494) @@ -622,18 +622,19 @@ \ pockets implementation for 7.3.4.1 100 constant pocketsize +4 constant numpockets variable pockets 0 pockets ! variable whichpocket 0 whichpocket ! -\ allocate 2 pockets to begin with +\ allocate 4 pockets to begin with : init-pockets ( -- ) - pocketsize 2* alloc-mem pockets ! + pocketsize numpockets * alloc-mem pockets ! ; : pocket ( ?? -- ?? ) pocketsize whichpocket @ * pockets @ + - 1 whichpocket @ - + whichpocket @ 1 + numpockets mod whichpocket ! ;

1 0

[PATCH] fix regprop int encoding
by Igor Kovalenko 22 May '09

22 May '09

Wrong encoding of "#address-cells" property can lead to a failure fetching correct value in my-#acells method. According to docs properties must be encoded with "encode-int". I spent some time looking at the docs and it is clear that encode-int produces quad-sized result (of size /l bytes). This patch fixes pci helpers to encode to 32bit instead of 64bit values, and correctes my-address and my-unit methods to read 32bit data to match encode-int rules modules/bindings.c: also fixed set_int_property and get_int_property to match encode-int rules Signed-off-by: Igor Kovalenko <igor.v.kovalenko(a)gmail.com> -- Kind regards, Igor V. Kovalenko

2 2

r493 - in trunk/openbios-devel: drivers forth/device include/openbios modules
by svn＠openbios.org 22 May '09

22 May '09

Author: blueswirl Date: 2009-05-22 19:14:10 +0200 (Fri, 22 May 2009) New Revision: 493 Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/forth/device/package.fs trunk/openbios-devel/include/openbios/bindings.h trunk/openbios-devel/modules/bindings.c Log: Fix regprop int encoding (Igor Kovalenko) Wrong encoding of "#address-cells" property can lead to a failure fetching correct value in my-#acells method. According to docs properties must be encoded with "encode-int". I spent some time looking at the docs and it is clear that encode-int produces quad-sized result (of size /l bytes). This patch fixes pci helpers to encode to 32bit instead of 64bit values, and correctes my-address and my-unit methods to read 32bit data to match encode-int rules modules/bindings.c: also fixed set_int_property and get_int_property to match encode-int rules Signed-off-by: Igor Kovalenko <igor.v.kovalenko(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci.c =================================================================== --- trunk/openbios-devel/drivers/pci.c 2009-05-22 17:09:52 UTC (rev 492) +++ trunk/openbios-devel/drivers/pci.c 2009-05-22 17:14:10 UTC (rev 493) @@ -52,7 +52,7 @@ MEMORY_SPACE_64 = 3, }; -static inline void pci_encode_phys_addr(cell *phys, int flags, int space_code, +static inline void pci_encode_phys_addr(u32 *phys, int flags, int space_code, pci_addr dev, uint8_t reg, uint64_t addr) { @@ -174,27 +174,27 @@ static void pci_set_bus_range(const pci_config_t *config) { phandle_t dev = get_cur_dev(); - cell props[2]; + u32 props[2]; props[0] = (config->dev >> 16) & 0xFF; props[1] = 1; - set_property(dev, "bus-range", (char *)props, 2 * sizeof(cell)); + set_property(dev, "bus-range", (char *)props, 2 * sizeof(props[0])); } static void pci_host_set_reg(const pci_config_t *config) { phandle_t dev = get_cur_dev(); - cell props[2]; + u32 props[2]; props[0] = arch->cfg_base; props[1] = arch->cfg_len; - set_property(dev, "reg", (char *)props, 2 * sizeof(cell)); + set_property(dev, "reg", (char *)props, 2 * sizeof(props[0])); } static void pci_host_set_ranges(const pci_config_t *config) { phandle_t dev = get_cur_dev(); - cell props[32]; + u32 props[32]; int ncells; ncells = 0; @@ -222,7 +222,7 @@ props[ncells++] = 0x00000000; props[ncells++] = arch->mem_len; } - set_property(dev, "ranges", (char *)props, ncells * sizeof(cell)); + set_property(dev, "ranges", (char *)props, ncells * sizeof(props[0])); } int host_config_cb(const pci_config_t *config) @@ -234,6 +234,7 @@ set_property(aliases, "pci", config->path, strlen(config->path) + 1); + //XXX this overrides "reg" property pci_host_set_reg(config); pci_host_set_ranges(config); pci_set_bus_range(config); @@ -265,7 +266,7 @@ int eth_config_cb (const pci_config_t *config) { - phandle_t ph = get_cur_dev();; + phandle_t ph = get_cur_dev(); set_property(ph, "network-type", "ethernet", 9); set_property(ph, "removable", "network", 8); @@ -325,7 +326,7 @@ static void pci_set_assigned_addresses(const pci_config_t *config) { phandle_t dev = get_cur_dev(); - cell props[32]; + u32 props[32]; int ncells; int i; uint32_t mask; @@ -349,13 +350,13 @@ } if (ncells) set_property(dev, "assigned-addresses", (char *)props, - ncells * sizeof(cell)); + ncells * sizeof(props[0])); } static void pci_set_reg(const pci_config_t *config) { phandle_t dev = get_cur_dev(); - cell props[38]; + u32 props[38]; int ncells; int i; uint32_t mask; @@ -387,14 +388,14 @@ props[ncells++] = 0x00000000; props[ncells++] = config->sizes[i]; } - set_property(dev, "reg", (char *)props, ncells * sizeof(cell)); + set_property(dev, "reg", (char *)props, ncells * sizeof(props[0])); } static void pci_set_ranges(const pci_config_t *config) { phandle_t dev = get_cur_dev(); - cell props[32]; + u32 props[32]; int ncells; int i; uint32_t mask; @@ -423,7 +424,7 @@ props[ncells++] = config->sizes[i]; } - set_property(dev, "ranges", (char *)props, ncells * sizeof(cell)); + set_property(dev, "ranges", (char *)props, ncells * sizeof(props[0])); } int macio_heathrow_config_cb (const pci_config_t *config) Modified: trunk/openbios-devel/forth/device/package.fs =================================================================== --- trunk/openbios-devel/forth/device/package.fs 2009-05-22 17:09:52 UTC (rev 492) +++ trunk/openbios-devel/forth/device/package.fs 2009-05-22 17:14:10 UTC (rev 493) @@ -175,9 +175,9 @@ : my-address ( -- phys.lo ... ) ?my-self >in.device-node @ >dn.probe-addr - my-#acells tuck cells + swap 1- 0 + my-#acells tuck /l* + swap 1- 0 ?do - cell - dup @ swap + /l - dup l@ swap loop drop ; @@ -189,8 +189,8 @@ : my-unit ( -- phys.lo ... phys.hi ) ?my-self >in.my-unit - my-#acells tuck cells + swap 0 ?do - cell - dup @ swap + my-#acells tuck /l* + swap 0 ?do + /l - dup l@ swap loop drop ; Modified: trunk/openbios-devel/include/openbios/bindings.h =================================================================== --- trunk/openbios-devel/include/openbios/bindings.h 2009-05-22 17:09:52 UTC (rev 492) +++ trunk/openbios-devel/include/openbios/bindings.h 2009-05-22 17:14:10 UTC (rev 493) @@ -61,8 +61,8 @@ extern void set_property( phandle_t ph, const char *name, const char *buf, int len ); extern void set_int_property( phandle_t ph, const char *name, - cell val ); -extern cell get_int_property( phandle_t ph, const char *name, + u32 val ); +extern u32 get_int_property( phandle_t ph, const char *name, int *retlen ); extern char *get_property( phandle_t ph, const char *name, int *retlen ); Modified: trunk/openbios-devel/modules/bindings.c =================================================================== --- trunk/openbios-devel/modules/bindings.c 2009-05-22 17:09:52 UTC (rev 492) +++ trunk/openbios-devel/modules/bindings.c 2009-05-22 17:14:10 UTC (rev 493) @@ -287,10 +287,10 @@ } void -set_int_property( phandle_t ph, const char *name, cell val ) +set_int_property( phandle_t ph, const char *name, u32 val ) { - cell swapped=__cpu_to_becell(val); - set_property( ph, name, (char*)&swapped, sizeof(cell) ); + u32 swapped=__cpu_to_be32(val); + set_property( ph, name, (char*)&swapped, sizeof(swapped) ); } char * @@ -312,14 +312,14 @@ return (char*)POP(); } -cell +u32 get_int_property( phandle_t ph, const char *name, int *retlen ) { - cell *p; + u32 *p; - if( !(p=(cell *)get_property(ph, name, retlen)) ) + if( !(p=(u32 *)get_property(ph, name, retlen)) ) return 0; - return __becell_to_cpu(*p); + return __be32_to_cpu(*p); }

1 0

PATCH: Fix b(do) ... b(leaves) ... b(loop)/b(+loop)
by Mark Cave-Ayland 22 May '09

22 May '09

Hi everyone, This patch fixes the b(do)...b(leaves)...b(loop)/b(+loop) structures by marking them as immediate rather then compile-only. Without this in place, the loop addresses would be calculated incorrectly which would cause the Fcode evaluator to jump to the wrong location for each loop iteration. I've confirmed that this change does not break do...leaves...loop in immediate mode either. For reference, here are the test cases I used: \ Test Fcode do...loop \ Forth: 3 0 do i . cr loop here cc c, \ offset16 a8 c, \ 3 a5 c, \ 0 17 c, 00 c, 08 c, \ b(do) 19 c, \ i 9d c, \ . 92 c, \ cr 15 c, ff c, fc c, \ b(loop) 00 c, \ end \ Test Fcode do...+loop \ Forth: 10 0 do i . cr 2 +loop here cc c, \ offset16 10 c, 00 c, 00 c, 00 c, 10 c, \ b(lit) 0x10 a5 c, \ 0 17 c, 00 c, 09 c, \ b(do) 19 c, \ i 9d c, \ . 92 c, \ cr a7 c, \ 2 16 c, ff c, fb c, \ b(+loop) 00 c, \ end \ Test Fcode do...leave...loop \ Forth: a 0 do i dup . 3 = if leave then loop here cc c, \ offset16 10 c, 00 c, 00 c, 00 c, 0a c, \ b(lit) 0xA a5 c, \ 0 17 c, 00 c, 0f c, \ b(do) 19 c, \ i 47 c, \ dup 9d c, \ . a8 c, \ 3 3c c, \ = 14 c, 00 c, 04 c, \ b?branch 1b c, \ b(leave) b2 c, \ b(>resolve) 15 c, ff c, f5 c, \ b(loop) 00 c, \ end With these last 2 patches and diag-switch? set to true, the Fcode evaluator will now finish executing my SPARC64 disk image without crashing giving the following output: OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 CPUs: 1 x SUNW,UltraSPARC-II UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.0 built on May 21 2009 19:09 Type 'help' for detailed information [sparc64] Booting file 'disk' with parameters '' Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Loading FCode image... Loaded 5936 bytes entry point is 0x4000 Evaluating FCode... reserved fcode word. Loading package 1.4 04 Aug 1995 13:02:54. reserved fcode word. reserved fcode word. reserved fcode word. FCode UFS Reader 1.12 00/07/17 15:48:16. Loading: /platform//ufsboot Loading: /platform/sun4u/ufsboot Boot load failed. byte-load: stack overflow, diff -2 0 > It looks as if the next stage is to implement the missing push-package/pop-package forth words to ensure that the ufs-file-system package is located at the correct point in the tree - I'll see if I can come up with something over the next few days. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063

3 3

PATCH: Read the diagnostic mode setting from NVRAM
by Mark Cave-Ayland 22 May '09

22 May '09

Hi everyone, When trying to boot a SPARC64 disk image under QEMU, extra diagnostic information can be made available on the console if diagnostic-mode? returns true. This patch implements the simple step of reading the diag-switch? NVRAM parameter and using this to determine whether diagnostic mode is enabled or disabled. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063

2 1

r492 - trunk/openbios-devel/forth/bootstrap
by svn＠openbios.org 22 May '09

22 May '09

Author: blueswirl Date: 2009-05-22 19:09:52 +0200 (Fri, 22 May 2009) New Revision: 492 Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs Log: Fix b(do) ... b(leaves) ... b(loop)/b(+loop) (Mark Cave-Ayland) Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs =================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-05-22 17:09:05 UTC (rev 491) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-05-22 17:09:52 UTC (rev 492) @@ -278,13 +278,13 @@ ['] (loop) , resolve-loop execute-tmp-comp - ; compile-only + ; immediate : +loop ['] (+loop) , resolve-loop execute-tmp-comp - ; compile-only + ; immediate \ Using primitive versions of i and j \ speeds up loops by 300% @@ -299,7 +299,7 @@ leaves @ here leaves ! , - ; compile-only + ; immediate : ?leave if leave then ;

1 0

r491 - in trunk/openbios-devel/forth: admin device
by svn＠openbios.org 22 May '09

22 May '09

Author: blueswirl Date: 2009-05-22 19:09:05 +0200 (Fri, 22 May 2009) New Revision: 491 Modified: trunk/openbios-devel/forth/admin/nvram.fs trunk/openbios-devel/forth/device/other.fs Log: Read the diagnostic mode setting from NVRAM (Mark Cave-Ayland) Modified: trunk/openbios-devel/forth/admin/nvram.fs =================================================================== --- trunk/openbios-devel/forth/admin/nvram.fs 2009-05-20 18:07:09 UTC (rev 490) +++ trunk/openbios-devel/forth/admin/nvram.fs 2009-05-22 17:09:05 UTC (rev 491) @@ -364,3 +364,4 @@ \ defers ['] fcode-debug? to _fcode-debug? +['] diag-switch? to _diag-switch? Modified: trunk/openbios-devel/forth/device/other.fs =================================================================== --- trunk/openbios-devel/forth/device/other.fs 2009-05-20 18:07:09 UTC (rev 490) +++ trunk/openbios-devel/forth/device/other.fs 2009-05-22 17:09:05 UTC (rev 491) @@ -8,6 +8,10 @@ \ the copyright and warranty status of this work. \ +\ The current diagnostic setting +defer _diag-switch? + + \ \ 5.3.7 Other FCode functions \ @@ -89,6 +93,8 @@ ; : diagnostic-mode? ( -- diag? ) + \ Return the NVRAM diag-switch? setting + _diag-switch? ; \ 5.3.7.6 Start and end.

1 0

r490 - in trunk/openbios-devel: include/libc libc
by svn＠openbios.org 20 May '09

20 May '09

Author: blueswirl Date: 2009-05-20 20:07:09 +0200 (Wed, 20 May 2009) New Revision: 490 Modified: trunk/openbios-devel/include/libc/string.h trunk/openbios-devel/libc/misc.c Log: Fix stack protector problems with newer GCC versions Modified: trunk/openbios-devel/include/libc/string.h =================================================================== --- trunk/openbios-devel/include/libc/string.h 2009-05-17 18:59:32 UTC (rev 489) +++ trunk/openbios-devel/include/libc/string.h 2009-05-20 18:07:09 UTC (rev 490) @@ -103,5 +103,6 @@ extern long __guard[8]; void __stack_smash_handler(const char *func, int damaged); +void __stack_chk_fail(void); #endif /* _H_STRING */ Modified: trunk/openbios-devel/libc/misc.c =================================================================== --- trunk/openbios-devel/libc/misc.c 2009-05-17 18:59:32 UTC (rev 489) +++ trunk/openbios-devel/libc/misc.c 2009-05-20 18:07:09 UTC (rev 490) @@ -86,13 +86,24 @@ 0, 0, 0, 0, 0, 0, 0 }; -void __stack_smash_handler(const char *func, int damaged) +static void freeze(void) { - printk("Propolice detected a stack smashing attack %x at function %s," - " freezing\n", damaged, func); - // Freeze // XXX: Disable interrupts? for(;;) ; } + +void __stack_smash_handler(const char *func, int damaged) +{ + printk("Propolice detected a stack smashing attack %x at function %s," + " freezing\n", damaged, func); + freeze(); +} + +void __stack_chk_fail(void) +{ + printk("Propolice detected a stack smashing attack, freezing\n"); + + freeze(); +}

1 0