July 2008 - openfirmware - mail.coreboot.org

r864 - dev/mmc/sdhci
by svn＠openfirmware.info July 30, 2008

July 30, 2008

Author: wmb Date: 2008-07-31 01:49:08 +0200 (Thu, 31 Jul 2008) New Revision: 864 Modified: dev/mmc/sdhci/sdhci.fth Log: OLPC trac 7725 - SDHCI driver was doing DMA to a non-DMA buffer, sometimes causing command and/or data timeouts. Modified: dev/mmc/sdhci/sdhci.fth =================================================================== --- dev/mmc/sdhci/sdhci.fth 2008-07-30 10:19:38 UTC (rev 863) +++ dev/mmc/sdhci/sdhci.fth 2008-07-30 23:49:08 UTC (rev 864) @@ -322,7 +322,7 @@ \ h# 10 cl@ 8 lshift r> 3 la+ l! ; -d# 64 instance buffer: scratch-buf +0 value scratch-buf 0 instance value rca d# 16 instance buffer: cid @@ -617,6 +617,7 @@ open-count 0= if map-regs setup-host + d# 64 " dma-alloc" $call-parent to scratch-buf then open-count 1+ to open-count true @@ -626,6 +627,7 @@ open-count 1 = if intstat-on wait-write-done + scratch-buf d# 64 " dma-free" $call-parent card-clock-off card-power-off unmap-regs

1 0

r863 - cpu/x86/pc/olpc
by svn＠openfirmware.info July 30, 2008

July 30, 2008

Author: wmb Date: 2008-07-30 12:19:38 +0200 (Wed, 30 Jul 2008) New Revision: 863 Modified: cpu/x86/pc/olpc/dsdt.dsl cpu/x86/pc/olpc/versions.fth Log: OLPC - Added retries to ACPI EC commands to prevent blue screens. Modified: cpu/x86/pc/olpc/dsdt.dsl =================================================================== --- cpu/x86/pc/olpc/dsdt.dsl 2008-07-30 09:51:22 UTC (rev 862) +++ cpu/x86/pc/olpc/dsdt.dsl 2008-07-30 10:19:38 UTC (rev 863) @@ -132,7 +132,7 @@ { if (LEqual (Subtract(Local0, One, Local0), Zero)) { - Fatal(1, 1, 0) + Return (One) } Sleep(1) } @@ -142,10 +142,11 @@ { if (LEqual (Subtract(Local0, One, Local0), Zero)) { - Fatal(1, 1, 1) + Return (2) } Sleep(1) } + Return (Zero) } Method (ECRB, 0, NotSerialized) // EC Read Byte after command -> byte @@ -153,15 +154,34 @@ Store (200, Local0) While (LNot (And (ECCM, 1))) // Wait for OBF != 0 { - if (LEqual (Subtract(Local0, One, Local0), Zero)) + If (LEqual (Subtract(Local0, One, Local0), Zero)) { - Fatal(1, 1, 2) + Return (0xffffffff) } Sleep(1) } Return (ECDA) } + Method (ECC1, 1, NotSerialized) // EC Command returning 1 byte + { + Store (10, Local0) // Ten retries + While (Subtract(Local0, One, Local0)) // While more tries left + { + If (ECCO (Arg0)) + { + Continue // Command timeout + } + Store (ECRB (), Local1) + If (LNotEqual (Local1, 0xffffffff)) + { + Return (Local1) // Success + } + } + Return (Zero) + + } + Scope (_PR) { Processor (CPU0, 0x01, 0x00000000, 0x00) {} // Processor (CPU0, 0x01, 0x00009E00, 0x06) { @@ -267,8 +287,7 @@ Store (One, Local0) While (Local0) { - ECCO(0x84) // Read SCI Queue - Store (ECRB(), Local0) + Store (ECC1(0x84), Local0) // Read SCI Queue // UDOT (Local0) If (And(Local0, 0x40)) { Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-07-30 09:51:22 UTC (rev 862) +++ cpu/x86/pc/olpc/versions.fth 2008-07-30 10:19:38 UTC (rev 863) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 12b +macro: FW_MINOR 12c \ The EC microcode macro: EC_VERSION e11

1 0

r862 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openfirmware.info July 30, 2008

July 30, 2008

Author: wmb Date: 2008-07-30 11:51:22 +0200 (Wed, 30 Jul 2008) New Revision: 862 Modified: cpu/x86/pc/olpc/acpi.fth cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/dsdt.dsl cpu/x86/pc/olpc/versions.fth dev/olpc/kb3700/ecio.fth Log: OLPC - Improvements in ACPI event handling for lid switch and changes in AC/battery status. Modified: cpu/x86/pc/olpc/acpi.fth =================================================================== --- cpu/x86/pc/olpc/acpi.fth 2008-07-29 22:09:17 UTC (rev 861) +++ cpu/x86/pc/olpc/acpi.fth 2008-07-30 09:51:22 UTC (rev 862) @@ -195,4 +195,10 @@ : rm-platform-fixup ( -- ) xp-smbus-base h# f001 h# 5140.000b 3dup msr! find-msr-entry 2! xp-smbus-base 1+ h# 10 isa-hdr >hdr-value l! + + begin sci-queue@ 0= until \ Clean out the SCI queue + h# 18 acpi-l@ h# 18 acpi-l! \ Ack outstanding events + h# 4e sci-mask! \ Include in the mask only events we care about + + 0 h# 40 pm! \ Restore long delay for power-off button ; Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2008-07-29 22:09:17 UTC (rev 861) +++ cpu/x86/pc/olpc/devices.fth 2008-07-30 09:51:22 UTC (rev 862) @@ -105,9 +105,7 @@ devalias dropins /dropins \ Create a pseudo-device that presents the dropin modules as a filesystem. -0 0 " " " /" begin-package - fload ${BP}/ofw/fs/dropinfs.fth -end-package +fload ${BP}/ofw/fs/dropinfs.fth \ This devalias lets us say, for example, "dir rom:" devalias rom /dropin-fs Modified: cpu/x86/pc/olpc/dsdt.dsl =================================================================== --- cpu/x86/pc/olpc/dsdt.dsl 2008-07-29 22:09:17 UTC (rev 861) +++ cpu/x86/pc/olpc/dsdt.dsl 2008-07-30 09:51:22 UTC (rev 862) @@ -43,6 +43,125 @@ Release (VSA4) } +// Mutex (ECMX, 0x00) + + OperationRegion (UART, SystemIO, 0x03f8, 0x07) + + Field (UART, ByteAcc, NoLock, Preserve) + { + UDAT, 8, + UAR1, 8, + UAR2, 8, + UAR3, 8, + UAR4, 8, + USTA, 8, + UAR5, 8 + } + Method (UPUT, 1, NotSerialized) + { + While( LEqual (And (USTA, 0x20), Zero) ) + { + Stall (99) + } + Store (Arg0, UDAT) + } + + Method (UDOT, 1, NotSerialized) + { + + And (ShiftRight (Arg0, 4), 0xF, Local0) + If (LLess (Local0, 10)) + { + Add (Local0, 0x30, Local0) // '0' + } Else { + Add (Local0, 0x57, Local0) // 'a' - 10 + } + UPUT (Local0) + + And (Arg0, 0xF, Local0) + If (LLess (Local0, 10)) + { + Add (Local0, 0x30, Local0) // '0' + } Else { + Add (Local0, 0x57, Local0) // 'a' - 10 + } + UPUT (Local0) + + UPUT (0x20) + } + + OperationRegion (ECIX, SystemIO, 0x0381, 0x03) + + Field (ECIX, ByteAcc, NoLock, Preserve) + { + EIXH, 8, + EIXL, 8, + EDAT, 8 + } + + Method (ECRD, 1, NotSerialized) + { +// Acquire (ECMX, 5000) + Store (ShiftRight (Arg0, 0x08), EIXH) + Store (And (Arg0, 0xFF), EIXL) +// Sleep (15) + Stall(255) + Store (EDAT, Local0) +// UDOT (Local0) + Stall(255) +// Sleep (15) +// Release (ECMX) + Return (Local0) + } + + OperationRegion (ECCP, SystemIO, 0x068, 0x05) + + Field (ECCP, ByteAcc, NoLock, Preserve) + { + ECDA, 8, // 0x68 + , 8, + , 8, + , 8, + ECCM, 8, // 0x6c + } + + Method (ECCO, 1, NotSerialized) // EC Command Out (command) + { + Store (1000, Local0) + While (And (ECCM, 2)) // Wait for IBF == 0 + { + if (LEqual (Subtract(Local0, One, Local0), Zero)) + { + Fatal(1, 1, 0) + } + Sleep(1) + } + Store (Arg0, ECCM) + Store (1000, Local0) + While (LNot (And (ECCM, 2))) // Wait for IBF != 0 + { + if (LEqual (Subtract(Local0, One, Local0), Zero)) + { + Fatal(1, 1, 1) + } + Sleep(1) + } + } + + Method (ECRB, 0, NotSerialized) // EC Read Byte after command -> byte + { + Store (200, Local0) + While (LNot (And (ECCM, 1))) // Wait for OBF != 0 + { + if (LEqual (Subtract(Local0, One, Local0), Zero)) + { + Fatal(1, 1, 2) + } + Sleep(1) + } + Return (ECDA) + } + Scope (_PR) { Processor (CPU0, 0x01, 0x00000000, 0x00) {} // Processor (CPU0, 0x01, 0x00009E00, 0x06) { @@ -85,7 +204,7 @@ Method (_WAK, 1, NotSerialized) { // Arg is the sleeping state // VSAW(0, 9) Store (Zero, \_SB.ZZY2) - Switch (ToInteger(Arg0)) { + Switch (Arg0) { Case (One) { Notify (\_SB.PCI0.USB0, Zero) Notify (\_SB.PCI0.USB1, Zero) @@ -128,16 +247,14 @@ Notify (\_SB.PCI0.USB1, 0x02) } -// XXX ??? Do we need a battery event at _L15 ? - - // XXX probably pointless as power is off Method (_L1E, 0, NotSerialized) { // Comes from IRQ/PME Mapper bit 6 - LID switch // VSAW(0, 6) - If (LEqual (\_SB.ZZY2, Zero)) { - If (LLess (ZZY1, 0x02)) { // no state or working state or waking -// Notify (\_SB.SLPB, 0x80) // XXX ??? Should this be LID switch instead? +// UPUT(0x4C) // L +// UPUT(Add(0x30, ZZY1)) + If (LEqual (\_SB.ZZY2, Zero)) { // Not preparing to sleep +// If (LLess (ZZY1, 0x02)) { // no state or working state or waking Notify (\_SB.LIDS, 0x80) // Request to go to sleep - } +// } } Else { Notify (\_SB.LIDS, 0x02) // Request to wake up } @@ -145,13 +262,36 @@ Method (_L1F, 0, NotSerialized) { // Comes from IRQ/PME Mapper bit 7 - SCI // VSAW(0, 5) - Notify (\_SB.PCI0, 0x02) // Request to wake up from EC +// UPUT(0x53) // S + + Store (One, Local0) + While (Local0) + { + ECCO(0x84) // Read SCI Queue + Store (ECRB(), Local0) +// UDOT (Local0) + If (And(Local0, 0x40)) + { + Notify (\_SB.AC, 0x80) + } + If (And(Local0, 0x0e)) + { + Notify (\_SB.BATT, 0x80) + } + } + +// Notify (\_SB.PCI0, 0x02) // Request to wake up from EC +// Notify (\_SB.AC, 0x80) +// Notify (\_SB.BATT, 0x80) +// UPUT(0x54) // T } } // This is an indicator method - it sets LEDs based on the sleep state Scope (_SI) { Method (_SST, 1, NotSerialized) { +// UPUT(0x24) // $ +// UPUT(Add(0x30, Arg0)) // VSAW(1, Arg0) // XXX ??? need to set LEDs by doing VR accesses - or probably the EC does it automatically Store (Arg0, ZZY1) @@ -193,13 +333,22 @@ // VSAW(0, 1) } - OperationRegion (GPIO, SystemIO, 0x6100, 0x0100) + OperationRegion (GPIO, SystemIO, 0x1000, 0x0100) Field (GPIO, DWordAcc, NoLock, Preserve) { // Offset (0x38), // GLEE, 32 - Offset (0xB0), // DDD geoderom doesn't have this IMPORTANT - High bank read back + Offset (0xA4), + GHIN, 32, // High bank Input Invert + Offset (0xB0), // High bank read back , 10, LSWI, 1 // Lid switch bit +// Offset (0xB8), +// GHEE, 32 // High bank events enable +// Offset (0xC0), +// GHPE, 32, // High bank posedge enable +// GHNE, 32, // High bank negedge enable +// GHPS, 32, // High bank posedge status +// GHNS, 32, // High bank negedge status } Device (LNKA) { @@ -238,14 +387,30 @@ Name (_STA, 0x09) } + Mutex (ACMX, 0x00) Device (AC) { /* AC adapter */ Name (_HID, "ACPI0003") Name (_PCL, Package (0x01) { _SB }) // Power consumer list - points to main system bus - // Power Source - XXX this is a stub - it doesn't really tell you if the AC is on-line -// XXX ??? Make the AC adapter check actually do something - Name (_PSR, One) + Method (_PSR, 0, NotSerialized) + { + If (LNot (Acquire (ACMX, 5000))) + { +// UPUT (0x70) // p + Store (ECRD (0xFA40), Local0) + Release (ACMX) + } + If (And (Local0, One)) + { + Return (One) + } + Else + { + Return (Zero) + } + } + // Name (_STA, 0x0F) Method (_STA, 0, NotSerialized) { Return (0x0F) } } @@ -263,16 +428,16 @@ 0x01B3, // granularity between low and warning 0x09F6, // granularity between warning and full "NiMH (GP) ", // Model number - "MIT OLPC ", // serial number + "", // serial number "NiMH", // type "OLPC " // OEM info }) Name (BSTP, Package (0x04) // Battery status (dynamic) p 343 { Zero, // state - bitmask 1: discharging 2: charging 4: critical - 0x02F8, // current flow - 0x0B5E, // remaining capacity - 0x5B0A // voltage in mV + 760, // current flow + 2910, // remaining capacity + 23306 // voltage in mV }) Device (BATT) { @@ -289,150 +454,147 @@ Return (0x0F) } -// If (LNot (Acquire (MUT0, 0x1400))) -// { -// Store (RDEC (0xFAA4), Local0) -// Release (MUT0) -// } + If (LNot (Acquire (ACMX, 5000))) + { +// UPUT (0x73) // s + Store (ECRD (0xFAA4), Local0) + Release (ACMX) + } -// If (And (Local0, One)) -// { - Return (0x1F) -// } -// Else -// { -// Return (0x0F) -// } + If (And (Local0, One)) + { + Return (0x1F) + } + Else + { + Return (0x0F) + } } Method (_BIF, 0, NotSerialized) // Battery Info { -// If (LNot (Acquire (MUT0, 0x1400))) -// { -// Store (RDEC (0xFB5F), Local0) -// Store (RDEC (0xF929), Local1) -// Store (Local0, _T00) -// If (LEqual (0x22, _T00)) -// { -// Store (0x0ED8, Index (BIFP, One)) -// Store (0x0BB8, Index (BIFP, 0x02)) -// Store (0x1770, Index (BIFP, 0x04)) -// Multiply (Local1, 0x1E, Local1) -// Store (Local1, Index (BIFP, 0x05)) -// Store (0x0F, Index (BIFP, 0x06)) -// Subtract (Local1, 0x0F, Local2) -// Store (Local2, Index (BIFP, 0x07)) -// Subtract (0x0BB8, Local1, Local3) -// Store (Local3, Index (BIFP, 0x08)) -// Store ("NiMH (GP) ", Index (BIFP, 0x09)) -// Store ("MIT OLPC ", Index (BIFP, 0x0A)) -// } -// Else -// { -// If (LEqual (0x11, _T00)) -// { -// Store (0x0DDE, Index (BIFP, One)) -// Store (0x0C1C, Index (BIFP, 0x02)) -// Store (0x1964, Index (BIFP, 0x04)) -// Multiply (Local1, 0x1F, Local1) -// Store (Local1, Index (BIFP, 0x05)) -// Store (0x0F, Index (BIFP, 0x06)) -// Subtract (Local1, 0x0F, Local2) -// Store (Local2, Index (BIFP, 0x07)) -// Subtract (0x0C1C, Local1, Local3) -// Store (Local3, Index (BIFP, 0x08)) -// Store ("LiFePo4 (BYD) ", Index (BIFP, 0x09)) -// Store ("MIT OLPC ", Index (BIFP, 0x0A)) -// } -// Else -// { -// If (LEqual (0x12, _T00)) -// { -// Store (0x0BB8, Index (BIFP, One)) -// Store (0x0AF0, Index (BIFP, 0x02)) -// Store (0x1770, Index (BIFP, 0x04)) -// Multiply (Local1, 0x1C, Local1) -// Store (Local1, Index (BIFP, 0x05)) -// Store (0x0E, Index (BIFP, 0x06)) -// Subtract (Local1, 0x0E, Local2) -// Store (Local2, Index (BIFP, 0x07)) -// Subtract (0x0AF0, Local1, Local3) -// Store (Local3, Index (BIFP, 0x08)) -// Store ("LiFePo4 (GP) ", Index (BIFP, 0x09)) -// Store ("MIT OLPC ", Index (BIFP, 0x0A)) -// } -// } -// } -// -// Store (RDEC (0xFAA5), Local0) -// If (And (Local0, 0x08)) -// { -// Store ("NiMH", Index (BIFP, 0x0B)) -// } -// Else -// { -// Store ("LiON", Index (BIFP, 0x0B)) -// } -// -// Store ("OLPC ", Index (BIFP, 0x0C)) -// Release (MUT0) -// } + If (LNot (Acquire (ACMX, 5000))) + { +// UPUT (0x69) // i + Store (ECRD (0xFB5F), Local0) + Store (ECRD (0xF929), Local1) + Switch (Local0) + { + Case (0x11) + { +// UPUT (0x42) // B + Store (3800, Index (BIFP, One)) + Store (3000, Index (BIFP, 2)) + Store (6000, Index (BIFP, 0x04)) + Multiply (Local1, 30, Local1) + Store (Local1, Index (BIFP, 5)) + Store (15, Index (BIFP, 6)) + Store (Subtract (Local1, 15), Index (BIFP, 7)) + Store (Subtract (3000, Local1), Index (BIFP, 8)) + Store ("NiMH (GP) ", Index (BIFP, 9)) + Store ("", Index (BIFP, 10)) + Store ("GoldPeak ", Index (BIFP, 0x0C)) +// UPUT (0x62) // b + } + Case (0x12) + { +// UPUT (0x44) // D + Store (3000, Index (BIFP, One)) + Store (2800, Index (BIFP, 2)) + Store (6000, Index (BIFP, 4)) + Multiply (Local1, 28, Local1) + Store (Local1, Index (BIFP, 5)) + Store (14, Index (BIFP, 6)) + Store (Subtract (Local1, 14), Index (BIFP, 7)) + Store (Subtract (2800, Local1), Index (BIFP, 8)) + Store ("LiFePO4 (GP) ", Index (BIFP, 9)) + Store ("", Index (BIFP, 10)) + Store ("GoldPeak ", Index (BIFP, 0x0C)) +// UPUT (0x64) // d + } + Case (0x22) + { +// UPUT (0x43) // C + Store (3550, Index (BIFP, One)) + Store (3100, Index (BIFP, 2)) + Store (6500, Index (BIFP, 4)) + Multiply (Local1, 31, Local1) + Store (Local1, Index (BIFP, 5)) + Store (15, Index (BIFP, 6)) + Store (Subtract (Local1, 15), Index (BIFP, 7)) + Store (Subtract (3100, Local1), Index (BIFP, 8)) + Store ("LiFePO4 (BYD) ", Index (BIFP, 9)) + Store ("", Index (BIFP, 10)) + Store ("BYD ", Index (BIFP, 0x0C)) +// UPUT (0x63) // c + } + } +// UPUT (0x49) // I + If (And (ECRD (0xFAA5), 8)) + { + Store ("NiMH", Index (BIFP, 11)) + } + Else + { +//x Store ("LiON", Index (BIFP, 11)) + Store ("LiFePO4", Index (BIFP, 11)) + } + +//x Store ("OLPC ", Index (BIFP, 0x0C)) + Release (ACMX) + } + Return (BIFP) } Method (_BST, 0, NotSerialized) { -// If (LNot (Acquire (MUT0, 0x1400))) -// { -// Store (RDEC (0xFAA5), Local0) -// If (And (Local0, One)) -// { -// Store (0x02, Local1) -// } -// Else -// { -// Store (One, Local1) -// } -// -// Sleep (0x0F) -// Store (RDEC (0xF910), Local0) -// If (LLess (Local0, 0x0F)) -// { -// Or (Local1, 0x04, Local1) -// } -// -// Store (Local1, Index (BSTP, Zero)) -// Sleep (0x0F) -// Store (RDEC (0xFB5F), Local1) -// Sleep (0x0F) -// Store (Local1, _T01) -// If (LEqual (0x22, _T01)) -// { -// Store (0x02F8, Index (BSTP, One)) -// Multiply (Local0, 0x1E, Local2) -// } -// Else -// { -// If (LEqual (0x11, _T01)) -// { -// Store (0x05DC, Index (BSTP, One)) -// Multiply (Local0, 0x1F, Local2) -// } -// Else -// { -// If (LEqual (0x12, _T01)) -// { -// Store (0x05DC, Index (BSTP, One)) -// Multiply (Local0, 0x1C, Local2) -// } -// } -// } -// -// Store (Local2, Index (BSTP, 0x02)) -// Release (MUT0) -// } + If (LNot (Acquire (ACMX, 5000))) + { +// UPUT (0x74) // t + If (And (ECRD (0xFAA5), One)) + { + Store (0x02, Local1) // charging + } + Else + { + Store (One, Local1) // discharging + } + Sleep (15) + Store (ECRD (0xF910), Local0) + If (LLess (Local0, 15)) + { + Or (Local1, 4, Local1) // critical + } + + Store (Local1, Index (BSTP, Zero)) + Sleep (15) + + Switch (ECRD (0xFB5F)) + { + Case (0x11) + { + Store (760, Index (BSTP, One)) + Multiply (Local0, 30, Local2) + } + Case (0x22) + { + Store (1500, Index (BSTP, One)) + Multiply (Local0, 31, Local2) + } + Case (0x12) + { + Store (1500, Index (BSTP, One)) + Multiply (Local0, 28, Local2) + } + } + + Store (Local2, Index (BSTP, 2)) + Release (ACMX) + } + Return (BSTP) } } @@ -442,7 +604,40 @@ Device (LIDS) { Name (_HID, EisaId ("PNP0C0D")) Name (_PRW, Package (0x02) { 0x1e, 0x03 }) // Event 1e, wakes from S3 - Method (_LID, 0, NotSerialized) { Return (LSWI) } // Lid switch bit + Method (_INI, 0, NotSerialized) { + Store (0x400, GHIN) // Turn on invert to see falling edge + } + Method (_LID, 0, NotSerialized) { + // The expected state is LSWI == 1, because the inverter is either + // on or off depending on the previous state. + // If LSWI == 0, it means that the switch changed values then + // changed back to the previous state. +// UPUT (0x6c) // l + If (LSWI) { + If (And(GHIN, 0x400)) + { // Inverted, became closed +// UPUT (0x30) + Store (0x4000000, GHIN) // Turn on invert to see falling edge + Store (Zero, Local0) + } Else { // Not inverted, became open +// UPUT (0x31) + Store (0x400, GHIN) // Turn on invert to see falling edge + Store (One, Local0) + } + } Else { // Spurious event + If (And(GHIN, 0x400)) + { // Inverted, stayed open + Store (One, Local0) +// UPUT (0x61) + } Else { + Store (Zero, Local0) +// UPUT (0x62) + } + } +// UPUT (0x20) + + Return (Local0) + } } Device (PCI0) { @@ -451,7 +646,7 @@ // XXX Probably should be sleep state 0 - can't wake from PCI as power is off // Name (_PRW, Package (0x02) { 0x1f, 0x05 }) - Name (_PRW, Package (0x02) { 0x1f, 0x03 }) +// XXX Name (_PRW, Package (0x02) { 0x1f, 0x03 }) // Name (_STA, 0x0F) Method (_STA, 0, NotSerialized) { Return (0x0F) } Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-07-29 22:09:17 UTC (rev 861) +++ cpu/x86/pc/olpc/versions.fth 2008-07-30 09:51:22 UTC (rev 862) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 12 +macro: FW_MINOR 12b \ The EC microcode macro: EC_VERSION e11 Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2008-07-29 22:09:17 UTC (rev 861) +++ dev/olpc/kb3700/ecio.fth 2008-07-30 09:51:22 UTC (rev 862) @@ -155,6 +155,7 @@ : write-protect-fw ( -- ) 3 ec-cmd ; : ebook-mode? ( -- b ) h# 2a ec-cmd-b@ ; : wlan-freeze ( -- ) h# 35 ec-cmd ; +: sci-queue@ ( -- b ) h# 84 ec-cmd-b@ ; : ec-indexed-io-off ( -- ) h# fe95 ec@ h# 40 invert and h# fe95 ec! ;

1 0

r861 - dev/mmc/sdhci
by svn＠openfirmware.info July 29, 2008

July 29, 2008

Author: wmb Date: 2008-07-30 00:09:17 +0200 (Wed, 30 Jul 2008) New Revision: 861 Modified: dev/mmc/sdhci/sdhci.fth Log: OLPC trac 7702 - Fixed random hang when reading SD cards > 4 GB. The problem was an off-by-one error in the CSD parser, which caused it to look at an undefined bit outside the CSD area, sometimes causing the wrong card size to be reported. Modified: dev/mmc/sdhci/sdhci.fth =================================================================== --- dev/mmc/sdhci/sdhci.fth 2008-07-29 00:57:21 UTC (rev 860) +++ dev/mmc/sdhci/sdhci.fth 2008-07-29 22:09:17 UTC (rev 861) @@ -596,6 +596,7 @@ : dma-free ( vadr size -- ) " dma-free" $call-parent ; : r/w-blocks ( addr block# #blocks in? -- actual ) + over 0= if 2drop 2drop 0 exit then \ Prevents hangs intstat-on >r ( addr block# #blocks r: in? ) rot dma-setup ( block# r: in? ) @@ -655,7 +656,7 @@ \ The calculation below is shown on page 81 of the \ SD Physical Layer Simplified Specification Version 2.00. : size ( -- d.bytes ) - d# 128 d# 126 csdbits case + d# 127 d# 126 csdbits case 0 of d# 49 d# 47 csdbits ( c_size_mult ) 2 + 1 swap lshift ( mult ) @@ -670,7 +671,8 @@ d# 70 d# 48 csdbits d# 10 lshift h# 200 um* endof ( default ) - h# ffffffff 0 rot + ." SD: Warning - invalid CSD; using default device size." cr + h# 8.0000.0000. rot \ 32 GB endcase ; external

1 0

r860 - cpu/x86/pc/olpc
by svn＠openfirmware.info July 29, 2008

July 29, 2008

Author: wmb Date: 2008-07-29 02:57:21 +0200 (Tue, 29 Jul 2008) New Revision: 860 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2E12 , built from svn 850 with cherry-picked fix for trac 7607 (one line from svn 858). Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-07-23 22:51:44 UTC (rev 859) +++ cpu/x86/pc/olpc/versions.fth 2008-07-29 00:57:21 UTC (rev 860) @@ -2,10 +2,10 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 11x +macro: FW_MINOR 12 \ The EC microcode -macro: EC_VERSION d13 +macro: EC_VERSION e11 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

r859 - forth/lib
by svn＠openfirmware.info July 23, 2008

July 23, 2008

Author: wmb Date: 2008-07-24 00:51:44 +0200 (Thu, 24 Jul 2008) New Revision: 859 Modified: forth/lib/decomp.fth Log: Decompiler - move install-decomp from the hidden vocabulary to the forth vocabulary so [ifdef] can see it. This fixes the problem where the debugger displays just "to" instead of "to <wordname>" for some kinds of objects. Modified: forth/lib/decomp.fth =================================================================== --- forth/lib/decomp.fth 2008-07-23 19:57:18 UTC (rev 858) +++ forth/lib/decomp.fth 2008-07-23 22:51:44 UTC (rev 859) @@ -381,6 +381,7 @@ ; headers +also forth definitions : install-decomp ( literal-acf display-acf skip-acf -- ) ['] dummy ['] do-scan (patch ['] dummy ['] .execution-class (patch @@ -388,6 +389,7 @@ dup [ #decomp-classes ] literal ta+ tsearch drop token! ; +previous definitions headerless \ Scan the parameter field of a colon definition and determine the

1 0

r858 - ofw/fs/jffs2
by svn＠openfirmware.info July 23, 2008

July 23, 2008

Author: wmb Date: 2008-07-23 21:57:18 +0200 (Wed, 23 Jul 2008) New Revision: 858 Modified: ofw/fs/jffs2/jffs2.fth Log: OLPC trac 7607 - JFFS2 scanning hang. If a non-summarized erase block contained a node whose header spanned a page boundary, and the second page was all ff's due to not being written (perhaps because of an unclean shutdown), the scanning process would loop forever. This change fixes that bug, and also adds a new command "debug-jffs2" that will enable warning messages about bad nodes. Usage: ok debug-jffs2 dir nand:\ Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2008-07-23 09:29:00 UTC (rev 857) +++ ofw/fs/jffs2/jffs2.fth 2008-07-23 19:57:18 UTC (rev 858) @@ -6,7 +6,13 @@ defer scan-callout ' noop to scan-callout 0 value debug-scan? \ True to display progress reports +0 value warn? \ True to warn about bad nodes +true value first-time? +also forth definitions +: debug-jffs2 true to warn? true to first-time? ; +previous definitions + 0 instance value block-buf \ Start address of working buffer 0 instance value eb-end \ End address of working buffer 0 value cleanmark? @@ -89,7 +95,6 @@ : dma-alloc ( len -- adr ) " dma-alloc" $call-parent ; : dma-free ( len -- adr ) " dma-free" $call-parent ; -true value first-time? -1 value partition# -1 value #writes @@ -187,16 +192,26 @@ \ Validate the summary; it's all in memory now \ The numeric field references are from struct jffs2_raw_summary -: bad-summary? ( adr -- flag ) - dup 6 /l* crc ( adr crc ) - over 7 j@ <> if drop true exit then \ Exit if bad node CRC +: bad-summary? ( page# adr -- flag ) + dup 6 /l* crc ( page# adr crc ) + over 7 j@ <> if ( page# adr ) + warn? if ( page# adr ) + ." JFFS2 warning: Bad CRC in summary node - eblock# " over page>eblock .x cr + then + 2drop true exit + then \ Exit if bad node CRC \ Omitting CRC check of just the node header, and the \ totlen check, as both are covered by the node CRC. - dup 8 la+ sumsize -8 la+ crc ( adr crc ) - over 6 j@ <> if drop true exit then \ Exit if bad summary data CRC - drop false + dup 8 la+ sumsize -8 la+ crc ( page# adr crc ) + over 6 j@ <> if ( page# adr ) + warn? if ( page# adr ) + ." JFFS2 warning: Bad CRC in summary data - eblock# " over page>eblock .x cr + then + 2drop true exit + then \ Exit if bad summary data CRC ( page# adr ) + 2drop false ; 3 /n* instance buffer: curinum \ cur-inum, cur-vers, cur-offset @@ -721,8 +736,8 @@ block-buf /page + -1 j@ ( page# magic ) h# 02851885 <> if drop true exit then ( page# ) - get-summary if true exit then ( adr ) - dup bad-summary? if drop true exit then ( adr ) + dup get-summary if drop true exit then ( page# adr ) + tuck bad-summary? if drop true exit then ( adr ) scan-summary false ; @@ -763,10 +778,13 @@ drop false ( false ) then exit + then ( adr len ) + warn? if ( adr len ) + ." JFFS2 warning: Bad CRC in node header - eblock# " have-eblock# .x + ." offset " over block-buf - .x cr then - else ( adr len ) - 1 /string ( adr' len' ) then ( adr len ) + 1 /string ( adr' len' ) repeat ( adr len ) 2drop false ;

1 0

r857 - ofw/core
by svn＠openfirmware.info July 23, 2008

July 23, 2008

Author: wmb Date: 2008-07-23 11:29:00 +0200 (Wed, 23 Jul 2008) New Revision: 857 Modified: ofw/core/filecmds.fth Log: filecmds.fth - fixed bug in rev 849 - ls-r gave General Protection Fault if exited prematurely by typing 'q' during pagination. Modified: ofw/core/filecmds.fth =================================================================== --- ofw/core/filecmds.fth 2008-07-23 08:48:56 UTC (rev 856) +++ ofw/core/filecmds.fth 2008-07-23 09:29:00 UTC (rev 857) @@ -446,7 +446,7 @@ begin-search 0. ( d.totsize ) begin another-match? while ( d.totsize 8*attributes name$ ) handle-dirent d+ ( d.totsize' ) - exit? if close-search 2drop r> 2drop exit then + exit? if close-search 2drop 2r> 2drop exit then repeat ( d.totsize r: pattern$ ) 2r> .totsize ( ) ;

1 0

r856 - cpu/x86/pc/olpc
by svn＠openfirmware.info July 23, 2008

July 23, 2008

Author: wmb Date: 2008-07-23 10:48:56 +0200 (Wed, 23 Jul 2008) New Revision: 856 Modified: cpu/x86/pc/olpc/devices.fth Log: OLPC - added "tofile.fth" to the build. The to-file and append-to-file commands let you redirect the console output of a command to a file. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2008-07-23 08:47:22 UTC (rev 855) +++ cpu/x86/pc/olpc/devices.fth 2008-07-23 08:48:56 UTC (rev 856) @@ -163,6 +163,7 @@ [then] fload ${BP}/forth/lib/pattern.fth \ Text string pattern matching +fload ${BP}/forth/lib/tofile.fth \ to-file and append-to-file \ XXX remove the OS file commands from tools.dic fload ${BP}/ofw/core/filecmds.fth \ File commands: dir, del, ren, etc.

1 0

r855 - ofw/core
by svn＠openfirmware.info July 23, 2008

July 23, 2008

Author: wmb Date: 2008-07-23 10:47:22 +0200 (Wed, 23 Jul 2008) New Revision: 855 Modified: ofw/core/filecmds.fth Log: Implemented "ls-r" command for recursive directory listing. It also displays the accumulated sizes of subdirectory trees. Modified: ofw/core/filecmds.fth =================================================================== --- ofw/core/filecmds.fth 2008-07-23 08:44:58 UTC (rev 854) +++ ofw/core/filecmds.fth 2008-07-23 08:47:22 UTC (rev 855) @@ -222,7 +222,7 @@ begin-search another-match? dup if close-search then ; -: dir-attr? ( attribute -- flag ) h# 4000 and 0<> ; +: dir-attr? ( attribute -- flag ) h# f000 and h# 4000 = ; : dir? ( 8attributes -- flag ) >r drop 3drop 3drop r> dir-attr? ; \ Standard file type encoding; this is a melange of Unix and DOS file @@ -336,15 +336,14 @@ \ a "*", thus causing all the files to be listed. : add\ ( pstr -- ) " \" rot $cat ; : ?add\ ( adr len -- adr' len' ) - 2dup is-pattern? 0= if - separator? if exit then - 2dup begin-search another-match? if - 2drop >r 3drop 2drop 2drop r> h# 4000 and if - string2 pack add\ string2 count - then - close-search - then - then + 2dup is-pattern? 0= if ( adr len ) + separator? if exit then ( adr len ) + 2dup first-match if ( adr len 8*attrs name$ ) + 2drop dir? if ( adr len ) + string2 pack add\ string2 count ( adr' len' ) + then ( adr len ) + then ( adr len ) + then ( adr len ) ; : .fs-name ( -- ) @@ -371,6 +370,89 @@ : dir ( "pattern" -- ) parse-word $dir ; : dir" ( "pattern"" -- ) [char] " parse $dir ; +defer handle-dirent ( 8*attributes $name ) + +d# 256 buffer: ls-r-name +0 value ls-r-len + +: ls-r-name$ ( -- adr len ) ls-r-name ls-r-len ; + +variable indent-level + +: .totsize ( d.size name$ -- ) + indent-level @ spaces type ." Total: " push-decimal ud. pop-base cr +; +: ($ls-r) ( name$ -- d.totsize ) + + search-ih >r ls-r-len >r + + \ Extend the path with the new name component and start new search + tuck ( len name$ ) + ls-r-name$ + swap move ( len ) + dup ls-r-name$ + + [char] \ swap c! ( len ) + ls-r-len + 1+ to ls-r-len ( ) + + ls-r-name$ $open-dir to search-ih ( ) + + 1 indent-level +! ( ) + + 0. 0 ( d.totsize index ) + begin " next-file-info" search-ih $call-method while ( index 8*attributes name$ ) + handle-dirent ( d.totsize index d.size ) + rot >r d+ r> ( d.totsize index' ) + exit? until \ Resolves "begin" ( d.totsize index ) + \ This block executes only if the loop terminates via "until" + drop ( d.totsize ) + then \ Resolves "while" ( d.totsize ) + close-search ( d.totsize ) + + -1 indent-level +! ( d.totsize ) + + 2dup ls-r-name$ .totsize ( d.totsize ) + + \ Restore the path (removing the new name) and the search parameters + r> to ls-r-len r> to search-ih ( d.totsize ) +; + +: recursive-.file ( 8*attributes $name -- d.size ) + 2dup " ." $= >r 2dup " .." $= r> or if ( 8*attributes $name ) + 2drop 4drop 4drop 0. exit + then + + 3 pick >r 2dup 2>r 2 pick >r ( 8*attributes $name r: len $name attr ) + indent-level @ spaces .file cr ( r: len $name attr ) + r> dir-attr? if ( r: len $name ) + 2r> r> drop ($ls-r) ( d.size ) + else ( r: len $name ) + 2r> 2drop r> 0 ( d.size ) + then +; +' recursive-.file to handle-dirent + +: $ls-r ( pattern$ -- ) + \ If the pattern$ is null or has no name component, add a "*" to the end + dup if ( pattern$ ) + ?add\ ( pattern$' ) + 2dup file&dir 2nip ( pattern$ dir$ ) + dup to ls-r-len ( pattern$ dir$ ) + ls-r-name swap move ( pattern$ ) + separator? ( pattern$ no-name? ) + else true then ( pattern$ no-name? ) + + if string2 pack " *" rot $cat string2 count then ( pattern$ ) + + 0 indent-level ! ( pattern$ ) + 2dup 2>r ( pattern$ r: pattern$ ) + begin-search 0. ( d.totsize ) + begin another-match? while ( d.totsize 8*attributes name$ ) + handle-dirent d+ ( d.totsize' ) + exit? if close-search 2drop r> 2drop exit then + repeat ( d.totsize r: pattern$ ) + 2r> .totsize ( ) +; +: ls-r ( "pattern" -- ) parse-word $ls-r ; +: ls-r" ( "pattern"" -- ) [char] " parse $ls-r ; + internal : do-fileop ( ... path$ op$ -- )

1 0