[S] Change in coreboot[main]: CFR: Add min/max/step values and hex display flag for number options

[Matt DeVillier (Code Review)]

Matt DeVillier has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86039?usp=email )

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

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

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86039
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
---
M src/commonlib/include/commonlib/cfr.h
M src/drivers/option/cfr.c
M src/drivers/option/cfr_frontend.h
3 files changed, 30 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved

diff --git a/src/commonlib/include/commonlib/cfr.h b/src/commonlib/include/commonlib/cfr.h
index 570ce3c..af68269 100644
--- a/src/commonlib/include/commonlib/cfr.h
+++ b/src/commonlib/include/commonlib/cfr.h
@@ -121,6 +121,15 @@
     */
 };

+/*
+ * 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 @@
    			 */
    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
diff --git a/src/drivers/option/cfr.c b/src/drivers/option/cfr.c
index c439ed9..26bdd55 100644
--- a/src/drivers/option/cfr.c
+++ b/src/drivers/option/cfr.c
@@ -104,8 +104,9 @@

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 @@
    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 @@
 {
    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 @@
 {
    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 @@
 {
    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);
 }

diff --git a/src/drivers/option/cfr_frontend.h b/src/drivers/option/cfr_frontend.h
index 21c18e7..17332bd 100644
--- a/src/drivers/option/cfr_frontend.h
+++ b/src/drivers/option/cfr_frontend.h
@@ -30,6 +30,10 @@
    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 {