diff options
Diffstat (limited to 'chip')
| -rw-r--r-- | chip/it83xx/registers.h | 6 | ||||
| -rw-r--r-- | chip/it83xx/system.c | 6 | ||||
| -rw-r--r-- | chip/mec1322/system.c | 28 | ||||
| -rw-r--r-- | chip/npcx/system.c | 13 | ||||
| -rw-r--r-- | chip/npcx/system_chip.h | 2 | ||||
| -rw-r--r-- | chip/stm32/system.c | 8 |
6 files changed, 53 insertions, 10 deletions
diff --git a/chip/it83xx/registers.h b/chip/it83xx/registers.h index a90b5b72f2..e47c40e97c 100644 --- a/chip/it83xx/registers.h +++ b/chip/it83xx/registers.h @@ -1075,7 +1075,11 @@ enum bram_indices { BRAM_IDX_RESET_FLAGS2 = 2, BRAM_IDX_RESET_FLAGS3 = 3, - /* index 4 ~ 7 are reserved */ + /* PD state data for CONFIG_USB_PD_DUAL_ROLE uses 2 bytes */ + BRAM_IDX_PD0 = 4, + BRAM_IDX_PD1 = 5, + + /* index 6 ~ 7 are reserved */ BRAM_IDX_SCRATCHPAD = 8, BRAM_IDX_SCRATCHPAD1 = 9, diff --git a/chip/it83xx/system.c b/chip/it83xx/system.c index 055c586cd8..8ba3a970c1 100644 --- a/chip/it83xx/system.c +++ b/chip/it83xx/system.c @@ -232,6 +232,12 @@ static int bram_idx_lookup(enum system_bbram_idx idx) idx <= SYSTEM_BBRAM_IDX_VBNVBLOCK15) return BRAM_IDX_NVCONTEXT + idx - SYSTEM_BBRAM_IDX_VBNVBLOCK0; +#ifdef CONFIG_USB_PD_DUAL_ROLE + if (idx == SYSTEM_BBRAM_IDX_PD0) + return BRAM_IDX_PD0; + if (idx == SYSTEM_BBRAM_IDX_PD1) + return BRAM_IDX_PD1; +#endif return -1; } diff --git a/chip/mec1322/system.c b/chip/mec1322/system.c index 54ff2f45c8..4b2738e969 100644 --- a/chip/mec1322/system.c +++ b/chip/mec1322/system.c @@ -24,6 +24,8 @@ enum hibdata_index { HIBDATA_INDEX_SCRATCHPAD = 0, /* General-purpose scratchpad */ HIBDATA_INDEX_SAVED_RESET_FLAGS, /* Saved reset flags */ + HIBDATA_INDEX_PD0, /* USB-PD0 saved port state */ + HIBDATA_INDEX_PD1, /* USB-PD1 saved port state */ }; static void check_reset_cause(void) @@ -166,14 +168,26 @@ const char *system_get_chip_revision(void) return buf; } -int system_get_bbram(enum system_bbram_idx idx, uint8_t *value) +static int bbram_idx_lookup(enum system_bbram_idx idx) { - enum hibdata_index hibdata; - switch (idx) { +#ifdef CONFIG_USB_PD_DUAL_ROLE + case SYSTEM_BBRAM_IDX_PD0: + return HIBDATA_INDEX_PD0; + case SYSTEM_BBRAM_IDX_PD1: + return HIBDATA_INDEX_PD1; +#endif default: - return EC_ERROR_UNIMPLEMENTED; + return -1; } +} + +int system_get_bbram(enum system_bbram_idx idx, uint8_t *value) +{ + int hibdata = bbram_idx_lookup(idx); + + if (hibdata < 0) + return EC_ERROR_UNIMPLEMENTED; *value = MEC1322_VBAT_RAM(hibdata); return EC_SUCCESS; @@ -181,12 +195,10 @@ int system_get_bbram(enum system_bbram_idx idx, uint8_t *value) int system_set_bbram(enum system_bbram_idx idx, uint8_t value) { - enum hibdata_index hibdata; + int hibdata = bbram_idx_lookup(idx); - switch (idx) { - default: + if (hibdata < 0) return EC_ERROR_UNIMPLEMENTED; - } MEC1322_VBAT_RAM(hibdata) = value; return EC_SUCCESS; diff --git a/chip/npcx/system.c b/chip/npcx/system.c index a747cbf866..97f2611493 100644 --- a/chip/npcx/system.c +++ b/chip/npcx/system.c @@ -87,7 +87,12 @@ void system_watchdog_reset(void) static int bbram_is_byte_access(enum bbram_data_index index) { return (index >= BBRM_DATA_INDEX_VBNVCNTXT && - index < BBRM_DATA_INDEX_RAMLOG); + index < BBRM_DATA_INDEX_RAMLOG) +#ifdef CONFIG_USB_PD_DUAL_ROLE + || index == BBRM_DATA_INDEX_PD0 + || index == BBRM_DATA_INDEX_PD1 +#endif + ; } /** @@ -158,6 +163,12 @@ static int bbram_idx_lookup(enum system_bbram_idx idx) idx <= SYSTEM_BBRAM_IDX_VBNVBLOCK15) return BBRM_DATA_INDEX_VBNVCNTXT + idx - SYSTEM_BBRAM_IDX_VBNVBLOCK0; +#ifdef CONFIG_USB_PD_DUAL_ROLE + if (idx == SYSTEM_BBRAM_IDX_PD0) + return BBRM_DATA_INDEX_PD0; + if (idx == SYSTEM_BBRAM_IDX_PD1) + return BBRM_DATA_INDEX_PD1; +#endif return -1; } diff --git a/chip/npcx/system_chip.h b/chip/npcx/system_chip.h index b15c030dc4..c32c163c6a 100644 --- a/chip/npcx/system_chip.h +++ b/chip/npcx/system_chip.h @@ -13,6 +13,8 @@ enum bbram_data_index { BBRM_DATA_INDEX_SCRATCHPAD = 0, /* General-purpose scratchpad */ BBRM_DATA_INDEX_SAVED_RESET_FLAGS = 4, /* Saved reset flags */ BBRM_DATA_INDEX_WAKE = 8, /* Wake reasons for hibernate */ + BBRM_DATA_INDEX_PD0 = 12, /* USB-PD saved port0 state */ + BBRM_DATA_INDEX_PD1 = 13, /* USB-PD saved port1 state */ BBRM_DATA_INDEX_VBNVCNTXT = 16, /* VbNvContext for ARM arch */ BBRM_DATA_INDEX_RAMLOG = 32, /* RAM log for Booter */ }; diff --git a/chip/stm32/system.c b/chip/stm32/system.c index 466ebc50c9..0dfa92f44c 100644 --- a/chip/stm32/system.c +++ b/chip/stm32/system.c @@ -34,6 +34,8 @@ enum bkpdata_index { BKPDATA_INDEX_SAVED_PANIC_INFO, /* Saved panic data */ BKPDATA_INDEX_SAVED_PANIC_EXCEPTION, /* Saved panic exception code */ #endif + BKPDATA_INDEX_PD0, /* USB-PD saved port0 state */ + BKPDATA_INDEX_PD1, /* USB-PD saved port1 state */ }; /** @@ -346,6 +348,12 @@ static int bkpdata_index_lookup(enum system_bbram_idx idx, int *msb) return BKPDATA_INDEX_VBNV_CONTEXT0 + (idx - SYSTEM_BBRAM_IDX_VBNVBLOCK0) / 2; } +#ifdef CONFIG_USB_PD_DUAL_ROLE + if (idx == SYSTEM_BBRAM_IDX_PD0) + return BKPDATA_INDEX_PD0; + if (idx == SYSTEM_BBRAM_IDX_PD1) + return BKPDATA_INDEX_PD1; +#endif return -1; } |