diff options
author | Yuval Peress <peress@chromium.org> | 2021-08-04 11:19:55 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-08-20 14:32:44 +0000 |
commit | 8270698e589f14239b4942a42b27132af497410b (patch) | |
tree | ea10c53f412c229980ea24a6faf8572295b92f75 /chip | |
parent | d63ba9739b77bece9e0be136dd256c89ce2fd688 (diff) | |
download | chrome-ec-8270698e589f14239b4942a42b27132af497410b.tar.gz |
system: fix system_get_scratchpad API
The current API for system_get_scratchpad mixes the status and the value
being read. Update the signature to allow both.
BRANCH=none
BUG=b:195481980
TEST=make testall && zmake testall
Signed-off-by: Yuval Peress <peress@chromium.org>
Change-Id: I3a5f5ad523d507c53a5d474806f58afafb82e70c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3074828
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Diffstat (limited to 'chip')
-rw-r--r-- | chip/host/system.c | 11 | ||||
-rw-r--r-- | chip/ish/system.c | 4 | ||||
-rw-r--r-- | chip/it83xx/system.c | 13 | ||||
-rw-r--r-- | chip/lm4/system.c | 5 | ||||
-rw-r--r-- | chip/mchp/system.c | 5 | ||||
-rw-r--r-- | chip/mec1322/system.c | 5 | ||||
-rw-r--r-- | chip/mt_scp/mt8183/system.c | 5 | ||||
-rw-r--r-- | chip/npcx/system.c | 5 | ||||
-rw-r--r-- | chip/stm32/system.c | 5 |
9 files changed, 29 insertions, 29 deletions
diff --git a/chip/host/system.c b/chip/host/system.c index b685d86a7d..60d765deab 100644 --- a/chip/host/system.c +++ b/chip/host/system.c @@ -225,22 +225,21 @@ int system_set_scratchpad(uint32_t value) return EC_SUCCESS; } -uint32_t system_get_scratchpad(void) +int system_get_scratchpad(uint32_t *value) { FILE *f = get_persistent_storage("scratchpad", "r"); - uint32_t value; int success; if (f == NULL) - return 0; + return EC_ERROR_UNKNOWN; - success = fscanf(f, "%u", &value); + success = fscanf(f, "%u", value); release_persistent_storage(f); if (success) - return value; + return EC_SUCCESS; else - return 0; + return EC_ERROR_UNKNOWN; } static void __jump_resetvec(void) diff --git a/chip/ish/system.c b/chip/ish/system.c index 1e6fe87800..30a2576e5e 100644 --- a/chip/ish/system.c +++ b/chip/ish/system.c @@ -147,9 +147,9 @@ int system_set_scratchpad(uint32_t value) return EC_SUCCESS; } -uint32_t system_get_scratchpad(void) +int system_get_scratchpad(uint32_t *unused) { - return 0; + return EC_ERROR_UNIMPLEMENTED; } void system_hibernate(uint32_t seconds, uint32_t microseconds) diff --git a/chip/it83xx/system.c b/chip/it83xx/system.c index a85cbe7c0f..16871e5826 100644 --- a/chip/it83xx/system.c +++ b/chip/it83xx/system.c @@ -373,16 +373,11 @@ int system_set_scratchpad(uint32_t value) return EC_SUCCESS; } -uint32_t system_get_scratchpad(void) +int system_get_scratchpad(uint32_t *value) { - uint32_t value = 0; - - value |= BRAM_SCRATCHPAD3 << 24; - value |= BRAM_SCRATCHPAD2 << 16; - value |= BRAM_SCRATCHPAD1 << 8; - value |= BRAM_SCRATCHPAD0; - - return value; + *value = (BRAM_SCRATCHPAD3 << 24) | (BRAM_SCRATCHPAD2 << 16) | + (BRAM_SCRATCHPAD1 << 8) | (BRAM_SCRATCHPAD0); + return EC_SUCCESS; } static uint32_t system_get_chip_id(void) diff --git a/chip/lm4/system.c b/chip/lm4/system.c index bdb15d3861..56bd1a82fd 100644 --- a/chip/lm4/system.c +++ b/chip/lm4/system.c @@ -579,9 +579,10 @@ int system_set_scratchpad(uint32_t value) return hibdata_write(HIBDATA_INDEX_SCRATCHPAD, value); } -uint32_t system_get_scratchpad(void) +int system_get_scratchpad(uint32_t *value) { - return hibdata_read(HIBDATA_INDEX_SCRATCHPAD); + *value = hibdata_read(HIBDATA_INDEX_SCRATCHPAD); + return EC_SUCCESS; } const char *system_get_chip_vendor(void) diff --git a/chip/mchp/system.c b/chip/mchp/system.c index c17383bcad..d67314d716 100644 --- a/chip/mchp/system.c +++ b/chip/mchp/system.c @@ -413,9 +413,10 @@ int system_set_scratchpad(uint32_t value) return EC_SUCCESS; } -uint32_t system_get_scratchpad(void) +int system_get_scratchpad(uint32_t *value) { - return MCHP_VBAT_RAM(HIBDATA_INDEX_SCRATCHPAD); + *value = MCHP_VBAT_RAM(HIBDATA_INDEX_SCRATCHPAD); + return EC_SUCCESS; } /* diff --git a/chip/mec1322/system.c b/chip/mec1322/system.c index bfa4a3c031..6e482d3a78 100644 --- a/chip/mec1322/system.c +++ b/chip/mec1322/system.c @@ -218,9 +218,10 @@ int system_set_scratchpad(uint32_t value) return EC_SUCCESS; } -uint32_t system_get_scratchpad(void) +int system_get_scratchpad(uint32_t *value) { - return MEC1322_VBAT_RAM(HIBDATA_INDEX_SCRATCHPAD); + *value = MEC1322_VBAT_RAM(HIBDATA_INDEX_SCRATCHPAD); + return EC_SUCCESS; } void system_hibernate(uint32_t seconds, uint32_t microseconds) diff --git a/chip/mt_scp/mt8183/system.c b/chip/mt_scp/mt8183/system.c index dc822e47d5..03f39298c9 100644 --- a/chip/mt_scp/mt8183/system.c +++ b/chip/mt_scp/mt8183/system.c @@ -35,9 +35,10 @@ int system_set_scratchpad(uint32_t value) return EC_SUCCESS; } -uint32_t system_get_scratchpad(void) +int system_get_scratchpad(uint32_t *value) { - return SCP_GPR[0] & 0xffff; + *value = SCP_GPR[0] & 0xffff; + return EC_SUCCESS; } const char *system_get_chip_vendor(void) diff --git a/chip/npcx/system.c b/chip/npcx/system.c index 48727c2686..ac7056330f 100644 --- a/chip/npcx/system.c +++ b/chip/npcx/system.c @@ -1141,9 +1141,10 @@ int system_set_scratchpad(uint32_t value) return bbram_data_write(BBRM_DATA_INDEX_SCRATCHPAD, value); } -uint32_t system_get_scratchpad(void) +int system_get_scratchpad(uint32_t *value) { - return bbram_data_read(BBRM_DATA_INDEX_SCRATCHPAD); + *value = bbram_data_read(BBRM_DATA_INDEX_SCRATCHPAD); + return EC_SUCCESS; } int system_is_reboot_warm(void) diff --git a/chip/stm32/system.c b/chip/stm32/system.c index 060b4fa227..66158991d2 100644 --- a/chip/stm32/system.c +++ b/chip/stm32/system.c @@ -526,9 +526,10 @@ int system_set_scratchpad(uint32_t value) return bkpdata_write(BKPDATA_INDEX_SCRATCHPAD, (uint16_t)value); } -uint32_t system_get_scratchpad(void) +int system_get_scratchpad(uint32_t *value) { - return (uint32_t)bkpdata_read(BKPDATA_INDEX_SCRATCHPAD); + *value = (uint32_t)bkpdata_read(BKPDATA_INDEX_SCRATCHPAD); + return EC_SUCCESS; } const char *system_get_chip_vendor(void) |