erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CFR: Add min/max/step values and hex display flag for number options

Browse source 
This commit adds support for minimum/maximum limit values as well as
step sizes for CFR number options. Additionally, add a new flag that
specifies the option should be displayed in hexadecimal notation instead
of decimal.

Change-Id: I2e70f1430fb1911f1ad974832f8abfe76f928ac3
Signed-off-by: Filip Brozovic <fbrozovic@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86039
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Filip Brozovic 2025-01-21 12:02:10 +01:00 • committed by Matt DeVillier
commit 3a6481aeb2
3 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/commonlib/include/commonlib/cfr.h
View file

@ -121,6 +121,15 @@ struct __packed lb_cfr_enum_value {
*/
};
/*
* The optional flags describe how a numeric option is to be displayed.
* CFR_NUM_OPT_DISPFLAG_HEX:
* Displays a NUMBER option in hexadecimal instead of decimal notation.
*/
enum cfr_numeric_option_display_flags {
CFR_NUM_OPT_DISPFLAG_HEX = 1 << 0,
};
/* Supports multiple option types: ENUM, NUMBER, BOOL */
struct __packed lb_cfr_numeric_option {
uint32_t tag; /*
@ -134,6 +143,11 @@ struct __packed lb_cfr_numeric_option {
*/
uint32_t flags; /* enum cfr_option_flags */
uint32_t default_value;
uint32_t min;
uint32_t max;
uint32_t step;
uint32_t display_flags; /* enum cfr_numeric_option_display_flags */
/*
* struct lb_cfr_varbinary opt_name
* struct lb_cfr_varbinary ui_name

18
src/drivers/option/cfr.c
View file

@ -104,8 +104,9 @@ static uint32_t sm_write_enum_value(char *current, const struct sm_enum_value *e
static uint32_t write_numeric_option(char *current, uint32_t tag, const uint64_t object_id,
const char *opt_name, const char *ui_name, const char *ui_helptext,
uint32_t flags, uint32_t default_value, const struct sm_enum_value *values,
const uint64_t dep_id, const uint32_t *dep_values, const uint32_t num_dep_values)
uint32_t flags, uint32_t default_value, uint32_t min, uint32_t max, uint32_t step,
uint32_t display_flags, const struct sm_enum_value *values, const uint64_t dep_id,
const uint32_t *dep_values, const uint32_t num_dep_values)
{
struct lb_cfr_numeric_option *option = (struct lb_cfr_numeric_option *)current;
size_t len;
@ -117,6 +118,10 @@ static uint32_t write_numeric_option(char *current, uint32_t tag, const uint64_t
if (option->flags & (CFR_OPTFLAG_INACTIVE | CFR_OPTFLAG_VOLATILE))
option->flags |= CFR_OPTFLAG_READONLY;
option->default_value = default_value;
option->min = (min <= max) ? min : 0;
option->max = (min == 0 && max == 0) ? UINT32_MAX : max;
option->step = step;
option->display_flags = display_flags;
option->size = sizeof(*option);
current += option->size;
@ -148,7 +153,7 @@ static uint32_t sm_write_opt_enum(char *current, const struct sm_obj_enum *sm_en
{
return write_numeric_option(current, CFR_TAG_OPTION_ENUM, object_id,
sm_enum->opt_name, sm_enum->ui_name, sm_enum->ui_helptext,
sm_enum->flags, sm_enum->default_value, sm_enum->values,
sm_enum->flags, sm_enum->default_value, 0, 0, 0, 0, sm_enum->values,
dep_id, dep_values, num_dep_values);
}
@ -159,8 +164,9 @@ static uint32_t sm_write_opt_number(char *current, const struct sm_obj_number *s
{
return write_numeric_option(current, CFR_TAG_OPTION_NUMBER, object_id,
sm_number->opt_name, sm_number->ui_name, sm_number->ui_helptext,
sm_number->flags, sm_number->default_value, NULL, dep_id,
dep_values, num_dep_values);
sm_number->flags, sm_number->default_value, sm_number->min, sm_number->max,
sm_number->step, sm_number->display_flags, NULL, dep_id, dep_values,
num_dep_values);
}
static uint32_t sm_write_opt_bool(char *current, const struct sm_obj_bool *sm_bool,
@ -170,7 +176,7 @@ static uint32_t sm_write_opt_bool(char *current, const struct sm_obj_bool *sm_bo
{
return write_numeric_option(current, CFR_TAG_OPTION_BOOL, object_id,
sm_bool->opt_name, sm_bool->ui_name, sm_bool->ui_helptext,
sm_bool->flags, sm_bool->default_value, NULL, dep_id,
sm_bool->flags, sm_bool->default_value, 0, 0, 0, 0, NULL, dep_id,
dep_values, num_dep_values);
}

4
src/drivers/option/cfr_frontend.h
View file

@ -30,6 +30,10 @@ struct sm_obj_number {
const char *ui_name;
const char *ui_helptext;
uint32_t default_value;
uint32_t min;
uint32_t max;
uint32_t step;
uint32_t display_flags; /* enum cfr_numeric_option_display_flags */
};
struct sm_obj_bool {