Commit Graph

354 Commits

Author SHA1 Message Date
Louis Yung-Chieh Lo
0ece3ef0dc Fix the SETREP and EX_SETLED state machine (keyboard module).
Original code doesn't handle those 2 commands well. SETREP needs a new
state for incoming data byte. EX_SETLED expects 2-byte parameter instead
of 1-byte.

Also enclose all asynchronous debug output in [] for servo-based testing.

BUG=chrome-os-partner:8674
TEST=on the target board. No "Unsupported data 0x00" message is seen.

Change-Id: Icb8e592fe54620677878ee15ef8a781c8906063e
2012-04-03 11:26:06 +08:00
Gerrit
75343c6970 Merge "Implement persistent flash write protect settings" 2012-04-02 12:49:54 -07:00
Randall Spangler
b70183a9bd Implement persistent flash write protect settings
This uses the last bank of flash to hold persistent settings, and
looks at the write protect GPIO to decide whether to protect the chip
at boot (chrome-os-partner:7453).

For ease of debugging, I've temporarily hacked this so flash uses the
RECOVERYn signal (dut-control goog_rec_mode:on) to enable WP instead
of the write protect signal; this works around chrome-os-partner:8580.

Also note that if you write protect any blocks even temporarily,
you'll need to do a power-on reset to clear them before you can
reprogram the flash.  See chrome-os-partner:8632.  At the EC console,
"hibernate 1" will do that, or you can just yank the power.

This also fixes a bug in the flash write and erase commands, where
they weren't properly detecting failure if you attempted to modify a
protected block (missed an interrupt reason...)

New "flashwp" console commands work.  LPC commands need reworking.

Signed-off-by: Randall Spangler <rspangler@chromium.org>

BUG=chrome-os-partner:8448
TEST=manual

Change-Id: I49c38cc25c793094ae3331a4586fda0761b4bac6
2012-04-02 10:57:03 -07:00
Randall Spangler
d1a162d4b1 Dump a few words at the start of flash as a diagnostic for full-chip erase failure
Signed-off-by: Randall Spangler <rspangler@chromium.org>

BUG=chrome-os-partner:8632
TEST=manual; run flash_link

Change-Id: I87b02c766345182cea64c5bec980c3940a25b3cf
2012-04-02 10:43:53 -07:00
Bill Richardson
36572d45fa Create slow version of servo config for proto0.5
No point in saying "edit the file if it doesn't work", when we could just
provide a slow version instead.

BUG=none
TEST=none

Change-Id: I94731495635e4dc6d0aa6e3f577cb727af92894a
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
2012-03-28 14:56:16 -07:00
Louis Yung-Chieh Lo
8d6725baf3 Remove the un-necessary TODO comments in i8042 module.
See issue tracker for more information.

BUG=chrome-os-partner:8493
TEST=compile okay

Change-Id: I910aebec7d2a505a02b1bbd5d985a540b94be5c2
2012-03-28 16:51:40 +08:00
Louis Yung-Chieh Lo
b71837716d flash write and erase commands protect the active image.
Comapre the range to be write (erase) with the range of active image.
If overlap, return error to indicate the access denied.

Note that we actually protect only runtime code and ro data.
FMAP is intentional unprotected so that flashrom can update to new map
before jumping. Since the vector table and init code are in the same
erase page, they are unprotected as well.

BUG=chrome-os-partner:7478
TEST=

Change-Id: Icb5cc89836432a11cef80e18eb66bb39a6c9b1d9
2012-03-27 14:36:45 +08:00
Randall Spangler
43686b0588 Fix sysjump to RO
Signed-off-by: Randall Spangler <rspangler@chromium.org>

BUG=chrome-os-partner:8613
TEST=sysjump A, then sysjump RO

Change-Id: Id9b3c867fa01893542812373f4469534b4be9918
2012-03-23 09:13:40 -07:00
Bill Richardson
e4e7f5bdf7 Rename led.c to lightbar.c, improve command interface.
BUG=chrome-os-partner:7839
TEST=none

Signed-off-by: Bill Richardson <wfrichar@google.com>

Only tested on BDS at the moment, because that's all I have.

Change-Id: I30c7202856a272953bf7170c6786999378984329
2012-03-20 15:55:58 -07:00
Randall Spangler
41e3b58258 Remove old scratchpad-based reboot-to-image interface
Now that we can jump directly to other images, we don't need this.

We jump to image A by default, unless the recovery button or signal is asserted.

Signed-off-by: Randall Spangler <rspangler@chromium.org>

BUG=chrome-os-partner:8562
TEST=manual

Reboot -> runs image A
Reboot with reload (F3) held down -> runs RO
Reboot with 'dut-control goog_rec_mode:on' -> runs RO

Change-Id: I8259fe0d738ce0ca897d2f4427d8cf61858b8901
2012-03-20 09:43:46 -07:00
Gerrit
61748b4f04 Merge "Keyboard wakeup." 2012-03-20 09:26:18 -07:00
Gerrit
dfa34083c5 Merge "Support warm reboot from one EC image to another." 2012-03-20 09:26:16 -07:00
Gerrit
7cf6983eb5 Merge "Set power adapter LED based on charge state" 2012-03-20 01:11:50 -07:00
Rong Chang
13ad11292e Set power adapter LED based on charge state
Power adapter LED:
  GREEN = charge done
  YELLOW = charging
  RED = error

Signed-off-by: Rong Chang <rongchang@chromium.org>

BUG=chrome-os-partner:8536
TEST=manual

Change-Id: I5580763a4136e1de7f5eae4e3dda8e169309d902
2012-03-20 14:33:09 +08:00
Louis Yung-Chieh Lo
f8f802cbb8 Keyboard wakeup.
The final piece links the keyboard press and x86_power module.

BUG=chrome-os-partner:8523
TEST=on the link board.
wait for 15 minutes to make host suspend. touch any key to wake up host.

Change-Id: Ie6ae840ae546731daea48ab457fdc056feb5a685
2012-03-20 11:07:19 +08:00
Randall Spangler
b2ac77b37b Support warm reboot from one EC image to another.
This is necessary at init-time for verified boot to jump from RO to
one of the RW images.

It's also used by factory EC update to update one image and then jump
to the updated image to finish the update.  In this case, the x86 does
NOT reboot.

Signed-off-by: Randall Spangler <rspangler@chromium.org>

BUG=chrome-os-partner:8449
TEST=manual

1) power on x86 and log in
2) sysjump a  --> system is in a; x86 has not rebooted
3) sysjump ro --> system is back in RO; x86 has not rebooted
4) reboot -> system is in RO; x86 HAS rebooted

Change-Id: I9dbadcf9775e146a0718abfd4ee0758b65350a87
2012-03-19 15:41:14 -07:00
Randall Spangler
1fd7062b29 Tidy ADC channel definitions
We moved a while ago to a table of ADC channels, so having a
meaningless constant defined in board.h is more harmful than helpful.

BUG=none
TEST=build link, bds

Change-Id: I651a609c9ed13f879bb943c90731275407d77e50
Signed-off-by: Randall Spangler <rspangler@chromium.org>
2012-03-19 09:05:16 -07:00
Randall Spangler
9ff6f390b9 Remove code for skipping duplicate port 80 writes
The kernel no longer uses port 80 as a delay mechanism, so we don't
need to detect the no-longer-present spammy writes.

Signed-off-by: Randall Spangler <rspangler@chromium.org>

BUG=chrome-os-partner:7972
TEST=port80 scroll, then boot the system.  see a few repeated bytes,
but not piles of 00 and ff's.

Change-Id: Id14dc43ab4e1b15c6bab99a17c062f295a59e7e6
2012-03-19 09:05:07 -07:00
Randall Spangler
2a9f80d2d9 More cleanup of board/chip configs and initialization
More modules can be disabled individually through CONFIG_ defines.

Reordered early module pre-init and init, and added comments to
explain why things are ordered in main() the way they are.

Fixed a few assorted init-related bugs along the way, like st32m
keyboard scan double-initializing.

BUG=none
TEST=build link, bds, daisy

Signed-off-by: Randall Spangler <rspangler@chromium.org>

Change-Id: I04a7fa51d743adfab4be4bdddaeef68943b96dec
2012-03-19 09:04:56 -07:00
Gerrit
eb3920ec7a Merge "Add battery SMI events and refactor charging state" 2012-03-19 01:54:54 -07:00
Rong Chang
e8afc9946a Add battery SMI events and refactor charging state
This CL adds battery SMI events. And refactors the charging state
machine by adding share state context for all handlers.

Power events are moved to common handler. Minor clean up on console
output messages.

Signed-off-by: Rong Chang <rongchang@chromium.org>

BUG=chrome-os-partner:7526,7937,8450
TEST=manual:
  Watch console message when connecting/disconnecting AC adapter and
  battery. Check the state transition.

Change-Id: I42eec4f87a9d49bd193cb9dde9080e3dfccbb77c
2012-03-19 16:08:40 +08:00
Randall Spangler
e68844824b Clean up chip/board configs for LM4
Board-specific features like lightbar should be config'd at the board
level, not at the chip level.

BUG=none
TEST=build link, bds, daisy

Change-Id: If1df2ca0422f7b8bdc172d0df7bd9f6a1af6a9d2
Signed-off-by: Randall Spangler <rspangler@chromium.org>
2012-03-16 14:02:59 -07:00
Randall Spangler
a9f4794edb Add support for 1-wire protocol and power adapter LEDs
BUG=chrome-os-partner:7498
TEST=powerled {off, red, yellow, green}

Signed-off-by: Randall Spangler <rspangler@chromium.org>

Change-Id: I48beaad94d75c0ec30a969ea4b0e35f54e052085
2012-03-16 11:03:13 -07:00
Gerrit
54f8d7e323 Merge "Update test scripts" 2012-03-15 20:43:56 -07:00
Gerrit
2743514996 Merge "Fix test build" 2012-03-15 20:43:56 -07:00
Vic Yang
9f8e8dc6a3 Temperature sensor grouping.
Group temperature sensors into different types so we only have to set
temperature threshold for each type instead of each sensor.

Signed-off-by: Vic Yang <victoryang@google.com>

BUG=chrome-os-partner:8466
TEST=Fan control still works.

Change-Id: I7acc714c32f282cec490b9e02d402ab91a53becf
2012-03-16 10:40:52 +08:00
Gerrit
7d1884ee06 Merge "Prevent fan from keep turning on and off." 2012-03-15 17:59:33 -07:00
Vic Yang
826e811493 Prevent fan from keep turning on and off.
Modify thermal engine to treat temperature threshold as a 3-degree range
instead of a certain value. This way the fan do not keep turning on and
off, while the temperature floating around the threshold value.

Signed-off-by: Vic Yang <victoryang@google.com>

BUG=chrome-os-partner:8466
TEST=Set threshold to current temperature. The fan turns on and does not
immediately turns off.

Change-Id: Iad1de05a409dbbc573a8ffd0ece0dc7961b20806
2012-03-16 07:25:37 +08:00
Vincent Palatin
a191591cf0 Update test scripts
Update test python scripts for recent trace modifications :
 - lack of firmware B
 - updated motd

Update QEMU to deal gracefully with various new registers accesses.

Signed-off-by: Vincent Palatin <vpalatin@chromium.org>

BUG=None
TEST=make qemu-tests

Change-Id: I59a53822193b7377fe5f61f75c951b6cd24fc54b
2012-03-15 21:25:48 +00:00
Vincent Palatin
e456584ce1 Fix test build
Allow to build without the power button task.

Signed-off-by: Vincent Palatin <vpalatin@chromium.org>

BUG=None
TEST=make qemu-tests

Change-Id: Ibc757a6641f195f0d10e6a673792b996694f8cec
2012-03-15 21:25:48 +00:00
Randall Spangler
c72f66c050 Add wake signal to PCH
This works similar to SCI/SMI events, but triggers a separate
level-sensitive signal to the PCH instead.

Signed-off-by: Randall Spangler <rspangler@chromium.org>

BUG=chrome-os-partner:8514
TEST=manual

From EC console:
gpioget PCH_WAKEn --> should be 1
hostevent wake 0x1
close lid switch (with magnet)
hostevent -> should show wake mask 0x1, raw events 0x1
gpioget PCH_WAKEn --> should be 0
hostevent clear 0x1
hostevent -> should show raw events 0
gpioget PCH_WAKEn --> should be 1

Change-Id: I29832c1dc30239a98987578f07dfeb25791dde11
2012-03-15 12:42:11 -07:00
Randall Spangler
38d1b2e8ba Add ability to trigger both warm and cold resets.
Keyboard reset now triggers a cold reset.

Signed-off-by: Randall Spangler <rspangler@chromium.org>

BUG=chrome-os-partner:8397
TEST=power system on, then do 'x86reset cold' for a cold reset or
'x86reset warm' for a warm reset.  Check x86 debug console to see that
coreboot detects the warm (soft) reset.

Change-Id: I00930d9f5df98365277cd5c7f2eb8f135c4e4398
2012-03-15 09:27:45 -07:00
Vincent Palatin
0cde4cfec3 ensure the re-scheduling is not interrupted
The re-scheduling is protected by increasing our priority to -1,
according to ARMv-M architecture manual, we need an ISB after setting
the faultmask register to ensure that the new priority is visible.

Signed-off-by: Vincent Palatin <vpalatin@chromium.org>

BUG=chrome-os-partner:8492
TEST=run on proto-0.5 and see that the temperature sensor and battery
tasks are longer hanging (see the bug for details how to check it)

Change-Id: Ia55859cf5c9101a09c61be7647a920126fc0a3b9
2012-03-14 22:34:35 +00:00
Vincent Palatin
ce60b937cb mutex: retry immediatly if we could not get exclusive access
When updating the lock field of the mutex to acquire it, if the store
exclusive fails, we want to retry immediatly else if the failure has
been triggered by the other user doing the mutex_unlock we might not be
woken up.

Signed-off-by: Vincent Palatin <vpalatin@chromium.org>

BUG=chrome-os-partner:8492
TEST=run on proto-0.5 and see that the temperature sensor and battery
tasks are longer hanging (see the bug for details how to check it)

Change-Id: I0c8a4e997666a7781b3837f0dbbc47ffbc06b6c3
2012-03-14 20:58:52 +00:00
Gerrit
1a3becdbc2 Merge "Add comxtest debug command" 2012-03-14 09:17:41 -07:00
Gerrit
5f83ab456c Merge "Add back LPC temperature read command as workaround." 2012-03-14 07:06:07 -07:00
Vic Yang
dfe22b2b1e Add back LPC temperature read command as workaround.
Until we solve the I2C hanging issue, we need a reliable way to read
temperature. Add back LPC temperature read command that actually trigger
a I2C read.

Signed-off-by: Vic Yang <victoryang@google.com>

BUG=chrome-os-partner:8452,chrome-os-partner:8495
TEST=none

Change-Id: Icddd1fe3c1f09889bca633af19041a8aca582de9
2012-03-14 20:53:42 +08:00
Gerrit
6f0512752f Merge "Debug command to simulate keystroke" 2012-03-14 01:41:56 -07:00
Vic Yang
7c874a582a Thermal Engine: set lowest fan speed to 4000rpm
Currently temperature polling task sometimes hangs. Until we solve this
problem, fan should not be turned off according to temperature readings.

Signed-off-by: Vic Yang <victoryang@google.com>

BUG=chrome-os-partner:8479
TEST=none

Change-Id: I3892c55dd18d3533515d5537b1a877e4fc36d631
2012-03-14 15:36:20 +08:00
Vic Yang
dcb111f1e6 Debug command to simulate keystroke
Add debug command 'kbpress' to simulate keystroke.

Signed-off-by: Vic Yang <victoryang@google.com>

BUG=chrome-os-partner:8025
TEST='kbpress 3 7 1' pressed 'r' key.

Change-Id: I80eef1e03f0f383e5472b4a7cc53c43ce6c15041
2012-03-14 15:35:19 +08:00
Gerrit
a7b90e65b4 Merge "Temp sensor report 0xfd on sensor unpowered." 2012-03-14 00:34:03 -07:00
Vic Yang
d2fbdfbc67 Temp sensor report 0xfd on sensor unpowered.
Make temp sensor report 0xfd when sensor is unpowered.
Also refactor power specification of temp sensors from thermal.c to
temp_sensor.c.

Signed-off-by: Vic Yang <victoryang@google.com>

BUG=chrome-os-partner:8279
TEST=none

Change-Id: Ib13813bdbac2f048fbc3b98fae5bbf104ebf37d7
2012-03-14 13:32:02 +08:00
Louis Yung-Chieh Lo
20fcd29d42 Add keyboard controller reset command.
To handle outp(0x64, 0xfe) instruction from host.

BUG=chrome-os-partner:8464,chrome-os-partner:8397
TEST= build on bds and l*. tested on proto 0.5.

Change-Id: I8cb3a870b2a5c7a711dc911ba44e154813e9f123
2012-03-14 12:24:46 +08:00
Gerrit
386f4618f3 Merge "Thermal Engine SMI" 2012-03-13 20:04:09 -07:00
Randall Spangler
1c6709a332 Add comxtest debug command
Remove dummy boot-time output to UART1; no longer needed now that
there's a debug command to do the same thing.

Signed-off-by: Randall Spangler <rspangler@chromium.org>

BUG=none
TEST=manual
comxtest - prints default message to x86 UART
comxtext ccc123 - prints 'ccc123' to x86 UART

Change-Id: I37d37aeca06bf71b106f5ad3473a79780fd089a9
2012-03-13 16:52:53 -07:00
Gerrit
f69b2ffc90 Merge "Tidy output of temps command" 2012-03-13 14:43:02 -07:00
Gerrit
221c5b8f43 Merge "Add vboot_init() function in correct place, make it do the switching." 2012-03-13 14:16:44 -07:00
Randall Spangler
8a0cc7756f Tidy output of temps command
Signed-off-by: Randall Spangler <rspangler@chromium.org>

BUG=none
TEST=temps - see, prettier!

Change-Id: Ia11937e8b1be384f7b8386c97aea0eb3e2eef897
2012-03-13 13:43:31 -07:00
Randall Spangler
3eafbbe360 Remove unused temp_sensor.c file
Not compiled into any target; new version of temp_sensor.c is in common/

Signed-off-by: Randall Spangler <rspangler@chromium.org>

BUG=none
TEST=build link and bds

Change-Id: I00232a7cd8a8a9ee6353c5f04c86fcacc83cbd3e
2012-03-13 13:05:59 -07:00
Randall Spangler
eec896d6d8 Watch LPC0RESET line and print changes
For debugging PCH reset.

Signed-off-by: Randall Spangler <rspangler@chromium.org>

BUG=chrome-os-partner:8397
TEST=power system on, then use x86reset to reset it.  Should see line state changes printed.

Change-Id: Ief2f09bd0986339812183d0b32dc0208437d1103
2012-03-13 12:53:52 -07:00