[coreboot-gerrit] Patch set updated for coreboot: a346e80 device_ops: add device_t argument to acpi_fill_ssdt_generator
Alexander Couzens (lynxis@fe80.eu)
gerrit at coreboot.org
Mon Apr 13 01:25:00 CEST 2015
Alexander Couzens (lynxis at fe80.eu) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9598
-gerrit
commit a346e804f6f187b65eb646a43eadb0cb088853f2
Author: Alexander Couzens <lynxis at fe80.eu>
Date: Sun Apr 12 22:18:55 2015 +0200
device_ops: add device_t argument to acpi_fill_ssdt_generator
`device_t device` is missing as argument. Every device_op function
should have a `device_t device` argument.
Change-Id: I7fca8c3fa15c1be672e50e4422d7ac8e4aaa1e36
Signed-off-by: Alexander Couzens <lynxis at fe80.eu>
---
src/arch/x86/boot/acpi.c | 2 +-
src/arch/x86/include/arch/acpi.h | 11 ++++++-----
src/cpu/intel/fsp_model_206ax/acpi.c | 2 +-
src/cpu/intel/fsp_model_406dx/acpi.c | 2 +-
src/cpu/intel/haswell/acpi.c | 2 +-
src/cpu/intel/model_2065x/acpi.c | 2 +-
src/cpu/intel/model_206ax/acpi.c | 2 +-
src/cpu/intel/speedstep/acpi.c | 2 +-
src/include/device/device.h | 2 +-
src/mainboard/google/rambi/acpi_tables.c | 5 +++--
src/mainboard/intel/bayleybay_fsp/acpi_tables.c | 4 ++--
src/mainboard/intel/minnowmax/acpi_tables.c | 4 ++--
src/mainboard/lenovo/x201/mainboard.c | 2 +-
src/mainboard/lenovo/x60/mainboard.c | 2 +-
src/mainboard/siemens/mc_tcu3/acpi_tables.c | 4 ++--
src/mainboard/tyan/s2891/mainboard.c | 2 +-
src/mainboard/tyan/s2892/mainboard.c | 2 +-
src/mainboard/tyan/s2895/mainboard.c | 2 +-
src/mainboard/winent/mb6047/mainboard.c | 2 +-
src/northbridge/amd/agesa/family12/northbridge.c | 2 +-
src/northbridge/amd/agesa/family14/northbridge.c | 2 +-
src/northbridge/amd/agesa/family15/northbridge.c | 2 +-
src/northbridge/amd/agesa/family15rl/northbridge.c | 2 +-
src/northbridge/amd/agesa/family15tn/northbridge.c | 2 +-
src/northbridge/amd/agesa/family16kb/northbridge.c | 2 +-
src/northbridge/amd/amdfam10/acpi.c | 2 +-
src/northbridge/amd/amdfam10/amdfam10.h | 2 +-
src/northbridge/amd/amdk8/acpi.c | 2 +-
src/northbridge/amd/amdk8/acpi.h | 2 +-
src/northbridge/amd/pi/00630F01/northbridge.c | 2 +-
src/northbridge/amd/pi/00730F01/northbridge.c | 2 +-
src/northbridge/intel/fsp_rangeley/acpi.c | 4 ++--
src/northbridge/intel/fsp_rangeley/northbridge.h | 10 +++++++++-
src/soc/intel/baytrail/acpi.c | 2 +-
src/soc/intel/broadwell/acpi.c | 2 +-
src/soc/intel/fsp_baytrail/acpi.c | 2 +-
src/southbridge/amd/amd8111/lpc.c | 2 +-
src/southbridge/amd/sb600/lpc.c | 2 +-
src/southbridge/amd/sb700/lpc.c | 2 +-
src/southbridge/intel/bd82x6x/lpc.c | 2 +-
src/southbridge/intel/i82371eb/acpi_tables.c | 2 +-
src/southbridge/intel/i82371eb/isa.c | 4 ++--
src/southbridge/intel/i82801ix/lpc.c | 2 +-
src/southbridge/intel/ibexpeak/lpc.c | 2 +-
src/southbridge/nvidia/ck804/lpc.c | 2 +-
src/southbridge/nvidia/mcp55/lpc.c | 2 +-
src/southbridge/via/k8t890/traf_ctrl.c | 2 +-
47 files changed, 67 insertions(+), 57 deletions(-)
diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c
index e2f7d6d..f7f3e6a 100644
--- a/src/arch/x86/boot/acpi.c
+++ b/src/arch/x86/boot/acpi.c
@@ -282,7 +282,7 @@ void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id)
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();
+ dev->ops->acpi_fill_ssdt_generator(dev);
}
current = (unsigned long) acpigen_get_current();
#else
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index b85f3e1..25d1bca 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -29,6 +29,7 @@
#include <stdint.h>
#include <rules.h>
+#include <device/device.h>
#define RSDP_SIG "RSD PTR " /* RSDT pointer signature */
#define ACPI_TABLE_CREATOR "COREBOOT" /* Must be exactly 8 bytes long! */
@@ -491,10 +492,6 @@ unsigned long acpi_fill_madt(unsigned long current);
unsigned long acpi_fill_mcfg(unsigned long current);
unsigned long acpi_fill_srat(unsigned long current);
unsigned long acpi_fill_slit(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)
@@ -536,7 +533,11 @@ void acpi_create_hpet(acpi_hpet_t *hpet);
unsigned long acpi_write_hpet(unsigned long start, acpi_rsdp_t *rsdp);
/* cpu/intel/speedstep/acpi.c */
-void generate_cpu_entries(void);
+void generate_cpu_entries(device_t device);
+#if !IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
+unsigned long acpi_fill_ssdt_generator(unsigned long current,
+ const char *oem_table_id);
+#endif
#endif
void acpi_create_mcfg(acpi_mcfg_t *mcfg);
diff --git a/src/cpu/intel/fsp_model_206ax/acpi.c b/src/cpu/intel/fsp_model_206ax/acpi.c
index fabf313..f56d4e7 100644
--- a/src/cpu/intel/fsp_model_206ax/acpi.c
+++ b/src/cpu/intel/fsp_model_206ax/acpi.c
@@ -303,7 +303,7 @@ static void generate_P_state_entries(int core, int cores_per_package)
acpigen_pop_len();
}
-void generate_cpu_entries(void)
+void generate_cpu_entries(device_t device)
{
int coreID, cpuID, pcontrol_blk = PMB0_BASE, plen = 6;
int totalcores = dev_count_cpu();
diff --git a/src/cpu/intel/fsp_model_406dx/acpi.c b/src/cpu/intel/fsp_model_406dx/acpi.c
index 4f883f4..294765f 100644
--- a/src/cpu/intel/fsp_model_406dx/acpi.c
+++ b/src/cpu/intel/fsp_model_406dx/acpi.c
@@ -264,7 +264,7 @@ static void generate_P_state_entries(int core, int cores_per_package)
acpigen_pop_len();
}
-void generate_cpu_entries(void)
+void generate_cpu_entries(device_t device)
{
int coreID, cpuID, pcontrol_blk = PMB0_BASE, plen = 6;
int totalcores = dev_count_cpu();
diff --git a/src/cpu/intel/haswell/acpi.c b/src/cpu/intel/haswell/acpi.c
index 6323d27..7c040fe 100644
--- a/src/cpu/intel/haswell/acpi.c
+++ b/src/cpu/intel/haswell/acpi.c
@@ -308,7 +308,7 @@ static void generate_P_state_entries(int core, int cores_per_package)
acpigen_pop_len();
}
-void generate_cpu_entries(void)
+void generate_cpu_entries(device_t device)
{
int coreID, cpuID, pcontrol_blk = get_pmbase(), plen = 6;
int totalcores = dev_count_cpu();
diff --git a/src/cpu/intel/model_2065x/acpi.c b/src/cpu/intel/model_2065x/acpi.c
index 8d8757a..9157f76 100644
--- a/src/cpu/intel/model_2065x/acpi.c
+++ b/src/cpu/intel/model_2065x/acpi.c
@@ -304,7 +304,7 @@ static void generate_P_state_entries(int core, int cores_per_package)
acpigen_pop_len();
}
-void generate_cpu_entries(void)
+void generate_cpu_entries(device_t device)
{
int coreID, cpuID, pcontrol_blk = PMB0_BASE, plen = 6;
int totalcores = dev_count_cpu();
diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c
index 465525b..3a50be0 100644
--- a/src/cpu/intel/model_206ax/acpi.c
+++ b/src/cpu/intel/model_206ax/acpi.c
@@ -307,7 +307,7 @@ static void generate_P_state_entries(int core, int cores_per_package)
acpigen_pop_len();
}
-void generate_cpu_entries(void)
+void generate_cpu_entries(device_t device)
{
int coreID, cpuID, pcontrol_blk = PMB0_BASE, plen = 6;
int totalcores = dev_count_cpu();
diff --git a/src/cpu/intel/speedstep/acpi.c b/src/cpu/intel/speedstep/acpi.c
index 8a2bff1..d1c3df2 100644
--- a/src/cpu/intel/speedstep/acpi.c
+++ b/src/cpu/intel/speedstep/acpi.c
@@ -131,7 +131,7 @@ static void gen_pstate_entries(const sst_table_t *const pstates,
/**
* @brief Generate ACPI entries for Speedstep for each cpu
*/
-void generate_cpu_entries(void)
+void generate_cpu_entries(device_t device)
{
int coreID, cpuID, pcontrol_blk = PMB0_BASE, plen = 6;
int totalcores = determine_total_number_of_cores();
diff --git a/src/include/device/device.h b/src/include/device/device.h
index b73e874..ec538d5 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -57,7 +57,7 @@ struct device_operations {
#endif
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
unsigned long (*write_acpi_tables)(unsigned long start, struct acpi_rsdp *rsdp);
- void (*acpi_fill_ssdt_generator)(void);
+ void (*acpi_fill_ssdt_generator)(device_t dev);
void (*acpi_inject_dsdt_generator)(device_t dev);
#endif
const struct pci_operations *ops_pci;
diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c
index 981116b..ead950f 100644
--- a/src/mainboard/google/rambi/acpi_tables.c
+++ b/src/mainboard/google/rambi/acpi_tables.c
@@ -70,9 +70,10 @@ unsigned long acpi_fill_madt(unsigned long current)
}
unsigned long acpi_fill_ssdt_generator(unsigned long current,
- const char *oem_table_id)
+ const char *oem_table_id)
{
- generate_cpu_entries();
+ device_t device = NULL;
+ generate_cpu_entries(device);
return (unsigned long) (acpigen_get_current());
}
diff --git a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
index 5f81e26..b0b8e42 100644
--- a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
+++ b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
@@ -72,9 +72,9 @@ unsigned long acpi_fill_madt(unsigned long current)
}
unsigned long acpi_fill_ssdt_generator(unsigned long current,
- const char *oem_table_id)
+ const char *oem_table_id)
{
- generate_cpu_entries();
+ generate_cpu_entries(NULL);
return (unsigned long) (acpigen_get_current());
}
diff --git a/src/mainboard/intel/minnowmax/acpi_tables.c b/src/mainboard/intel/minnowmax/acpi_tables.c
index 881c143..341a2f7 100644
--- a/src/mainboard/intel/minnowmax/acpi_tables.c
+++ b/src/mainboard/intel/minnowmax/acpi_tables.c
@@ -63,9 +63,9 @@ unsigned long acpi_fill_madt(unsigned long current)
}
unsigned long acpi_fill_ssdt_generator(unsigned long current,
- const char *oem_table_id)
+ const char *oem_table_id)
{
- generate_cpu_entries();
+ generate_cpu_entries(NULL);
return (unsigned long) (acpigen_get_current());
}
diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c
index 3cda4fa..aa85f63 100644
--- a/src/mainboard/lenovo/x201/mainboard.c
+++ b/src/mainboard/lenovo/x201/mainboard.c
@@ -109,7 +109,7 @@ static void mainboard_init(device_t dev)
pc_keyboard_init();
}
-static void fill_ssdt(void)
+static void fill_ssdt(device_t device)
{
drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0);
}
diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c
index 334c27d..f25ffd8 100644
--- a/src/mainboard/lenovo/x60/mainboard.c
+++ b/src/mainboard/lenovo/x60/mainboard.c
@@ -115,7 +115,7 @@ const char *smbios_mainboard_bios_version(void)
return s;
}
-static void fill_ssdt(void)
+static void fill_ssdt(device_t device)
{
drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 1);
}
diff --git a/src/mainboard/siemens/mc_tcu3/acpi_tables.c b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
index 5f81e26..b0b8e42 100644
--- a/src/mainboard/siemens/mc_tcu3/acpi_tables.c
+++ b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
@@ -72,9 +72,9 @@ unsigned long acpi_fill_madt(unsigned long current)
}
unsigned long acpi_fill_ssdt_generator(unsigned long current,
- const char *oem_table_id)
+ const char *oem_table_id)
{
- generate_cpu_entries();
+ generate_cpu_entries(NULL);
return (unsigned long) (acpigen_get_current());
}
diff --git a/src/mainboard/tyan/s2891/mainboard.c b/src/mainboard/tyan/s2891/mainboard.c
index 9a8dd90..10d99a2 100644
--- a/src/mainboard/tyan/s2891/mainboard.c
+++ b/src/mainboard/tyan/s2891/mainboard.c
@@ -6,7 +6,7 @@
#include <arch/acpigen.h>
#include <cpu/amd/amdk8_sysconf.h>
-static void mainboard_acpi_fill_ssdt_generator(void) {
+static void mainboard_acpi_fill_ssdt_generator(device_t device) {
amd_generate_powernow(0, 0, 0);
}
diff --git a/src/mainboard/tyan/s2892/mainboard.c b/src/mainboard/tyan/s2892/mainboard.c
index 9a8dd90..10d99a2 100644
--- a/src/mainboard/tyan/s2892/mainboard.c
+++ b/src/mainboard/tyan/s2892/mainboard.c
@@ -6,7 +6,7 @@
#include <arch/acpigen.h>
#include <cpu/amd/amdk8_sysconf.h>
-static void mainboard_acpi_fill_ssdt_generator(void) {
+static void mainboard_acpi_fill_ssdt_generator(device_t device) {
amd_generate_powernow(0, 0, 0);
}
diff --git a/src/mainboard/tyan/s2895/mainboard.c b/src/mainboard/tyan/s2895/mainboard.c
index 604df51..e62b95e 100644
--- a/src/mainboard/tyan/s2895/mainboard.c
+++ b/src/mainboard/tyan/s2895/mainboard.c
@@ -8,7 +8,7 @@
extern u16 pm_base;
-static void mainboard_acpi_fill_ssdt_generator(void) {
+static void mainboard_acpi_fill_ssdt_generator(device_t device) {
amd_generate_powernow(0, 0, 0);
}
diff --git a/src/mainboard/winent/mb6047/mainboard.c b/src/mainboard/winent/mb6047/mainboard.c
index 9a8dd90..10d99a2 100644
--- a/src/mainboard/winent/mb6047/mainboard.c
+++ b/src/mainboard/winent/mb6047/mainboard.c
@@ -6,7 +6,7 @@
#include <arch/acpigen.h>
#include <cpu/amd/amdk8_sysconf.h>
-static void mainboard_acpi_fill_ssdt_generator(void) {
+static void mainboard_acpi_fill_ssdt_generator(device_t device) {
amd_generate_powernow(0, 0, 0);
}
diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c
index 9d078ed..da208da 100644
--- a/src/northbridge/amd/agesa/family12/northbridge.c
+++ b/src/northbridge/amd/agesa/family12/northbridge.c
@@ -823,7 +823,7 @@ unsigned long acpi_fill_srat(unsigned long current)
return current;
}
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index 4017944..86372ea 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -794,7 +794,7 @@ static void cpu_bus_init(device_t dev)
/* North Bridge Structures */
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c
index 593579e..7263d62 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -513,7 +513,7 @@ unsigned long acpi_fill_srat(unsigned long current)
return current;
}
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/agesa/family15rl/northbridge.c b/src/northbridge/amd/agesa/family15rl/northbridge.c
index 223a0a0..d5406ef 100644
--- a/src/northbridge/amd/agesa/family15rl/northbridge.c
+++ b/src/northbridge/amd/agesa/family15rl/northbridge.c
@@ -489,7 +489,7 @@ unsigned long acpi_fill_srat(unsigned long current)
return current;
}
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index a18da68..3f1caaa 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -488,7 +488,7 @@ unsigned long acpi_fill_srat(unsigned long current)
return current;
}
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c
index d0638ca..958a037 100644
--- a/src/northbridge/amd/agesa/family16kb/northbridge.c
+++ b/src/northbridge/amd/agesa/family16kb/northbridge.c
@@ -489,7 +489,7 @@ unsigned long acpi_fill_srat(unsigned long current)
return current;
}
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/amdfam10/acpi.c b/src/northbridge/amd/amdfam10/acpi.c
index c6e004c..63ec306 100644
--- a/src/northbridge/amd/amdfam10/acpi.c
+++ b/src/northbridge/amd/amdfam10/acpi.c
@@ -196,7 +196,7 @@ void update_ssdtx(void *ssdtx, int i)
}
-void northbridge_acpi_write_vars(void)
+void northbridge_acpi_write_vars(device_t device)
{
/*
* If more than one physical CPU is installed, northbridge_acpi_write_vars()
diff --git a/src/northbridge/amd/amdfam10/amdfam10.h b/src/northbridge/amd/amdfam10/amdfam10.h
index 238c45f..4518165 100644
--- a/src/northbridge/amd/amdfam10/amdfam10.h
+++ b/src/northbridge/amd/amdfam10/amdfam10.h
@@ -1076,6 +1076,6 @@ struct acpi_rsdp;
unsigned long northbridge_write_acpi_tables(unsigned long start,
struct acpi_rsdp *rsdp);
-void northbridge_acpi_write_vars(void);
+void northbridge_acpi_write_vars(device_t device);
#endif /* AMDFAM10_H */
diff --git a/src/northbridge/amd/amdk8/acpi.c b/src/northbridge/amd/amdk8/acpi.c
index 3f3b009..f56f292 100644
--- a/src/northbridge/amd/amdk8/acpi.c
+++ b/src/northbridge/amd/amdk8/acpi.c
@@ -248,7 +248,7 @@ static void k8acpi_write_pci_data(int dlen, const char *name, int offset) {
acpigen_pop_len();
}
-void k8acpi_write_vars(void)
+void k8acpi_write_vars(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/amdk8/acpi.h b/src/northbridge/amd/amdk8/acpi.h
index 6d7c4d9..aa76366 100644
--- a/src/northbridge/amd/amdk8/acpi.h
+++ b/src/northbridge/amd/amdk8/acpi.h
@@ -21,6 +21,6 @@
#define AMDK8_ACPI_H
#include <arch/acpigen.h>
-void k8acpi_write_vars(void);
+void k8acpi_write_vars(device_t device);
#endif
diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c
index f8b3246..f58622e 100644
--- a/src/northbridge/amd/pi/00630F01/northbridge.c
+++ b/src/northbridge/amd/pi/00630F01/northbridge.c
@@ -483,7 +483,7 @@ unsigned long acpi_fill_srat(unsigned long current)
return current;
}
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index b10da3d..7c33ee3 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -477,7 +477,7 @@ unsigned long acpi_fill_srat(unsigned long current)
return current;
}
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/intel/fsp_rangeley/acpi.c b/src/northbridge/intel/fsp_rangeley/acpi.c
index 4c959c0..1f3ae9a 100644
--- a/src/northbridge/intel/fsp_rangeley/acpi.c
+++ b/src/northbridge/intel/fsp_rangeley/acpi.c
@@ -66,7 +66,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
return current;
}
-void northbridge_acpi_fill_ssdt_generator(void)
+void northbridge_acpi_fill_ssdt_generator(device_t device)
{
u32 bmbound;
char pscope[] = "\\_SB.PCI0";
@@ -75,5 +75,5 @@ void northbridge_acpi_fill_ssdt_generator(void)
acpigen_write_scope(pscope);
acpigen_write_name_dword("BMBD", bmbound);
acpigen_pop_len();
- generate_cpu_entries();
+ generate_cpu_entries(device);
}
diff --git a/src/northbridge/intel/fsp_rangeley/northbridge.h b/src/northbridge/intel/fsp_rangeley/northbridge.h
index dab5a9c..8bf2bc9 100644
--- a/src/northbridge/intel/fsp_rangeley/northbridge.h
+++ b/src/northbridge/intel/fsp_rangeley/northbridge.h
@@ -24,9 +24,13 @@
#define DEFAULT_ECBASE CONFIG_MMCONF_BASE_ADDRESS
+
/* Everything below this line is ignored in the DSDT */
#ifndef __ACPI__
+#include <rules.h>
+#include <device/device.h>
+
/* Device 0:0.0 PCI configuration space (Host Bridge) */
/* SideBand B-UNIT */
@@ -72,7 +76,11 @@ void dump_pci_devices(void);
void dump_spd_registers(void);
void dump_mem(unsigned start, unsigned end);
void report_platform_info(void);
-void northbridge_acpi_fill_ssdt_generator(void);
+
+
+#if ENV_RAMSTAGE
+void northbridge_acpi_fill_ssdt_generator(device_t device);
+#endif
#endif /* #ifndef __ASSEMBLER__ */
#endif /* #ifndef __ACPI__ */
diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c
index 74e7336..b09313a 100644
--- a/src/soc/intel/baytrail/acpi.c
+++ b/src/soc/intel/baytrail/acpi.c
@@ -455,7 +455,7 @@ static int generate_P_state_entries(int core, int cores_per_package)
return len + len_pss;
}
-void generate_cpu_entries(void)
+void generate_cpu_entries(device_t device)
{
int len_pr, core;
int pcontrol_blk = get_pmbase(), plen = 6;
diff --git a/src/soc/intel/broadwell/acpi.c b/src/soc/intel/broadwell/acpi.c
index f038e87..21db3cf 100644
--- a/src/soc/intel/broadwell/acpi.c
+++ b/src/soc/intel/broadwell/acpi.c
@@ -541,7 +541,7 @@ static void generate_P_state_entries(int core, int cores_per_package)
acpigen_pop_len();
}
-void generate_cpu_entries(void)
+void generate_cpu_entries(device_t device)
{
int coreID, cpuID, pcontrol_blk = ACPI_BASE_ADDRESS, plen = 6;
int totalcores = dev_count_cpu();
diff --git a/src/soc/intel/fsp_baytrail/acpi.c b/src/soc/intel/fsp_baytrail/acpi.c
index 11c4493..9e4fc34 100644
--- a/src/soc/intel/fsp_baytrail/acpi.c
+++ b/src/soc/intel/fsp_baytrail/acpi.c
@@ -521,7 +521,7 @@ static int generate_P_state_entries(int core, int cores_per_package)
return len + len_pss;
}
-void generate_cpu_entries(void)
+void generate_cpu_entries(device_t device)
{
int len_pr, core;
int pcontrol_blk = get_pmbase(), plen = 6;
diff --git a/src/southbridge/amd/amd8111/lpc.c b/src/southbridge/amd/amd8111/lpc.c
index d75723c..7d7ac41 100644
--- a/src/southbridge/amd/amd8111/lpc.c
+++ b/src/southbridge/amd/amd8111/lpc.c
@@ -128,7 +128,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
return current;
}
-static void southbridge_acpi_fill_ssdt_generator(void) {
+static void southbridge_acpi_fill_ssdt_generator(device_t device) {
#if CONFIG_SET_FIDVID
amd_generate_powernow(pm_base + 0x10, 6, 1);
acpigen_write_mainboard_resources("\\_SB.PCI0.MBRS", "_CRS");
diff --git a/src/southbridge/amd/sb600/lpc.c b/src/southbridge/amd/sb600/lpc.c
index dc2f31b..0fdac09 100644
--- a/src/southbridge/amd/sb600/lpc.c
+++ b/src/southbridge/amd/sb600/lpc.c
@@ -223,7 +223,7 @@ static void sb600_lpc_enable_resources(device_t dev)
extern u16 pm_base;
-static void southbridge_acpi_fill_ssdt_generator(void) {
+static void southbridge_acpi_fill_ssdt_generator(device_t device) {
amd_generate_powernow(pm_base + 8, 6, 1);
}
diff --git a/src/southbridge/amd/sb700/lpc.c b/src/southbridge/amd/sb700/lpc.c
index 7bb21d2..5acd329 100644
--- a/src/southbridge/amd/sb700/lpc.c
+++ b/src/southbridge/amd/sb700/lpc.c
@@ -267,7 +267,7 @@ static void sb700_lpc_enable_resources(device_t dev)
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
-static void southbridge_acpi_fill_ssdt_generator(void) {
+static void southbridge_acpi_fill_ssdt_generator(device_t device) {
amd_generate_powernow(ACPI_CPU_CONTROL, 6, 1);
}
diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index bc94f71..ef94e79 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -834,7 +834,7 @@ void acpi_fill_fadt(acpi_fadt_t *fadt)
fadt->x_gpe1_blk.addrh = 0x0;
}
-static void southbridge_fill_ssdt(void)
+static void southbridge_fill_ssdt(device_t device)
{
device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));
config_t *chip = dev->chip_info;
diff --git a/src/southbridge/intel/i82371eb/acpi_tables.c b/src/southbridge/intel/i82371eb/acpi_tables.c
index 64d2c23..6465f8d 100644
--- a/src/southbridge/intel/i82371eb/acpi_tables.c
+++ b/src/southbridge/intel/i82371eb/acpi_tables.c
@@ -45,7 +45,7 @@ static int determine_total_number_of_cores(void)
return count;
}
-void generate_cpu_entries(void)
+void generate_cpu_entries(device_t device)
{
int cpu, pcontrol_blk=DEFAULT_PMBASE+PCNTRL, plen=6;
int numcpus = determine_total_number_of_cores();
diff --git a/src/southbridge/intel/i82371eb/isa.c b/src/southbridge/intel/i82371eb/isa.c
index 1deddf6..d460abb 100644
--- a/src/southbridge/intel/i82371eb/isa.c
+++ b/src/southbridge/intel/i82371eb/isa.c
@@ -129,10 +129,10 @@ static void sb_read_resources(struct device *dev)
}
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
-static void southbridge_acpi_fill_ssdt_generator(void)
+static void southbridge_acpi_fill_ssdt_generator(device_t device)
{
acpigen_write_mainboard_resources("\\_SB.PCI0.MBRS", "_CRS");
- generate_cpu_entries();
+ generate_cpu_entries(device);
}
#endif
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 548c22e..4ad40a1 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -556,7 +556,7 @@ static void southbridge_inject_dsdt(device_t dev)
}
}
-static void southbridge_fill_ssdt(void)
+static void southbridge_fill_ssdt(device_t device)
{
device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));
config_t *chip = dev->chip_info;
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index caee2fc..70a678f 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -817,7 +817,7 @@ void acpi_fill_fadt(acpi_fadt_t *fadt)
fadt->x_gpe1_blk.addrh = 0x0;
}
-static void southbridge_fill_ssdt(void)
+static void southbridge_fill_ssdt(device_t device)
{
device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));
config_t *chip = dev->chip_info;
diff --git a/src/southbridge/nvidia/ck804/lpc.c b/src/southbridge/nvidia/ck804/lpc.c
index 5df8acf..e89fc21 100644
--- a/src/southbridge/nvidia/ck804/lpc.c
+++ b/src/southbridge/nvidia/ck804/lpc.c
@@ -313,7 +313,7 @@ static void ck804_lpc_enable_resources(device_t dev)
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
-static void southbridge_acpi_fill_ssdt_generator(void)
+static void southbridge_acpi_fill_ssdt_generator(device_t device)
{
amd_generate_powernow(0, 0, 0);
}
diff --git a/src/southbridge/nvidia/mcp55/lpc.c b/src/southbridge/nvidia/mcp55/lpc.c
index 5f190b8..0ec528d 100644
--- a/src/southbridge/nvidia/mcp55/lpc.c
+++ b/src/southbridge/nvidia/mcp55/lpc.c
@@ -283,7 +283,7 @@ static const struct pci_driver lpc_driver __pci_driver = {
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
-static void southbridge_acpi_fill_ssdt_generator(void)
+static void southbridge_acpi_fill_ssdt_generator(device_t device)
{
amd_generate_powernow(0, 0, 0);
}
diff --git a/src/southbridge/via/k8t890/traf_ctrl.c b/src/southbridge/via/k8t890/traf_ctrl.c
index 51fcc87..4e3ef5a 100644
--- a/src/southbridge/via/k8t890/traf_ctrl.c
+++ b/src/southbridge/via/k8t890/traf_ctrl.c
@@ -127,7 +127,7 @@ static void traf_ctrl_enable_k8t890(struct device *dev)
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
-static void southbridge_acpi_fill_ssdt_generator(void) {
+static void southbridge_acpi_fill_ssdt_generator(device_t dev) {
amd_generate_powernow(0, 0, 0);
acpigen_write_mainboard_resources("\\_SB.PCI0.MBRS", "_CRS");
}
More information about the coreboot-gerrit
mailing list