Patch set updated for coreboot: 8670191 device_ops: add device_t argument to acpi_inject_dsdt_generator
Alexander Couzens (lynxis@fe80.eu) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9597
-gerrit
commit 86701919e921bc32bf803f6bbf464c78b9bdc8a1 Author: Alexander Couzens lynxis@fe80.eu Date: Sun Apr 12 21:49:46 2015 +0200
device_ops: add device_t argument to acpi_inject_dsdt_generator
`device_t device` is missing as argument. Every device_op function should have a `device_t device` argument.
Change-Id: I3fc8e0339fa46fe92cc39f7afa896ffd38c26c8d Signed-off-by: Alexander Couzens lynxis@fe80.eu --- src/arch/x86/boot/acpi.c | 2 +- src/include/device/device.h | 2 +- src/mainboard/siemens/sitemp_g1p1/acpi_tables.c | 2 +- src/mainboard/siemens/sitemp_g1p1/mainboard.h | 2 +- src/soc/intel/baytrail/southcluster.c | 2 +- src/soc/intel/broadwell/lpc.c | 2 +- src/soc/intel/fsp_baytrail/acpi.c | 2 +- src/soc/intel/fsp_baytrail/baytrail/acpi.h | 3 ++- src/southbridge/intel/bd82x6x/lpc.c | 2 +- src/southbridge/intel/fsp_bd82x6x/lpc.c | 2 +- src/southbridge/intel/fsp_rangeley/lpc.c | 2 +- src/southbridge/intel/i82801gx/lpc.c | 2 +- src/southbridge/intel/i82801ix/lpc.c | 2 +- src/southbridge/intel/ibexpeak/lpc.c | 2 +- src/southbridge/intel/lynxpoint/lpc.c | 2 +- src/southbridge/intel/sch/lpc.c | 2 +- 16 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index 48260fc..3fb3e7f 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -754,7 +754,7 @@ unsigned long write_acpi_tables(unsigned long start) acpigen_set_current((char *) current); for (dev = all_devices; dev; dev = dev->next) if (dev->ops && dev->ops->acpi_inject_dsdt_generator) { - dev->ops->acpi_inject_dsdt_generator(); + dev->ops->acpi_inject_dsdt_generator(dev); } current = (unsigned long) acpigen_get_current(); memcpy((char *)current, diff --git a/src/include/device/device.h b/src/include/device/device.h index 0acebb8..d221b2c 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -58,7 +58,7 @@ struct device_operations { #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); + void (*acpi_inject_dsdt_generator)(device_t dev); #endif const struct pci_operations *ops_pci; const struct smbus_bus_operations *ops_smbus_bus; diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c b/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c index c6f7dc1..dbb3229 100644 --- a/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c +++ b/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c @@ -91,7 +91,7 @@ unsigned long acpi_fill_madt(unsigned long current) return current; }
-void mainboard_inject_dsdt(void) +void mainboard_inject_dsdt(device_t device) { global_vars_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, GLOBAL_VARS_SIZE);
diff --git a/src/mainboard/siemens/sitemp_g1p1/mainboard.h b/src/mainboard/siemens/sitemp_g1p1/mainboard.h index 7f80ca8..33d0a5e 100644 --- a/src/mainboard/siemens/sitemp_g1p1/mainboard.h +++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.h @@ -1 +1 @@ -void mainboard_inject_dsdt(void); +void mainboard_inject_dsdt(device_t device); diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c index 365ac3d..f53a43a 100644 --- a/src/soc/intel/baytrail/southcluster.c +++ b/src/soc/intel/baytrail/southcluster.c @@ -513,7 +513,7 @@ void southcluster_enable_dev(device_t dev) } }
-static void southcluster_inject_dsdt(void) +static void southcluster_inject_dsdt(device_t device) { global_nvs_t *gnvs;
diff --git a/src/soc/intel/broadwell/lpc.c b/src/soc/intel/broadwell/lpc.c index 0acfe78..db22b53 100644 --- a/src/soc/intel/broadwell/lpc.c +++ b/src/soc/intel/broadwell/lpc.c @@ -611,7 +611,7 @@ static void pch_lpc_read_resources(device_t dev) memset(gnvs, 0, sizeof(global_nvs_t)); }
-static void southcluster_inject_dsdt(void) +static void southcluster_inject_dsdt(device_t device) { global_nvs_t *gnvs;
diff --git a/src/soc/intel/fsp_baytrail/acpi.c b/src/soc/intel/fsp_baytrail/acpi.c index 1a0c0ce..2825773 100644 --- a/src/soc/intel/fsp_baytrail/acpi.c +++ b/src/soc/intel/fsp_baytrail/acpi.c @@ -596,7 +596,7 @@ unsigned long southcluster_write_acpi_tables(unsigned long current, return current; }
-void southcluster_inject_dsdt(void) +void southcluster_inject_dsdt(device_t device) { global_nvs_t *gnvs;
diff --git a/src/soc/intel/fsp_baytrail/baytrail/acpi.h b/src/soc/intel/fsp_baytrail/baytrail/acpi.h index 6798f45..1e60508 100644 --- a/src/soc/intel/fsp_baytrail/baytrail/acpi.h +++ b/src/soc/intel/fsp_baytrail/baytrail/acpi.h @@ -23,6 +23,7 @@
#include <arch/acpi.h> #include <baytrail/nvs.h> +#include <device/device.h>
void acpi_create_intel_hpet(acpi_hpet_t * hpet); void acpi_create_serialio_ssdt(acpi_header_t *ssdt); @@ -31,6 +32,6 @@ unsigned long acpi_madt_irq_overrides(unsigned long current); void acpi_init_gnvs(global_nvs_t *gnvs); unsigned long southcluster_write_acpi_tables(unsigned long current, struct acpi_rsdp *rsdp); -void southcluster_inject_dsdt(void); +void southcluster_inject_dsdt(device_t device);
#endif /* _BAYTRAIL_ACPI_H_ */ diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c index 0ecd389..e768ed9 100644 --- a/src/southbridge/intel/bd82x6x/lpc.c +++ b/src/southbridge/intel/bd82x6x/lpc.c @@ -669,7 +669,7 @@ static void set_subsystem(device_t dev, unsigned vendor, unsigned device) } }
-static void southbridge_inject_dsdt(void) +static void southbridge_inject_dsdt(device_t dev) { global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof (*gnvs)); void *opregion; diff --git a/src/southbridge/intel/fsp_bd82x6x/lpc.c b/src/southbridge/intel/fsp_bd82x6x/lpc.c index e707afa..bcbaaa8 100644 --- a/src/southbridge/intel/fsp_bd82x6x/lpc.c +++ b/src/southbridge/intel/fsp_bd82x6x/lpc.c @@ -631,7 +631,7 @@ static void set_subsystem(device_t dev, unsigned vendor, unsigned device) } }
-static void southbridge_inject_dsdt(void) +static void southbridge_inject_dsdt(device_t dev) { global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof (*gnvs)); void *opregion; diff --git a/src/southbridge/intel/fsp_rangeley/lpc.c b/src/southbridge/intel/fsp_rangeley/lpc.c index 3aee7ed..a0ea24c 100644 --- a/src/southbridge/intel/fsp_rangeley/lpc.c +++ b/src/southbridge/intel/fsp_rangeley/lpc.c @@ -431,7 +431,7 @@ static void set_subsystem(device_t dev, unsigned vendor, unsigned device) } }
-static void southbridge_inject_dsdt(void) +static void southbridge_inject_dsdt(device_t dev) { global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof (*gnvs));
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c index ccaabba..822ee7e 100644 --- a/src/southbridge/intel/i82801gx/lpc.c +++ b/src/southbridge/intel/i82801gx/lpc.c @@ -612,7 +612,7 @@ static void set_subsystem(device_t dev, unsigned vendor, unsigned device) } }
-static void southbridge_inject_dsdt(void) +static void southbridge_inject_dsdt(device_t dev) { global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof (*gnvs));
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c index de936a3..cffbae0 100644 --- a/src/southbridge/intel/i82801ix/lpc.c +++ b/src/southbridge/intel/i82801ix/lpc.c @@ -539,7 +539,7 @@ static void set_subsystem(device_t dev, unsigned vendor, unsigned device) } }
-static void southbridge_inject_dsdt(void) +static void southbridge_inject_dsdt(device_t dev) { global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof (*gnvs));
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c index c33f9d9..cf45897 100644 --- a/src/southbridge/intel/ibexpeak/lpc.c +++ b/src/southbridge/intel/ibexpeak/lpc.c @@ -662,7 +662,7 @@ static void set_subsystem(device_t dev, unsigned vendor, unsigned device) } }
-static void southbridge_inject_dsdt(void) +static void southbridge_inject_dsdt(device_t dev) { global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof (*gnvs)); void *opregion; diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c index 6b2a522..c31624a 100644 --- a/src/southbridge/intel/lynxpoint/lpc.c +++ b/src/southbridge/intel/lynxpoint/lpc.c @@ -743,7 +743,7 @@ static void set_subsystem(device_t dev, unsigned vendor, unsigned device) } }
-static void southbridge_inject_dsdt(void) +static void southbridge_inject_dsdt(device_t dev) { global_nvs_t *gnvs;
diff --git a/src/southbridge/intel/sch/lpc.c b/src/southbridge/intel/sch/lpc.c index f06c149..09ff6a6 100644 --- a/src/southbridge/intel/sch/lpc.c +++ b/src/southbridge/intel/sch/lpc.c @@ -188,7 +188,7 @@ static void set_subsystem(device_t dev, unsigned vendor, unsigned device) } }
-static void southbridge_inject_dsdt(void) +static void southbridge_inject_dsdt(device_t dev) { global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof (*gnvs));
-
Alexander Couzens