summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Delco <delco@chromium.org>2018-07-27 14:01:05 -0700
committerMartin Roth <martinroth@google.com>2018-08-15 18:35:56 +0000
commitc3f9d7a4c38b0c999b6fda5e2dba0016c8f848ce (patch)
treec3e32b0129b19c330113fb515459b55c6795920d
parent6bbfc5e7ddfce91406183f30583a334c6c245ecf (diff)
downloadcoreboot-c3f9d7a4c38b0c999b6fda5e2dba0016c8f848ce.tar.xz
arch/x86/acpigen: refactor calls to acpigen_write_register
All of the callers to acpigen_write_register() also make calls to acpigen_write_resourcetemplate_[header|footer](). This change introduces acpigen_write_register_resource() to unify all of those trio of calls into one. I also made the input parameter const. Change-Id: I10b336acf9f03c423bee9dc38955b1617e11c025 Signed-off-by: Matt Delco <delco@chromium.org> Reviewed-on: https://review.coreboot.org/27672 Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Duncan Laurie <dlaurie@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/arch/x86/acpigen.c21
-rw-r--r--src/arch/x86/include/arch/acpigen.h2
2 files changed, 12 insertions, 11 deletions
diff --git a/src/arch/x86/acpigen.c b/src/arch/x86/acpigen.c
index 732f749209..a614efb002 100644
--- a/src/arch/x86/acpigen.c
+++ b/src/arch/x86/acpigen.c
@@ -578,14 +578,10 @@ void acpigen_write_empty_PTC(void)
acpigen_write_package(2);
/* ControlRegister */
- acpigen_write_resourcetemplate_header();
- acpigen_write_register(&addr);
- acpigen_write_resourcetemplate_footer();
+ acpigen_write_register_resource(&addr);
/* StatusRegister */
- acpigen_write_resourcetemplate_header();
- acpigen_write_register(&addr);
- acpigen_write_resourcetemplate_footer();
+ acpigen_write_register_resource(&addr);
acpigen_pop_len();
}
@@ -725,9 +721,7 @@ void acpigen_write_PSD_package(u32 domain, u32 numprocs, PSD_coord coordtype)
void acpigen_write_CST_package_entry(acpi_cstate_t *cstate)
{
acpigen_write_package(4);
- acpigen_write_resourcetemplate_header();
- acpigen_write_register(&cstate->resource);
- acpigen_write_resourcetemplate_footer();
+ acpigen_write_register_resource(&cstate->resource);
acpigen_write_dword(cstate->ctype);
acpigen_write_dword(cstate->latency);
acpigen_write_dword(cstate->power);
@@ -827,7 +821,7 @@ void acpigen_write_mem32fixed(int readwrite, u32 base, u32 size)
acpigen_emit_dword(size);
}
-void acpigen_write_register(acpi_addr_t *addr)
+static void acpigen_write_register(const acpi_addr_t *addr)
{
acpigen_emit_byte(0x82); /* Register Descriptor */
acpigen_emit_byte(0x0c); /* Register Length 7:0 */
@@ -840,6 +834,13 @@ void acpigen_write_register(acpi_addr_t *addr)
acpigen_emit_dword(addr->addrh); /* Register Address High */
}
+void acpigen_write_register_resource(const acpi_addr_t *addr)
+{
+ acpigen_write_resourcetemplate_header();
+ acpigen_write_register(addr);
+ acpigen_write_resourcetemplate_footer();
+}
+
void acpigen_write_irq(u16 mask)
{
/*
diff --git a/src/arch/x86/include/arch/acpigen.h b/src/arch/x86/include/arch/acpigen.h
index 52aa55b6b8..042c7971b3 100644
--- a/src/arch/x86/include/arch/acpigen.h
+++ b/src/arch/x86/include/arch/acpigen.h
@@ -228,7 +228,7 @@ void acpigen_write_TSS_package(int entries, acpi_tstate_t *tstate_list);
void acpigen_write_TSD_package(u32 domain, u32 numprocs, PSD_coord coordtype);
void acpigen_write_mem32fixed(int readwrite, u32 base, u32 size);
void acpigen_write_io16(u16 min, u16 max, u8 align, u8 len, u8 decode16);
-void acpigen_write_register(acpi_addr_t *addr);
+void acpigen_write_register_resource(const acpi_addr_t *addr);
void acpigen_write_resourcetemplate_header(void);
void acpigen_write_resourcetemplate_footer(void);
void acpigen_write_mainboard_resource_template(void);