diff options
Diffstat (limited to 'zephyr/shim/src/cbi/cros_cbi_fw_config.c')
| -rw-r--r-- | zephyr/shim/src/cbi/cros_cbi_fw_config.c | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/zephyr/shim/src/cbi/cros_cbi_fw_config.c b/zephyr/shim/src/cbi/cros_cbi_fw_config.c index e94c950a0f..6710a30726 100644 --- a/zephyr/shim/src/cbi/cros_cbi_fw_config.c +++ b/zephyr/shim/src/cbi/cros_cbi_fw_config.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The Chromium OS Authors. All rights reserved. +/* Copyright 2022 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -20,15 +20,15 @@ LOG_MODULE_REGISTER(cros_cbi_fw_config, LOG_LEVEL_ERR); * Statically count the number of bits set in a 32 bit constant expression. */ #define BIT_SET(v, b) ((v >> b) & 1) -#define BIT_COUNT(v) \ +#define BIT_COUNT(v) \ (BIT_SET(v, 31) + BIT_SET(v, 30) + BIT_SET(v, 29) + BIT_SET(v, 28) + \ BIT_SET(v, 27) + BIT_SET(v, 26) + BIT_SET(v, 25) + BIT_SET(v, 24) + \ BIT_SET(v, 23) + BIT_SET(v, 22) + BIT_SET(v, 21) + BIT_SET(v, 20) + \ BIT_SET(v, 19) + BIT_SET(v, 18) + BIT_SET(v, 17) + BIT_SET(v, 16) + \ BIT_SET(v, 15) + BIT_SET(v, 14) + BIT_SET(v, 13) + BIT_SET(v, 12) + \ - BIT_SET(v, 11) + BIT_SET(v, 10) + BIT_SET(v, 9) + BIT_SET(v, 8) + \ - BIT_SET(v, 7) + BIT_SET(v, 6) + BIT_SET(v, 5) + BIT_SET(v, 4) + \ - BIT_SET(v, 3) + BIT_SET(v, 2) + BIT_SET(v, 1) + BIT_SET(v, 0)) + BIT_SET(v, 11) + BIT_SET(v, 10) + BIT_SET(v, 9) + BIT_SET(v, 8) + \ + BIT_SET(v, 7) + BIT_SET(v, 6) + BIT_SET(v, 5) + BIT_SET(v, 4) + \ + BIT_SET(v, 3) + BIT_SET(v, 2) + BIT_SET(v, 1) + BIT_SET(v, 0)) /* * Shorthand macros to access properties on the field node. @@ -64,7 +64,7 @@ LOG_MODULE_REGISTER(cros_cbi_fw_config, LOG_LEVEL_ERR); * fw_config nodes, and another for the child field nodes in each * of the fw_config nodes. */ -#define PLUS_FIELD_SIZE(inst) + DT_PROP(inst, size) +#define PLUS_FIELD_SIZE(inst) +DT_PROP(inst, size) #define FIELDS_ALL_SIZE(inst) \ DT_FOREACH_CHILD_STATUS_OKAY(inst, PLUS_FIELD_SIZE) @@ -83,23 +83,21 @@ BUILD_ASSERT(TOTAL_FW_CONFIG_NODES_SIZE <= 32, * total of the sizes. They should match. */ #define OR_FIELD_SHIFT_MASK(id) | FW_SHIFT_MASK(id) -#define FIELDS_ALL_BITS_SET(inst) \ +#define FIELDS_ALL_BITS_SET(inst) \ DT_FOREACH_CHILD_STATUS_OKAY(inst, OR_FIELD_SHIFT_MASK) #define TOTAL_BITS_SET \ - (0 DT_FOREACH_STATUS_OKAY(CBI_FW_CONFIG_COMPAT, \ - FIELDS_ALL_BITS_SET)) + (0 DT_FOREACH_STATUS_OKAY(CBI_FW_CONFIG_COMPAT, FIELDS_ALL_BITS_SET)) BUILD_ASSERT(BIT_COUNT(TOTAL_BITS_SET) == TOTAL_FW_CONFIG_NODES_SIZE, - "CBI FW Config has overlapping fields"); + "CBI FW Config has overlapping fields"); /* * Validation for each assigned field values. * The value must fit within the parent's defined size. */ -#define FW_VALUE_BUILD_ASSERT(inst) \ - BUILD_ASSERT(DT_PROP(inst, value) < \ - (1 << FW_PARENT_SIZE(inst)), \ +#define FW_VALUE_BUILD_ASSERT(inst) \ + BUILD_ASSERT(DT_PROP(inst, value) < (1 << FW_PARENT_SIZE(inst)), \ "CBI FW Config value too big"); DT_FOREACH_STATUS_OKAY(CBI_FW_CONFIG_VALUE_COMPAT, FW_VALUE_BUILD_ASSERT) @@ -144,9 +142,9 @@ DT_FOREACH_STATUS_OKAY(CBI_FW_CONFIG_VALUE_COMPAT, FW_VALUE_BUILD_ASSERT) * The per-field case statement. * Extract the field value using the start and size. */ -#define FW_FIELD_CASE(id, cached, value) \ - case CBI_FW_CONFIG_ENUM(id): \ - *value = (cached >> FW_START(id)) & FW_MASK(id); \ +#define FW_FIELD_CASE(id, cached, value) \ + case CBI_FW_CONFIG_ENUM(id): \ + *value = (cached >> FW_START(id)) & FW_MASK(id); \ break; /* @@ -173,10 +171,9 @@ void cros_cbi_fw_config_init(void) LOG_INF("Read CBI FW Config : 0x%08X\n", cached_fw_config); } -static int cros_cbi_fw_config_get_field( - uint32_t cached_fw_config, - enum cbi_fw_config_field_id field_id, - uint32_t *value) +static int cros_cbi_fw_config_get_field(uint32_t cached_fw_config, + enum cbi_fw_config_field_id field_id, + uint32_t *value) { switch (field_id) { /* @@ -184,8 +181,7 @@ static int cros_cbi_fw_config_get_field( * and create cases for all of their child nodes. */ DT_FOREACH_STATUS_OKAY_VARGS(CBI_FW_CONFIG_COMPAT, - FW_FIELD_NODES, - cached_fw_config, + FW_FIELD_NODES, cached_fw_config, value) default: return -EINVAL; |