Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/54077 )
Change subject: soc/amd: factor out acpigen_write_alib_dptc to common code ......................................................................
soc/amd: factor out acpigen_write_alib_dptc to common code
Also drop unneeded intermediate cast to void * before casting the address of the struct dptc_input type variables to uint8_t *.
Signed-off-by: Felix Held felix-coreboot@felixheld.de Change-Id: Ie1e2aa1ec728a4e16d3a587d7400cdfc8962f443 --- M src/soc/amd/cezanne/root_complex.c M src/soc/amd/common/block/acpi/alib.c M src/soc/amd/common/block/include/amdblocks/alib.h M src/soc/amd/picasso/root_complex.c 4 files changed, 33 insertions(+), 45 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/54077/1
diff --git a/src/soc/amd/cezanne/root_complex.c b/src/soc/amd/cezanne/root_complex.c index 68f4473..f101680 100644 --- a/src/soc/amd/cezanne/root_complex.c +++ b/src/soc/amd/cezanne/root_complex.c @@ -195,29 +195,9 @@ config->sustained_power_limit_tablet_mode_mW, config->fast_ppt_limit_tablet_mode_mW, config->slow_ppt_limit_tablet_mode_mW); - /* Scope (_SB) */ - acpigen_write_scope("\_SB");
- /* Method(DPTC, 0, Serialized) */ - acpigen_write_method_serialized("DPTC", 0); - - /* TODO: The code assumes that if DPTC gets called the folowing object exists */ - /* If (LEqual ("_SB.PCI0.LPCB.EC0.TBMD", 1)) */ - acpigen_write_if_lequal_namestr_int("\_SB.PCI0.LPCB.EC0.TBMD", 1); - - acpigen_dptc_call_alib("TABB", (uint8_t *)(void *)&tablet_mode_input, - sizeof(tablet_mode_input)); - - /* Else */ - acpigen_write_else(); - - acpigen_dptc_call_alib("DEFB", (uint8_t *)(void *)&default_input, - sizeof(default_input)); - - acpigen_pop_len(); /* Else */ - - acpigen_pop_len(); /* Method DPTC */ - acpigen_pop_len(); /* Scope _SB */ + acpigen_write_alib_dptc((uint8_t *)&default_input, sizeof(default_input), + (uint8_t *)&tablet_mode_input, sizeof(tablet_mode_input)); }
static void root_complex_fill_ssdt(const struct device *device) diff --git a/src/soc/amd/common/block/acpi/alib.c b/src/soc/amd/common/block/acpi/alib.c index 5e1e8fb..f379bb7 100644 --- a/src/soc/amd/common/block/acpi/alib.c +++ b/src/soc/amd/common/block/acpi/alib.c @@ -4,7 +4,7 @@ #include <amdblocks/alib.h> #include <types.h>
-void acpigen_dptc_call_alib(const char *buf_name, uint8_t *buffer, size_t size) +static void acpigen_dptc_call_alib(const char *buf_name, uint8_t *buffer, size_t size) { /* Name (buf_name, Buffer(size) {...} */ acpigen_write_name(buf_name); @@ -15,3 +15,29 @@ acpigen_write_integer(ALIB_FUNCTION_DYNAMIC_POWER_THERMAL_CONFIG); acpigen_emit_namestring(buf_name); } + +void acpigen_write_alib_dptc(uint8_t *default_param, size_t default_param_len, + uint8_t *tablet_param, size_t tablet_param_len) +{ + /* Scope (_SB) */ + acpigen_write_scope("\_SB"); + + /* Method(DPTC, 0, Serialized) */ + acpigen_write_method_serialized("DPTC", 0); + + /* TODO: The code assumes that if DPTC gets called the folowing object exists */ + /* If (LEqual ("_SB.PCI0.LPCB.EC0.TBMD", 1)) */ + acpigen_write_if_lequal_namestr_int("\_SB.PCI0.LPCB.EC0.TBMD", 1); + + acpigen_dptc_call_alib("TABB", tablet_param, tablet_param_len); + + /* Else */ + acpigen_write_else(); + + acpigen_dptc_call_alib("DEFB", default_param, default_param_len); + + acpigen_pop_len(); /* Else */ + + acpigen_pop_len(); /* Method DPTC */ + acpigen_pop_len(); /* Scope _SB */ +} diff --git a/src/soc/amd/common/block/include/amdblocks/alib.h b/src/soc/amd/common/block/include/amdblocks/alib.h index b9d34c5..61608d5 100644 --- a/src/soc/amd/common/block/include/amdblocks/alib.h +++ b/src/soc/amd/common/block/include/amdblocks/alib.h @@ -21,7 +21,8 @@ uint32_t value; } __packed;
-void acpigen_dptc_call_alib(const char *buf_name, uint8_t *buffer, size_t size); +void acpigen_write_alib_dptc(uint8_t *default_param, size_t default_param_len, + uint8_t *tablet_param, size_t tablet_param_len);
#endif /* !__ACPI__ */
diff --git a/src/soc/amd/picasso/root_complex.c b/src/soc/amd/picasso/root_complex.c index 3517e3d..eee2036 100644 --- a/src/soc/amd/picasso/root_complex.c +++ b/src/soc/amd/picasso/root_complex.c @@ -193,28 +193,9 @@ config->sustained_power_limit_tablet_mode_mW, config->fast_ppt_limit_tablet_mode_mW, config->slow_ppt_limit_tablet_mode_mW); - /* Scope (_SB) */ - acpigen_write_scope("\_SB");
- /* Method(DPTC, 0, Serialized) */ - acpigen_write_method_serialized("DPTC", 0); - - /* If (LEqual ("_SB.PCI0.LPCB.EC0.TBMD", 1)) */ - acpigen_write_if_lequal_namestr_int("\_SB.PCI0.LPCB.EC0.TBMD", 1); - - acpigen_dptc_call_alib("TABB", (uint8_t *)(void *)&tablet_mode_input, - sizeof(tablet_mode_input)); - - /* Else */ - acpigen_write_else(); - - acpigen_dptc_call_alib("DEFB", (uint8_t *)(void *)&default_input, - sizeof(default_input)); - - acpigen_pop_len(); /* Else */ - - acpigen_pop_len(); /* Method DPTC */ - acpigen_pop_len(); /* Scope _SB */ + acpigen_write_alib_dptc((uint8_t *)&default_input, sizeof(default_input), + (uint8_t *)&tablet_mode_input, sizeof(tablet_mode_input)); }
static void root_complex_fill_ssdt(const struct device *device)