diff options
author | Randall Spangler <rspangler@chromium.org> | 2017-07-25 16:22:27 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2017-07-31 21:39:39 -0700 |
commit | 00ea73ab166ebc8a2c4b5693b7fa776c76c7fe45 (patch) | |
tree | c99009ec5bce12c97a85a32695bd7f0f435c1e2c /common/ccd_config.c | |
parent | ddbfe690e294e595c6ed3511dcf417410d9b2804 (diff) | |
download | chrome-ec-00ea73ab166ebc8a2c4b5693b7fa776c76c7fe45.tar.gz |
usb_i2c: Fail if board I2C bridge is disabled
Add usb_i2c_board_is_enabled().
On Cr50, this is now also connected to the I2C CCD capability. The
USB-I2C bridge can only be used when the capability is available.
On other platforms (Servo V4, etc.) where usb_i2c_board_enable() is
a no-op, add a dummy implementation which always returns true.
See go/cr50-ccd-wp for more information.
BUG=b:62537474
BRANCH=cr50
TEST=manual with CR50_DEV=1
Connect host PC to dev board USB port
On host PC:
sudo servod -c ccd_cr50.xml -c reef_r1_inas.xml
dut-control pp3300_ec_shv_reg --> fail, error 0x8001
ccdoops --> reset I2C config
ccd i2c disable --> I2C disabled
On host PC:
sudo servod -c ccd_cr50.xml -c reef_r1_inas.xml
dut-control pp3300_ec_shv_reg --> fail, error 0x0006
ccd i2c enable --> I2C enabled
ccdunlock --> I2C disabled
ccdoops --> I2C enabled
ccdset i2c unlesslocked
ccdlock --> I2C disabled
ccdunlock --> I2C enabled
Change-Id: Ia3df32e239a5f7c5915bc6c7e408ce0dc8b26c89
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/590577
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
Diffstat (limited to 'common/ccd_config.c')
-rw-r--r-- | common/ccd_config.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/common/ccd_config.c b/common/ccd_config.c index 5b6b11c1b8..e068d2c46c 100644 --- a/common/ccd_config.c +++ b/common/ccd_config.c @@ -136,6 +136,7 @@ static const struct ccd_capability_info cap_info[CCD_CAP_COUNT] = { {"OpenNoLongPP", CCD_CAP_STATE_IF_OPENED}, {"BatteryBypassPP", CCD_CAP_STATE_ALWAYS}, {"UpdateNoTPMWipe", CCD_CAP_STATE_ALWAYS}, + {"I2C", CCD_CAP_STATE_IF_OPENED}, }; static const char *ccd_state_names[CCD_STATE_COUNT] = { |