OpenBIOS September 2007

openbios@openbios.org

3 participants
60 discussions

r646 - dev/olpc/cafenand
by svn＠openbios.org 29 Sep '07

29 Sep '07

Author: wmb Date: 2007-09-29 21:16:30 +0200 (Sat, 29 Sep 2007) New Revision: 646 Modified: dev/olpc/cafenand/selftest.fth Log: CaFe NAND selftest - added some messages detailing which failure modes occurred. Modified: dev/olpc/cafenand/selftest.fth =================================================================== --- dev/olpc/cafenand/selftest.fth 2007-09-29 19:12:46 UTC (rev 645) +++ dev/olpc/cafenand/selftest.fth 2007-09-29 19:16:30 UTC (rev 646) @@ -51,17 +51,19 @@ ; : read-eblock ( adr page# -- error? ) pages/eblock read-blocks pages/eblock <> + dup if ." SAVE" cr then ; : write-eblock ( adr page# -- error? ) dup erase-block pages/eblock write-blocks pages/eblock <> + dup if ." RESTORE" cr then ; : test-eblock ( page# pattern -- error? ) obuf erase-size 2 pick fill ibuf erase-size rot invert fill - obuf over write-eblock if drop true exit then - ibuf swap read-eblock if true exit then - ibuf obuf erase-size comp + obuf over write-eblock if ." WRITE " obuf c@ . cr drop true exit then + ibuf swap read-eblock if ." READ " obuf c@ . cr true exit then + ibuf obuf erase-size comp dup if ." COMP " obuf c@ . cr then ; \ Destroy content of flash. No argument.

1 0

r645 - cpu/x86/pc/olpc
by svn＠openbios.org 29 Sep '07

29 Sep '07

Author: wmb Date: 2007-09-29 21:12:46 +0200 (Sat, 29 Sep 2007) New Revision: 645 Modified: cpu/x86/pc/olpc/linuxserial.fth Log: linuxserial.fth - don't reopen serial device if it is already open. Modified: cpu/x86/pc/olpc/linuxserial.fth =================================================================== --- cpu/x86/pc/olpc/linuxserial.fth 2007-09-28 01:18:30 UTC (rev 644) +++ cpu/x86/pc/olpc/linuxserial.fth 2007-09-29 19:12:46 UTC (rev 645) @@ -32,6 +32,7 @@ ; : $open-serial ( dev$ -- ) \ e.g. " /dev/ttyS0" + serial-fd -1 <> if 2drop then $cstr 0 2 rot 8 syscall 3drop retval to serial-fd serial-fd 0< abort" Can't open serial device" raw 8n1 blocking @@ -46,7 +47,7 @@ line-name place ; -: open-serial ( "devname" -- ) +: open-serial ( -- ) line-name c@ if line-name count else " /dev/ttyS0" then $open-serial ;

1 0

r170 - openbios-devel/arch/sparc32
by svn＠openbios.org 29 Sep '07

29 Sep '07

Author: blueswirl Date: 2007-09-29 13:33:31 +0200 (Sat, 29 Sep 2007) New Revision: 170 Modified: openbios-devel/arch/sparc32/vectors.S Log: Fix exception handling and printout Modified: openbios-devel/arch/sparc32/vectors.S =================================================================== --- openbios-devel/arch/sparc32/vectors.S 2007-08-11 07:45:33 UTC (rev 169) +++ openbios-devel/arch/sparc32/vectors.S 2007-09-29 11:33:31 UTC (rev 170) @@ -26,8 +26,8 @@ #define __ASSEMBLY #include "psr.h" #include "asi.h" -#define ASI_BP ASI_M_BYPASS -#define SER_ADDR 0x71100004 +#define SER_ADDR5 0x71100004 +#define SER_ADDR10 0xf1100004 .section ".text.vectors", "ax" .align 16384 @@ -91,53 +91,50 @@ rd %psr, %g2 andn %g2, PSR_ET, %g2 wr %g2, %psr - ! Disable mmu - call dump_exception - sta %g0, [%g0] ASI_M_MMUREGS -_forever: - /* Loop forever */ - b _forever ; - nop + ! Disable mmu, re-enable boot mode + set _start, %g3 + set dump_exception, %g2 + sub %g2, %g3, %g3 + set 1<<14, %g2 + jmp %g3 + sta %g2, [%g0] ASI_M_MMUREGS + outstr: - /* void outstr (unsigned long port, const unsigned char *str); + /* void outstr (unsigned long port5, unsigned long port10, + * const unsigned char *str); * Writes a string on an IO port. */ -1: ldub [%o1], %o3 +1: lduba [%o2] ASI_M_KERNELTXT, %o3 cmp %o3, 0 be 2f nop - stba %o3, [%o0] ASI_BP + stba %o3, [%o0] ASI_M_BYPASS + stba %o3, [%o1] ASI_M_CTL b 1b - inc %o1 + inc %o2 2: retl nop -outdigit: - /* void outdigit (unsigned long port, uint8_t digit); - * Dumps a single digit on serial port. - */ - add %o1, '0', %o1 - retl - stba %o1, [%o0] ASI_BP - outhex: - /* void outhex (unsigned long port, uint32_t value); + /* void outhex (unsigned long port5, unsigned long port10, + * uint32_t value); * Dumps a 32 bits hex number on serial port */ - mov %o1, %o2 + mov %o2, %o4 set 28, %o3 - srl %o2, %o3, %o1 -1: and %o1, 0xf, %o1 - cmp %o1, 9 + srl %o4, %o3, %o2 +1: and %o2, 0xf, %o2 + cmp %o2, 9 bgt 2f nop b 3f - add %o1, '0', %o1 -2: add %o1, 'a' - 10, %o1 -3: stba %o1, [%o0] ASI_BP + add %o2, '0', %o2 +2: add %o2, 'a' - 10, %o2 +3: stba %o2, [%o0] ASI_M_BYPASS + stba %o2, [%o1] ASI_M_CTL subcc %o3, 4, %o3 bge 1b - srl %o2, %o3, %o1 + srl %o4, %o3, %o2 retl nop @@ -146,34 +143,37 @@ * Dump a message when catching an exception */ dump_exception: - set SER_ADDR + 2, %o0 - set (_BUG_message_0), %o1 + set SER_ADDR5 + 2, %o0 + set SER_ADDR10 + 2, %o1 + set (_BUG_message_0), %o2 call outstr nop call outhex - mov %g1, %o1 + mov %g1, %o2 - set (_BUG_message_1), %o1 + set (_BUG_message_1), %o2 call outstr nop call outhex - mov %l1, %o1 + mov %l1, %o2 - set (_BUG_message_2), %o1 + set (_BUG_message_2), %o2 call outstr nop call outhex - mov %l2, %o1 + mov %l2, %o2 - set (_BUG_message_3), %o1 + set (_BUG_message_3), %o2 call outstr nop +_forever: + /* Loop forever */ + b _forever ; + nop - retl - nop /* Register window handlers */ #include "wof.S" #include "wuf.S" @@ -182,8 +182,8 @@ _BUG_message_0: .string "Unhandled Exception 0x" _BUG_message_1: - .string "\nPC = 0x" + .string "\r\nPC = 0x" _BUG_message_2: .string " NPC = 0x" _BUG_message_3: - .string "\nStopping execution\n" + .string "\r\nStopping execution\r\n"

1 0

r644 - cpu/x86/pc/olpc
by svn＠openbios.org 28 Sep '07

28 Sep '07

Author: wmb Date: 2007-09-28 03:18:30 +0200 (Fri, 28 Sep 2007) New Revision: 644 Modified: cpu/x86/pc/olpc/resume.bth Log: resume.bth - third try is the charm. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-09-28 01:15:27 UTC (rev 643) +++ cpu/x86/pc/olpc/resume.bth 2007-09-28 01:18:30 UTC (rev 644) @@ -358,7 +358,7 @@ h# 40000000 # ax mov ax dx out \ Clear SMB_CLOCK - \ 50 uS delay (slightly longer for GX) + \ 5 uS delay (slightly longer for GX) rdtsc ax bx mov d# 5 d# 500 * # bx add begin rdtsc bx ax sub 0>= until @@ -367,7 +367,7 @@ loopa \ 50 uS delay (slightly longer for GX) - rdtsc ax bx mov d# 50 d# 500 * # bx add + rdtsc ax bx mov d# 5 d# 500 * # bx add begin rdtsc bx ax sub 0>= until [then]

1 0

r643 - cpu/x86/pc/olpc
by svn＠openbios.org 28 Sep '07

28 Sep '07

Author: wmb Date: 2007-09-28 03:15:27 +0200 (Fri, 28 Sep 2007) New Revision: 643 Modified: cpu/x86/pc/olpc/resume.bth Log: svn 640 for resume.bth was pessimistic - the SMBUS clock rate was 10 kHz instead of the correct 100 kHz. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-09-27 23:30:15 UTC (rev 642) +++ cpu/x86/pc/olpc/resume.bth 2007-09-28 01:15:27 UTC (rev 643) @@ -352,14 +352,14 @@ 8 # cx mov \ Generate 8 low pulses on SMB_CLOCK begin - \ 50 uS delay (slightly longer for GX) - rdtsc ax bx mov d# 50 d# 500 * # bx add + \ 5 uS delay (slightly longer for GX) + rdtsc ax bx mov d# 5 d# 500 * # bx add begin rdtsc bx ax sub 0>= until h# 40000000 # ax mov ax dx out \ Clear SMB_CLOCK \ 50 uS delay (slightly longer for GX) - rdtsc ax bx mov d# 50 d# 500 * # bx add + rdtsc ax bx mov d# 5 d# 500 * # bx add begin rdtsc bx ax sub 0>= until h# 4000 # ax mov ax dx out \ Set SMB_CLOCK

1 0

r642 - dev/geode
by svn＠openbios.org 28 Sep '07

28 Sep '07

Author: wmb Date: 2007-09-28 01:30:15 +0200 (Fri, 28 Sep 2007) New Revision: 642 Modified: dev/geode/acpi.fth Log: Geode acpi.fth - Removed unnecessary cruft from gx-power-off . Modified: dev/geode/acpi.fth =================================================================== --- dev/geode/acpi.fth 2007-09-27 22:11:13 UTC (rev 641) +++ dev/geode/acpi.fth 2007-09-27 23:30:15 UTC (rev 642) @@ -20,26 +20,18 @@ \ Shorten off delay to .5 sec : quick-power-button ( -- ) d# 32768 pm-enable or h# 40 pm! ; +\ This turns off the main CPU, but the EC stays on. : gx-power-off ( -- ) - \ The rest of this will succeed in turning off the CPU, but the EC will - \ stay on. The ec-power-off above turns off both the EC and CPU, so the - \ rest of this is for historical interest only. - - \ Recipe from AMD; no way I would have figured this out from manual - 5 d# 10 << 1 or 8 acpi-w! \ S5 - power off - \ Enable all of these controls with 0 delay pm-enable h# 10 pm! \ PM_SCLK pm-enable h# 20 pm! \ PM_IN_SLPCTL pm-enable h# 34 pm! \ PM_WKXD pm-enable h# 30 pm! \ PM_WKD - \ Should be "2 acpi-w@", but 16-bit writes to ACPI and PM regs are broken - 0 acpi-l@ h# 100.0000 or 0 acpi-l! \ Enable button wakeup in PM1_EN h# 2ffff h# 54 pm! \ Clear status bits i PM_SSC - h# 1301 rdmsr swap 2 or swap h# 1301 wrmsr \ Set SMM_SUSP_EN h# ffff.ffff h# 18 acpi-l! \ Clear status bits in PM_GPE0_STS - 8 acpi-l@ h# 2000 or 8 acpi-l! \ SLP_EN in PM1_CNT - Down we go + + h# 2000 8 acpi-l! \ SLP_EN in PM1_CNT - Down we go ; ' gx-power-off is power-off

1 0

r641 - dev/olpc/kb3700
by svn＠openbios.org 28 Sep '07

28 Sep '07

Author: rsmith Date: 2007-09-28 00:11:13 +0200 (Fri, 28 Sep 2007) New Revision: 641 Modified: dev/olpc/kb3700/ecio.fth Log: - Rename dcon-enable dcon-disable to power on/off to prevent - confusion with the words in the dcon device Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-09-27 22:06:12 UTC (rev 640) +++ dev/olpc/kb3700/ecio.fth 2007-09-27 22:11:13 UTC (rev 641) @@ -147,8 +147,8 @@ : wlan-on ( -- ) 1 h# 23 ec-cmd-b! ; : wlan-wake ( -- ) h# 24 ec-cmd ; : wlan-reset ( -- ) h# 25 ec-cmd ; -: dcon-disable ( -- ) 0 h# 26 ec-cmd-b! ; -: dcon-enable ( -- ) 1 h# 26 ec-cmd-b! ; +: dcon-power-off ( -- ) 0 h# 26 ec-cmd-b! ; +: dcon-power-on ( -- ) 1 h# 26 ec-cmd-b! ; : reset-ec-warm ( -- ) h# 27 ec-cmd ; : reset-ec ( -- ) h# 28 ec-cmd ; : write-protect-fw ( -- ) h# 29 ec-cmd ;

1 0

r640 - cpu/x86/pc/olpc
by svn＠openbios.org 28 Sep '07

28 Sep '07

Author: wmb Date: 2007-09-28 00:06:12 +0200 (Fri, 28 Sep 2007) New Revision: 640 Modified: cpu/x86/pc/olpc/resume.bth Log: OLPC resume - added code to bitbang the DCON SMBUS, generating 8 clock pulses with DATA held high, in order to clear the DCON in case it sees a false start condition. This is per a suggestion from HiMax. To enable this code, uncomment the "create reset-smbus-bitbang" line. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-09-27 17:25:13 UTC (rev 639) +++ cpu/x86/pc/olpc/resume.bth 2007-09-27 22:06:12 UTC (rev 640) @@ -20,7 +20,8 @@ \ This code will be copied to RAM at suspend-base \ create save-display -create reset-smbus +\ create reset-smbus +\ create reset-smbus-bitbang \ create restore-usb-power h# fe00.0000 constant gp-pa @@ -336,6 +337,40 @@ ax lods ax dx xchg ax lods ax dx xchg h# c000.2001 wmsr \ Video output format ax lods ax dx xchg ax lods ax dx xchg h# c000.2011 wmsr \ TFTP pad select +[ifdef] reset-smbus-bitbang + \ GPIO15 is SMB_DATA + \ GPIO14 is SMB_CLOCK + h# c0000000 # ax mov \ Mask to clear SMB_DATA and SMB_CLOCK + h# 1010 # dx mov ax dx out \ Deselect OUT AUX1 + h# 1014 # dx mov ax dx out \ Deselect OUT AUX2 + h# 1034 # dx mov ax dx out \ Deselect IN AUX1 + h# c000 # ax mov \ Mask to set SMB_DATA and SMB_CLOCK + h# 1000 # dx mov ax dx out \ Set output values to high + h# 1004 # dx mov ax dx out \ Set pins to output + + h# 1000 # dx mov \ Output value register + + 8 # cx mov \ Generate 8 low pulses on SMB_CLOCK + begin + \ 50 uS delay (slightly longer for GX) + rdtsc ax bx mov d# 50 d# 500 * # bx add + begin rdtsc bx ax sub 0>= until + + h# 40000000 # ax mov ax dx out \ Clear SMB_CLOCK + + \ 50 uS delay (slightly longer for GX) + rdtsc ax bx mov d# 50 d# 500 * # bx add + begin rdtsc bx ax sub 0>= until + + h# 4000 # ax mov ax dx out \ Set SMB_CLOCK + + loopa + + \ 50 uS delay (slightly longer for GX) + rdtsc ax bx mov d# 50 d# 500 * # bx add + begin rdtsc bx ax sub 0>= until +[then] + h# 1038 # dx mov \ Low bank - first contiguous GPIO register h# 3c /l / # cx mov \ Register count (stop at lock register) begin

1 0

r639 - cpu/x86/pc/olpc/sdtools
by svn＠openbios.org 27 Sep '07

27 Sep '07

Author: wmb Date: 2007-09-27 19:25:13 +0200 (Thu, 27 Sep 2007) New Revision: 639 Modified: cpu/x86/pc/olpc/sdtools/ecio.fth Log: OLPC SDKIT - Changed the names of the EC commands dcon-{en,dis}able to dcon-power-{on,off} to fix a name conflict with dcon-enable in the DCON driver. Modified: cpu/x86/pc/olpc/sdtools/ecio.fth =================================================================== --- cpu/x86/pc/olpc/sdtools/ecio.fth 2007-09-26 19:56:06 UTC (rev 638) +++ cpu/x86/pc/olpc/sdtools/ecio.fth 2007-09-27 17:25:13 UTC (rev 639) @@ -77,8 +77,8 @@ : wlan-on ( -- ) 1 h# 23 ec-cmd-b! ; : wlan-wake ( -- ) h# 24 ec-cmd-out ; : wlan-reset ( -- ) h# 25 ec-cmd-out ; -: dcon-disable ( -- ) 0 h# 26 ec-cmd-b! ; -: dcon-enable ( -- ) 1 h# 26 ec-cmd-b! ; +: dcon-power-on ( -- ) 0 h# 26 ec-cmd-b! ; +: dcon-power-off ( -- ) 1 h# 26 ec-cmd-b! ; : reset-ec-warm ( -- ) h# 27 ec-cmd-out ; : reset-ec ( -- ) h# 28 ec-cmd-out ; : write-protect-fw ( -- ) h# 29 ec-cmd-out ;

1 0

r638 - dev/olpc/kb3700
by svn＠openbios.org 26 Sep '07

26 Sep '07

Author: rsmith Date: 2007-09-26 21:56:06 +0200 (Wed, 26 Sep 2007) New Revision: 638 Modified: dev/olpc/kb3700/battery.fth Log: - Add trickle charge indication support. This should appear in EC firmware Q2c28 Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2007-09-26 02:36:53 UTC (rev 637) +++ dev/olpc/kb3700/battery.fth 2007-09-26 19:56:06 UTC (rev 638) @@ -54,6 +54,7 @@ ," charging-full " ," discharge " ," abnormal: " + ," trickle " end-string-array : .bat-type ( -- ) @@ -84,7 +85,7 @@ ." AC:" dup h# 10 and if ." on " else ." off " then ( stat ) ." PCB: " pcb-temp 2.d ." C " - dup 1 and if + dup h# 81 and if ." Battery: " .bat-type soc .% ." " @@ -96,6 +97,7 @@ dup 8 and if ." error " then dup h# 20 and if ." charging " then dup h# 40 and if ." discharging " then + dup h# 80 and if ." trickle " then else ." No battery" then

1 0