coreboot-gerrit May 2015

coreboot-gerrit@coreboot.org

1 participants
1299 discussions

Patch set updated for coreboot: 1213630 Make acpi_fill_hest into parameter
by Vladimir Serbinenko 14 May '15

14 May '15

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7373 -gerrit commit 1213630214f1de873a8c2d6f9191dc0cdbd167a9 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sun Nov 9 13:36:18 2014 +0100 Make acpi_fill_hest into parameter Change-Id: Ie96475babb4aa4ea8db49023af5b31bfa63b21dc Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/arch/x86/boot/acpi.c | 8 ++------ src/arch/x86/include/arch/acpi.h | 4 ++-- src/northbridge/amd/agesa/family12/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family14/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family15/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family15rl/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family15tn/northbridge.c | 5 +++-- src/northbridge/amd/agesa/family16kb/northbridge.c | 4 ++-- src/northbridge/amd/pi/00630F01/northbridge.c | 4 ++-- src/northbridge/amd/pi/00730F01/northbridge.c | 4 ++-- 10 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index bc2a0cc..bb994e2 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -554,11 +554,6 @@ static void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, rsdp->ext_checksum = acpi_checksum((void *)rsdp, sizeof(acpi_rsdp_t)); } -unsigned long __attribute__((weak)) acpi_fill_hest(acpi_hest_t *hest) -{ - return (unsigned long)hest; -} - unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t *esd, u16 type, void *data, u16 data_len) { acpi_header_t *header = &(hest->header); @@ -618,7 +613,8 @@ unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t * } /* ACPI 4.0 */ -void acpi_write_hest(acpi_hest_t *hest) +void acpi_write_hest(acpi_hest_t *hest, + unsigned long (*acpi_fill_hest)(acpi_hest_t *hest)) { acpi_header_t *header = &(hest->header); diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index da1a020..bb78aaa 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -546,10 +546,10 @@ unsigned long acpi_create_dmar_drhd(unsigned long current, u8 flags, void acpi_dmar_drhd_fixup(unsigned long base, unsigned long current); unsigned long acpi_create_dmar_drhd_ds_pci(unsigned long current, u8 segment, u8 dev, u8 fn); +void acpi_write_hest(acpi_hest_t *hest, + unsigned long (*acpi_fill_hest)(acpi_hest_t *hest)); -void acpi_write_hest(acpi_hest_t *hest); unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t *esd, u16 type, void *data, u16 len); -unsigned long acpi_fill_hest(acpi_hest_t *hest); void acpi_save_gnvs(u32 gnvs_address); diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c index 26d4eee..7dabf4b 100644 --- a/src/northbridge/amd/agesa/family12/northbridge.c +++ b/src/northbridge/amd/agesa/family12/northbridge.c @@ -793,7 +793,7 @@ static void cpu_bus_init(device_t dev) /* North Bridge Structures */ -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -843,7 +843,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c index e4da36c..a65140c 100644 --- a/src/northbridge/amd/agesa/family14/northbridge.c +++ b/src/northbridge/amd/agesa/family14/northbridge.c @@ -815,7 +815,7 @@ static void northbridge_fill_ssdt_generator(void) acpigen_pop_len(); } -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -845,7 +845,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c index 14f56f2..8a909e6 100644 --- a/src/northbridge/amd/agesa/family15/northbridge.c +++ b/src/northbridge/amd/agesa/family15/northbridge.c @@ -483,7 +483,7 @@ static unsigned scan_chains(device_t dev, unsigned max) } -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -534,7 +534,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/agesa/family15rl/northbridge.c b/src/northbridge/amd/agesa/family15rl/northbridge.c index b9baf0c..e7ecfa7 100644 --- a/src/northbridge/amd/agesa/family15rl/northbridge.c +++ b/src/northbridge/amd/agesa/family15rl/northbridge.c @@ -459,7 +459,7 @@ static void set_resources(struct device *dev) } } -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -511,7 +511,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index 29337fb..840deaf 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -458,7 +458,8 @@ static void nb_set_resources(device_t dev) } } -unsigned long acpi_fill_hest(acpi_hest_t *hest) + +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -510,7 +511,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c index 86d5a92..c557e8d 100644 --- a/src/northbridge/amd/agesa/family16kb/northbridge.c +++ b/src/northbridge/amd/agesa/family16kb/northbridge.c @@ -459,7 +459,7 @@ static void set_resources(device_t dev) } -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -511,7 +511,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c index 76581cd..6240b7e 100644 --- a/src/northbridge/amd/pi/00630F01/northbridge.c +++ b/src/northbridge/amd/pi/00630F01/northbridge.c @@ -453,7 +453,7 @@ static void set_resources(device_t dev) } } -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -505,7 +505,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c index 4f646f7..0e38f3e 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -447,7 +447,7 @@ static void northbridge_init(struct device *dev) { } -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -499,7 +499,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length;

1 0

Patch set updated for coreboot: e27e063 gm45: Link cstates.c rather than including it.
by Vladimir Serbinenko 14 May '15

14 May '15

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7375 -gerrit commit e27e063ad9d44017b50a8cb23c04ba7ac19edcba Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sun Nov 9 13:44:36 2014 +0100 gm45: Link cstates.c rather than including it. The comment about necessity of include isn't true anymore as get_cst_entries is not weak anymore so if it's not found, the linking would fail. Change-Id: I4bf88208d63ac3e625f464c3907e2e1ea575dd9f Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/mainboard/lenovo/x200/Makefile.inc | 1 + src/mainboard/lenovo/x200/mainboard.c | 3 --- src/mainboard/roda/rk9/Makefile.inc | 2 ++ src/mainboard/roda/rk9/mainboard.c | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/mainboard/lenovo/x200/Makefile.inc b/src/mainboard/lenovo/x200/Makefile.inc index 4eb1216..c3c8a0e 100644 --- a/src/mainboard/lenovo/x200/Makefile.inc +++ b/src/mainboard/lenovo/x200/Makefile.inc @@ -18,3 +18,4 @@ ## ramstage-y += dock.c +ramstage-y += cstates.c diff --git a/src/mainboard/lenovo/x200/mainboard.c b/src/mainboard/lenovo/x200/mainboard.c index 5354834..8ba7a35 100644 --- a/src/mainboard/lenovo/x200/mainboard.c +++ b/src/mainboard/lenovo/x200/mainboard.c @@ -32,9 +32,6 @@ #include <ec/acpi/ec.h> #include <ec/lenovo/h8/h8.h> -#include "cstates.c" /* Include it, as the linker won't find - the overloaded weak function in there. */ - const char *smbios_mainboard_bios_version(void) { static char *s = NULL; diff --git a/src/mainboard/roda/rk9/Makefile.inc b/src/mainboard/roda/rk9/Makefile.inc index 1a6cb02..d69f715 100644 --- a/src/mainboard/roda/rk9/Makefile.inc +++ b/src/mainboard/roda/rk9/Makefile.inc @@ -18,3 +18,5 @@ ## ramstage-$(CONFIG_CARDBUS_PLUGIN_SUPPORT) += ti_pci7xx1.c +ramstage-y += cstates.c + diff --git a/src/mainboard/roda/rk9/mainboard.c b/src/mainboard/roda/rk9/mainboard.c index 4ae004b..1b607cc 100644 --- a/src/mainboard/roda/rk9/mainboard.c +++ b/src/mainboard/roda/rk9/mainboard.c @@ -26,9 +26,6 @@ #include <pc80/keyboard.h> #include <ec/acpi/ec.h> -#include "cstates.c" /* Include it, as the linker won't find - the overloaded weak function in there. */ - static void ec_setup(void) { /* Thermal limits? Values are from ectool's ram dump. */

1 0

Patch set updated for coreboot: c728dba speedstep: Don't supply weak get_cst_entries.
by Vladimir Serbinenko 14 May '15

14 May '15

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7368 -gerrit commit c728dba6e38e9387b86891c41269e1ee76e9f7d8 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sun Nov 9 12:59:29 2014 +0100 speedstep: Don't supply weak get_cst_entries. This should be overriden by mobo even if it's no-op override. weak function in this case would only hide real problems. Change-Id: I30dd671eb605b490a51153d00ae308c4bdef3d05 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/cpu/intel/speedstep/acpi.c | 13 ------------- src/mainboard/getac/p470/Makefile.inc | 1 + src/mainboard/getac/p470/cstates.c | 7 +++++++ src/mainboard/ibase/mb899/Makefile.inc | 1 + src/mainboard/ibase/mb899/cstates.c | 7 +++++++ src/mainboard/intel/d945gclf/Makefile.inc | 1 + src/mainboard/intel/d945gclf/cstates.c | 7 +++++++ src/mainboard/intel/eagleheights/Makefile.inc | 1 + src/mainboard/intel/eagleheights/cstates.c | 7 +++++++ src/mainboard/iwave/iWRainbowG6/Makefile.inc | 1 + src/mainboard/iwave/iWRainbowG6/cstates.c | 7 +++++++ src/mainboard/kontron/986lcd-m/Makefile.inc | 1 + src/mainboard/kontron/986lcd-m/cstates.c | 7 +++++++ src/mainboard/roda/rk886ex/Makefile.inc | 1 + src/mainboard/roda/rk886ex/cstates.c | 7 +++++++ 15 files changed, 56 insertions(+), 13 deletions(-) diff --git a/src/cpu/intel/speedstep/acpi.c b/src/cpu/intel/speedstep/acpi.c index 8a2bff1..0217f71 100644 --- a/src/cpu/intel/speedstep/acpi.c +++ b/src/cpu/intel/speedstep/acpi.c @@ -29,19 +29,6 @@ #include <cpu/intel/speedstep.h> #include <device/device.h> -/** - * @brief Returns c-state entries for this system - * - * This function is usually overwritten in mainboard code. - * - * @return Number of c-states *entries will point to. - */ -int __attribute__((weak)) get_cst_entries(acpi_cstate_t **entries - __attribute__((unused))) -{ - return 0; -} - static int determine_total_number_of_cores(void) { struct device *cpu; diff --git a/src/mainboard/getac/p470/Makefile.inc b/src/mainboard/getac/p470/Makefile.inc index 1ba662e..39c6a2b 100644 --- a/src/mainboard/getac/p470/Makefile.inc +++ b/src/mainboard/getac/p470/Makefile.inc @@ -17,3 +17,4 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +ramstage-y += cstates.c diff --git a/src/mainboard/getac/p470/cstates.c b/src/mainboard/getac/p470/cstates.c new file mode 100644 index 0000000..2d543ff --- /dev/null +++ b/src/mainboard/getac/p470/cstates.c @@ -0,0 +1,7 @@ +#include <device/device.h> +#include <arch/x86/include/arch/acpigen.h> + +int get_cst_entries(acpi_cstate_t **entries) +{ + return 0; +} diff --git a/src/mainboard/ibase/mb899/Makefile.inc b/src/mainboard/ibase/mb899/Makefile.inc index c4e781b..0b70b89 100644 --- a/src/mainboard/ibase/mb899/Makefile.inc +++ b/src/mainboard/ibase/mb899/Makefile.inc @@ -1 +1,2 @@ ramstage-y += superio_hwm.c +ramstage-y += cstates.c diff --git a/src/mainboard/ibase/mb899/cstates.c b/src/mainboard/ibase/mb899/cstates.c new file mode 100644 index 0000000..2d543ff --- /dev/null +++ b/src/mainboard/ibase/mb899/cstates.c @@ -0,0 +1,7 @@ +#include <device/device.h> +#include <arch/x86/include/arch/acpigen.h> + +int get_cst_entries(acpi_cstate_t **entries) +{ + return 0; +} diff --git a/src/mainboard/intel/d945gclf/Makefile.inc b/src/mainboard/intel/d945gclf/Makefile.inc new file mode 100644 index 0000000..f9621db --- /dev/null +++ b/src/mainboard/intel/d945gclf/Makefile.inc @@ -0,0 +1 @@ +ramstage-y += cstates.c diff --git a/src/mainboard/intel/d945gclf/cstates.c b/src/mainboard/intel/d945gclf/cstates.c new file mode 100644 index 0000000..2d543ff --- /dev/null +++ b/src/mainboard/intel/d945gclf/cstates.c @@ -0,0 +1,7 @@ +#include <device/device.h> +#include <arch/x86/include/arch/acpigen.h> + +int get_cst_entries(acpi_cstate_t **entries) +{ + return 0; +} diff --git a/src/mainboard/intel/eagleheights/Makefile.inc b/src/mainboard/intel/eagleheights/Makefile.inc new file mode 100644 index 0000000..f9621db --- /dev/null +++ b/src/mainboard/intel/eagleheights/Makefile.inc @@ -0,0 +1 @@ +ramstage-y += cstates.c diff --git a/src/mainboard/intel/eagleheights/cstates.c b/src/mainboard/intel/eagleheights/cstates.c new file mode 100644 index 0000000..2d543ff --- /dev/null +++ b/src/mainboard/intel/eagleheights/cstates.c @@ -0,0 +1,7 @@ +#include <device/device.h> +#include <arch/x86/include/arch/acpigen.h> + +int get_cst_entries(acpi_cstate_t **entries) +{ + return 0; +} diff --git a/src/mainboard/iwave/iWRainbowG6/Makefile.inc b/src/mainboard/iwave/iWRainbowG6/Makefile.inc new file mode 100644 index 0000000..f9621db --- /dev/null +++ b/src/mainboard/iwave/iWRainbowG6/Makefile.inc @@ -0,0 +1 @@ +ramstage-y += cstates.c diff --git a/src/mainboard/iwave/iWRainbowG6/cstates.c b/src/mainboard/iwave/iWRainbowG6/cstates.c new file mode 100644 index 0000000..2d543ff --- /dev/null +++ b/src/mainboard/iwave/iWRainbowG6/cstates.c @@ -0,0 +1,7 @@ +#include <device/device.h> +#include <arch/x86/include/arch/acpigen.h> + +int get_cst_entries(acpi_cstate_t **entries) +{ + return 0; +} diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.inc new file mode 100644 index 0000000..f9621db --- /dev/null +++ b/src/mainboard/kontron/986lcd-m/Makefile.inc @@ -0,0 +1 @@ +ramstage-y += cstates.c diff --git a/src/mainboard/kontron/986lcd-m/cstates.c b/src/mainboard/kontron/986lcd-m/cstates.c new file mode 100644 index 0000000..2d543ff --- /dev/null +++ b/src/mainboard/kontron/986lcd-m/cstates.c @@ -0,0 +1,7 @@ +#include <device/device.h> +#include <arch/x86/include/arch/acpigen.h> + +int get_cst_entries(acpi_cstate_t **entries) +{ + return 0; +} diff --git a/src/mainboard/roda/rk886ex/Makefile.inc b/src/mainboard/roda/rk886ex/Makefile.inc index 7a05dc3..402b4f5 100644 --- a/src/mainboard/roda/rk886ex/Makefile.inc +++ b/src/mainboard/roda/rk886ex/Makefile.inc @@ -18,3 +18,4 @@ ## ramstage-y += m3885.c +ramstage-y += cstates.c diff --git a/src/mainboard/roda/rk886ex/cstates.c b/src/mainboard/roda/rk886ex/cstates.c new file mode 100644 index 0000000..2d543ff --- /dev/null +++ b/src/mainboard/roda/rk886ex/cstates.c @@ -0,0 +1,7 @@ +#include <device/device.h> +#include <arch/x86/include/arch/acpigen.h> + +int get_cst_entries(acpi_cstate_t **entries) +{ + return 0; +}

1 0

Patch set updated for coreboot: 4811bad Make acpi_fill_hest into parameter
by Vladimir Serbinenko 14 May '15

14 May '15

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7373 -gerrit commit 4811badf98c11ac15e323bc22ed56c7ad9ca65be Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sun Nov 9 13:36:18 2014 +0100 Make acpi_fill_hest into parameter Change-Id: Ie96475babb4aa4ea8db49023af5b31bfa63b21dc Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/arch/x86/boot/acpi.c | 8 ++------ src/arch/x86/include/arch/acpi.h | 4 ++-- src/northbridge/amd/agesa/family12/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family14/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family15/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family15tn/northbridge.c | 5 +++-- src/northbridge/amd/agesa/family16kb/northbridge.c | 4 ++-- src/northbridge/amd/pi/00730F01/northbridge.c | 4 ++-- 8 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index bc2a0cc..bb994e2 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -554,11 +554,6 @@ static void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, rsdp->ext_checksum = acpi_checksum((void *)rsdp, sizeof(acpi_rsdp_t)); } -unsigned long __attribute__((weak)) acpi_fill_hest(acpi_hest_t *hest) -{ - return (unsigned long)hest; -} - unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t *esd, u16 type, void *data, u16 data_len) { acpi_header_t *header = &(hest->header); @@ -618,7 +613,8 @@ unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t * } /* ACPI 4.0 */ -void acpi_write_hest(acpi_hest_t *hest) +void acpi_write_hest(acpi_hest_t *hest, + unsigned long (*acpi_fill_hest)(acpi_hest_t *hest)) { acpi_header_t *header = &(hest->header); diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index da1a020..bb78aaa 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -546,10 +546,10 @@ unsigned long acpi_create_dmar_drhd(unsigned long current, u8 flags, void acpi_dmar_drhd_fixup(unsigned long base, unsigned long current); unsigned long acpi_create_dmar_drhd_ds_pci(unsigned long current, u8 segment, u8 dev, u8 fn); +void acpi_write_hest(acpi_hest_t *hest, + unsigned long (*acpi_fill_hest)(acpi_hest_t *hest)); -void acpi_write_hest(acpi_hest_t *hest); unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t *esd, u16 type, void *data, u16 len); -unsigned long acpi_fill_hest(acpi_hest_t *hest); void acpi_save_gnvs(u32 gnvs_address); diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c index 26d4eee..7dabf4b 100644 --- a/src/northbridge/amd/agesa/family12/northbridge.c +++ b/src/northbridge/amd/agesa/family12/northbridge.c @@ -793,7 +793,7 @@ static void cpu_bus_init(device_t dev) /* North Bridge Structures */ -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -843,7 +843,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c index e4da36c..a65140c 100644 --- a/src/northbridge/amd/agesa/family14/northbridge.c +++ b/src/northbridge/amd/agesa/family14/northbridge.c @@ -815,7 +815,7 @@ static void northbridge_fill_ssdt_generator(void) acpigen_pop_len(); } -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -845,7 +845,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c index 14f56f2..8a909e6 100644 --- a/src/northbridge/amd/agesa/family15/northbridge.c +++ b/src/northbridge/amd/agesa/family15/northbridge.c @@ -483,7 +483,7 @@ static unsigned scan_chains(device_t dev, unsigned max) } -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -534,7 +534,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index 29337fb..840deaf 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -458,7 +458,8 @@ static void nb_set_resources(device_t dev) } } -unsigned long acpi_fill_hest(acpi_hest_t *hest) + +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -510,7 +511,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c index 86d5a92..c557e8d 100644 --- a/src/northbridge/amd/agesa/family16kb/northbridge.c +++ b/src/northbridge/amd/agesa/family16kb/northbridge.c @@ -459,7 +459,7 @@ static void set_resources(device_t dev) } -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -511,7 +511,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c index 4f646f7..0e38f3e 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -447,7 +447,7 @@ static void northbridge_init(struct device *dev) { } -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -499,7 +499,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length;

1 0

Patch set updated for coreboot: 63a4164 acpi: Remove monolithic ACPI
by Vladimir Serbinenko 14 May '15

14 May '15

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7372 -gerrit commit 63a41641be71b20f3e4af20e053308e01f229d4d Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sun Nov 9 13:30:50 2014 +0100 acpi: Remove monolithic ACPI Change-Id: Ie4577f89bf3bb17b310b7b0a84b2c54e404b1606 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/Kconfig | 4 ---- src/arch/x86/boot/acpi.c | 19 ------------------- src/arch/x86/include/arch/acpi.h | 4 ---- src/include/device/device.h | 2 +- src/mainboard/emulation/qemu-i440fx/Kconfig | 1 - src/mainboard/via/epia-m700/Kconfig | 1 - src/mainboard/via/vt8454c/Kconfig | 1 - src/northbridge/amd/agesa/family12/Kconfig | 1 - src/northbridge/amd/agesa/family14/Kconfig | 1 - src/northbridge/amd/agesa/family15/Kconfig | 1 - src/northbridge/amd/agesa/family15rl/Kconfig | 1 - src/northbridge/amd/agesa/family15tn/Kconfig | 1 - src/northbridge/amd/agesa/family16kb/Kconfig | 1 - src/northbridge/amd/amdfam10/Kconfig | 1 - src/northbridge/amd/amdk8/Kconfig | 1 - src/northbridge/amd/pi/00630F01/Kconfig | 1 - src/northbridge/amd/pi/00730F01/Kconfig | 1 - src/northbridge/intel/e7501/Kconfig | 1 - src/northbridge/intel/e7505/Kconfig | 1 - src/northbridge/intel/fsp_rangeley/Kconfig | 1 - src/northbridge/intel/fsp_sandybridge/Kconfig | 2 -- src/northbridge/intel/gm45/Kconfig | 1 - src/northbridge/intel/haswell/Kconfig | 1 - src/northbridge/intel/i945/Kconfig | 1 - src/northbridge/intel/nehalem/Kconfig | 1 - src/northbridge/intel/sandybridge/Kconfig | 4 ---- src/northbridge/intel/sch/Kconfig | 1 - src/soc/intel/baytrail/Kconfig | 1 - src/soc/intel/broadwell/Kconfig | 1 - src/soc/intel/fsp_baytrail/Kconfig | 2 +- src/southbridge/amd/agesa/hudson/lpc.c | 2 +- src/southbridge/amd/amd8111/lpc.c | 6 +++--- src/southbridge/amd/cimx/sb700/late.c | 2 +- src/southbridge/amd/cimx/sb800/late.c | 2 +- src/southbridge/amd/cimx/sb900/late.c | 2 +- src/southbridge/amd/pi/hudson/lpc.c | 2 +- src/southbridge/amd/sb600/lpc.c | 2 +- src/southbridge/amd/sb700/lpc.c | 4 ++-- src/southbridge/amd/sb800/lpc.c | 2 +- src/southbridge/intel/bd82x6x/Kconfig | 1 - src/southbridge/intel/fsp_bd82x6x/Kconfig | 1 - src/southbridge/intel/i3100/Kconfig | 1 - src/southbridge/intel/i82371eb/Kconfig | 9 --------- src/southbridge/intel/i82801ix/Kconfig | 1 - src/southbridge/intel/ibexpeak/Kconfig | 1 - src/southbridge/nvidia/ck804/lpc.c | 2 +- src/southbridge/nvidia/mcp55/lpc.c | 4 ++-- 47 files changed, 17 insertions(+), 87 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 0149931..9539fd3 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -539,10 +539,6 @@ config MAX_PIRQ_LINKS table specifies links greater than 4, pirq_route_irqs will not function properly, unless this variable is correctly set. -config PER_DEVICE_ACPI_TABLES - bool - default n - config COMMON_FADT bool default n diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index 75d7d2e..bc2a0cc 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -250,18 +250,6 @@ void acpi_create_mcfg(acpi_mcfg_t *mcfg) header->checksum = acpi_checksum((void *)mcfg, header->length); } -#if !IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) -/* - * This can be overridden by platform ACPI setup code, if it calls - * acpi_create_ssdt_generator(). - */ -unsigned long __attribute__((weak)) acpi_fill_ssdt_generator( - unsigned long current, const char *oem_table_id) -{ - return current; -} -#endif - void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id) { unsigned long current = (unsigned long)ssdt + sizeof(acpi_header_t); @@ -279,16 +267,12 @@ void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id) acpigen_set_current((char *) current); { -#if IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) struct device *dev; for (dev = all_devices; dev; dev = dev->next) if (dev->ops && dev->ops->acpi_fill_ssdt_generator) { dev->ops->acpi_fill_ssdt_generator(); } current = (unsigned long) acpigen_get_current(); -#else - current = acpi_fill_ssdt_generator(current, oem_table_id); -#endif } /* (Re)calculate length and checksum. */ @@ -688,8 +672,6 @@ void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs, void *dsdt) } #endif -#if IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) - extern const unsigned char AmlCode[]; unsigned long __attribute__ ((weak)) fw_cfg_acpi_tables(unsigned long start) @@ -849,7 +831,6 @@ unsigned long write_acpi_tables(unsigned long start) printk(BIOS_INFO, "ACPI: done.\n"); return current; } -#endif #if CONFIG_HAVE_ACPI_RESUME void __attribute__((weak)) mainboard_suspend_resume(void) diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 809c6fa..da1a020 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -489,10 +489,6 @@ unsigned long fw_cfg_acpi_tables(unsigned long start); unsigned long write_acpi_tables(unsigned long addr); unsigned long acpi_fill_madt(unsigned long current); unsigned long acpi_fill_mcfg(unsigned long current); -#if !IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) -unsigned long acpi_fill_ssdt_generator(unsigned long current, - const char *oem_table_id); -#endif void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id); void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs, void *dsdt); #if IS_ENABLED(CONFIG_COMMON_FADT) diff --git a/src/include/device/device.h b/src/include/device/device.h index c1c9fdb..0acebb8 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -55,7 +55,7 @@ struct device_operations { int (*get_smbios_data)(device_t dev, int *handle, unsigned long *current); void (*get_smbios_strings)(device_t dev, struct smbios_type11 *t); #endif -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) unsigned long (*write_acpi_tables)(unsigned long start, struct acpi_rsdp *rsdp); void (*acpi_fill_ssdt_generator)(void); void (*acpi_inject_dsdt_generator)(void); diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig index 406612e..b74ba62 100644 --- a/src/mainboard/emulation/qemu-i440fx/Kconfig +++ b/src/mainboard/emulation/qemu-i440fx/Kconfig @@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG - select PER_DEVICE_ACPI_TABLES config MAINBOARD_DIR string diff --git a/src/mainboard/via/epia-m700/Kconfig b/src/mainboard/via/epia-m700/Kconfig index 7d21038..c64f8d2 100644 --- a/src/mainboard/via/epia-m700/Kconfig +++ b/src/mainboard/via/epia-m700/Kconfig @@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy # Note: For ACPI, you need to use the 'get_dsdt' script and uncomment # the "select HAVE_ACPI_TABLES" line below. # select HAVE_ACPI_TABLES - # select PER_DEVICE_ACPI_TABLES select HAVE_OPTION_TABLE select BOARD_ROMSIZE_KB_512 diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig index 789a063..da71c87 100644 --- a/src/mainboard/via/vt8454c/Kconfig +++ b/src/mainboard/via/vt8454c/Kconfig @@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_MP_TABLE select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_512 - select PER_DEVICE_ACPI_TABLES config MAINBOARD_DIR string diff --git a/src/northbridge/amd/agesa/family12/Kconfig b/src/northbridge/amd/agesa/family12/Kconfig index 671bd4d..9a4c7e7 100644 --- a/src/northbridge/amd/agesa/family12/Kconfig +++ b/src/northbridge/amd/agesa/family12/Kconfig @@ -22,7 +22,6 @@ config NORTHBRIDGE_AMD_AGESA_FAMILY12 select HAVE_DEBUG_SMBUS select HYPERTRANSPORT_PLUGIN_SUPPORT select MMCONF_SUPPORT - select PER_DEVICE_ACPI_TABLES if NORTHBRIDGE_AMD_AGESA_FAMILY12 diff --git a/src/northbridge/amd/agesa/family14/Kconfig b/src/northbridge/amd/agesa/family14/Kconfig index 3e73e5a..ee1e902 100644 --- a/src/northbridge/amd/agesa/family14/Kconfig +++ b/src/northbridge/amd/agesa/family14/Kconfig @@ -19,7 +19,6 @@ config NORTHBRIDGE_AMD_AGESA_FAMILY14 bool select MMCONF_SUPPORT - select PER_DEVICE_ACPI_TABLES if NORTHBRIDGE_AMD_AGESA_FAMILY14 diff --git a/src/northbridge/amd/agesa/family15/Kconfig b/src/northbridge/amd/agesa/family15/Kconfig index 9d15be0..b440885 100644 --- a/src/northbridge/amd/agesa/family15/Kconfig +++ b/src/northbridge/amd/agesa/family15/Kconfig @@ -23,7 +23,6 @@ config NORTHBRIDGE_AMD_AGESA_FAMILY15 select HAVE_DEBUG_SMBUS select HYPERTRANSPORT_PLUGIN_SUPPORT select MMCONF_SUPPORT - select PER_DEVICE_ACPI_TABLES if NORTHBRIDGE_AMD_AGESA_FAMILY15 diff --git a/src/northbridge/amd/agesa/family15rl/Kconfig b/src/northbridge/amd/agesa/family15rl/Kconfig index 2cf332a..0a3b19e 100644 --- a/src/northbridge/amd/agesa/family15rl/Kconfig +++ b/src/northbridge/amd/agesa/family15rl/Kconfig @@ -19,7 +19,6 @@ config NORTHBRIDGE_AMD_AGESA_FAMILY15_RL bool select MMCONF_SUPPORT - select PER_DEVICE_ACPI_TABLES if NORTHBRIDGE_AMD_AGESA_FAMILY15_RL diff --git a/src/northbridge/amd/agesa/family15tn/Kconfig b/src/northbridge/amd/agesa/family15tn/Kconfig index 0fa3ca4..c94782c 100644 --- a/src/northbridge/amd/agesa/family15tn/Kconfig +++ b/src/northbridge/amd/agesa/family15tn/Kconfig @@ -19,7 +19,6 @@ config NORTHBRIDGE_AMD_AGESA_FAMILY15_TN bool select MMCONF_SUPPORT - select PER_DEVICE_ACPI_TABLES if NORTHBRIDGE_AMD_AGESA_FAMILY15_TN diff --git a/src/northbridge/amd/agesa/family16kb/Kconfig b/src/northbridge/amd/agesa/family16kb/Kconfig index 614a7d4..91b94c6 100644 --- a/src/northbridge/amd/agesa/family16kb/Kconfig +++ b/src/northbridge/amd/agesa/family16kb/Kconfig @@ -20,7 +20,6 @@ config NORTHBRIDGE_AMD_AGESA_FAMILY16_KB bool select MMCONF_SUPPORT - select PER_DEVICE_ACPI_TABLES if NORTHBRIDGE_AMD_AGESA_FAMILY16_KB diff --git a/src/northbridge/amd/amdfam10/Kconfig b/src/northbridge/amd/amdfam10/Kconfig index e094286..3e0537f 100644 --- a/src/northbridge/amd/amdfam10/Kconfig +++ b/src/northbridge/amd/amdfam10/Kconfig @@ -25,7 +25,6 @@ config NORTHBRIDGE_AMD_AMDFAM10 select HAVE_DEBUG_CAR select HYPERTRANSPORT_PLUGIN_SUPPORT select MMCONF_SUPPORT - select PER_DEVICE_ACPI_TABLES if NORTHBRIDGE_AMD_AMDFAM10 config AGP_APERTURE_SIZE diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig index 23fa390..dad711d 100644 --- a/src/northbridge/amd/amdk8/Kconfig +++ b/src/northbridge/amd/amdk8/Kconfig @@ -23,7 +23,6 @@ config NORTHBRIDGE_AMD_AMDK8 select HAVE_DEBUG_SMBUS select HAVE_DEBUG_CAR select HYPERTRANSPORT_PLUGIN_SUPPORT - select PER_DEVICE_ACPI_TABLES select LATE_CBMEM_INIT if NORTHBRIDGE_AMD_AMDK8 diff --git a/src/northbridge/amd/pi/00630F01/Kconfig b/src/northbridge/amd/pi/00630F01/Kconfig index cb6ab95..4978953 100644 --- a/src/northbridge/amd/pi/00630F01/Kconfig +++ b/src/northbridge/amd/pi/00630F01/Kconfig @@ -19,7 +19,6 @@ config NORTHBRIDGE_AMD_PI_00630F01 bool select MMCONF_SUPPORT - select PER_DEVICE_ACPI_TABLES if NORTHBRIDGE_AMD_PI_00630F01 diff --git a/src/northbridge/amd/pi/00730F01/Kconfig b/src/northbridge/amd/pi/00730F01/Kconfig index fc825dd..a9f4da4 100644 --- a/src/northbridge/amd/pi/00730F01/Kconfig +++ b/src/northbridge/amd/pi/00730F01/Kconfig @@ -20,7 +20,6 @@ config NORTHBRIDGE_AMD_PI_00730F01 bool select MMCONF_SUPPORT - select PER_DEVICE_ACPI_TABLES if NORTHBRIDGE_AMD_PI_00730F01 diff --git a/src/northbridge/intel/e7501/Kconfig b/src/northbridge/intel/e7501/Kconfig index 763b96e..496894f 100644 --- a/src/northbridge/intel/e7501/Kconfig +++ b/src/northbridge/intel/e7501/Kconfig @@ -1,6 +1,5 @@ config NORTHBRIDGE_INTEL_E7501 bool select HAVE_DEBUG_RAM_SETUP - select PER_DEVICE_ACPI_TABLES select LATE_CBMEM_INIT diff --git a/src/northbridge/intel/e7505/Kconfig b/src/northbridge/intel/e7505/Kconfig index e755852..1410205 100644 --- a/src/northbridge/intel/e7505/Kconfig +++ b/src/northbridge/intel/e7505/Kconfig @@ -25,7 +25,6 @@ if NORTHBRIDGE_INTEL_E7505 config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy def_bool y select HAVE_DEBUG_RAM_SETUP - select PER_DEVICE_ACPI_TABLES select LATE_CBMEM_INIT config HW_SCRUBBER diff --git a/src/northbridge/intel/fsp_rangeley/Kconfig b/src/northbridge/intel/fsp_rangeley/Kconfig index 2d2eda7..c1353ca 100644 --- a/src/northbridge/intel/fsp_rangeley/Kconfig +++ b/src/northbridge/intel/fsp_rangeley/Kconfig @@ -21,7 +21,6 @@ config NORTHBRIDGE_INTEL_FSP_RANGELEY bool select CPU_INTEL_FSP_MODEL_406DX - select PER_DEVICE_ACPI_TABLES if NORTHBRIDGE_INTEL_FSP_RANGELEY diff --git a/src/northbridge/intel/fsp_sandybridge/Kconfig b/src/northbridge/intel/fsp_sandybridge/Kconfig index 4eb5b8e..94fd330 100644 --- a/src/northbridge/intel/fsp_sandybridge/Kconfig +++ b/src/northbridge/intel/fsp_sandybridge/Kconfig @@ -21,12 +21,10 @@ config NORTHBRIDGE_INTEL_FSP_SANDYBRIDGE bool select CPU_INTEL_FSP_MODEL_206AX - select PER_DEVICE_ACPI_TABLES config NORTHBRIDGE_INTEL_FSP_IVYBRIDGE bool select CPU_INTEL_FSP_MODEL_306AX - select PER_DEVICE_ACPI_TABLES if NORTHBRIDGE_INTEL_FSP_IVYBRIDGE || NORTHBRIDGE_INTEL_FSP_SANDYBRIDGE diff --git a/src/northbridge/intel/gm45/Kconfig b/src/northbridge/intel/gm45/Kconfig index 096c80f..1aafdc2 100644 --- a/src/northbridge/intel/gm45/Kconfig +++ b/src/northbridge/intel/gm45/Kconfig @@ -30,7 +30,6 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy select IOMMU select VGA select INTEL_EDID - select PER_DEVICE_ACPI_TABLES config BOOTBLOCK_NORTHBRIDGE_INIT string diff --git a/src/northbridge/intel/haswell/Kconfig b/src/northbridge/intel/haswell/Kconfig index 0845a3f..5589e95 100644 --- a/src/northbridge/intel/haswell/Kconfig +++ b/src/northbridge/intel/haswell/Kconfig @@ -26,7 +26,6 @@ config NORTHBRIDGE_INTEL_HASWELL select MMCONF_SUPPORT_DEFAULT select INTEL_DDI select INTEL_DP - select PER_DEVICE_ACPI_TABLES if NORTHBRIDGE_INTEL_HASWELL diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig index 8a0cb5b..b139562 100644 --- a/src/northbridge/intel/i945/Kconfig +++ b/src/northbridge/intel/i945/Kconfig @@ -29,7 +29,6 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy select HAVE_DEBUG_RAM_SETUP select LAPIC_MONOTONIC_TIMER select VGA - select PER_DEVICE_ACPI_TABLES config NORTHBRIDGE_INTEL_SUBTYPE_I945GC def_bool n diff --git a/src/northbridge/intel/nehalem/Kconfig b/src/northbridge/intel/nehalem/Kconfig index ca5ffa5..70d17d4 100644 --- a/src/northbridge/intel/nehalem/Kconfig +++ b/src/northbridge/intel/nehalem/Kconfig @@ -25,7 +25,6 @@ config NORTHBRIDGE_INTEL_NEHALEM select VGA select INTEL_EDID select TSC_MONOTONIC_TIMER - select PER_DEVICE_ACPI_TABLES if NORTHBRIDGE_INTEL_NEHALEM diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig index fc6d6a4..9fc2848 100644 --- a/src/northbridge/intel/sandybridge/Kconfig +++ b/src/northbridge/intel/sandybridge/Kconfig @@ -23,7 +23,6 @@ config NORTHBRIDGE_INTEL_SANDYBRIDGE select MMCONF_SUPPORT select MMCONF_SUPPORT_DEFAULT select CPU_INTEL_MODEL_206AX - select PER_DEVICE_ACPI_TABLES config NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE bool @@ -32,7 +31,6 @@ config NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE select MMCONF_SUPPORT_DEFAULT select CPU_INTEL_MODEL_206AX select HAVE_DEBUG_RAM_SETUP - select PER_DEVICE_ACPI_TABLES config NORTHBRIDGE_INTEL_IVYBRIDGE bool @@ -40,7 +38,6 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE select MMCONF_SUPPORT select MMCONF_SUPPORT_DEFAULT select CPU_INTEL_MODEL_306AX - select PER_DEVICE_ACPI_TABLES config NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE bool @@ -49,7 +46,6 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE select MMCONF_SUPPORT_DEFAULT select CPU_INTEL_MODEL_306AX select HAVE_DEBUG_RAM_SETUP - select PER_DEVICE_ACPI_TABLES if NORTHBRIDGE_INTEL_SANDYBRIDGE || NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE || NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE diff --git a/src/northbridge/intel/sch/Kconfig b/src/northbridge/intel/sch/Kconfig index f495e6a..6d3dcae 100644 --- a/src/northbridge/intel/sch/Kconfig +++ b/src/northbridge/intel/sch/Kconfig @@ -20,7 +20,6 @@ config NORTHBRIDGE_INTEL_SCH bool select MMCONF_SUPPORT - select PER_DEVICE_ACPI_TABLES select LATE_CBMEM_INIT if NORTHBRIDGE_INTEL_SCH diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig index 0240830..85631fc 100644 --- a/src/soc/intel/baytrail/Kconfig +++ b/src/soc/intel/baytrail/Kconfig @@ -38,7 +38,6 @@ config CPU_SPECIFIC_OPTIONS select TSC_SYNC_MFENCE select UDELAY_TSC select SOC_INTEL_COMMON - select PER_DEVICE_ACPI_TABLES config BOOTBLOCK_CPU_INIT string diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig index 4a71aa7..6c54a55 100644 --- a/src/soc/intel/broadwell/Kconfig +++ b/src/soc/intel/broadwell/Kconfig @@ -47,7 +47,6 @@ config CPU_SPECIFIC_OPTIONS select TSC_CONSTANT_RATE select TSC_SYNC_MFENCE select UDELAY_TSC - select PER_DEVICE_ACPI_TABLES select SOC_INTEL_COMMON config BOOTBLOCK_CPU_INIT diff --git a/src/soc/intel/fsp_baytrail/Kconfig b/src/soc/intel/fsp_baytrail/Kconfig index 86d5b11..6b3465d 100644 --- a/src/soc/intel/fsp_baytrail/Kconfig +++ b/src/soc/intel/fsp_baytrail/Kconfig @@ -49,7 +49,7 @@ config CPU_SPECIFIC_OPTIONS select UDELAY_TSC select SUPPORT_CPU_UCODE_IN_CBFS select ROMSTAGE_RTC_INIT - select PER_DEVICE_ACPI_TABLES + select BROKEN_CAR_MIGRATE config SOC_INTEL_FSP_BAYTRAIL_MD bool diff --git a/src/southbridge/amd/agesa/hudson/lpc.c b/src/southbridge/amd/agesa/hudson/lpc.c index b784fc4..c965933 100644 --- a/src/southbridge/amd/agesa/hudson/lpc.c +++ b/src/southbridge/amd/agesa/hudson/lpc.c @@ -328,7 +328,7 @@ static struct pci_operations lops_pci = { static struct device_operations lpc_ops = { .read_resources = hudson_lpc_read_resources, .set_resources = hudson_lpc_set_resources, -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) .write_acpi_tables = acpi_write_hpet, #endif .enable_resources = hudson_lpc_enable_resources, diff --git a/src/southbridge/amd/amd8111/lpc.c b/src/southbridge/amd/amd8111/lpc.c index d75723c..2ded0cb 100644 --- a/src/southbridge/amd/amd8111/lpc.c +++ b/src/southbridge/amd/amd8111/lpc.c @@ -11,7 +11,7 @@ #include <pc80/isa-dma.h> #include <cpu/x86/lapic.h> #include <arch/ioapic.h> -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) #include <arch/acpi.h> #include <arch/acpigen.h> #include <cpu/amd/powernow.h> @@ -118,7 +118,7 @@ static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) ((device & 0xffff) << 16) | (vendor & 0xffff)); } -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) extern u16 pm_base; @@ -147,7 +147,7 @@ static struct device_operations lpc_ops = { .set_resources = pci_dev_set_resources, .enable_resources = pci_dev_enable_resources, .init = lpc_init, -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) .write_acpi_tables = acpi_write_hpet, .acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator, #endif diff --git a/src/southbridge/amd/cimx/sb700/late.c b/src/southbridge/amd/cimx/sb700/late.c index 1e1357e..5308150 100644 --- a/src/southbridge/amd/cimx/sb700/late.c +++ b/src/southbridge/amd/cimx/sb700/late.c @@ -107,7 +107,7 @@ static struct device_operations lpc_ops = { .read_resources = lpc_read_resources, .set_resources = lpc_set_resources, .enable_resources = lpc_enable_resources, -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) .write_acpi_tables = acpi_write_hpet, #endif .init = lpc_init, diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c index ffa3290..af6255f 100644 --- a/src/southbridge/amd/cimx/sb800/late.c +++ b/src/southbridge/amd/cimx/sb800/late.c @@ -157,7 +157,7 @@ static struct device_operations lpc_ops = { .read_resources = lpc_read_resources, .set_resources = lpc_set_resources, .enable_resources = pci_dev_enable_resources, -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) .write_acpi_tables = acpi_write_hpet, #endif .init = lpc_init, diff --git a/src/southbridge/amd/cimx/sb900/late.c b/src/southbridge/amd/cimx/sb900/late.c index 6d47f05..5a4b42a 100644 --- a/src/southbridge/amd/cimx/sb900/late.c +++ b/src/southbridge/amd/cimx/sb900/late.c @@ -129,7 +129,7 @@ static struct device_operations lpc_ops = { .set_resources = lpc_set_resources, .enable_resources = lpc_enable_resources, .init = lpc_init, -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) .write_acpi_tables = acpi_write_hpet, #endif .scan_bus = scan_static_bus, diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c index 555e255..20e58f7 100644 --- a/src/southbridge/amd/pi/hudson/lpc.c +++ b/src/southbridge/amd/pi/hudson/lpc.c @@ -336,7 +336,7 @@ static struct device_operations lpc_ops = { .read_resources = hudson_lpc_read_resources, .set_resources = hudson_lpc_set_resources, .enable_resources = hudson_lpc_enable_resources, -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) .write_acpi_tables = acpi_write_hpet, #endif .init = lpc_init, diff --git a/src/southbridge/amd/sb600/lpc.c b/src/southbridge/amd/sb600/lpc.c index dc2f31b..84af00b 100644 --- a/src/southbridge/amd/sb600/lpc.c +++ b/src/southbridge/amd/sb600/lpc.c @@ -219,7 +219,7 @@ static void sb600_lpc_enable_resources(device_t dev) sb600_lpc_enable_childrens_resources(dev); } -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) extern u16 pm_base; diff --git a/src/southbridge/amd/sb700/lpc.c b/src/southbridge/amd/sb700/lpc.c index 7bb21d2..db03ae4 100644 --- a/src/southbridge/amd/sb700/lpc.c +++ b/src/southbridge/amd/sb700/lpc.c @@ -265,7 +265,7 @@ static void sb700_lpc_enable_resources(device_t dev) sb700_lpc_enable_childrens_resources(dev); } -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) static void southbridge_acpi_fill_ssdt_generator(void) { amd_generate_powernow(ACPI_CPU_CONTROL, 6, 1); @@ -282,7 +282,7 @@ static struct device_operations lpc_ops = { .read_resources = sb700_lpc_read_resources, .set_resources = sb700_lpc_set_resources, .enable_resources = sb700_lpc_enable_resources, -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) .write_acpi_tables = acpi_write_hpet, .acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator, #endif diff --git a/src/southbridge/amd/sb800/lpc.c b/src/southbridge/amd/sb800/lpc.c index 87c09a2..4783c6f 100644 --- a/src/southbridge/amd/sb800/lpc.c +++ b/src/southbridge/amd/sb800/lpc.c @@ -250,7 +250,7 @@ static struct device_operations lpc_ops = { .read_resources = sb800_lpc_read_resources, .set_resources = sb800_lpc_set_resources, .enable_resources = sb800_lpc_enable_resources, -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) .write_acpi_tables = acpi_write_hpet, #endif .init = lpc_init, diff --git a/src/southbridge/intel/bd82x6x/Kconfig b/src/southbridge/intel/bd82x6x/Kconfig index 8a832aa..354686e 100644 --- a/src/southbridge/intel/bd82x6x/Kconfig +++ b/src/southbridge/intel/bd82x6x/Kconfig @@ -36,7 +36,6 @@ config SOUTH_BRIDGE_OPTIONS # dummy select PCIEXP_ASPM select PCIEXP_COMMON_CLOCK select SPI_FLASH - select PER_DEVICE_ACPI_TABLES select COMMON_FADT config EHCI_BAR diff --git a/src/southbridge/intel/fsp_bd82x6x/Kconfig b/src/southbridge/intel/fsp_bd82x6x/Kconfig index 97bfcb0..1edf332 100644 --- a/src/southbridge/intel/fsp_bd82x6x/Kconfig +++ b/src/southbridge/intel/fsp_bd82x6x/Kconfig @@ -32,7 +32,6 @@ config SOUTH_BRIDGE_OPTIONS # dummy select PCIEXP_ASPM select PCIEXP_COMMON_CLOCK select SPI_FLASH - select PER_DEVICE_ACPI_TABLES select COMMON_FADT config EHCI_BAR diff --git a/src/southbridge/intel/i3100/Kconfig b/src/southbridge/intel/i3100/Kconfig index 9dd8a38..eef30ef 100644 --- a/src/southbridge/intel/i3100/Kconfig +++ b/src/southbridge/intel/i3100/Kconfig @@ -2,7 +2,6 @@ config SOUTHBRIDGE_INTEL_I3100 bool select IOAPIC select HAVE_HARD_RESET - select PER_DEVICE_ACPI_TABLES if SOUTHBRIDGE_INTEL_I3100 diff --git a/src/southbridge/intel/i82371eb/Kconfig b/src/southbridge/intel/i82371eb/Kconfig index 5ddbe0f..5466b12 100644 --- a/src/southbridge/intel/i82371eb/Kconfig +++ b/src/southbridge/intel/i82371eb/Kconfig @@ -5,12 +5,3 @@ config BOOTBLOCK_SOUTHBRIDGE_INIT string default "southbridge/intel/i82371eb/bootblock.c" depends on SOUTHBRIDGE_INTEL_I82371EB - - -if SOUTHBRIDGE_INTEL_I82371EB - -config SOUTH_BRIDGE_OPTIONS # dummy - def_bool y - select PER_DEVICE_ACPI_TABLES - -endif diff --git a/src/southbridge/intel/i82801ix/Kconfig b/src/southbridge/intel/i82801ix/Kconfig index 7428d00..f7d7d7a 100644 --- a/src/southbridge/intel/i82801ix/Kconfig +++ b/src/southbridge/intel/i82801ix/Kconfig @@ -27,7 +27,6 @@ config SOUTHBRIDGE_INTEL_I82801IX select USE_WATCHDOG_ON_BOOT select HAVE_SMI_HANDLER select HAVE_USBDEBUG_OPTIONS - select PER_DEVICE_ACPI_TABLES if SOUTHBRIDGE_INTEL_I82801IX diff --git a/src/southbridge/intel/ibexpeak/Kconfig b/src/southbridge/intel/ibexpeak/Kconfig index c62cf32..94f342c 100644 --- a/src/southbridge/intel/ibexpeak/Kconfig +++ b/src/southbridge/intel/ibexpeak/Kconfig @@ -34,7 +34,6 @@ config SOUTH_BRIDGE_OPTIONS # dummy select SPI_FLASH select SOUTHBRIDGE_INTEL_COMMON select HAVE_USBDEBUG_OPTIONS - select PER_DEVICE_ACPI_TABLES select COMMON_FADT config EHCI_BAR diff --git a/src/southbridge/nvidia/ck804/lpc.c b/src/southbridge/nvidia/ck804/lpc.c index 5df8acf..28e9598 100644 --- a/src/southbridge/nvidia/ck804/lpc.c +++ b/src/southbridge/nvidia/ck804/lpc.c @@ -311,7 +311,7 @@ static void ck804_lpc_enable_resources(device_t dev) ck804_lpc_enable_childrens_resources(dev); } -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) static void southbridge_acpi_fill_ssdt_generator(void) { diff --git a/src/southbridge/nvidia/mcp55/lpc.c b/src/southbridge/nvidia/mcp55/lpc.c index 5f190b8..90aeda9 100644 --- a/src/southbridge/nvidia/mcp55/lpc.c +++ b/src/southbridge/nvidia/mcp55/lpc.c @@ -281,7 +281,7 @@ static const struct pci_driver lpc_driver __pci_driver = { .devices = lpc_ids, }; -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) static void southbridge_acpi_fill_ssdt_generator(void) { @@ -294,7 +294,7 @@ static struct device_operations lpc_slave_ops = { .read_resources = mcp55_lpc_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pci_dev_enable_resources, -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) +#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) .acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator, .write_acpi_tables = acpi_write_hpet, #endif

1 0

Patch set updated for coreboot: 84bab59 acpigen: Remove all explicit length tracking
by Vladimir Serbinenko 14 May '15

14 May '15

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7367 -gerrit commit 84bab59e5c93dc50432f0f0168b9ea9f0a4b565d Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sun Nov 9 03:51:32 2014 +0100 acpigen: Remove all explicit length tracking Change-Id: I88248d78c01b4b4e42a097889b5f4ddfdac3d966 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/arch/x86/boot/acpigen.c | 381 +++++++++++++-------------------- src/arch/x86/include/arch/acpigen.h | 72 +++---- src/cpu/intel/model_2065x/acpi.c | 16 +- src/cpu/intel/model_206ax/acpi.c | 16 +- src/soc/intel/broadwell/acpi.c | 20 +- src/soc/intel/fsp_baytrail/acpi.c | 14 +- src/southbridge/intel/lynxpoint/acpi.c | 8 +- 7 files changed, 212 insertions(+), 315 deletions(-) diff --git a/src/arch/x86/boot/acpigen.c b/src/arch/x86/boot/acpigen.c index 662bc96..bbd5ae1 100644 --- a/src/arch/x86/boot/acpigen.c +++ b/src/arch/x86/boot/acpigen.c @@ -37,13 +37,12 @@ static char *gencurrent; char *len_stack[ACPIGEN_LENSTACK_SIZE]; int ltop = 0; -int acpigen_write_len_f(void) +void acpigen_write_len_f(void) { ASSERT(ltop < (ACPIGEN_LENSTACK_SIZE - 1)) len_stack[ltop++] = gencurrent; acpigen_emit_byte(0); acpigen_emit_byte(0); - return 2; } void acpigen_pop_len(void) @@ -69,31 +68,27 @@ char *acpigen_get_current(void) return gencurrent; } -int acpigen_emit_byte(unsigned char b) +void acpigen_emit_byte(unsigned char b) { (*gencurrent++) = b; - return 1; } -int acpigen_write_package(int nr_el) +void acpigen_write_package(int nr_el) { - int len; /* package op */ acpigen_emit_byte(0x12); - len = acpigen_write_len_f(); + acpigen_write_len_f(); acpigen_emit_byte(nr_el); - return len + 2; } -int acpigen_write_byte(unsigned int data) +void acpigen_write_byte(unsigned int data) { /* byte op */ acpigen_emit_byte(0xa); acpigen_emit_byte(data & 0xff); - return 2; } -int acpigen_write_dword(unsigned int data) +void acpigen_write_dword(unsigned int data) { /* dword op */ acpigen_emit_byte(0xc); @@ -101,10 +96,9 @@ int acpigen_write_dword(unsigned int data) acpigen_emit_byte((data >> 8) & 0xff); acpigen_emit_byte((data >> 16) & 0xff); acpigen_emit_byte((data >> 24) & 0xff); - return 5; } -int acpigen_write_qword(uint64_t data) +void acpigen_write_qword(uint64_t data) { /* qword op */ acpigen_emit_byte(0xe); @@ -116,40 +110,32 @@ int acpigen_write_qword(uint64_t data) acpigen_emit_byte((data >> 40) & 0xff); acpigen_emit_byte((data >> 48) & 0xff); acpigen_emit_byte((data >> 56) & 0xff); - return 9; } -int acpigen_write_name_byte(const char *name, uint8_t val) +void acpigen_write_name_byte(const char *name, uint8_t val) { - int len; - len = acpigen_write_name(name); - len += acpigen_write_byte(val); - return len; + acpigen_write_name(name); + acpigen_write_byte(val); } -int acpigen_write_name_dword(const char *name, uint32_t val) +void acpigen_write_name_dword(const char *name, uint32_t val) { - int len; - len = acpigen_write_name(name); - len += acpigen_write_dword(val); - return len; + acpigen_write_name(name); + acpigen_write_dword(val); } -int acpigen_write_name_qword(const char *name, uint64_t val) +void acpigen_write_name_qword(const char *name, uint64_t val) { - int len; - len = acpigen_write_name(name); - len += acpigen_write_qword(val); - return len; + acpigen_write_name(name); + acpigen_write_qword(val); } -int acpigen_emit_stream(const char *data, int size) +void acpigen_emit_stream(const char *data, int size) { int i; for (i = 0; i < size; i++) { acpigen_emit_byte(data[i]); } - return size; } /* @@ -161,39 +147,36 @@ int acpigen_emit_stream(const char *data, int size) * Check sections 5.3, 18.2.2 and 18.4 of ACPI spec 3.0 for details. */ -static int acpigen_emit_simple_namestring(const char *name) { - int i, len = 0; +static void acpigen_emit_simple_namestring(const char *name) { + int i; char ud[] = "____"; for (i = 0; i < 4; i++) { if ((name[i] == '\0') || (name[i] == '.')) { - len += acpigen_emit_stream(ud, 4 - i); + acpigen_emit_stream(ud, 4 - i); break; } else { - len += acpigen_emit_byte(name[i]); + acpigen_emit_byte(name[i]); } } - return len; } -static int acpigen_emit_double_namestring(const char *name, int dotpos) { - int len = 0; +static void acpigen_emit_double_namestring(const char *name, int dotpos) { /* mark dual name prefix */ - len += acpigen_emit_byte(0x2e); - len += acpigen_emit_simple_namestring(name); - len += acpigen_emit_simple_namestring(&name[dotpos + 1]); - return len; + acpigen_emit_byte(0x2e); + acpigen_emit_simple_namestring(name); + acpigen_emit_simple_namestring(&name[dotpos + 1]); } -static int acpigen_emit_multi_namestring(const char *name) { - int len = 0, count = 0; +static void acpigen_emit_multi_namestring(const char *name) { + int count = 0; unsigned char *pathlen; /* mark multi name prefix */ - len += acpigen_emit_byte(0x2f); - len += acpigen_emit_byte(0x0); + acpigen_emit_byte(0x2f); + acpigen_emit_byte(0x0); pathlen = ((unsigned char *) acpigen_get_current()) - 1; while (name[0] != '\0') { - len += acpigen_emit_simple_namestring(name); + acpigen_emit_simple_namestring(name); /* find end or next entity */ while ((name[0] != '.') && (name[0] != '\0')) name++; @@ -204,32 +187,30 @@ static int acpigen_emit_multi_namestring(const char *name) { } pathlen[0] = count; - return len; } -int acpigen_emit_namestring(const char *namepath) { +void acpigen_emit_namestring(const char *namepath) { int dotcount = 0, i; int dotpos = 0; - int len = 0; /* We can start with a '\'. */ if (namepath[0] == '\\') { - len += acpigen_emit_byte('\\'); + acpigen_emit_byte('\\'); namepath++; } /* And there can be any number of '^' */ while (namepath[0] == '^') { - len += acpigen_emit_byte('^'); + acpigen_emit_byte('^'); namepath++; } /* If we have only \\ or only ^...^. Then we need to put a null name (0x00). */ if(namepath[0] == '\0') { - len += acpigen_emit_byte(0x00); - return len; + acpigen_emit_byte(0x00); + return; } i = 0; @@ -242,58 +223,53 @@ int acpigen_emit_namestring(const char *namepath) { } if (dotcount == 0) { - len += acpigen_emit_simple_namestring(namepath); + acpigen_emit_simple_namestring(namepath); } else if (dotcount == 1) { - len += acpigen_emit_double_namestring(namepath, dotpos); + acpigen_emit_double_namestring(namepath, dotpos); } else { - len += acpigen_emit_multi_namestring(namepath); + acpigen_emit_multi_namestring(namepath); } - return len; } -int acpigen_write_name(const char *name) +void acpigen_write_name(const char *name) { - int len; /* name op */ - len = acpigen_emit_byte(0x8); - return len + acpigen_emit_namestring(name); + acpigen_emit_byte(0x8); + acpigen_emit_namestring(name); } -int acpigen_write_scope(const char *name) +void acpigen_write_scope(const char *name) { - int len; /* scope op */ - len = acpigen_emit_byte(0x10); - len += acpigen_write_len_f(); - return len + acpigen_emit_namestring(name); + acpigen_emit_byte(0x10); + acpigen_write_len_f(); + acpigen_emit_namestring(name); } -int acpigen_write_processor(u8 cpuindex, u32 pblock_addr, u8 pblock_len) +void acpigen_write_processor(u8 cpuindex, u32 pblock_addr, u8 pblock_len) { /* Processor (\_PR.CPUcpuindex, cpuindex, pblock_addr, pblock_len) { */ char pscope[16]; - int len; /* processor op */ acpigen_emit_byte(0x5b); acpigen_emit_byte(0x83); - len = acpigen_write_len_f(); + acpigen_write_len_f(); snprintf(pscope, sizeof (pscope), "\\_PR.CP%02d", (unsigned int) cpuindex); - len += acpigen_emit_namestring(pscope); + acpigen_emit_namestring(pscope); acpigen_emit_byte(cpuindex); acpigen_emit_byte(pblock_addr & 0xff); acpigen_emit_byte((pblock_addr >> 8) & 0xff); acpigen_emit_byte((pblock_addr >> 16) & 0xff); acpigen_emit_byte((pblock_addr >> 24) & 0xff); acpigen_emit_byte(pblock_len); - return 6 + 2 + len; } -int acpigen_write_empty_PCT(void) +void acpigen_write_empty_PCT(void) { /* Name (_PCT, Package (0x02) @@ -326,10 +302,10 @@ int acpigen_write_empty_PCT(void) 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 00000058 "........" */ 0x00, 0x79, 0x00 }; - return acpigen_emit_stream(stream, ARRAY_SIZE(stream)); + acpigen_emit_stream(stream, ARRAY_SIZE(stream)); } -int acpigen_write_empty_PTC(void) +void acpigen_write_empty_PTC(void) { /* Name (_PTC, Package (0x02) @@ -353,7 +329,6 @@ int acpigen_write_empty_PTC(void) } }) */ - int len, nlen, rlen; acpi_addr_t addr = { .space_id = ACPI_ADDRESS_SPACE_FIXED, .bit_width = 0, @@ -365,55 +340,44 @@ int acpigen_write_empty_PTC(void) .addrh = 0, }; - nlen = acpigen_write_name("_PTC"); - len = acpigen_write_package(2); + acpigen_write_name("_PTC"); + acpigen_write_package(2); /* ControlRegister */ - rlen = acpigen_write_resourcetemplate_header(); - rlen += acpigen_write_register(&addr); - len += acpigen_write_resourcetemplate_footer(); - len += rlen; + acpigen_write_resourcetemplate_header(); + acpigen_write_register(&addr); + acpigen_write_resourcetemplate_footer(); /* StatusRegister */ - rlen = acpigen_write_resourcetemplate_header(); - rlen += acpigen_write_register(&addr); - len += acpigen_write_resourcetemplate_footer(); - len += rlen; + acpigen_write_resourcetemplate_header(); + acpigen_write_register(&addr); + acpigen_write_resourcetemplate_footer(); acpigen_pop_len(); - return len + nlen; } -int acpigen_write_method(const char *name, int nargs) +void acpigen_write_method(const char *name, int nargs) { - int len; - /* method op */ - len = acpigen_emit_byte(0x14); - len += acpigen_write_len_f(); - len += acpigen_emit_namestring(name); - len += acpigen_emit_byte(nargs & 7); - - return len; + acpigen_emit_byte(0x14); + acpigen_write_len_f(); + acpigen_emit_namestring(name); + acpigen_emit_byte(nargs & 7); } -int acpigen_write_device(const char *name) +void acpigen_write_device(const char *name) { - int len; - /* method op */ - len = acpigen_emit_byte(0x5b); - len += acpigen_emit_byte(0x82); - len += acpigen_write_len_f(); - len += acpigen_emit_namestring(name); - - return len; + acpigen_emit_byte(0x5b); + acpigen_emit_byte(0x82); + acpigen_write_len_f(); + acpigen_emit_namestring(name); } /* * Generates a func with max supported P-states. */ -int acpigen_write_PPC(u8 nr) +void acpigen_write_PPC(u8 nr) { /* Method (_PPC, 0, NotSerialized) @@ -421,23 +385,19 @@ int acpigen_write_PPC(u8 nr) Return (nr) } */ - int len; - len = acpigen_write_method("_PPC", 0); + acpigen_write_method("_PPC", 0); /* return */ acpigen_emit_byte(0xa4); /* arg */ - len += acpigen_write_byte(nr); - /* add all single bytes */ - len += 1; + acpigen_write_byte(nr); acpigen_pop_len(); - return len; } /* * Generates a func with max supported P-states saved * in the variable PPCM. */ -int acpigen_write_PPC_NVS(void) +void acpigen_write_PPC_NVS(void) { /* Method (_PPC, 0, NotSerialized) @@ -445,20 +405,15 @@ int acpigen_write_PPC_NVS(void) Return (PPCM) } */ - int len; - - len = acpigen_write_method("_PPC", 0); + acpigen_write_method("_PPC", 0); /* return */ acpigen_emit_byte(0xa4); /* arg */ - len += acpigen_emit_namestring("PPCM"); - /* add all single bytes */ - len += 1; + acpigen_emit_namestring("PPCM"); acpigen_pop_len(); - return len; } -int acpigen_write_TPC(const char *gnvs_tpc_limit) +void acpigen_write_TPC(const char *gnvs_tpc_limit) { /* // Sample _TPC method @@ -467,88 +422,68 @@ int acpigen_write_TPC(const char *gnvs_tpc_limit) Return (\TLVL) } */ - int len; - - len = acpigen_write_method("_TPC", 0); - len += acpigen_emit_byte(0xa4); /* ReturnOp */ - len += acpigen_emit_namestring(gnvs_tpc_limit); + acpigen_write_method("_TPC", 0); + acpigen_emit_byte(0xa4); /* ReturnOp */ + acpigen_emit_namestring(gnvs_tpc_limit); acpigen_pop_len(); - return len; } -int acpigen_write_PSS_package(u32 coreFreq, u32 power, u32 transLat, +void acpigen_write_PSS_package(u32 coreFreq, u32 power, u32 transLat, u32 busmLat, u32 control, u32 status) { - int len; - len = acpigen_write_package(6); - len += acpigen_write_dword(coreFreq); - len += acpigen_write_dword(power); - len += acpigen_write_dword(transLat); - len += acpigen_write_dword(busmLat); - len += acpigen_write_dword(control); - len += acpigen_write_dword(status); - // pkglen without the len opcode + acpigen_write_package(6); + acpigen_write_dword(coreFreq); + acpigen_write_dword(power); + acpigen_write_dword(transLat); + acpigen_write_dword(busmLat); + acpigen_write_dword(control); + acpigen_write_dword(status); acpigen_pop_len(); printk(BIOS_DEBUG, "PSS: %uMHz power %u control 0x%x status 0x%x\n", coreFreq, power, control, status); - - return len; } -int acpigen_write_PSD_package(u32 domain, u32 numprocs, PSD_coord coordtype) +void acpigen_write_PSD_package(u32 domain, u32 numprocs, PSD_coord coordtype) { - int len, lenh, lenp; - lenh = acpigen_write_name("_PSD"); - lenp = acpigen_write_package(1); - len = acpigen_write_package(5); - len += acpigen_write_byte(5); // 5 values - len += acpigen_write_byte(0); // revision 0 - len += acpigen_write_dword(domain); - len += acpigen_write_dword(coordtype); - len += acpigen_write_dword(numprocs); + acpigen_write_name("_PSD"); + acpigen_write_package(1); + acpigen_write_package(5); + acpigen_write_byte(5); // 5 values + acpigen_write_byte(0); // revision 0 + acpigen_write_dword(domain); + acpigen_write_dword(coordtype); + acpigen_write_dword(numprocs); acpigen_pop_len(); - len += lenp; acpigen_pop_len(); - return len + lenh; } -int acpigen_write_CST_package_entry(acpi_cstate_t *cstate) +void acpigen_write_CST_package_entry(acpi_cstate_t *cstate) { - int len, len0; - char *start, *end; - - len0 = acpigen_write_package(4); - len = acpigen_write_resourcetemplate_header(); - start = acpigen_get_current(); + acpigen_write_package(4); + acpigen_write_resourcetemplate_header(); acpigen_write_register(&cstate->resource); - end = acpigen_get_current(); - len += end - start; - len += acpigen_write_resourcetemplate_footer(); - len += len0; - len += acpigen_write_dword(cstate->ctype); - len += acpigen_write_dword(cstate->latency); - len += acpigen_write_dword(cstate->power); + acpigen_write_resourcetemplate_footer(); + acpigen_write_dword(cstate->ctype); + acpigen_write_dword(cstate->latency); + acpigen_write_dword(cstate->power); acpigen_pop_len(); - return len; } -int acpigen_write_CST_package(acpi_cstate_t *cstate, int nentries) +void acpigen_write_CST_package(acpi_cstate_t *cstate, int nentries) { - int len, lenh, lenp, i; - lenh = acpigen_write_name("_CST"); - lenp = acpigen_write_package(nentries+1); - len = acpigen_write_dword(nentries); + int i; + acpigen_write_name("_CST"); + acpigen_write_package(nentries+1); + acpigen_write_dword(nentries); for (i = 0; i < nentries; i++) - len += acpigen_write_CST_package_entry(cstate + i); + acpigen_write_CST_package_entry(cstate + i); - len += lenp; acpigen_pop_len(); - return len + lenh; } -int acpigen_write_TSS_package(int entries, acpi_tstate_t *tstate_list) +void acpigen_write_TSS_package(int entries, acpi_tstate_t *tstate_list) { /* Sample _TSS package with 100% and 50% duty cycles @@ -558,48 +493,43 @@ int acpigen_write_TSS_package(int entries, acpi_tstate_t *tstate_list) Package(){50, 520, 0, 0x18, 0) }) */ - int i, len, plen, nlen; + int i; acpi_tstate_t *tstate = tstate_list; - nlen = acpigen_write_name("_TSS"); - plen = acpigen_write_package(entries); + acpigen_write_name("_TSS"); + acpigen_write_package(entries); for (i = 0; i < entries; i++) { - len = acpigen_write_package(5); - len += acpigen_write_dword(tstate->percent); - len += acpigen_write_dword(tstate->power); - len += acpigen_write_dword(tstate->latency); - len += acpigen_write_dword(tstate->control); - len += acpigen_write_dword(tstate->status); + acpigen_write_package(5); + acpigen_write_dword(tstate->percent); + acpigen_write_dword(tstate->power); + acpigen_write_dword(tstate->latency); + acpigen_write_dword(tstate->control); + acpigen_write_dword(tstate->status); acpigen_pop_len(); tstate++; - plen += len; } acpigen_pop_len(); - return plen + nlen; } -int acpigen_write_TSD_package(u32 domain, u32 numprocs, PSD_coord coordtype) +void acpigen_write_TSD_package(u32 domain, u32 numprocs, PSD_coord coordtype) { - int len, lenh, lenp; - lenh = acpigen_write_name("_TSD"); - lenp = acpigen_write_package(1); - len = acpigen_write_package(5); - len += acpigen_write_byte(5); // 5 values - len += acpigen_write_byte(0); // revision 0 - len += acpigen_write_dword(domain); - len += acpigen_write_dword(coordtype); - len += acpigen_write_dword(numprocs); + acpigen_write_name("_TSD"); + acpigen_write_package(1); + acpigen_write_package(5); + acpigen_write_byte(5); // 5 values + acpigen_write_byte(0); // revision 0 + acpigen_write_dword(domain); + acpigen_write_dword(coordtype); + acpigen_write_dword(numprocs); acpigen_pop_len(); - len += lenp; acpigen_pop_len(); - return len + lenh; } -int acpigen_write_mem32fixed(int readwrite, u32 base, u32 size) +void acpigen_write_mem32fixed(int readwrite, u32 base, u32 size) { /* * acpi 4.0 section 6.4.3.4: 32-Bit Fixed Memory Range Descriptor @@ -621,10 +551,9 @@ int acpigen_write_mem32fixed(int readwrite, u32 base, u32 size) acpigen_emit_byte((size >> 8) & 0xff); acpigen_emit_byte((size >> 16) & 0xff); acpigen_emit_byte((size >> 24) & 0xff); - return 12; } -int acpigen_write_register(acpi_addr_t *addr) +void acpigen_write_register(acpi_addr_t *addr) { acpigen_emit_byte(0x82); /* Register Descriptor */ acpigen_emit_byte(0x0c); /* Register Length 7:0 */ @@ -641,10 +570,9 @@ int acpigen_write_register(acpi_addr_t *addr) acpigen_emit_byte((addr->addrh >> 8) & 0xff); acpigen_emit_byte((addr->addrh >> 16) & 0xff); acpigen_emit_byte((addr->addrh >> 24) & 0xff); - return 15; } -int acpigen_write_irq(u16 mask) +void acpigen_write_irq(u16 mask) { /* * acpi 3.0b section 6.4.2.1: IRQ Descriptor @@ -656,10 +584,9 @@ int acpigen_write_irq(u16 mask) acpigen_emit_byte(0x22); acpigen_emit_byte(mask & 0xff); acpigen_emit_byte((mask >> 8) & 0xff); - return 3; } -int acpigen_write_io16(u16 min, u16 max, u8 align, u8 len, u8 decode16) +void acpigen_write_io16(u16 min, u16 max, u8 align, u8 len, u8 decode16) { /* * acpi 4.0 section 6.4.2.6: I/O Port Descriptor @@ -681,28 +608,25 @@ int acpigen_write_io16(u16 min, u16 max, u8 align, u8 len, u8 decode16) /* alignment for min base */ acpigen_emit_byte(align & 0xff); acpigen_emit_byte(len & 0xff); - return 8; } -int acpigen_write_resourcetemplate_header(void) +void acpigen_write_resourcetemplate_header(void) { - int len; /* * A ResourceTemplate() is a Buffer() with a * (Byte|Word|DWord) containing the length, followed by one or more * resource items, terminated by the end tag. * (small item 0xf, len 1) */ - len = acpigen_emit_byte(0x11); /* Buffer opcode */ - len += acpigen_write_len_f(); - len += acpigen_emit_byte(0x0b); /* Word opcode */ + acpigen_emit_byte(0x11); /* Buffer opcode */ + acpigen_write_len_f(); + acpigen_emit_byte(0x0b); /* Word opcode */ len_stack[ltop++] = acpigen_get_current(); - len += acpigen_emit_byte(0x00); - len += acpigen_emit_byte(0x00); - return len; + acpigen_emit_byte(0x00); + acpigen_emit_byte(0x00); } -int acpigen_write_resourcetemplate_footer(void) +void acpigen_write_resourcetemplate_footer(void) { char *p = len_stack[--ltop]; int len; @@ -722,7 +646,6 @@ int acpigen_write_resourcetemplate_footer(void) p[1] = (len >> 8) & 0xff; /* patch len field */ acpigen_pop_len(); - return 2; } static void acpigen_add_mainboard_rsvd_mem32(void *gp, struct device *dev, @@ -744,13 +667,9 @@ static void acpigen_add_mainboard_rsvd_io(void *gp, struct device *dev, } } -int acpigen_write_mainboard_resource_template(void) +void acpigen_write_mainboard_resource_template(void) { - int len; - char *start; - char *end; - len = acpigen_write_resourcetemplate_header(); - start = acpigen_get_current(); + acpigen_write_resourcetemplate_header(); /* Add reserved memory ranges. */ search_global_resources( @@ -764,20 +683,15 @@ int acpigen_write_mainboard_resource_template(void) IORESOURCE_IO | IORESOURCE_RESERVE, acpigen_add_mainboard_rsvd_io, 0); - end = acpigen_get_current(); - len += end-start; - len += acpigen_write_resourcetemplate_footer(); - return len; + acpigen_write_resourcetemplate_footer(); } -int acpigen_write_mainboard_resources(const char *scope, const char *name) +void acpigen_write_mainboard_resources(const char *scope, const char *name) { - int len; - len = acpigen_write_scope(scope); - len += acpigen_write_name(name); - len += acpigen_write_mainboard_resource_template(); + acpigen_write_scope(scope); + acpigen_write_name(name); + acpigen_write_mainboard_resource_template(); acpigen_pop_len(); - return len; } static int hex2bin(const char c) @@ -789,7 +703,7 @@ static int hex2bin(const char c) return c - '0'; } -int acpigen_emit_eisaid(const char *eisaid) +void acpigen_emit_eisaid(const char *eisaid) { u32 compact = 0; @@ -811,5 +725,4 @@ int acpigen_emit_eisaid(const char *eisaid) acpigen_emit_byte((compact >> 16) & 0xff); acpigen_emit_byte((compact >> 8) & 0xff); acpigen_emit_byte(compact & 0xff); - return 5; } diff --git a/src/arch/x86/include/arch/acpigen.h b/src/arch/x86/include/arch/acpigen.h index e4d6f1e..1ec512f 100644 --- a/src/arch/x86/include/arch/acpigen.h +++ b/src/arch/x86/include/arch/acpigen.h @@ -25,47 +25,47 @@ #include <stdint.h> #include <arch/acpi.h> -int acpigen_write_len_f(void); +void acpigen_write_len_f(void); void acpigen_pop_len(void); void acpigen_set_current(char *curr); char *acpigen_get_current(void); -int acpigen_write_package(int nr_el); -int acpigen_write_byte(unsigned int data); -int acpigen_emit_byte(unsigned char data); -int acpigen_emit_stream(const char *data, int size); -int acpigen_emit_namestring(const char *namepath); -int acpigen_emit_eisaid(const char *eisaid); -int acpigen_write_dword(unsigned int data); -int acpigen_write_qword(uint64_t data); -int acpigen_write_name(const char *name); -int acpigen_write_name_dword(const char *name, uint32_t val); -int acpigen_write_name_qword(const char *name, uint64_t val); -int acpigen_write_name_byte(const char *name, uint8_t val); -int acpigen_write_scope(const char *name); -int acpigen_write_method(const char *name, int nargs); -int acpigen_write_device(const char *name); -int acpigen_write_PPC(u8 nr); -int acpigen_write_PPC_NVS(void); -int acpigen_write_empty_PCT(void); -int acpigen_write_empty_PTC(void); -int acpigen_write_TPC(const char *gnvs_tpc_limit); -int acpigen_write_PSS_package(u32 coreFreq, u32 power, u32 transLat, u32 busmLat, +void acpigen_write_package(int nr_el); +void acpigen_write_byte(unsigned int data); +void acpigen_emit_byte(unsigned char data); +void acpigen_emit_stream(const char *data, int size); +void acpigen_emit_namestring(const char *namepath); +void acpigen_emit_eisaid(const char *eisaid); +void acpigen_write_dword(unsigned int data); +void acpigen_write_qword(uint64_t data); +void acpigen_write_name(const char *name); +void acpigen_write_name_dword(const char *name, uint32_t val); +void acpigen_write_name_qword(const char *name, uint64_t val); +void acpigen_write_name_byte(const char *name, uint8_t val); +void acpigen_write_scope(const char *name); +void acpigen_write_method(const char *name, int nargs); +void acpigen_write_device(const char *name); +void acpigen_write_PPC(u8 nr); +void acpigen_write_PPC_NVS(void); +void acpigen_write_empty_PCT(void); +void acpigen_write_empty_PTC(void); +void acpigen_write_TPC(const char *gnvs_tpc_limit); +void acpigen_write_PSS_package(u32 coreFreq, u32 power, u32 transLat, u32 busmLat, u32 control, u32 status); typedef enum { SW_ALL=0xfc, SW_ANY=0xfd, HW_ALL=0xfe } PSD_coord; -int acpigen_write_PSD_package(u32 domain, u32 numprocs, PSD_coord coordtype); -int acpigen_write_CST_package_entry(acpi_cstate_t *cstate); -int acpigen_write_CST_package(acpi_cstate_t *entry, int nentries); -int acpigen_write_processor(u8 cpuindex, u32 pblock_addr, u8 pblock_len); -int acpigen_write_TSS_package(int entries, acpi_tstate_t *tstate_list); -int acpigen_write_TSD_package(u32 domain, u32 numprocs, PSD_coord coordtype); -int acpigen_write_mem32fixed(int readwrite, u32 base, u32 size); -int acpigen_write_io16(u16 min, u16 max, u8 align, u8 len, u8 decode16); -int acpigen_write_register(acpi_addr_t *addr); -int acpigen_write_resourcetemplate_header(void); -int acpigen_write_resourcetemplate_footer(void); -int acpigen_write_mainboard_resource_template(void); -int acpigen_write_mainboard_resources(const char *scope, const char *name); -int acpigen_write_irq(u16 mask); +void acpigen_write_PSD_package(u32 domain, u32 numprocs, PSD_coord coordtype); +void acpigen_write_CST_package_entry(acpi_cstate_t *cstate); +void acpigen_write_CST_package(acpi_cstate_t *entry, int nentries); +void acpigen_write_processor(u8 cpuindex, u32 pblock_addr, u8 pblock_len); +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_resourcetemplate_header(void); +void acpigen_write_resourcetemplate_footer(void); +void acpigen_write_mainboard_resource_template(void); +void acpigen_write_mainboard_resources(const char *scope, const char *name); +void acpigen_write_irq(u16 mask); int get_cst_entries(acpi_cstate_t **); diff --git a/src/cpu/intel/model_2065x/acpi.c b/src/cpu/intel/model_2065x/acpi.c index 8d8757a..b4258c8 100644 --- a/src/cpu/intel/model_2065x/acpi.c +++ b/src/cpu/intel/model_2065x/acpi.c @@ -153,31 +153,27 @@ static acpi_tstate_t tss_table_coarse[] = { { 13, 125, 0, 0x19, 0 }, }; -static int generate_T_state_entries(int core, int cores_per_package) +static void generate_T_state_entries(int core, int cores_per_package) { - int len; - /* Indicate SW_ALL coordination for T-states */ - len = acpigen_write_TSD_package(core, cores_per_package, SW_ALL); + acpigen_write_TSD_package(core, cores_per_package, SW_ALL); /* Indicate FFixedHW so OS will use MSR */ - len += acpigen_write_empty_PTC(); + acpigen_write_empty_PTC(); /* Set a T-state limit that can be modified in NVS */ - len += acpigen_write_TPC("\\TLVL"); + acpigen_write_TPC("\\TLVL"); /* * CPUID.(EAX=6):EAX[5] indicates support * for extended throttle levels. */ if (cpuid_eax(6) & (1 << 5)) - len += acpigen_write_TSS_package( + acpigen_write_TSS_package( ARRAY_SIZE(tss_table_fine), tss_table_fine); else - len += acpigen_write_TSS_package( + acpigen_write_TSS_package( ARRAY_SIZE(tss_table_coarse), tss_table_coarse); - - return len; } static int calculate_power(int tdp, int p1_ratio, int ratio) diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c index 465525b..28bb7dc 100644 --- a/src/cpu/intel/model_206ax/acpi.c +++ b/src/cpu/intel/model_206ax/acpi.c @@ -153,31 +153,27 @@ static acpi_tstate_t tss_table_coarse[] = { { 13, 125, 0, 0x19, 0 }, }; -static int generate_T_state_entries(int core, int cores_per_package) +static void generate_T_state_entries(int core, int cores_per_package) { - int len; - /* Indicate SW_ALL coordination for T-states */ - len = acpigen_write_TSD_package(core, cores_per_package, SW_ALL); + acpigen_write_TSD_package(core, cores_per_package, SW_ALL); /* Indicate FFixedHW so OS will use MSR */ - len += acpigen_write_empty_PTC(); + acpigen_write_empty_PTC(); /* Set a T-state limit that can be modified in NVS */ - len += acpigen_write_TPC("\\TLVL"); + acpigen_write_TPC("\\TLVL"); /* * CPUID.(EAX=6):EAX[5] indicates support * for extended throttle levels. */ if (cpuid_eax(6) & (1 << 5)) - len += acpigen_write_TSS_package( + acpigen_write_TSS_package( ARRAY_SIZE(tss_table_fine), tss_table_fine); else - len += acpigen_write_TSS_package( + acpigen_write_TSS_package( ARRAY_SIZE(tss_table_coarse), tss_table_coarse); - - return len; } static int calculate_power(int tdp, int p1_ratio, int ratio) diff --git a/src/soc/intel/broadwell/acpi.c b/src/soc/intel/broadwell/acpi.c index f038e87..a4f80c5 100644 --- a/src/soc/intel/broadwell/acpi.c +++ b/src/soc/intel/broadwell/acpi.c @@ -365,34 +365,30 @@ static acpi_tstate_t tss_table_coarse[] = { { 13, 125, 0, 0x19, 0 }, }; -static int generate_T_state_entries(int core, int cores_per_package) +static void generate_T_state_entries(int core, int cores_per_package) { - int len; - /* Indicate SW_ALL coordination for T-states */ - len = acpigen_write_TSD_package(core, cores_per_package, SW_ALL); + acpigen_write_TSD_package(core, cores_per_package, SW_ALL); /* Indicate FFixedHW so OS will use MSR */ - len += acpigen_write_empty_PTC(); + acpigen_write_empty_PTC(); /* Set a T-state limit that can be modified in NVS */ - len += acpigen_write_TPC("\\TLVL"); + acpigen_write_TPC("\\TLVL"); /* * CPUID.(EAX=6):EAX[5] indicates support * for extended throttle levels. */ if (cpuid_eax(6) & (1 << 5)) - len += acpigen_write_TSS_package( + acpigen_write_TSS_package( ARRAY_SIZE(tss_table_fine), tss_table_fine); else - len += acpigen_write_TSS_package( + acpigen_write_TSS_package( ARRAY_SIZE(tss_table_coarse), tss_table_coarse); - - return len; } -static int generate_C_state_entries(void) +static void generate_C_state_entries(void) { device_t dev = SA_DEV_ROOT; config_t *config = dev->chip_info; @@ -411,7 +407,7 @@ static int generate_C_state_entries(void) } /* Generate C-state tables */ - return acpigen_write_CST_package(map, ARRAY_SIZE(map)); + acpigen_write_CST_package(map, ARRAY_SIZE(map)); } static int calculate_power(int tdp, int p1_ratio, int ratio) diff --git a/src/soc/intel/fsp_baytrail/acpi.c b/src/soc/intel/fsp_baytrail/acpi.c index a843e71..c2f7ae8 100644 --- a/src/soc/intel/fsp_baytrail/acpi.c +++ b/src/soc/intel/fsp_baytrail/acpi.c @@ -362,24 +362,20 @@ static acpi_tstate_t baytrail_tss_table[] = { { 13, 125, 0, 0x12, 0 }, }; -static int generate_T_state_entries(int core, int cores_per_package) +static void generate_T_state_entries(int core, int cores_per_package) { - int len; - /* Indicate SW_ALL coordination for T-states */ - len = acpigen_write_TSD_package(core, cores_per_package, SW_ALL); + acpigen_write_TSD_package(core, cores_per_package, SW_ALL); /* Indicate FFixedHW so OS will use MSR */ - len += acpigen_write_empty_PTC(); + acpigen_write_empty_PTC(); /* Set NVS controlled T-state limit */ - len += acpigen_write_TPC("\\TLVL"); + acpigen_write_TPC("\\TLVL"); /* Write TSS table for MSR access */ - len += acpigen_write_TSS_package( + acpigen_write_TSS_package( ARRAY_SIZE(baytrail_tss_table), baytrail_tss_table); - - return len; } static int calculate_power(int tdp, int p1_ratio, int ratio) diff --git a/src/southbridge/intel/lynxpoint/acpi.c b/src/southbridge/intel/lynxpoint/acpi.c index d1c8934..731aa2a 100644 --- a/src/southbridge/intel/lynxpoint/acpi.c +++ b/src/southbridge/intel/lynxpoint/acpi.c @@ -57,18 +57,18 @@ void acpi_create_intel_hpet(acpi_hpet_t * hpet) acpi_checksum((void *) hpet, sizeof(acpi_hpet_t)); } -static int acpi_create_serialio_ssdt_entry(int id, global_nvs_t *gnvs) +static void acpi_create_serialio_ssdt_entry(int id, global_nvs_t *gnvs) { char sio_name[5] = {}; snprintf(sio_name, sizeof (sio_name), "S%1uEN", id); - return acpigen_write_name_byte(sio_name, gnvs->s0b[id] ? 1 : 0); + acpigen_write_name_byte(sio_name, gnvs->s0b[id] ? 1 : 0); } void acpi_create_serialio_ssdt(acpi_header_t *ssdt) { unsigned long current = (unsigned long)ssdt + sizeof(acpi_header_t); global_nvs_t *gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS); - int id, len = 0; + int id; if (!gnvs) return; @@ -87,7 +87,7 @@ void acpi_create_serialio_ssdt(acpi_header_t *ssdt) /* Fill the SSDT with an entry for each SerialIO device */ for (id = 0; id < 8; id++) - len += acpi_create_serialio_ssdt_entry(id, gnvs); + acpi_create_serialio_ssdt_entry(id, gnvs); /* (Re)calculate length and checksum. */ current = (unsigned long)acpigen_get_current();

1 0

Patch set updated for coreboot: caf9866 speedstep: Don't supply weak get_cst_entries.
by Vladimir Serbinenko 14 May '15

14 May '15

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7368 -gerrit commit caf9866849cc68f7a2088eb0c4acfb2081c03521 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sun Nov 9 12:59:29 2014 +0100 speedstep: Don't supply weak get_cst_entries. This shouls be overriden by mobo even if it's no-op override. weak function in this case would only hide real problems. Change-Id: I30dd671eb605b490a51153d00ae308c4bdef3d05 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/cpu/intel/speedstep/acpi.c | 13 ------------- src/mainboard/getac/p470/Makefile.inc | 1 + src/mainboard/getac/p470/cstates.c | 7 +++++++ src/mainboard/ibase/mb899/Makefile.inc | 1 + src/mainboard/ibase/mb899/cstates.c | 7 +++++++ src/mainboard/intel/d945gclf/Makefile.inc | 1 + src/mainboard/intel/d945gclf/cstates.c | 7 +++++++ src/mainboard/intel/eagleheights/Makefile.inc | 1 + src/mainboard/intel/eagleheights/cstates.c | 7 +++++++ src/mainboard/iwave/iWRainbowG6/Makefile.inc | 1 + src/mainboard/iwave/iWRainbowG6/cstates.c | 7 +++++++ src/mainboard/kontron/986lcd-m/Makefile.inc | 1 + src/mainboard/kontron/986lcd-m/cstates.c | 7 +++++++ src/mainboard/roda/rk886ex/Makefile.inc | 1 + src/mainboard/roda/rk886ex/cstates.c | 7 +++++++ 15 files changed, 56 insertions(+), 13 deletions(-) diff --git a/src/cpu/intel/speedstep/acpi.c b/src/cpu/intel/speedstep/acpi.c index 8a2bff1..0217f71 100644 --- a/src/cpu/intel/speedstep/acpi.c +++ b/src/cpu/intel/speedstep/acpi.c @@ -29,19 +29,6 @@ #include <cpu/intel/speedstep.h> #include <device/device.h> -/** - * @brief Returns c-state entries for this system - * - * This function is usually overwritten in mainboard code. - * - * @return Number of c-states *entries will point to. - */ -int __attribute__((weak)) get_cst_entries(acpi_cstate_t **entries - __attribute__((unused))) -{ - return 0; -} - static int determine_total_number_of_cores(void) { struct device *cpu; diff --git a/src/mainboard/getac/p470/Makefile.inc b/src/mainboard/getac/p470/Makefile.inc index 1ba662e..39c6a2b 100644 --- a/src/mainboard/getac/p470/Makefile.inc +++ b/src/mainboard/getac/p470/Makefile.inc @@ -17,3 +17,4 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +ramstage-y += cstates.c diff --git a/src/mainboard/getac/p470/cstates.c b/src/mainboard/getac/p470/cstates.c new file mode 100644 index 0000000..2d543ff --- /dev/null +++ b/src/mainboard/getac/p470/cstates.c @@ -0,0 +1,7 @@ +#include <device/device.h> +#include <arch/x86/include/arch/acpigen.h> + +int get_cst_entries(acpi_cstate_t **entries) +{ + return 0; +} diff --git a/src/mainboard/ibase/mb899/Makefile.inc b/src/mainboard/ibase/mb899/Makefile.inc index c4e781b..0b70b89 100644 --- a/src/mainboard/ibase/mb899/Makefile.inc +++ b/src/mainboard/ibase/mb899/Makefile.inc @@ -1 +1,2 @@ ramstage-y += superio_hwm.c +ramstage-y += cstates.c diff --git a/src/mainboard/ibase/mb899/cstates.c b/src/mainboard/ibase/mb899/cstates.c new file mode 100644 index 0000000..2d543ff --- /dev/null +++ b/src/mainboard/ibase/mb899/cstates.c @@ -0,0 +1,7 @@ +#include <device/device.h> +#include <arch/x86/include/arch/acpigen.h> + +int get_cst_entries(acpi_cstate_t **entries) +{ + return 0; +} diff --git a/src/mainboard/intel/d945gclf/Makefile.inc b/src/mainboard/intel/d945gclf/Makefile.inc new file mode 100644 index 0000000..f9621db --- /dev/null +++ b/src/mainboard/intel/d945gclf/Makefile.inc @@ -0,0 +1 @@ +ramstage-y += cstates.c diff --git a/src/mainboard/intel/d945gclf/cstates.c b/src/mainboard/intel/d945gclf/cstates.c new file mode 100644 index 0000000..2d543ff --- /dev/null +++ b/src/mainboard/intel/d945gclf/cstates.c @@ -0,0 +1,7 @@ +#include <device/device.h> +#include <arch/x86/include/arch/acpigen.h> + +int get_cst_entries(acpi_cstate_t **entries) +{ + return 0; +} diff --git a/src/mainboard/intel/eagleheights/Makefile.inc b/src/mainboard/intel/eagleheights/Makefile.inc new file mode 100644 index 0000000..f9621db --- /dev/null +++ b/src/mainboard/intel/eagleheights/Makefile.inc @@ -0,0 +1 @@ +ramstage-y += cstates.c diff --git a/src/mainboard/intel/eagleheights/cstates.c b/src/mainboard/intel/eagleheights/cstates.c new file mode 100644 index 0000000..2d543ff --- /dev/null +++ b/src/mainboard/intel/eagleheights/cstates.c @@ -0,0 +1,7 @@ +#include <device/device.h> +#include <arch/x86/include/arch/acpigen.h> + +int get_cst_entries(acpi_cstate_t **entries) +{ + return 0; +} diff --git a/src/mainboard/iwave/iWRainbowG6/Makefile.inc b/src/mainboard/iwave/iWRainbowG6/Makefile.inc new file mode 100644 index 0000000..f9621db --- /dev/null +++ b/src/mainboard/iwave/iWRainbowG6/Makefile.inc @@ -0,0 +1 @@ +ramstage-y += cstates.c diff --git a/src/mainboard/iwave/iWRainbowG6/cstates.c b/src/mainboard/iwave/iWRainbowG6/cstates.c new file mode 100644 index 0000000..2d543ff --- /dev/null +++ b/src/mainboard/iwave/iWRainbowG6/cstates.c @@ -0,0 +1,7 @@ +#include <device/device.h> +#include <arch/x86/include/arch/acpigen.h> + +int get_cst_entries(acpi_cstate_t **entries) +{ + return 0; +} diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.inc new file mode 100644 index 0000000..f9621db --- /dev/null +++ b/src/mainboard/kontron/986lcd-m/Makefile.inc @@ -0,0 +1 @@ +ramstage-y += cstates.c diff --git a/src/mainboard/kontron/986lcd-m/cstates.c b/src/mainboard/kontron/986lcd-m/cstates.c new file mode 100644 index 0000000..2d543ff --- /dev/null +++ b/src/mainboard/kontron/986lcd-m/cstates.c @@ -0,0 +1,7 @@ +#include <device/device.h> +#include <arch/x86/include/arch/acpigen.h> + +int get_cst_entries(acpi_cstate_t **entries) +{ + return 0; +} diff --git a/src/mainboard/roda/rk886ex/Makefile.inc b/src/mainboard/roda/rk886ex/Makefile.inc index 7a05dc3..402b4f5 100644 --- a/src/mainboard/roda/rk886ex/Makefile.inc +++ b/src/mainboard/roda/rk886ex/Makefile.inc @@ -18,3 +18,4 @@ ## ramstage-y += m3885.c +ramstage-y += cstates.c diff --git a/src/mainboard/roda/rk886ex/cstates.c b/src/mainboard/roda/rk886ex/cstates.c new file mode 100644 index 0000000..2d543ff --- /dev/null +++ b/src/mainboard/roda/rk886ex/cstates.c @@ -0,0 +1,7 @@ +#include <device/device.h> +#include <arch/x86/include/arch/acpigen.h> + +int get_cst_entries(acpi_cstate_t **entries) +{ + return 0; +}

1 0

Patch set updated for coreboot: e10294c gm45: Link cstates.c rather than including it.
by Vladimir Serbinenko 14 May '15

14 May '15

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7375 -gerrit commit e10294ce781225130562b30f8686cb28ef32b54d Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sun Nov 9 13:44:36 2014 +0100 gm45: Link cstates.c rather than including it. The comment about necessity of include isn't true anymore as get_cst_entries is not weak anymore so if it's not found, the linking would fail. Change-Id: I4bf88208d63ac3e625f464c3907e2e1ea575dd9f Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/mainboard/lenovo/x200/Makefile.inc | 1 + src/mainboard/lenovo/x200/mainboard.c | 3 --- src/mainboard/roda/rk9/Makefile.inc | 2 ++ src/mainboard/roda/rk9/mainboard.c | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/mainboard/lenovo/x200/Makefile.inc b/src/mainboard/lenovo/x200/Makefile.inc index 4eb1216..c3c8a0e 100644 --- a/src/mainboard/lenovo/x200/Makefile.inc +++ b/src/mainboard/lenovo/x200/Makefile.inc @@ -18,3 +18,4 @@ ## ramstage-y += dock.c +ramstage-y += cstates.c diff --git a/src/mainboard/lenovo/x200/mainboard.c b/src/mainboard/lenovo/x200/mainboard.c index 5354834..8ba7a35 100644 --- a/src/mainboard/lenovo/x200/mainboard.c +++ b/src/mainboard/lenovo/x200/mainboard.c @@ -32,9 +32,6 @@ #include <ec/acpi/ec.h> #include <ec/lenovo/h8/h8.h> -#include "cstates.c" /* Include it, as the linker won't find - the overloaded weak function in there. */ - const char *smbios_mainboard_bios_version(void) { static char *s = NULL; diff --git a/src/mainboard/roda/rk9/Makefile.inc b/src/mainboard/roda/rk9/Makefile.inc index 1a6cb02..d69f715 100644 --- a/src/mainboard/roda/rk9/Makefile.inc +++ b/src/mainboard/roda/rk9/Makefile.inc @@ -18,3 +18,5 @@ ## ramstage-$(CONFIG_CARDBUS_PLUGIN_SUPPORT) += ti_pci7xx1.c +ramstage-y += cstates.c + diff --git a/src/mainboard/roda/rk9/mainboard.c b/src/mainboard/roda/rk9/mainboard.c index 4ae004b..1b607cc 100644 --- a/src/mainboard/roda/rk9/mainboard.c +++ b/src/mainboard/roda/rk9/mainboard.c @@ -26,9 +26,6 @@ #include <pc80/keyboard.h> #include <ec/acpi/ec.h> -#include "cstates.c" /* Include it, as the linker won't find - the overloaded weak function in there. */ - static void ec_setup(void) { /* Thermal limits? Values are from ectool's ram dump. */

1 0

Patch set updated for coreboot: 170857e ACPI: slic support
by Vladimir Serbinenko 14 May '15

14 May '15

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7202 -gerrit commit 170857ea75dffb5979910949dd120af3bc295069 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sun Oct 26 20:42:08 2014 +0100 ACPI: slic support Export SLIC table from file in CBFS. Change-Id: Id0e7fe0a49b9cd50b5e43cd15030e1c2098728ec Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/Kconfig | 4 --- src/arch/x86/boot/acpi.c | 61 +++++++++++++++++++++++------------ src/arch/x86/boot/tables.c | 6 ++-- src/arch/x86/include/arch/acpi.h | 8 ----- src/mainboard/getac/p470/Kconfig | 1 - src/mainboard/getac/p470/Makefile.inc | 1 - src/mainboard/getac/p470/acpi_slic.c | 38 ---------------------- 7 files changed, 43 insertions(+), 76 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 480b8e9..0149931 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -406,10 +406,6 @@ config HAVE_ACPI_RESUME bool default n -config HAVE_ACPI_SLIC - bool - default n - config HAVE_HARD_RESET bool default n diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index b2e0df3..75d7d2e 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -33,6 +33,7 @@ #include <cbmem.h> #include <cpu/x86/lapic_def.h> #include <cpu/cpu.h> +#include <cbfs.h> #if CONFIG_COLLECT_TIMESTAMPS #include <timestamp.h> #endif @@ -501,14 +502,14 @@ void acpi_create_facs(acpi_facs_t *facs) facs->version = 1; /* ACPI 1.0: 0, ACPI 2.0/3.0: 1, ACPI 4.0: 2 */ } -void acpi_write_rsdt(acpi_rsdt_t *rsdt) +static void acpi_write_rsdt(acpi_rsdt_t *rsdt, char *oem_id, char *oem_table_id) { acpi_header_t *header = &(rsdt->header); /* Fill out header fields. */ memcpy(header->signature, "RSDT", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); + memcpy(header->oem_id, oem_id, 6); + memcpy(header->oem_table_id, oem_table_id, 8); memcpy(header->asl_compiler_id, ASLC, 4); header->length = sizeof(acpi_rsdt_t); @@ -520,14 +521,14 @@ void acpi_write_rsdt(acpi_rsdt_t *rsdt) header->checksum = acpi_checksum((void *)rsdt, sizeof(acpi_rsdt_t)); } -void acpi_write_xsdt(acpi_xsdt_t *xsdt) +static void acpi_write_xsdt(acpi_xsdt_t *xsdt, char *oem_id, char *oem_table_id) { acpi_header_t *header = &(xsdt->header); /* Fill out header fields. */ memcpy(header->signature, "XSDT", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); + memcpy(header->oem_id, oem_id, 6); + memcpy(header->oem_table_id, oem_table_id, 8); memcpy(header->asl_compiler_id, ASLC, 4); header->length = sizeof(acpi_xsdt_t); @@ -539,12 +540,13 @@ void acpi_write_xsdt(acpi_xsdt_t *xsdt) header->checksum = acpi_checksum((void *)xsdt, sizeof(acpi_xsdt_t)); } -void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, acpi_xsdt_t *xsdt) +static void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, + acpi_xsdt_t *xsdt, char *oem_id) { memset(rsdp, 0, sizeof(acpi_rsdp_t)); memcpy(rsdp->signature, RSDP_SIG, 8); - memcpy(rsdp->oem_id, OEM_ID, 6); + memcpy(rsdp->oem_id, oem_id, 6); rsdp->length = sizeof(acpi_rsdp_t); rsdp->rsdt_address = (u32)rsdt; @@ -704,15 +706,15 @@ unsigned long write_acpi_tables(unsigned long start) acpi_xsdt_t *xsdt; acpi_fadt_t *fadt; acpi_facs_t *facs; -#if CONFIG_HAVE_ACPI_SLIC - acpi_header_t *slic; -#endif + acpi_header_t *slic_file, *slic; acpi_header_t *ssdt; acpi_header_t *dsdt; acpi_mcfg_t *mcfg; acpi_madt_t *madt; struct device *dev; unsigned long fw; + size_t slic_size; + char oem_id[6], oem_table_id[8]; current = start; @@ -723,6 +725,22 @@ unsigned long write_acpi_tables(unsigned long start) if (fw) return fw; + slic_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, + CONFIG_CBFS_PREFIX "/slic", + CBFS_TYPE_RAW, &slic_size); + if (slic_file && (slic_file->length > slic_size + || slic_file->length < sizeof (acpi_header_t))) { + slic_file = 0; + } + + if (slic_file) { + memcpy(oem_id, slic_file->oem_id, 6); + memcpy(oem_table_id, slic_file->oem_table_id, 8); + } else { + memcpy(oem_id, OEM_ID, 6); + memcpy(oem_table_id, ACPI_TABLE_CREATOR, 8); + } + printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx.\n", start); /* We need at least an RSDP and an RSDT Table */ @@ -739,9 +757,9 @@ unsigned long write_acpi_tables(unsigned long start) /* clear all table memory */ memset((void *) start, 0, current - start); - acpi_write_rsdp(rsdp, rsdt, xsdt); - acpi_write_rsdt(rsdt); - acpi_write_xsdt(xsdt); + acpi_write_rsdp(rsdp, rsdt, xsdt, oem_id); + acpi_write_rsdt(rsdt, oem_id, oem_table_id); + acpi_write_xsdt(xsdt, oem_id, oem_table_id); printk(BIOS_DEBUG, "ACPI: * FACS\n"); facs = (acpi_facs_t *) current; @@ -782,13 +800,14 @@ unsigned long write_acpi_tables(unsigned long start) acpi_create_fadt(fadt, facs, dsdt); acpi_add_table(rsdp, fadt); -#if CONFIG_HAVE_ACPI_SLIC - printk(BIOS_DEBUG, "ACPI: * SLIC\n"); - slic = (acpi_header_t *)current; - current += acpi_create_slic(current); - ALIGN_CURRENT; - acpi_add_table(rsdp, slic); -#endif + if (slic_file) { + printk(BIOS_DEBUG, "ACPI: * SLIC\n"); + slic = (acpi_header_t *)current; + memcpy(slic, slic_file, slic_file->length); + current += slic_file->length; + ALIGN_CURRENT; + acpi_add_table(rsdp, slic); + } printk(BIOS_DEBUG, "ACPI: * SSDT\n"); ssdt = (acpi_header_t *)current; diff --git a/src/arch/x86/boot/tables.c b/src/arch/x86/boot/tables.c index 04efd6f..db761bd 100644 --- a/src/arch/x86/boot/tables.c +++ b/src/arch/x86/boot/tables.c @@ -147,9 +147,9 @@ void write_tables(void) acpi_rsdp_t *low_rsdp = (acpi_rsdp_t *)rom_table_end, *high_rsdp = (acpi_rsdp_t *)acpi_start; - acpi_write_rsdp(low_rsdp, - (acpi_rsdt_t *)(high_rsdp->rsdt_address), - (acpi_xsdt_t *)((unsigned long)high_rsdp->xsdt_address)); + /* Technically rsdp length varies but coreboot always + writes longest size available. */ + memcpy(low_rsdp, high_rsdp, sizeof(acpi_rsdp_t)); } else { printk(BIOS_ERR, "ERROR: Didn't find RSDP in high table.\n"); } diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 588de93..809c6fa 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -551,14 +551,6 @@ void acpi_dmar_drhd_fixup(unsigned long base, unsigned long current); unsigned long acpi_create_dmar_drhd_ds_pci(unsigned long current, u8 segment, u8 dev, u8 fn); -#if CONFIG_HAVE_ACPI_SLIC -unsigned long acpi_create_slic(unsigned long current); -#endif - -void acpi_write_rsdt(acpi_rsdt_t *rsdt); -void acpi_write_xsdt(acpi_xsdt_t *xsdt); -void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, acpi_xsdt_t *xsdt); - void acpi_write_hest(acpi_hest_t *hest); unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t *esd, u16 type, void *data, u16 len); unsigned long acpi_fill_hest(acpi_hest_t *hest); diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig index 919a8ef..3455872 100644 --- a/src/mainboard/getac/p470/Kconfig +++ b/src/mainboard/getac/p470/Kconfig @@ -35,7 +35,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_MP_TABLE select HAVE_OPTION_TABLE select HAVE_ACPI_RESUME - select HAVE_ACPI_SLIC select UDELAY_LAPIC select BOARD_ROMSIZE_KB_1024 select CHANNEL_XOR_RANDOMIZATION diff --git a/src/mainboard/getac/p470/Makefile.inc b/src/mainboard/getac/p470/Makefile.inc index ebfdd49..1ba662e 100644 --- a/src/mainboard/getac/p470/Makefile.inc +++ b/src/mainboard/getac/p470/Makefile.inc @@ -17,4 +17,3 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -ramstage-$(CONFIG_HAVE_ACPI_SLIC) += acpi_slic.c diff --git a/src/mainboard/getac/p470/acpi_slic.c b/src/mainboard/getac/p470/acpi_slic.c deleted file mode 100644 index b042f36..0000000 --- a/src/mainboard/getac/p470/acpi_slic.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2009 coresystems GmbH - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -#include <string.h> -#include <device/pci.h> -#include <arch/acpi.h> - -static const char slic[0x4] = { - 0x53, 0x4c, 0x49, 0x43 /* incomplete. */ - /* If you wish to compile coreboot images with a windows license key - * built in, you need to extract the ACPI SLIC from your machine and - * add it here. - */ -}; - -unsigned long acpi_create_slic(unsigned long current) -{ - memcpy((void *) current, slic, sizeof(slic)); - return sizeof(slic); -}

1 0

Patch set updated for coreboot: d5c9d57 Make acpi_fill_hest into parameter
by Vladimir Serbinenko 14 May '15

14 May '15

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7373 -gerrit commit d5c9d5736346d393782cb5e8ee99164d937fc6d0 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sun Nov 9 13:36:18 2014 +0100 Make acpi_fill_hest into parameter Change-Id: Ie96475babb4aa4ea8db49023af5b31bfa63b21dc Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/arch/x86/boot/acpi.c | 8 ++------ src/arch/x86/include/arch/acpi.h | 3 ++- src/northbridge/amd/agesa/family12/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family14/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family15/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family15tn/northbridge.c | 5 +++-- src/northbridge/amd/agesa/family16kb/northbridge.c | 4 ++-- src/northbridge/amd/pi/00730F01/northbridge.c | 4 ++-- 8 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index bc2a0cc..bb994e2 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -554,11 +554,6 @@ static void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, rsdp->ext_checksum = acpi_checksum((void *)rsdp, sizeof(acpi_rsdp_t)); } -unsigned long __attribute__((weak)) acpi_fill_hest(acpi_hest_t *hest) -{ - return (unsigned long)hest; -} - unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t *esd, u16 type, void *data, u16 data_len) { acpi_header_t *header = &(hest->header); @@ -618,7 +613,8 @@ unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t * } /* ACPI 4.0 */ -void acpi_write_hest(acpi_hest_t *hest) +void acpi_write_hest(acpi_hest_t *hest, + unsigned long (*acpi_fill_hest)(acpi_hest_t *hest)) { acpi_header_t *header = &(hest->header); diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index da1a020..edc217c 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -546,10 +546,11 @@ unsigned long acpi_create_dmar_drhd(unsigned long current, u8 flags, void acpi_dmar_drhd_fixup(unsigned long base, unsigned long current); unsigned long acpi_create_dmar_drhd_ds_pci(unsigned long current, u8 segment, u8 dev, u8 fn); +void acpi_write_hest(acpi_hest_t *hest, + unsigned long (*acpi_fill_hest)(acpi_hest_t *hest)); void acpi_write_hest(acpi_hest_t *hest); unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t *esd, u16 type, void *data, u16 len); -unsigned long acpi_fill_hest(acpi_hest_t *hest); void acpi_save_gnvs(u32 gnvs_address); diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c index 26d4eee..7dabf4b 100644 --- a/src/northbridge/amd/agesa/family12/northbridge.c +++ b/src/northbridge/amd/agesa/family12/northbridge.c @@ -793,7 +793,7 @@ static void cpu_bus_init(device_t dev) /* North Bridge Structures */ -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -843,7 +843,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c index e4da36c..a65140c 100644 --- a/src/northbridge/amd/agesa/family14/northbridge.c +++ b/src/northbridge/amd/agesa/family14/northbridge.c @@ -815,7 +815,7 @@ static void northbridge_fill_ssdt_generator(void) acpigen_pop_len(); } -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -845,7 +845,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c index 14f56f2..8a909e6 100644 --- a/src/northbridge/amd/agesa/family15/northbridge.c +++ b/src/northbridge/amd/agesa/family15/northbridge.c @@ -483,7 +483,7 @@ static unsigned scan_chains(device_t dev, unsigned max) } -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -534,7 +534,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index 29337fb..840deaf 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -458,7 +458,8 @@ static void nb_set_resources(device_t dev) } } -unsigned long acpi_fill_hest(acpi_hest_t *hest) + +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -510,7 +511,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c index 86d5a92..c557e8d 100644 --- a/src/northbridge/amd/agesa/family16kb/northbridge.c +++ b/src/northbridge/amd/agesa/family16kb/northbridge.c @@ -459,7 +459,7 @@ static void set_resources(device_t dev) } -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -511,7 +511,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length; diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c index 4f646f7..0e38f3e 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -447,7 +447,7 @@ static void northbridge_init(struct device *dev) { } -unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current; @@ -499,7 +499,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit May 2015