diff options
| author | Vladimir Serbinenko <phcoder@gmail.com> | 2014-10-05 11:10:35 +0200 |
|---|---|---|
| committer | Vladimir Serbinenko <phcoder@gmail.com> | 2014-10-11 04:08:15 +0200 |
| commit | 334fd8e28b6f572dc8a82c7969696c6072709583 (patch) | |
| tree | 8dc340c8d7c117fc3cdcfd92dc5c8f731886141e /src/southbridge | |
| parent | bf3e2dfaafb4b523a893a43aab4e0da661c94e5a (diff) | |
| download | coreboot-334fd8e28b6f572dc8a82c7969696c6072709583.tar.xz | |
bd82x6x, ibexpeak, lynxpoint: Declare NVSA before its use.
Windows chokes if it's not the case.
Change-Id: I3df15228ed00c3124b8d42fc01d7d63ff3fe07ba
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/7017
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@gmail.com>
Diffstat (limited to 'src/southbridge')
| -rw-r--r-- | src/southbridge/intel/bd82x6x/lpc.c | 8 | ||||
| -rw-r--r-- | src/southbridge/intel/ibexpeak/lpc.c | 6 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/lpc.c | 8 |
3 files changed, 8 insertions, 14 deletions
diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c index a1c7c2a289..62188749c0 100644 --- a/src/southbridge/intel/bd82x6x/lpc.c +++ b/src/southbridge/intel/bd82x6x/lpc.c @@ -671,7 +671,7 @@ static void set_subsystem(device_t dev, unsigned vendor, unsigned device) } } -static unsigned long southbridge_fill_ssdt(unsigned long current, const char *oem_table_id) +static void southbridge_inject_dsdt(void) { global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof (*gnvs)); void *opregion; @@ -690,13 +690,11 @@ static unsigned long southbridge_fill_ssdt(unsigned long current, const char *oe /* And tell SMI about it */ smm_setup_structures(gnvs, NULL, NULL); - /* Add it to SSDT. */ + /* Add it to DSDT. */ scopelen = acpigen_write_scope("\\"); scopelen += acpigen_write_name_dword("NVSA", (u32) gnvs); acpigen_patch_len(scopelen - 1); } - - return (unsigned long) (acpigen_get_current()); } static struct pci_operations pci_ops = { @@ -708,7 +706,7 @@ static struct device_operations device_ops = { .set_resources = pci_dev_set_resources, .enable_resources = pch_lpc_enable_resources, .write_acpi_tables = acpi_write_hpet, - .acpi_fill_ssdt_generator = southbridge_fill_ssdt, + .acpi_inject_dsdt_generator = southbridge_inject_dsdt, .init = lpc_init, .enable = pch_lpc_enable, .scan_bus = scan_static_bus, diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c index 27ece63359..31bb4e7921 100644 --- a/src/southbridge/intel/ibexpeak/lpc.c +++ b/src/southbridge/intel/ibexpeak/lpc.c @@ -665,7 +665,7 @@ static void set_subsystem(device_t dev, unsigned vendor, unsigned device) } } -static unsigned long southbridge_fill_ssdt(unsigned long current, const char *oem_table_id) +static void southbridge_inject_dsdt(void) { global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof (*gnvs)); void *opregion; @@ -689,8 +689,6 @@ static unsigned long southbridge_fill_ssdt(unsigned long current, const char *oe scopelen += acpigen_write_name_dword("NVSA", (u32) gnvs); acpigen_patch_len(scopelen - 1); } - - return (unsigned long) (acpigen_get_current()); } static struct pci_operations pci_ops = { @@ -701,7 +699,7 @@ static struct device_operations device_ops = { .read_resources = pch_lpc_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pch_lpc_enable_resources, - .acpi_fill_ssdt_generator = southbridge_fill_ssdt, + .acpi_inject_dsdt_generator = southbridge_inject_dsdt, .write_acpi_tables = acpi_write_hpet, .init = lpc_init, .enable = pch_lpc_enable, diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c index 451aeabc2e..9e860d0d5c 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 unsigned long southbridge_fill_ssdt(unsigned long current, const char *oem_table_id) +static void southbridge_inject_dsdt(void) { global_nvs_t *gnvs; @@ -761,13 +761,11 @@ static unsigned long southbridge_fill_ssdt(unsigned long current, const char *oe /* And tell SMI about it */ smm_setup_structures(gnvs, NULL, NULL); - /* Add it to SSDT. */ + /* Add it to DSDT. */ scopelen = acpigen_write_scope("\\"); scopelen += acpigen_write_name_dword("NVSA", (u32) gnvs); acpigen_patch_len(scopelen - 1); } - - return (unsigned long) (acpigen_get_current()); } #define ALIGN_CURRENT current = (ALIGN(current, 16)) @@ -815,7 +813,7 @@ static struct device_operations device_ops = { .read_resources = pch_lpc_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pci_dev_enable_resources, - .acpi_fill_ssdt_generator = southbridge_fill_ssdt, + .acpi_inject_dsdt_generator = southbridge_inject_dsdt, .write_acpi_tables = southbridge_write_acpi_tables, .init = lpc_init, .enable = pch_lpc_enable, |