openfirmware

openfirmware@openfirmware.info

3007 discussions

r1049 - cpu/x86/pc/olpc
by svn＠openfirmware.info 24 Dec '08

24 Dec '08

Author: wmb Date: 2008-12-24 22:16:22 +0100 (Wed, 24 Dec 2008) New Revision: 1049 Modified: cpu/x86/pc/olpc/addrs.fth cpu/x86/pc/olpc/resume.bth cpu/x86/pc/olpc/suspend.fth Log: OLPC suspend/resume: a) Fixed a problem in the SD register restore code b) Added "forget-msr" directives after ecx modifications to ensure that the correct MSR is read thereafter. c) Fixed the "save-display" portion of the suspend/resume code (which is commented-out by default) which had stopped working some time ago. The main fix was to change the value of the address constant "resume-data" to prevent it overwriting the save/restore code, which is longer when save-display is defined. This was done while investigating how to eliminate display glitches. d) Added code to save/restore the state of graphics processor registers (part of the commented-out "save-display" code). e) Added a "kb-suspend" test for testing suspend-between-keystrokes. Modified: cpu/x86/pc/olpc/addrs.fth =================================================================== --- cpu/x86/pc/olpc/addrs.fth 2008-12-24 21:05:15 UTC (rev 1048) +++ cpu/x86/pc/olpc/addrs.fth 2008-12-24 21:16:22 UTC (rev 1049) @@ -80,7 +80,7 @@ h# f.0000 constant suspend-base \ In the DOS hole h# f.0008 constant resume-entry -h# f.0800 constant resume-data +h# f.1000 constant resume-data \ If you change these, also change {g/l}xmsrs.fth and {g/l}xearly.fth h# fd00.0000 constant fw-map-base Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2008-12-24 21:05:15 UTC (rev 1048) +++ cpu/x86/pc/olpc/resume.bth 2008-12-24 21:16:22 UTC (rev 1049) @@ -19,6 +19,7 @@ \ This code will be copied to RAM at suspend-base +\ create measure-suspend \ create save-display \ create reset-smbus \ create reset-smbus-bitbang @@ -61,7 +62,7 @@ \ Page directory VA in AX ax si mov \ Save PDIR VA - 0 [si] cx mov \ Save old PDIR entry 0 + 0 [si] cx mov forget-msr \ Save old PDIR entry 0 h# 83 # 0 [ax] mov \ Punch a 4M mapping 0->0 into the page directory cr3 ax mov ax cr3 mov \ Invalide the TLB to activate the mapping h# f0060 # ax mov ax jmp \ Jump to suspend-physical, disabling paging @@ -101,19 +102,23 @@ cld h# 38 [bp] di lea \ Save area +[ifdef] measure-suspend + rdtsc eax h# 10 #) mov edx h# 14 #) mov +[then] + [ifdef] save-msrs h# 30 [bp] si mov \ MSR table 0 [si] bl mov begin - 1 [si] cx mov + 1 [si] cx mov forget-msr 5 # si add begin \ loop count in bl, msr# in cx rdmsr \ msr.lo in ax, msr.hi in dx ax stos dx ax mov ax stos - cx inc + cx inc forget-msr bl dec 0= until 0 [si] bl mov @@ -130,8 +135,28 @@ h# 4c00.0015 rmsr ax stos dx ax mov ax stos \ DOTPLL [ifdef] save-display + \ Wait until it's safe to set the DCONLOAD bit; if you do it at the wrong time + \ you get screen artifacts + + \ Wait for VSYNC + begin + dc-pci-base h# 6c + #) ax mov \ DC_LINE_CNT/STATUS Register + h# 2000.0000 # ax test \ VSYNC bit + 0<> until + + \ Wait until the line count is 38. + \ Testing shows that it suffices to wait for any line in the range 36..911 + \ If DCONLOAD is cleared during lines 0..35, display artifacts will appear + \ at the bottom of the screen. + begin + dc-pci-base h# 6c + #) ax mov \ DC_LINE_CNT/STATUS Register + h# 3ff # ax and \ DOT_LINE_CNT field + d# 38 # ax cmp + = until \ Loop until line count is 38 (empirically good) + \ Freeze image by clearing the DCONLOAD bit (0x800) in the GPIO output register - h# 0800.0000 h# 1000 port-wl + h# 5140.000c rmsr h# 00 [ax] dx lea \ GPIO output port + h# 0800.0000 # ax mov ax dx out [then] \ Save the GPIO setup @@ -146,7 +171,7 @@ h# e0 [bx] dx lea dx ax in ax stos \ GPIO_MAP_Z h# 38 [bx] dx lea \ Low bank - first contiguous GPIO register - h# 3c /l / # cx mov \ Register count (stop at lock register) + h# 3c /l / # cx mov forget-msr \ Register count (stop at lock register) begin dx ax in \ Read GPIO control register ax stos \ Save @@ -160,7 +185,7 @@ [ifndef] omit-high-gpio-restore \ This is probably unnecessary, as these registers may be in the suspend well h# b8 [bx] dx lea \ High bank - first contiguous GPIO register - h# 3c /l / # cx mov \ Register count (stop at lock register) + h# 3c /l / # cx mov forget-msr \ Register count (stop at lock register) begin ax dx in \ Read GPIO control register ax stos \ Save @@ -178,13 +203,22 @@ [ifdef] save-display \ \ h# 3c 0 do i gp@ l!+ 4 +loop h# 4c gp@ l!+ -\ h# f # cx mov gp-pci-base set-base begin 0 [bx] ax mov ax stos 4 # bx add loopa +\ h# f # cx mov forget-msr gp-pci-base set-base begin 0 [bx] ax mov ax stos 4 # bx add loopa \ gp-pci-base h# 4c + #) ax mov ax stos + gp-pci-base set-base + h# 00 reg-save h# 04 reg-save h# 08 reg-save h# 0c reg-save + h# 10 reg-save h# 14 reg-save h# 18 reg-save h# 1c reg-save + h# 20 reg-save h# 24 reg-save h# 28 reg-save h# 2c reg-save + h# 30 reg-save h# 34 reg-save h# 38 reg-save ( h# 3c reg-save ) + ( h# 40 reg-save h# 44 reg-save h# 48 reg-save ) h# 4c reg-save + h# 50 reg-save h# 54 reg-save ( h# 58 reg-save h# 5c reg-save ) + h# 60 reg-save h# 64 reg-save h# 68 reg-save h# 6c reg-save + h# 70 reg-save h# 74 reg-save h# 78 reg-save ( h# 7c reg-save ) vp-pci-base set-base h# 400 reg-save h# 408 reg-save h# 418 reg-save h# 8 reg-save - 0 # h# 38 [bx] mov h# 100 # cx mov begin h# 40 reg-save loopa \ Gamma + 0 # h# 38 [bx] mov h# 100 # cx mov forget-msr begin h# 40 reg-save loopa \ Gamma h# 410 reg-save dc-pci-base set-base @@ -195,7 +229,7 @@ h# 40 reg-save h# 44 reg-save h# 48 reg-save h# 50 reg-save h# 54 reg-save h# 58 reg-save h# 60 reg-save h# 64 reg-save h# 68 reg-save - 0 # h# 70 [bx] mov h# 100 # cx mov begin h# 74 reg-save loopa + 0 # h# 70 [bx] mov h# 100 # cx mov forget-msr begin h# 74 reg-save loopa h# 80 reg-save h# 84 reg-save h# 8 reg-save h# 4 reg-save @@ -246,7 +280,7 @@ \ MFGPTs 0-5. MFGPT 6 and 7 are in the standby domain, live during suspend h# 1800 # dx mov \ MFGPT base port - h# 18 # cx mov \ Save registers up to h# 30. + h# 18 # cx mov forget-msr \ Save registers up to h# 30. begin op: dx ax in op: ax stos @@ -286,8 +320,8 @@ [ifdef] save-display \ Wait until the DCON has loaded a frame - DCONIRQ=1 and DCONSTAT=10 - d# 50,000 # cx mov \ 50K spins is about 40 mS - h# 1030 # dx mov + h# 5140.000c rmsr h# 30 [ax] dx lea \ GPIO data port + d# 50,000 # cx mov forget-msr \ 50K spins is about 40 mS begin dx ax in h# e0 # al and h# c0 # al cmp loopne [then] @@ -295,11 +329,16 @@ \ Checksum memory from 1M to top (excluding framebuffer) bx bx xor h# 0010.0000 # si mov - h# 0ef0.0000 2 rshift # cx mov \ Word count + h# 0ef0.0000 2 rshift # cx mov forget-msr \ Word count begin ax lods ax bx add loopa bx resume-data h# 10 - #) mov \ Save checksum [then] +[ifdef] measure-suspend + di 0 #) mov + rdtsc ax h# 18 #) mov dx h# 1c #) mov +[then] + \ Stop video refresh h# 4758 # dc-pci-base #) mov \ Unlock DC registers h# 0 # dc-pci-base 4 + #) mov \ Turn off access to display memory @@ -333,7 +372,7 @@ \ Setup the register values in advance so the active instruction sequence \ is as short as possible, thus keeping all the activity in one cache line. h# 4. # dx mov # ax mov \ Value to write to MSR - h# 2000.2004 # cx mov \ GLD_MSR_PM MSR number + h# 2000.2004 # cx mov forget-msr \ GLD_MSR_PM MSR number h# 2000 # bx mov \ Value to write to PM1_CNT register h# 1848 # di mov \ PM1_CNT I/O port number @@ -345,7 +384,7 @@ wrmsr \ Write GLD_MSR_PM to self-refresh memory di dx mov bx ax mov ax dx out \ Write PM1_CNT to initial suspend - h# fff # cx mov begin nop loopa \ Spin in this cache line while going down + h# fff # cx mov forget-msr begin nop loopa \ Spin in this cache line while going down \ If the processor didn't really go down, perhaps because a wakeup event was \ already pending, restart the memory clocks and proceed as with a wakeup @@ -371,6 +410,10 @@ h# 20 resume-progress +[ifdef] measure-suspend + rdtsc eax h# 20 #) mov edx h# 24 #) mov +[then] + [ifndef] save-msrs \ MSR init h# 30 [bp] si mov \ MSR table start address @@ -378,7 +421,7 @@ h# 34 [bp] bx add \ MSR table end address begin - ax lods ax cx mov \ msr# + ax lods ax cx mov forget-msr \ msr# ax lods ax dx mov \ msr.hi ax lods \ msr.lo wrmsr @@ -392,7 +435,7 @@ \ Checksum memory from 1M to top (excluding framebuffer) bx bx xor h# 0010.0000 # si mov - h# 0ef0.0000 2 rshift # cx mov \ Word count + h# 0ef0.0000 2 rshift # cx mov forget-msr \ Word count begin ax lods ax bx add loopa bx resume-data h# 10 - #) cmp <> if ret then [then] @@ -404,14 +447,14 @@ 0 [di] bl mov begin - 1 [di] cx mov + 1 [di] cx mov forget-msr 5 # di add begin \ loop count in bl, msr# in cx ax lods ax dx mov ax lods ax dx xchg \ msr.lo in ax, msr.hi in dx wrmsr - cx inc + cx inc forget-msr bl dec 0= until 0 [di] bl mov @@ -441,7 +484,7 @@ h# 14 [bx] dx lea ax dx out \ Deselect OUT AUX2 h# 34 [bx] dx lea ax dx out \ Deselect IN AUX1 - d# 16 # cx mov \ Generate 8 low pulses on SMB_CLOCK + d# 16 # cx mov forget-msr \ Generate 8 low pulses on SMB_CLOCK begin \ 5 uS delay (slightly longer for GX) rdtsc ax bx mov d# 5 d# 500 * # bx add @@ -450,7 +493,7 @@ cx bx mov \ Save cx for use by rmsr h# 5140.000c rmsr ax dx mov \ GPIO output register h# 40000000 # ax mov ax dx out \ Clear SMB_CLOCK - bx cx mov \ Restore cx + bx cx mov forget-ms \ Restore cx \ 5 uS delay (slightly longer for GX) rdtsc ax bx mov d# 5 d# 500 * # bx add @@ -459,7 +502,7 @@ cx bx mov \ Save cx for use by rmsr h# 5140.000c rmsr ax dx mov \ GPIO output register h# 4000 # ax mov ax dx out \ Set SMB_CLOCK - bx cx mov \ Restore cx + bx cx mov forget-msr \ Restore cx loopa \ 5 uS delay (slightly longer for GX) @@ -477,7 +520,7 @@ ax lods h# e0 [bx] dx lea ax dx out \ GPIO_MAP_Z h# 38 [bx] dx lea \ Low bank - first contiguous GPIO register - h# 3c /l / # cx mov \ Register count (stop at lock register) + h# 3c /l / # cx mov forget-msr \ Register count (stop at lock register) begin ax lods ax dx out \ Write to GPIO control register @@ -496,7 +539,7 @@ [ifndef] omit-high-gpio-restore \ This is probably unnecessary, as these registers may be in the suspend well h# b8 [bx] dx lea \ High bank - first contiguous GPIO register - h# 3c /l / # cx mov \ Register count (stop at lock register) + h# 3c /l / # cx mov forget-msr \ Register count (stop at lock register) begin ax lods ax dx out \ Write to GPIO control register @@ -519,24 +562,36 @@ [ifdef] save-display \ \ h# 3c 0 do l@+ i gp! 4 +loop l@+ h# 4c gp! -\ h# f # cx mov gp-pci-base set-base begin ax lods ax 0 [bx] mov 4 # bx add loopa +\ h# f # cx mov forget-msr gp-pci-base set-base begin ax lods ax 0 [bx] mov 4 # bx add loopa \ ax lods ax gp-pci-base h# 4c + #) mov \ Synchronize the flat panel turn-on with the DCON blanking -\ d# 50,000 # cx mov \ 50K spins is about 40 mS -\ h# 1030 # dx mov \ GPIO data port +\ h# 5140.000c rmsr h# 30 [ax] dx lea \ GPIO data port +\ h# 1030 # dx mov +\ d# 50,000 # cx mov forget-msr \ 50K spins is about 40 mS \ begin dx ax in h# 1000 # ax test loope \ Wait for blanking + gp-pci-base set-base + h# 00 reg-restore h# 04 reg-restore h# 08 reg-restore h# 0c reg-restore + h# 10 reg-restore h# 14 reg-restore h# 18 reg-restore h# 1c reg-restore + h# 20 reg-restore h# 24 reg-restore h# 28 reg-restore h# 2c reg-restore + h# 30 reg-restore h# 34 reg-restore h# 38 reg-restore ( h# 3c reg-restore ) + ( h# 40 reg-restore h# 44 reg-restore h# 48 reg-restore ) h# 4c reg-restore + h# 50 reg-restore h# 54 reg-restore ( h# 58 reg-restore h# 5c reg-restore ) + h# 60 reg-restore h# 64 reg-restore h# 68 reg-restore h# 6c reg-restore + h# 70 reg-restore h# 74 reg-restore h# 78 reg-restore ( h# 7c reg-save ) + vp-pci-base set-base 0 # h# 50 [bx] mov \ Power on for DACs, enable gamma correction h# 400 reg-restore h# 408 reg-restore h# 418 reg-restore h# 8 reg-restore - 0 # h# 38 [bx] mov h# 100 # cx mov begin h# 40 reg-restore loopa \ Gamma + 0 # h# 38 [bx] mov h# 100 # cx mov forget-msr begin h# 40 reg-restore loopa \ Gamma h# 410 reg-restore -\ d# 1,000,000 # cx mov begin h# 410 [bx] ax mov 1 # al test loope \ Panel power up +h# 34 resume-progress +\ d# 1,000,000 # cx mov forget-msr begin h# 410 [bx] ax mov 1 # al test loope \ Panel power up dc-pci-base set-base @@ -548,25 +603,34 @@ h# 40 reg-restore h# 44 reg-restore h# 48 reg-restore h# 50 reg-restore h# 54 reg-restore h# 58 reg-restore h# 60 reg-restore h# 64 reg-restore h# 68 reg-restore - 0 # h# 70 [bx] mov h# 100 # cx mov begin h# 74 reg-restore loopa + 0 # h# 70 [bx] mov h# 100 # cx mov forget-msr begin h# 74 reg-restore loopa h# 80 reg-restore h# 84 reg-restore +h# 35 resume-progress \ Synchronize the VGA turn-on with the DCON blanking - d# 50,000 # cx mov \ 50K spins is about 40 mS h# 5140.000c rmsr h# 30 [ax] dx lea \ GPIO data port + d# 50,000 # cx mov forget-msr \ 50K spins is about 40 mS begin dx ax in h# 1000 # ax test loope \ Wait for blanking h# 8 reg-restore h# 4 reg-restore +h# 36 resume-progress 0 # dc-pci-base #) mov \ Lock -\ d# 100,000 # cx mov begin h# 80 # ax in loopa \ Delay about 100 ms + \ Turn on the flat panel power as soon as possible + \ The 400.0000 bit make the panel power-up timers use the 14 MHz clock + \ instead of the 32 kHz clock. That is supposed to be only for simulation, + \ but we have DCON between the CPU and the panel, so we don't need delays. + h# 500.0000 # vp-pci-base h# 410 + #) mov - d# 80,000 # cx mov begin h# 80 # a in loopa \ Wait for panel power up +\ XX d# 80,000 # cx mov forget-msr begin h# 80 # ax in loopa \ Wait for panel power up + d# 1,000 # cx mov forget-msr begin h# 80 # ax in loopa \ Wait for panel power up +h# 36 resume-progress \ Unfreeze image by setting the DCONLOAD bit (0x800) in the GPIO output register h# 5140.000c rmsr ax dx mov \ GPIO output register h# 0800 # ax mov ax dx out +h# 37 resume-progress [else] \ Turn on the flat panel power as soon as possible \ The 400.0000 bit make the panel power-up timers use the 14 MHz clock @@ -661,7 +725,7 @@ \ the delay time with other work, but it doesn't matter because the \ later CaFe chip setup will stall anyway. - d# 32 # cx mov \ Loop count (usually ready in 20 uS) + d# 32 # cx mov forget-msr \ Loop count (usually ready in 20 uS) dx dec dx dec \ SMBUS reg1 (status) begin dx al in @@ -673,7 +737,7 @@ al dx out \ Initiate address out cycle \ Another possible split point, in case we should need to overlap - d# 256 # cx mov \ Loop count (usually ready in 172 uS) + d# 256 # cx mov forget-msr \ Loop count (usually ready in 172 uS) dx inc \ SMBUS reg1 (status) begin dx al in @@ -694,7 +758,7 @@ \ MFGPTs 0-5. MFGPT 6 and 7 are in the standby domain, live during suspend h# 1800 # dx mov \ MFGPT base port - h# 18 # cx mov + h# 18 # cx mov forget-msr begin op: ax lods ax ax test 0<> if op: ax dx out then dx inc dx inc @@ -719,7 +783,6 @@ [then] h# 2a resume-progress - \ Restore CaFe configuration h# 6010 config-setup ax lods ax dx out \ NAND BAR @@ -730,7 +793,7 @@ ax lods ax h# 2c [bx] mov \ NAND Timing 3 h# 6004 config-setup op: ax lods op: ax dx out \ NAND enables - op: ax lods ax cx mov \ SDHCI enables - save for later + op: ax lods ax cx mov forget-msr \ SDHCI enables - save for later h# 6110 config-setup ax lods ax dx out \ SDHCI BAR ax bx mov \ Base address 6 h# 6104 config-ww \ Enable access @@ -743,7 +806,7 @@ \ Empirically, they are readable! op: h# 0004 # h# 6a [bx] mov \ Magic recipe from Marvell op: h# 7fff # h# 60 [bx] mov \ Magic recipe from Marvell - h# 6104 config-setup ax lods op: ax dx out \ SDHCI enables +\ h# 6104 config-setup ax lods op: ax dx out \ SDHCI enables h# 610d config-setup al lods al dx out \ SDHCI latency timer h# 613c config-setup al lods al dx out \ SDHCI IRQ h# 6104 config-setup cx ax mov op: ax dx out \ Set SDHCI enables after restoring mapped registers @@ -774,7 +837,9 @@ ax dc-pci-base h# 88 + #) mov \ DV_CTL register - sets framebuffer mem offset fb-pci-base # dc-pci-base h# 84 + #) mov \ GLIU0 Memory offset +[ifndef] save-display fb-pci-base # gp-pci-base h# 4c + #) mov \ GP base +[then] fb-pci-base h# 80.0000 + # vp-pci-base h# 460 + #) mov \ Flat panel base (GX only) \ There is a lot of other stuff that must be done to turn on the @@ -784,11 +849,16 @@ \ DCON fiddling \ USB +[ifdef] measure-suspend + rdtsc eax h# 28 #) mov edx h# 2c #) mov + si 4 #) mov +[then] + h# 2c resume-progress h# 2c [bp] di mov \ VA of suspend-base in di h# 28 [bp] si mov \ PDIR VA - h# 24 [bp] cx mov \ PDIR entry 0 + h# 24 [bp] cx mov forget-msr \ PDIR entry 0 h# 20 [bp] ax mov ax cr4 mov h# 1c [bp] ax mov ax cr3 mov h# 18 [bp] ax mov Modified: cpu/x86/pc/olpc/suspend.fth =================================================================== --- cpu/x86/pc/olpc/suspend.fth 2008-12-24 21:05:15 UTC (rev 1048) +++ cpu/x86/pc/olpc/suspend.fth 2008-12-24 21:16:22 UTC (rev 1049) @@ -49,6 +49,31 @@ [then] \ sum-forth ; +dev screen + : gp-wait-idle ( -- ) begin h# 44 gp@ h# 15 and h# 10 = until ; + : wait-vsync ( -- ) begin 6c dc@ h# 2000.0000 and until ; + : wait-!vsync ( -- ) begin 6c dc@ h# 2000.0000 and 0= until ; + : wait-frames ( n -- ) 0 ?do wait-vsync wait-!vsync wait-vsync loop ; + : dot-line ( -- n ) 6c dc@ h# 3ff and ; + : wait-suspend ( -- ) + disable-interrupts + dot-line d# 28 < if wait-vsync then + begin dot-line d# 25 d# 27 between until + ; +dend +: kb-suspend ( -- ) + sci-wakeup + begin + begin 1 ms key? while key dup [char] q = abort" Quit" emit repeat +\ " gp-wait-idle" screen-ih $call-method +\ 2 " wait-frames" screen-ih $call-method + noop +\ " wait-vsync" screen-ih $call-method +\ " wait-suspend" screen-ih $call-method +\ d# 550 us \ 520 is sufficient + s3 + again +; : suspend " video-save" screen-ih $call-method \ Freeze display s3

1 0

r1048 - cpu/x86/pc/olpc
by svn＠openfirmware.info 24 Dec '08

24 Dec '08

Author: wmb Date: 2008-12-24 22:05:15 +0100 (Wed, 24 Dec 2008) New Revision: 1048 Modified: cpu/x86/pc/olpc/copynand.fth Log: OLPC scan-nand command - fixed "Stack Overflow" message that happened if the NAND had a lot of non-JFFS2 blocks, as could happen as a result of booting Windows XP on the machine. Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2008-12-24 00:56:57 UTC (rev 1047) +++ cpu/x86/pc/olpc/copynand.fth 2008-12-24 21:05:15 UTC (rev 1048) @@ -401,7 +401,7 @@ \ Not completely erased load-base /nand-block written? if 5 exit then [else] - ( adr ) h# 40 written? if 5 then + ( adr ) h# 40 written? if 5 exit then [then] \ Erased

1 0

r1047 - forth/wrapper
by svn＠openfirmware.info 24 Dec '08

24 Dec '08

Author: wmb Date: 2008-12-24 01:56:57 +0100 (Wed, 24 Dec 2008) New Revision: 1047 Modified: forth/wrapper/wrapper.c Log: wrapper.c - removed a test printf from the signal handler. Modified: forth/wrapper/wrapper.c =================================================================== --- forth/wrapper/wrapper.c 2008-12-24 00:49:38 UTC (rev 1046) +++ forth/wrapper/wrapper.c 2008-12-24 00:56:57 UTC (rev 1047) @@ -1143,9 +1143,6 @@ exit_handler(sig) int sig; { - printf("Mama\n"); - while (1) ; - #ifdef HAVE_PSIGNAL psignal(sig, "forth"); #else

1 0

r1046 - cpu/arm/build
by svn＠openfirmware.info 24 Dec '08

24 Dec '08

Author: wmb Date: 2008-12-24 01:49:38 +0100 (Wed, 24 Dec 2008) New Revision: 1046 Added: cpu/arm/build/builder.dic Log: ARM version - Added builder.dic to svn Property changes on: cpu/arm/build/builder.dic ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream

1 0

r1045 - cpu/x86/pc/olpc
by svn＠openfirmware.info 24 Dec '08

24 Dec '08

Author: wmb Date: 2008-12-24 01:18:20 +0100 (Wed, 24 Dec 2008) New Revision: 1045 Modified: cpu/x86/pc/olpc/smbios.fth Log: smbios.fth - added a different model name string for qualification testing against a BIOS-locked kernel. Modified: cpu/x86/pc/olpc/smbios.fth =================================================================== --- cpu/x86/pc/olpc/smbios.fth 2008-12-24 00:16:44 UTC (rev 1044) +++ cpu/x86/pc/olpc/smbios.fth 2008-12-24 00:18:20 UTC (rev 1045) @@ -309,6 +309,8 @@ ( 02 ) h# 7f01 w, \ Handle +: test-name$ ( -- $ ) " IE8y2D ScD%g4r2bAIFA." ; +: test-version$ ( -- $ ) " OLPC Ver 1.00.01" ; : fw-version$ ( -- $ ) " /openprom" find-package if " model" rot get-package-property 0= if @@ -378,8 +380,10 @@ 'smbios h# 1f + ( adr ) bios-info copy-smbios-table ( adr ) - +OLPC - fw-version$ +smbios$ + test-name$ +smbios$ + test-version$ +smbios$ +\ +OLPC +\ fw-version$ +smbios$ fw-date$ +smbios$ end-smbios-table

1 0

r1044 - cpu/x86/pc/olpc
by svn＠openfirmware.info 24 Dec '08

24 Dec '08

Author: wmb Date: 2008-12-24 01:16:44 +0100 (Wed, 24 Dec 2008) New Revision: 1044 Modified: cpu/x86/pc/olpc/nandcastui.fth Log: Added a licensing comment. Modified: cpu/x86/pc/olpc/nandcastui.fth =================================================================== --- cpu/x86/pc/olpc/nandcastui.fth 2008-12-24 00:15:58 UTC (rev 1043) +++ cpu/x86/pc/olpc/nandcastui.fth 2008-12-24 00:16:44 UTC (rev 1044) @@ -1,4 +1,5 @@ purpose: User interface for NAND multicast updater +\ See license at end of file : mesh-ssids ( -- $ ) " olpc-mesh"nolpc-mesh"nolpc-mesh"nolpc-mesh"nolpc-mesh"nolpc-mesh"

1 0

r1043 - cpu/x86
by svn＠openfirmware.info 24 Dec '08

24 Dec '08

Author: wmb Date: 2008-12-24 01:15:58 +0100 (Wed, 24 Dec 2008) New Revision: 1043 Modified: cpu/x86/call.fth Log: x86/call.fth - Increased the number of arguments passed to a C routine, in case we need to change the API for crypto calls. Modified: cpu/x86/call.fth =================================================================== --- cpu/x86/call.fth 2008-12-24 00:14:56 UTC (rev 1042) +++ cpu/x86/call.fth 2008-12-24 00:15:58 UTC (rev 1043) @@ -1,7 +1,7 @@ \ See license at end of file purpose: From Forth, call the C subroutine whose address is on the stack -code sp-call ( [ arg7 .. arg0 ] adr sp -- [ arg5 .. arg0 ] result ) +code sp-call ( [ arg19 .. arg0 ] adr sp -- [ arg19 .. arg0 ] result ) bx pop \ Get the new stack pointer ax pop \ Get the subroutine address @@ -9,7 +9,21 @@ rp 'user saved-rp mov \ Save for callbacks sp bx xchg \ Switch to new SP, with EBX set to old SP - 7 /n* [ebx] push \ Copy the arguments to the new stack + + \ Copy the arguments to the new stack + d# 19 /n* [ebx] push + d# 18 /n* [ebx] push + d# 17 /n* [ebx] push + d# 16 /n* [ebx] push + d# 15 /n* [ebx] push + d# 14 /n* [ebx] push + d# 13 /n* [ebx] push + d# 12 /n* [ebx] push + d# 11 /n* [ebx] push + d# 10 /n* [ebx] push + 9 /n* [ebx] push + 8 /n* [ebx] push + 7 /n* [ebx] push 6 /n* [ebx] push 5 /n* [ebx] push 4 /n* [ebx] push

1 0

r1042 - cpu/x86/pc/biosload
by svn＠openfirmware.info 24 Dec '08

24 Dec '08

Author: wmb Date: 2008-12-24 01:14:56 +0100 (Wed, 24 Dec 2008) New Revision: 1042 Modified: cpu/x86/pc/biosload/HOWTO_QEMU.txt Log: Biosload version - Wordsmithing in HOWTO_QEMU.txt documentation. Modified: cpu/x86/pc/biosload/HOWTO_QEMU.txt =================================================================== --- cpu/x86/pc/biosload/HOWTO_QEMU.txt 2008-12-24 00:14:23 UTC (rev 1041) +++ cpu/x86/pc/biosload/HOWTO_QEMU.txt 2008-12-24 00:14:56 UTC (rev 1042) @@ -1,4 +1,4 @@ -== Booting OFW Under QEMU == +== Booting OFW Under QEMU or VirtualBox == You can boot OFW directly from the BIOS in QEMU; you don't need Coreboot (formerly LinuxBIOS) or external bootloaders like GRUB @@ -19,7 +19,7 @@ The "config-virtualbox.fth" configuration is known to work with QEMU. Other configurations may work also - but the "qemu-loaded" config -option isn't what you want for this technique, because itt is a subcase +option isn't what you want for this technique, because it's a subcase of the CoreBoot-payload configuration. You will use the "floppyofw.img" output file in a later step. @@ -62,7 +62,11 @@ The "makefloppy.fth" program that creates the image is pretty simple; it copies bootsec.img to the output file "floppy.img", creates a couple of initially empty FAT tables, zeros the root directory area, and fills the data area with -zeros. Here's a pair of Linux commands that accomplish the same thing +zeros. + +== Making a Prototype Floppy Image with Linux Commands == + +Here's a pair of Linux commands that accomplish the same thing as makefloppy.fth: Step6a $ /sbin/mkdosfs -C -f 2 -F 12 -R 2 -r 224 -s 1 -S 512 floppy.img 1440 @@ -72,11 +76,10 @@ is specified in the BIOS parameter block in bootsec.img. The advantage of makefloppy.fth is that it reads the filesystem layout parameters -from the BPB in bootsec.img, so its guaranteed to be conistent. If bootsec.fth +from the BPB in bootsec.img, so its guaranteed to be consistent. If bootsec.fth were edited to change the layout, the arguments to "mkdosfs" would have to change. (But there's little need to change that layout, since it's a standard floppy size.) The advantage of the Linux command sequence is that it creates a file with -"holes", thus saving disk space for awhile (until something happens to fill -in the holes). +"holes", thus saving disk space for awhile (until something fills in the holes).

1 0

r1041 - cpu/arm cpu/ppc forth/kernel
by svn＠openfirmware.info 24 Dec '08

24 Dec '08

Author: wmb Date: 2008-12-24 01:14:23 +0100 (Wed, 24 Dec 2008) New Revision: 1041 Added: forth/kernel/metanswapmap.fth Modified: cpu/arm/kernel.bth cpu/ppc/kernel.bth Log: ARM and PowerPC versions - fixed some kernel compilation script problems. Modified: cpu/arm/kernel.bth =================================================================== --- cpu/arm/kernel.bth 2008-12-20 08:00:00 UTC (rev 1040) +++ cpu/arm/kernel.bth 2008-12-24 00:14:23 UTC (rev 1041) @@ -56,7 +56,7 @@ only forth also definitions \needs bitset fload ${BP}/forth/lib/bitops.fth -fload ${BP}/forth/kernel/nswapmap.fth \ Null swap map +fload ${BP}/forth/kernel/metanswapmap.fth \ Null swap map \ : : : lastacf .name cr ; fload ${BP}/cpu/arm/target.fth fload ${BP}/forth/kernel/forward.fth Modified: cpu/ppc/kernel.bth =================================================================== --- cpu/ppc/kernel.bth 2008-12-20 08:00:00 UTC (rev 1040) +++ cpu/ppc/kernel.bth 2008-12-24 00:14:23 UTC (rev 1041) @@ -45,6 +45,10 @@ fload ${BP}/cpu/ppc/metainit.fth +" kernel.tag" r/w create-file drop meta-tag-file ! + +always-headers + \ Comment out the following line(s) when debugging -1 threshold ! \ Turn OFF ALL debugging messages warning-t off \ Turn OFF target warning messages @@ -78,6 +82,8 @@ fload ${BP}/forth/kernel/init.fth fload ${BP}/cpu/ppc/finish.fth +meta-tag-file @ fclose meta-tag-file off + fload ${BP}/cpu/ppc/savemeta.fth .( --- Saving kernel.dic ---) " kernel.dic" $save-meta Added: forth/kernel/metanswapmap.fth =================================================================== --- forth/kernel/metanswapmap.fth (rev 0) +++ forth/kernel/metanswapmap.fth 2008-12-24 00:14:23 UTC (rev 1041) @@ -0,0 +1,4 @@ +\ Null byte swap table management for metacompiler + +: set-swap-bit-t ( addr -- ) drop ; +: note-string-t ( adr len -- adr len ) ;

1 0

r1040 - cpu/x86 cpu/x86/pc dev/geode
by svn＠openfirmware.info 20 Dec '08

20 Dec '08

Author: wmb Date: 2008-12-20 09:00:00 +0100 (Sat, 20 Dec 2008) New Revision: 1040 Modified: cpu/x86/disassem.fth cpu/x86/pc/biosints.fth dev/geode/smi.fth Log: BIOS emulation - fixed some problems with installation from USB and CD-ROM. Modified: cpu/x86/disassem.fth =================================================================== --- cpu/x86/disassem.fth 2008-12-20 07:55:35 UTC (rev 1039) +++ cpu/x86/disassem.fth 2008-12-20 08:00:00 UTC (rev 1040) @@ -160,8 +160,8 @@ then ( reg mod ) swap modes16 count $add-text ( mod ) case - 1 of op8@ +disp16 endof - 2 of op16@ +disp16 endof + 1 of op8@ bext +disp16 endof + 2 of op16@ wext +disp16 endof endcase ; : .ea ( -- ) Modified: cpu/x86/pc/biosints.fth =================================================================== --- cpu/x86/pc/biosints.fth 2008-12-20 07:55:35 UTC (rev 1039) +++ cpu/x86/pc/biosints.fth 2008-12-20 08:00:00 UTC (rev 1040) @@ -1,7 +1,8 @@ +purpose: Emulate legacy PC BIOS real-mode INTs +\ See license at end of file -[ifdef] syslinux-loaded : disk-name ( -- $ ) " /pci/ide@0" ; [then] -[ifdef] preof-loaded : disk-name ( -- $ ) " /pci/ide@0" ; [then] -[ifdef] rom-loaded : disk-name ( -- $ ) " sd:0" ; [then] +8 /l* buffer: init-regs +h# 80 value bios-boot-dev# struct 2 field >rm-gs @@ -74,6 +75,8 @@ : rm-esi@ caller-regs >rm-esi l@ ; : rm-esi! caller-regs >rm-esi l! ; +: rm-si@ caller-regs >rm-esi w@ ; + : rm-retaddr@ caller-regs >rm-retaddr seg:off@ ; : rm-flags@ caller-regs >rm-flags w@ ; @@ -84,6 +87,7 @@ true value show-rm-int? : noshow false to show-rm-int? ; +: noshow! false to show-rm-int? ; variable save-eax : snap-int true to show-rm-int? rm-eax@ save-eax ! @@ -399,18 +403,41 @@ h# 26 rm-eax! \ 32 bits ; -0 value disk-ih +0 value bios-ih +0 value bios-cdrom-ih +0 value bios-disk-ih + false value show-reads? -1 value read-match -: disk-read-sectors ( adr sector# #sectors -- #read ) +: drive-sectors ( -- n ) " #blocks" bios-ih $call-method ; +: drive-/sector ( -- n ) " block-size" bios-ih $call-method ; +[ifndef] notdef +: (bios-read-sectors) ( adr sector# #sectors -- #sectors-read ) + drive-/sector >r ( adr #sectors d.byte# r: /sector ) + swap r@ um* ( adr #sectors d.byte# r: /sector ) + " seek" bios-ih $call-method if ( adr #sectors r: /sector ) + r> 3drop 0 exit + then ( adr #sectors r: /sector ) + r@ * " read" bios-ih $call-method ( actual#bytes r: /sector ) + r> / ( #sectors-read ) +; +[else] +: (bios-read-sectors) ( adr sector# #sectors -- #sectors-read ) + " read-blocks" bios-ih $call-method +; +[then] + +: bios-read-sectors ( adr sector# #sectors -- #sectors-read ) noshow over read-match = if ." Reading block " read-match . debug-me then - show-reads? if ." Read " 2 pick . over . dup . ." -- " then - " read-blocks" disk-ih $call-method + show-reads? if ." Read " 2 pick . over . dup . ." -- " then ( adr sec# #sec ) + + (bios-read-sectors) ( #sectors-read ) +\ " read-blocks" bios-ih $call-method + show-reads? if dup . cr then - ; 0 value entry-count @@ -420,43 +447,53 @@ then ; -: disk-write-sectors ( adr sector# #sectors -- #read ) +: bios-write-sectors ( adr sector# #sectors -- #read ) \ ?hack noshow \ ." Write " 2 pick . over . dup . ." -- " \ over h# 8b74aaa = if debug-me then - " write-blocks" disk-ih $call-method + " write-blocks" bios-ih $call-method \ dup . cr ; +: select-bios-disk ( drive# -- ) + h# 82 = if bios-cdrom-ih else bios-disk-ih then to bios-ih +; : check-drive ( -- error? ) - rm-dl@ h# 80 <> if rm-set-cf 7 rm-ah! true exit then - disk-ih 0= dup if rm-set-cf h# aa rm-ah! then + show-reads? if ." Drive " rm-dl@ .x then + rm-dl@ h# 80 h# 81 between 0= if rm-set-cf 7 rm-ah! true exit then + bios-disk-ih to bios-ih + bios-ih 0= dup if rm-set-cf h# aa rm-ah! then ; -: read-sectors ( -- ) +: lba-check-drive ( -- error? ) + show-reads? if ." Drive " rm-dl@ .x then + rm-dl@ h# 80 h# 82 between 0= if rm-set-cf 7 rm-ah! true exit then + rm-dl@ select-bios-disk + bios-ih 0= dup if rm-set-cf h# aa rm-ah! then +; +: chs-read-sectors ( -- ) check-drive if exit then - disk-ih 0= if rm-set-cf h# aa rm-ah! exit then + bios-ih 0= if rm-set-cf h# aa rm-ah! exit then rm-ch@ rm-cl@ 6 rshift bwjoin ( cylinder# ) h# ff * rm-dh@ + ( trk# ) \ 255 heads h# 3f * rm-cl@ h# 3f and 1- + ( sector# ) \ 63 is max sector# rm-bx@ rm-es@ seg:off> ( sector# adr ) swap rm-al@ ( adr sector# #sectors ) - disk-read-sectors rm-al! + bios-read-sectors rm-al! ; -: write-sectors ( -- ) +: chs-write-sectors ( -- ) check-drive if exit then - disk-ih 0= if rm-set-cf h# aa rm-ah! exit then + bios-ih 0= if rm-set-cf h# aa rm-ah! exit then rm-ch@ rm-cl@ 6 rshift bwjoin ( cylinder# ) h# ff * rm-dh@ + ( trk# ) \ 255 heads h# 3f * rm-cl@ h# 3f and 1- + ( sector# ) \ 63 is max sector# rm-bx@ rm-es@ seg:off> ( sector# adr ) swap rm-al@ ( adr sector# #sectors ) - disk-write-sectors rm-al! + bios-write-sectors rm-al! ; -: drive-sectors ( -- n ) " #blocks" disk-ih $call-method ; : drive-params ( -- ) noshow check-drive if exit then @@ -472,37 +509,45 @@ rm-clr-cf ; -: ds:si ( -- adr ) rm-esi@ rm-ds@ seg:off> ; +: ds:si ( -- adr ) rm-si@ rm-ds@ seg:off> ; : lba-read ( -- ) - check-drive if exit then + lba-check-drive if exit then ds:si ( packet-adr ) >r r@ 4 + seg:off@ r@ 8 + l@ r@ 2+ w@ ( adr sector# #sectors ) \ ." LBA " - disk-read-sectors r> 2+ w! + bios-read-sectors r> 2+ w! ; : lba-write ( -- ) - check-drive if exit then + lba-check-drive if exit then ds:si ( packet-adr ) >r r@ 4 + seg:off@ r@ 8 + l@ r@ 2+ w@ ( adr sector# #sectors ) \ ." LBA " - disk-write-sectors r> 2+ w! + bios-write-sectors r> 2+ w! ; : check-disk-extensions ( -- ) noshow - check-drive if 0 rm-bx! exit then + lba-check-drive if 0 rm-bx! exit then rm-bx@ h# 55aa <> if exit then h# aa55 rm-bx! h# 20 rm-ah! 1 rm-cx! ; : ext-get-drive-params ( -- ) noshow - check-drive if exit then + lba-check-drive if exit then 0 rm-ah! ds:si >r ( adr ) r@ 2 + h# 0e erase \ CHS info not valid + + \ h# 70 is ATAPI, removable, LBA + \ h# 10 is LBA +\ rm-dl@ h# 81 = if h# 70 else h# 10 then r@ h# a + w! +\ XXX this might be a problem + rm-dl@ h# 82 = if ( 4 ) h# 34 else 0 then r@ 2 + w! + drive-sectors r@ h# 10 + l! 0 r@ h# 14 + l! \ Total #sectors - h# 200 r@ h# 18 + w! \ Sector len + + drive-/sector r@ h# 18 + w! \ Sector len h# 1a ( written-length ) r@ w@ h# 1e >= if -1 r@ h# 1a + l! \ No EDD @@ -525,26 +570,56 @@ ; : reset-disks ( -- ) noshow ; +\ c.f. El Torito CD booting spec +\ We construct a valid status packet, even though NT doesn't look at its +\ contents. It only looks at the return value in AX. Most of the fields +\ herein are irrelevant for the "get status" function anyway. +create cd-stat +\ len type drive# ctlr# LBA devspec(master/slave, SCSI LUN, etc) + h# 13 c, 0 c, h# 82 c, 0 c, 0 l, 0 w, +\ userbuf loadseg #sectors #cyls sec,cyl #heads + 0 w, 0 w, 0 w, 0 c, 0 c, 0 c, + +: cdrom-status ( -- ) + \ We don't distinguish between AL=00 and AL=01; both return the same + \ status. AL=00 also terminates hard disk emulation, but we don't + \ do emulation, so that is effectively a no-op. The NT SETUPLDR + \ only uses AL=01 anyway. + \ DL should be the drive number (82); we don't check that + cd-stat ds:si h# 13 move + \ This is the return code. The El Torito spec doesn't say what + \ the return codes are supposed to be. NT SETUPLDR fails if anything + \ other than 0 is returned. + 0 rm-ax! + rm-set-cf \ CF set means that the system is not in emulation mode +; + : disk-int ( -- ) \ INT 13 handler rm-ah@ case h# 00 of reset-disks endof \ Reset disk system - h# 02 of read-sectors endof - h# 03 of write-sectors endof + h# 02 of chs-read-sectors endof + h# 03 of chs-write-sectors endof h# 08 of drive-params endof h# 15 of get-disk-type endof h# 41 of check-disk-extensions endof h# 42 of lba-read endof h# 43 of lba-write endof h# 48 of ext-get-drive-params endof + h# 4b of cdrom-status endof ( default ) ." Unsupported disk INT 13 - AH = " dup . cr endcase ; +false value debug-mem? + : /1k d# 10 rshift ; : bigmem-16bit ( -- ) memory-limit dup h# 100.0000 min h# 10.0000 - 0 max /1k dup rm-ax! rm-cx! h# 100.0000 - 0 max d# 16 rshift dup rm-bx! rm-dx! + debug-mem? if + ." Bigmem 16: " rm-ax@ . rm-cx@ . rm-bx@ . rm-dx@ . cr + then ; : allmem ( -- n ) " /memory" find-package 0= abort" No /memory node" ( phandle ) @@ -571,7 +646,8 @@ h# 9fc00 0 d, h# a0000 h# 9fc00 - 0 d, 2 l, \ 28 reserved \ End test - h# e0000. d, h# 20000. d, 2 l, \ 3c reserved +\ h# e0000. d, h# 20000. d, 2 l, \ 3c reserved + h# e8000. d, h# 08000. d, 2 l, \ 3c reserved h# 100000. d, 0. d, 1 l, \ 50 available \ 0. d, 0. d, 4 l, \ 64 don't reclaim (yet) 0. d, 0. d, 2 l, \ 64 reserved fw memory @@ -597,6 +673,9 @@ \ Otherwise copy out the next table entry, return length in ECX and next address in EBX dup rm-edi@ h# ffff and rm-es@ seg:off> ( adr dst ) rm-ecx@ move ( adr ) + debug-mem? if + ." E820 Mem: " dup rm-ecx@ ldump cr + then rm-ecx@ + rm-ebx! ( ) \ Continuation ; @@ -688,8 +767,12 @@ noop h# 53 of apm endof h# 86 of rm-dx@ rm-cx@ wljoin us endof \ Delay microseconds - h# 8a of memory-limit h# 400.0000 - 0 max /1k lwsplit rm-dx! rm-ax! endof - h# 88 of h# fffc rm-ax! endof \ Extended memory - at least 64 MB + h# 8a of memory-limit h# 400.0000 - 0 max /1k lwsplit rm-dx! rm-ax! + debug-mem? if ." Mem 15/8a: " rm-dx@ . rm-ax@ . cr then + endof + h# 88 of h# fffc rm-ax! + debug-mem? if ." Mem 15/88: " rm-ax@ . cr then + endof \ Extended memory - at least 64 MB h# c0 of get-conf endof \ We use the extended BIOS data area as our workspace when loaded from another BIOS \ h# c1 of rm-set-cf h# 86 rm-ah! endof \ No extended BIOS data area @@ -727,7 +810,7 @@ 0 value polled? : poll-keystroke ( -- ) noshow - polled? 0= if ." ? " then +\ polled? 0= if ." ? " then true to polled? poll-key if ( scancode,ascii ) rm-ax! @@ -743,15 +826,16 @@ 0 to the-key rm-ax! - rm-al@ [char] q = if debug-me then +\ rm-al@ [char] d = if debug-me then false to polled? ; : keyboard-int ( -- ) \ INT 16 handler + noshow! rm-ah@ case 0 of get-keystroke endof 1 of poll-keystroke endof - 2 of noshow 0 rm-al! endof \ Claim that no shift keys are active + 2 of 0 rm-al! endof \ Claim that no shift keys are active 5 of rm-cx@ to the-key endof \ Put keystroke in buffer ( bit 7:sysrq 6:capslock 5:numlock 4:scrlock 3:ralt 2:rctrl 1:lalt 0:lctrl ) ( default ) ." Keyboard INT called with AH = " dup . cr @@ -830,12 +914,14 @@ h# 13 of disk-int endof h# 16 of keyboard-int endof h# 15 of system-int endof - h# 12 of 'ebda /1k rm-ax! endof \ Low memory size + h# 12 of 'ebda /1k rm-ax! + debug-mem? if ." Lowmem: " rm-ax@ . cr then + endof \ Low memory size h# 1a of int-1a endof h# 18 of ." Entering Open Firmware" cr interact endof h# 19 of ." Rebooting" cr bye endof h# 17 of printer-int endof - h# 1c of noshow 0 dispatch-interrupt endof \ Timer bounce vector + h# 1c of noshow! 0 dispatch-interrupt endof \ Timer bounce vector ( default ) ." Interrupt " dup . cr interact endcase ?showint @@ -844,10 +930,13 @@ h# 7c00 constant mbr-base : get-mbr ( -- ) -\ mbr-base h# 3f 1 disk-read-sectors 1 <> abort" Didn't read MBR" - mbr-base 0 1 disk-read-sectors 1 <> abort" Didn't read MBR" +\ mbr-base h# 3f 1 bios-read-sectors 1 <> abort" Didn't read MBR" + mbr-base 0 1 bios-read-sectors 1 <> abort" Didn't read MBR" ; +\ : #hard-drives ( -- n ) bios-boot-dev# h# 82 = if 2 else 1 then ; +: #hard-drives ( -- n ) 1 ; + : make-bda ( -- ) h# 400 h# 200 erase 'ebda h# 400 erase @@ -863,6 +952,7 @@ \ 46c.l is tick count, 470.b is midnight flag \ 4701.b bit 0x80 is ctrl-break flag h# 1234 h# 472 w! \ Skip memory test + #hard-drives h# 475 c! \ Number of hard drives d# 25 1- h# 484 c! \ Screen max row # d# 16 h# 485 w! \ Character height h# 100.0000 h# 487 l! \ Video RAM size @@ -870,7 +960,7 @@ 1 'ebda w! \ Size of EBDA in KiB \ 'ebda h# 3d + .. HD0 parameter table \ 'ebda h# 4d + .. HD1 parameter table - 1 'ebda h# 70 + c! \ Number of hard disks + #hard-drives 'ebda h# 70 + c! \ Number of hard disks ; label bounce-timer \ Redirect the timer interrupt through INT 1c @@ -894,11 +984,6 @@ 0 h# 82 w! h# c0 h# 80 w! \ CS = 0, IP = h# c0 = INT 30 ; -: open-bios-disk ( -- ) - disk-ih if exit then - disk-name open-dev to disk-ih -; - 0 value rm-prepped? : prep-rm ( -- ) rm-prepped? if exit then true to rm-prepped? @@ -915,25 +1000,33 @@ populate-memory-map rm-platform-fixup ; -: close-bios-disk ( -- ) disk-ih ?dup if close-dev 0 to disk-ih then ; -' close-bios-disk to quiesce-devices +: close-bios-disk ( -- ) bios-disk-ih ?dup if close-dev 0 to bios-disk-ih then ; +: close-bios-cdrom ( -- ) bios-cdrom-ih ?dup if close-dev 0 to bios-cdrom-ih then ; +: close-bios-devices ( -- ) close-bios-disk close-bios-cdrom ; +' close-bios-devices to quiesce-devices +[ifdef] notdef \ Doesn't work with CD-ROM : rm-go ( -- ) prep-rm open-bios-disk get-mbr \ Load boot image at 7c00 - usb-quiet - mbr-base rm-run +\ usb-quiet + init-regs mbr-base rm-run ; +[then] +0 value mbr-boot? : is-mbr? ( adr len -- flag ) - h# 200 <> if drop false exit then - h# 1fe + w@ h# aa55 = + mbr-boot? 0= if 2drop false exit then + + 2 - le-w@ h# aa55 = ; : init-program ( -- ) loaded is-mbr? if prep-rm - load-base mbr-base h# 200 move + loaded mbr-base swap move +\ init-regs /sregs+gregs erase + \ XXX + bios-boot-dev# init-regs >rm-edx c! \ DL exit then init-program @@ -943,33 +1036,111 @@ : execute-buffer ( adr len -- ) rm-prepped? if ( adr len ) 2drop ( ) - usb-quiet ( ) - mbr-base rm-run ( ) +\ usb-quiet ( ) + init-regs mbr-base rm-run ( ) exit \ Precautionary; rm-run shouldn't return then execute-buffer ; +0 value boot-sector# +1 value boot-#sectors +: get-cdrom-sector ( sector# -- error? ) + load-base swap 1 (bios-read-sectors) 1 <> +; +: close-bios-ih ( -- ) bios-ih ?dup if close-dev 0 to bios-ih then ; +: bootable-cdrom? ( -- flag ) + drive-/sector h# 800 <> if false exit then + + \ Check Boot Record + h# 11 get-cdrom-sector if false exit then + load-base " "(00)CD001"(01)EL TORITO SPECIFICATION" comp if false exit then + + \ Check Boot Catalog and Section Entry + load-base h# 47 + le-l@ get-cdrom-sector if false exit then + load-base le-l@ 1 <> if false exit then + 0 load-base h# 20 bounds do i le-w@ + /w +loop + h# ffff and if false exit then + load-base 1+ c@ if false exit then \ Must be for x86 platform + + \ Record pointer to boot code + load-base h# 20 + c@ h# 88 <> if false exit then \ Must be bootable + load-base h# 28 + le-l@ to boot-sector# + load-base h# 26 + le-w@ 4 / 1 max to boot-#sectors + + true +; +: set-hd-boot ( dev$ -- ) + open-dev to bios-disk-ih + 0 to boot-sector# 1 to boot-#sectors + h# 80 to bios-boot-dev# + bios-disk-ih to bios-ih +; +: get-one-sector ( dev$ -- error? ) + open-dev to bios-ih + load-base 0 1 (bios-read-sectors) ( #read ) + close-bios-ih ( #read ) + 1 <> ( error? ) +; +: mbr-bootable? ( dev$ -- flag ) + get-one-sector if false exit then + load-base h# 1be + c@ h# 80 = +; + +: ntfs? ( dev$ -- flag ) + get-one-sector if false exit then + load-base 3 + " NTFS " comp 0= ( flag ) +; + +: mbr-load ( adr -- #bytes ) + bios-boot-dev# select-bios-disk + boot-sector# boot-#sectors bios-read-sectors + bios-boot-dev# h# 82 = if h# 800 else h# 200 then * + true to mbr-boot? +; + 0 0 " " " /" begin-package " xp" device-name : open - " sd:1" open-dev ?dup 0= if false exit then ( ih ) - >r - load-base h# 200 " read" r@ $call-method ( #read ) - r> close-dev - h# 200 <> if false exit then - load-base 3 + " NTFS " comp if false exit then - true + " sd:1" ntfs? if " sd:0" set-hd-boot true exit then + false ; : close ; - \ Possible change: load at adr, then have init-program do all - \ the other fixups (prep-rm) and move the MBR to mbr-base - : load ( adr -- 0 ) - open-bios-disk - 0 1 disk-read-sectors h# 200 * - ; + : load ( adr -- nbytes ) mbr-load ; end-package +0 0 " " " /" begin-package + " xpinstall" device-name + : open + " /usb/disk:0" open-dev ?dup if ( ih ) + to bios-ih + bootable-cdrom? if + bios-ih to bios-cdrom-ih + " sd:0" open-dev ?dup if + to bios-disk-ih + else + ." Can't open SD device. Install from CD-ROM probably won't work." cr + then + h# 82 to bios-boot-dev# + true exit + then + close-bios-ih + then + + \ The device was not a bootable CDROM, but it might be a USB memory stick + + " /usb/disk:0" mbr-bootable? if " /usb/disk:0" set-hd-boot true exit then + + " sd:0" mbr-bootable? if " sd:0" set-hd-boot true exit then + + false + ; + : close ; + : load ( adr -- nbytes ) mbr-load ; +end-package + +: install-xp ( -- ) " /xpinstall" $boot ; + label xx h# 99 # al mov al h# 80 # out begin again end-code here xx - constant /xx : put-xx ( adr -- ) xx swap /xx move ; @@ -1073,3 +1244,27 @@ c; [then] + +\ LICENSE_BEGIN +\ Copyright (c) 2008 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Modified: dev/geode/smi.fth =================================================================== --- dev/geode/smi.fth 2008-12-20 07:55:35 UTC (rev 1039) +++ dev/geode/smi.fth 2008-12-20 08:00:00 UTC (rev 1040) @@ -644,6 +644,8 @@ smm-io-port h# fff0 and h# 30 = if smm-io-port h# 20 - to rm-int@ rm-sp la1+ >caller-physical w@ smm-rmeflags w! + \ Bias by -2 to point to INT instruction + rm-sp >caller-physical l@ 2- smm-retaddr l! handle-bios-call smm-rmeflags w@ rm-sp la1+ >caller-physical w! exit @@ -671,8 +673,10 @@ \ require jumping to a given address in real mode. -1 value rm-entry-adr -: rm-run ( eip -- ) to rm-entry-adr smi ; +0 value rm-regs +: rm-run ( 'gregs eip -- ) to rm-entry-adr to rm-regs smi ; + : smm-stack-w! ( w offset -- ) smm-sp +smm + w! ; : smm-stack-l! ( l offset -- ) smm-sp +smm + l! ; \ : smi-to-forth ( ip -- ) @@ -943,7 +947,7 @@ : smm-trace ( -- ) ." EBP RETADR CALLTO" cr - smm-ebp + smm-ebp l@ begin ?dup while ( ebp ) dup 8 u.r smm>physical ( padr ) dup la1+ l@ dup 9 u.r .callto cr ( padr ) @@ -997,25 +1001,29 @@ \ to the address "eip" in real mode. This is an implementation \ factor of the "rm-run" mechanism. -: rm-setup ( eip -- ) - >seg:off 2>r ( r: off seg ) +4 /w* 8 /l* + constant /sregs+gregs - smm-header h# 30 - - h# 38 l!++ \ SMM_CTL - 0 l!++ \ I/O DATA - 0 l!++ \ I/O ADDRESS, I/O SIZE - h# 938009 l!++ \ SS_FLAGS, SMM Flags - h# ffff l!++ \ CS_LIMIT - r@ 4 lshift l!++ \ CS_BASE - r> h# 9a wljoin l!++ \ CS_FLAGS.CS_INDEX - r> l!++ \ NEXT_IP - 0 l!++ \ CURRENT_IP - h# 10 l!++ \ CR0 - h# 2 l!++ \ EFLAGS - h# 400 l!++ \ DR7 +: rm-setup ( -- ) + rm-entry-adr >seg:off 2>r ( off seg ) + + smm-header h# 30 - ( adr ) + h# 38 l!++ ( adr' ) \ SMM_CTL + 0 l!++ ( adr' ) \ I/O DATA + 0 l!++ ( adr' ) \ I/O ADDRESS, I/O SIZE + h# 938009 l!++ ( adr' ) \ SS_FLAGS, SMM Flags + h# ffff l!++ ( adr' ) \ CS_LIMIT + r@ 4 lshift l!++ ( adr' ) \ CS_BASE + + r> h# 9a wljoin l!++ ( adr' ) \ CS_FLAGS.CS_INDEX + r> l!++ ( adr' ) \ NEXT_IP + 0 l!++ ( adr' ) \ CURRENT_IP + h# 10 l!++ ( adr' ) \ CR0 + h# 2 l!++ ( adr' ) \ EFLAGS + h# 400 l!++ ( adr' ) \ DR7 drop - smm-sregs 4 /w* erase smm-gregs 8 /l* erase + rm-regs caller-regs /sregs+gregs move + 0 smm-save-esp +smm l! smm-save-seg +smm @@ -1040,11 +1048,12 @@ : soft-smi ( -- ) smi-debug? if ." SOFT" cr then rm-entry-adr -1 <> if - rm-entry-adr rm-setup + rm-setup -1 to rm-entry-adr exit then + smm-pc smm-retaddr l! \ So .caller-regs will work sbpadr @ if sbpadr @ smm>physical smm-pc smm>physical <> if ." Not at SMI breakpoint!" cr

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware