diff options
| author | Peter Marheine <pmarheine@chromium.org> | 2022-06-14 16:09:31 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-06-14 20:41:01 +0000 |
| commit | 5f6d5a5768cebd5315e7f0f801d98688367c3a73 (patch) | |
| tree | 1c96df7e54cc174ba22951693fb763015680846b | |
| parent | d4511a09dfd816aece845e449852e017fbd0eafc (diff) | |
| download | chrome-ec-5f6d5a5768cebd5315e7f0f801d98688367c3a73.tar.gz | |
Revert "sm5803: verify CHG_MON_REG settings when sinking"
This reverts commit 042f73594fc0dd58c159f4cbec5133cc0b7be475.
Reason for revert: charger problems appear to have been
caused by low power mode ordering with regard to other operations;
this check was not found to be useful.
Original change's description:
> sm5803: verify CHG_MON_REG settings when sinking
>
> Incorrect settings for this register may be implicated in hardware
> damage that has been observed, so add a runtime check for correct
> configuration before enabling sinking. This should help debugging of
> issues that may be observed and prevent damage.
>
> CMD_CHARGER_DUMP is enabled on Nereid to assist in this investigation.
>
> BUG=b:230712704
> TEST=zmake build nereid, `charger dump` on earlier nereid shows charger
> register 5C reading expected 7A.
> BRANCH=none
>
> Change-Id: If81ec544b7b26ec20316cb7bc92eaa1770b1da77
> Signed-off-by: Peter Marheine <pmarheine@chromium.org>
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3676613
> Reviewed-by: Andrew McRae <amcrae@google.com>
Bug: b:230712704
Change-Id: I866f070b1afd83296d3872772ad6d9dcca6b1ff2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3705676
Reviewed-by: Andrew McRae <amcrae@google.com>
Tested-by: Peter Marheine <pmarheine@chromium.org>
Commit-Queue: Peter Marheine <pmarheine@chromium.org>
| -rw-r--r-- | driver/charger/sm5803.c | 31 | ||||
| -rw-r--r-- | zephyr/projects/nissa/prj_nereid.conf | 4 |
2 files changed, 0 insertions, 35 deletions
diff --git a/driver/charger/sm5803.c b/driver/charger/sm5803.c index f3ea29c9f5..131c611842 100644 --- a/driver/charger/sm5803.c +++ b/driver/charger/sm5803.c @@ -282,8 +282,6 @@ enum ec_error_list sm5803_set_vbus_disch(int chgnum, int enable) return rv; } -static int validate_sink_safety(int chgnum); - enum ec_error_list sm5803_vbus_sink_enable(int chgnum, int enable) { enum ec_error_list rv; @@ -294,16 +292,6 @@ enum ec_error_list sm5803_vbus_sink_enable(int chgnum, int enable) return rv; if (enable) { - /* - * Incorrect value for some registers can cause hardware - * damage; verify current configuration is safe before - * enabling sinking to prevent damage and allow debugging. - * - * TODO(b:230712704) remove this check when cause of - * incorrect behavior is understood. - */ - rv |= validate_sink_safety(chgnum); - if (chgnum == CHARGER_PRIMARY) { /* Magic for new silicon */ if (dev_id >= 3) { @@ -1915,25 +1903,6 @@ static void command_sm5803_dump(int chgnum) } #endif /* CONFIG_CMD_CHARGER_DUMP */ -static int validate_sink_safety(int chgnum) -{ - int regval = 0; - int out = chg_read8(chgnum, 0x5C, ®val); - - if (regval != 0x7A) { - CPRINTS("Register 0x5C had unexpected value 0x%02X" - " when enabling sinking", regval); -#ifdef CONFIG_CMD_CHARGER_DUMP - CPRINTS("Dumping all registers:"); - command_sm5803_dump(chgnum); -#endif - CPRINTS("Updating register 5C to expected 0x7A" - " and continuing.."); - out |= chg_write8(chgnum, 0x5C, 0x7A); - } - return out; -} - const struct charger_drv sm5803_drv = { .init = &sm5803_init, .post_init = &sm5803_post_init, diff --git a/zephyr/projects/nissa/prj_nereid.conf b/zephyr/projects/nissa/prj_nereid.conf index 2508f5b13b..4b0db30556 100644 --- a/zephyr/projects/nissa/prj_nereid.conf +++ b/zephyr/projects/nissa/prj_nereid.conf @@ -8,10 +8,6 @@ CONFIG_CROS_FLASH_IT8XXX2=y CONFIG_CROS_SYSTEM_IT8XXX2=y CONFIG_ESPI_IT8XXX2=y -# Permit more detailed debugging of chargers -# TODO(b:230712704) disable when behavior is better understood -CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_DUMP=y - # Allow more time for the charger to stabilise CONFIG_PLATFORM_EC_POWER_BUTTON_INIT_TIMEOUT=5 |