GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acpi: Remove monolithic ACPI 

All boards now use per-device ACPI. This patch finishes migration
by removing transitional kludges.

Change-Id: Ie4577f89bf3bb17b310b7b0a84b2c54e404b1606
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/7372
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
Vladimir Serbinenko 2014-11-09 13:30:50 +01:00
parent e288758b03
commit 83f81cad7a
47 changed files with 16 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Kconfig
View File

@ -543,10 +543,6 @@ config MAX_PIRQ_LINKS
table specifies links greater than 4, pirq_route_irqs will not table specifies links greater than 4, pirq_route_irqs will not
function properly, unless this variable is correctly set. function properly, unless this variable is correctly set.
config PER_DEVICE_ACPI_TABLES
bool
default n
config COMMON_FADT config COMMON_FADT
bool bool
default n default n

19
src/arch/x86/boot/acpi.c
View File

@ -249,18 +249,6 @@ void acpi_create_mcfg(acpi_mcfg_t *mcfg)
header->checksum = acpi_checksum((void *)mcfg, header->length); 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) void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id)
{ {
unsigned long current = (unsigned long)ssdt + sizeof(acpi_header_t); unsigned long current = (unsigned long)ssdt + sizeof(acpi_header_t);
@ -278,16 +266,12 @@ void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id)
acpigen_set_current((char *) current); acpigen_set_current((char *) current);
{ {
#if IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
struct device *dev; struct device *dev;
for (dev = all_devices; dev; dev = dev->next) for (dev = all_devices; dev; dev = dev->next)
if (dev->ops && dev->ops->acpi_fill_ssdt_generator) { if (dev->ops && dev->ops->acpi_fill_ssdt_generator) {
dev->ops->acpi_fill_ssdt_generator(); dev->ops->acpi_fill_ssdt_generator();
} }
current = (unsigned long) acpigen_get_current(); current = (unsigned long) acpigen_get_current();
#else
current = acpi_fill_ssdt_generator(current, oem_table_id);
#endif
} }
/* (Re)calculate length and checksum. */ /* (Re)calculate length and checksum. */
@ -686,8 +670,6 @@ void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs, void *dsdt)
} }
#endif #endif
#if IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
extern const unsigned char AmlCode[]; extern const unsigned char AmlCode[];
unsigned long __attribute__ ((weak)) fw_cfg_acpi_tables(unsigned long start) unsigned long __attribute__ ((weak)) fw_cfg_acpi_tables(unsigned long start)
@ -830,7 +812,6 @@ unsigned long write_acpi_tables(unsigned long start)
printk(BIOS_INFO, "ACPI: done.\n"); printk(BIOS_INFO, "ACPI: done.\n");
return current; return current;
} }
#endif
#if CONFIG_HAVE_ACPI_RESUME #if CONFIG_HAVE_ACPI_RESUME
void __attribute__((weak)) mainboard_suspend_resume(void) void __attribute__((weak)) mainboard_suspend_resume(void)

4
src/arch/x86/include/arch/acpi.h
View File

@ -489,10 +489,6 @@ unsigned long fw_cfg_acpi_tables(unsigned long start);
unsigned long write_acpi_tables(unsigned long addr); unsigned long write_acpi_tables(unsigned long addr);
unsigned long acpi_fill_madt(unsigned long current); unsigned long acpi_fill_madt(unsigned long current);
unsigned long acpi_fill_mcfg(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_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); void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs, void *dsdt);
#if IS_ENABLED(CONFIG_COMMON_FADT) #if IS_ENABLED(CONFIG_COMMON_FADT)

2
src/include/device/device.h
View File

@ -55,7 +55,7 @@ struct device_operations {
int (*get_smbios_data)(device_t dev, int *handle, unsigned long *current); int (*get_smbios_data)(device_t dev, int *handle, unsigned long *current);
void (*get_smbios_strings)(device_t dev, struct smbios_type11 *t); void (*get_smbios_strings)(device_t dev, struct smbios_type11 *t);
#endif #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); unsigned long (*write_acpi_tables)(unsigned long start, struct acpi_rsdp *rsdp);
void (*acpi_fill_ssdt_generator)(void); void (*acpi_fill_ssdt_generator)(void);
void (*acpi_inject_dsdt_generator)(void); void (*acpi_inject_dsdt_generator)(void);

1
src/mainboard/emulation/qemu-i440fx/Kconfig
View File

@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT
select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
select PER_DEVICE_ACPI_TABLES
config MAINBOARD_DIR config MAINBOARD_DIR
string string

1
src/mainboard/via/epia-m700/Kconfig
View File

@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
# Note: For ACPI, you need to use the 'get_dsdt' script and uncomment # Note: For ACPI, you need to use the 'get_dsdt' script and uncomment
# the "select HAVE_ACPI_TABLES" line below. # the "select HAVE_ACPI_TABLES" line below.
# select HAVE_ACPI_TABLES # select HAVE_ACPI_TABLES
# select PER_DEVICE_ACPI_TABLES
select HAVE_OPTION_TABLE select HAVE_OPTION_TABLE
select BOARD_ROMSIZE_KB_512 select BOARD_ROMSIZE_KB_512

1
src/mainboard/via/vt8454c/Kconfig
View File

@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_MP_TABLE select HAVE_MP_TABLE
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_512 select BOARD_ROMSIZE_KB_512
select PER_DEVICE_ACPI_TABLES
config MAINBOARD_DIR config MAINBOARD_DIR
string string

1
src/northbridge/amd/agesa/family12/Kconfig
View File

@ -22,7 +22,6 @@ config NORTHBRIDGE_AMD_AGESA_FAMILY12
select HAVE_DEBUG_SMBUS select HAVE_DEBUG_SMBUS
select HYPERTRANSPORT_PLUGIN_SUPPORT select HYPERTRANSPORT_PLUGIN_SUPPORT
select MMCONF_SUPPORT select MMCONF_SUPPORT
select PER_DEVICE_ACPI_TABLES
if NORTHBRIDGE_AMD_AGESA_FAMILY12 if NORTHBRIDGE_AMD_AGESA_FAMILY12

1
src/northbridge/amd/agesa/family14/Kconfig
View File

@ -19,7 +19,6 @@
config NORTHBRIDGE_AMD_AGESA_FAMILY14 config NORTHBRIDGE_AMD_AGESA_FAMILY14
bool bool
select MMCONF_SUPPORT select MMCONF_SUPPORT
select PER_DEVICE_ACPI_TABLES
if NORTHBRIDGE_AMD_AGESA_FAMILY14 if NORTHBRIDGE_AMD_AGESA_FAMILY14

1
src/northbridge/amd/agesa/family15/Kconfig
View File

@ -23,7 +23,6 @@ config NORTHBRIDGE_AMD_AGESA_FAMILY15
select HAVE_DEBUG_SMBUS select HAVE_DEBUG_SMBUS
select HYPERTRANSPORT_PLUGIN_SUPPORT select HYPERTRANSPORT_PLUGIN_SUPPORT
select MMCONF_SUPPORT select MMCONF_SUPPORT
select PER_DEVICE_ACPI_TABLES
if NORTHBRIDGE_AMD_AGESA_FAMILY15 if NORTHBRIDGE_AMD_AGESA_FAMILY15

1
src/northbridge/amd/agesa/family15rl/Kconfig
View File

@ -19,7 +19,6 @@
config NORTHBRIDGE_AMD_AGESA_FAMILY15_RL config NORTHBRIDGE_AMD_AGESA_FAMILY15_RL
bool bool
select MMCONF_SUPPORT select MMCONF_SUPPORT
select PER_DEVICE_ACPI_TABLES
if NORTHBRIDGE_AMD_AGESA_FAMILY15_RL if NORTHBRIDGE_AMD_AGESA_FAMILY15_RL

1
src/northbridge/amd/agesa/family15tn/Kconfig
View File

@ -19,7 +19,6 @@
config NORTHBRIDGE_AMD_AGESA_FAMILY15_TN config NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
bool bool
select MMCONF_SUPPORT select MMCONF_SUPPORT
select PER_DEVICE_ACPI_TABLES
if NORTHBRIDGE_AMD_AGESA_FAMILY15_TN if NORTHBRIDGE_AMD_AGESA_FAMILY15_TN

1
src/northbridge/amd/agesa/family16kb/Kconfig
View File

@ -20,7 +20,6 @@
config NORTHBRIDGE_AMD_AGESA_FAMILY16_KB config NORTHBRIDGE_AMD_AGESA_FAMILY16_KB
bool bool
select MMCONF_SUPPORT select MMCONF_SUPPORT
select PER_DEVICE_ACPI_TABLES
if NORTHBRIDGE_AMD_AGESA_FAMILY16_KB if NORTHBRIDGE_AMD_AGESA_FAMILY16_KB

1
src/northbridge/amd/amdfam10/Kconfig
View File

@ -25,7 +25,6 @@ config NORTHBRIDGE_AMD_AMDFAM10
select HAVE_DEBUG_CAR select HAVE_DEBUG_CAR
select HYPERTRANSPORT_PLUGIN_SUPPORT select HYPERTRANSPORT_PLUGIN_SUPPORT
select MMCONF_SUPPORT select MMCONF_SUPPORT
select PER_DEVICE_ACPI_TABLES
if NORTHBRIDGE_AMD_AMDFAM10 if NORTHBRIDGE_AMD_AMDFAM10
config AGP_APERTURE_SIZE config AGP_APERTURE_SIZE

1
src/northbridge/amd/amdk8/Kconfig
View File

@ -23,7 +23,6 @@ config NORTHBRIDGE_AMD_AMDK8
select HAVE_DEBUG_SMBUS select HAVE_DEBUG_SMBUS
select HAVE_DEBUG_CAR select HAVE_DEBUG_CAR
select HYPERTRANSPORT_PLUGIN_SUPPORT select HYPERTRANSPORT_PLUGIN_SUPPORT
select PER_DEVICE_ACPI_TABLES
select LATE_CBMEM_INIT select LATE_CBMEM_INIT
if NORTHBRIDGE_AMD_AMDK8 if NORTHBRIDGE_AMD_AMDK8

1
src/northbridge/amd/pi/00630F01/Kconfig
View File

@ -19,7 +19,6 @@
config NORTHBRIDGE_AMD_PI_00630F01 config NORTHBRIDGE_AMD_PI_00630F01
bool bool
select MMCONF_SUPPORT select MMCONF_SUPPORT
select PER_DEVICE_ACPI_TABLES
if NORTHBRIDGE_AMD_PI_00630F01 if NORTHBRIDGE_AMD_PI_00630F01

1
src/northbridge/amd/pi/00730F01/Kconfig
View File

@ -20,7 +20,6 @@
config NORTHBRIDGE_AMD_PI_00730F01 config NORTHBRIDGE_AMD_PI_00730F01
bool bool
select MMCONF_SUPPORT select MMCONF_SUPPORT
select PER_DEVICE_ACPI_TABLES
if NORTHBRIDGE_AMD_PI_00730F01 if NORTHBRIDGE_AMD_PI_00730F01

1
src/northbridge/intel/e7501/Kconfig
View File

@ -1,6 +1,5 @@
config NORTHBRIDGE_INTEL_E7501 config NORTHBRIDGE_INTEL_E7501
bool bool
select HAVE_DEBUG_RAM_SETUP select HAVE_DEBUG_RAM_SETUP
select PER_DEVICE_ACPI_TABLES
select LATE_CBMEM_INIT select LATE_CBMEM_INIT

1
src/northbridge/intel/e7505/Kconfig
View File

@ -25,7 +25,6 @@ if NORTHBRIDGE_INTEL_E7505
config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y
select HAVE_DEBUG_RAM_SETUP select HAVE_DEBUG_RAM_SETUP
select PER_DEVICE_ACPI_TABLES
select LATE_CBMEM_INIT select LATE_CBMEM_INIT
config HW_SCRUBBER config HW_SCRUBBER

1
src/northbridge/intel/fsp_rangeley/Kconfig
View File

@ -21,7 +21,6 @@
config NORTHBRIDGE_INTEL_FSP_RANGELEY config NORTHBRIDGE_INTEL_FSP_RANGELEY
bool bool
select CPU_INTEL_FSP_MODEL_406DX select CPU_INTEL_FSP_MODEL_406DX
select PER_DEVICE_ACPI_TABLES
if NORTHBRIDGE_INTEL_FSP_RANGELEY if NORTHBRIDGE_INTEL_FSP_RANGELEY

2
src/northbridge/intel/fsp_sandybridge/Kconfig
View File

@ -21,12 +21,10 @@
config NORTHBRIDGE_INTEL_FSP_SANDYBRIDGE config NORTHBRIDGE_INTEL_FSP_SANDYBRIDGE
bool bool
select CPU_INTEL_FSP_MODEL_206AX select CPU_INTEL_FSP_MODEL_206AX
select PER_DEVICE_ACPI_TABLES
config NORTHBRIDGE_INTEL_FSP_IVYBRIDGE config NORTHBRIDGE_INTEL_FSP_IVYBRIDGE
bool bool
select CPU_INTEL_FSP_MODEL_306AX select CPU_INTEL_FSP_MODEL_306AX
select PER_DEVICE_ACPI_TABLES
if NORTHBRIDGE_INTEL_FSP_IVYBRIDGE || NORTHBRIDGE_INTEL_FSP_SANDYBRIDGE if NORTHBRIDGE_INTEL_FSP_IVYBRIDGE || NORTHBRIDGE_INTEL_FSP_SANDYBRIDGE

1
src/northbridge/intel/gm45/Kconfig
View File

@ -30,7 +30,6 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
select IOMMU select IOMMU
select VGA select VGA
select INTEL_EDID select INTEL_EDID
select PER_DEVICE_ACPI_TABLES
config BOOTBLOCK_NORTHBRIDGE_INIT config BOOTBLOCK_NORTHBRIDGE_INIT
string string

1
src/northbridge/intel/haswell/Kconfig
View File

@ -26,7 +26,6 @@ config NORTHBRIDGE_INTEL_HASWELL
select MMCONF_SUPPORT_DEFAULT select MMCONF_SUPPORT_DEFAULT
select INTEL_DDI select INTEL_DDI
select INTEL_DP select INTEL_DP
select PER_DEVICE_ACPI_TABLES
if NORTHBRIDGE_INTEL_HASWELL if NORTHBRIDGE_INTEL_HASWELL

1
src/northbridge/intel/i945/Kconfig
View File

@ -29,7 +29,6 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
select HAVE_DEBUG_RAM_SETUP select HAVE_DEBUG_RAM_SETUP
select LAPIC_MONOTONIC_TIMER select LAPIC_MONOTONIC_TIMER
select VGA select VGA
select PER_DEVICE_ACPI_TABLES
config NORTHBRIDGE_INTEL_SUBTYPE_I945GC config NORTHBRIDGE_INTEL_SUBTYPE_I945GC
def_bool n def_bool n

1
src/northbridge/intel/nehalem/Kconfig
View File

@ -25,7 +25,6 @@ config NORTHBRIDGE_INTEL_NEHALEM
select VGA select VGA
select INTEL_EDID select INTEL_EDID
select TSC_MONOTONIC_TIMER select TSC_MONOTONIC_TIMER
select PER_DEVICE_ACPI_TABLES
if NORTHBRIDGE_INTEL_NEHALEM if NORTHBRIDGE_INTEL_NEHALEM

4
src/northbridge/intel/sandybridge/Kconfig
View File

@ -23,7 +23,6 @@ config NORTHBRIDGE_INTEL_SANDYBRIDGE
select MMCONF_SUPPORT select MMCONF_SUPPORT
select MMCONF_SUPPORT_DEFAULT select MMCONF_SUPPORT_DEFAULT
select CPU_INTEL_MODEL_206AX select CPU_INTEL_MODEL_206AX
select PER_DEVICE_ACPI_TABLES
config NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE config NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE
bool bool
@ -32,7 +31,6 @@ config NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE
select MMCONF_SUPPORT_DEFAULT select MMCONF_SUPPORT_DEFAULT
select CPU_INTEL_MODEL_206AX select CPU_INTEL_MODEL_206AX
select HAVE_DEBUG_RAM_SETUP select HAVE_DEBUG_RAM_SETUP
select PER_DEVICE_ACPI_TABLES
config NORTHBRIDGE_INTEL_IVYBRIDGE config NORTHBRIDGE_INTEL_IVYBRIDGE
bool bool
@ -40,7 +38,6 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE
select MMCONF_SUPPORT select MMCONF_SUPPORT
select MMCONF_SUPPORT_DEFAULT select MMCONF_SUPPORT_DEFAULT
select CPU_INTEL_MODEL_306AX select CPU_INTEL_MODEL_306AX
select PER_DEVICE_ACPI_TABLES
config NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE config NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE
bool bool
@ -49,7 +46,6 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE
select MMCONF_SUPPORT_DEFAULT select MMCONF_SUPPORT_DEFAULT
select CPU_INTEL_MODEL_306AX select CPU_INTEL_MODEL_306AX
select HAVE_DEBUG_RAM_SETUP 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 if NORTHBRIDGE_INTEL_SANDYBRIDGE || NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE || NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE

1
src/northbridge/intel/sch/Kconfig
View File

@ -20,7 +20,6 @@
config NORTHBRIDGE_INTEL_SCH config NORTHBRIDGE_INTEL_SCH
bool bool
select MMCONF_SUPPORT select MMCONF_SUPPORT
select PER_DEVICE_ACPI_TABLES
select LATE_CBMEM_INIT select LATE_CBMEM_INIT
if NORTHBRIDGE_INTEL_SCH if NORTHBRIDGE_INTEL_SCH

1
src/soc/intel/baytrail/Kconfig
View File

@ -38,7 +38,6 @@ config CPU_SPECIFIC_OPTIONS
select TSC_SYNC_MFENCE select TSC_SYNC_MFENCE
select UDELAY_TSC select UDELAY_TSC
select SOC_INTEL_COMMON select SOC_INTEL_COMMON
select PER_DEVICE_ACPI_TABLES
config BOOTBLOCK_CPU_INIT config BOOTBLOCK_CPU_INIT
string string

1
src/soc/intel/broadwell/Kconfig
View File

@ -47,7 +47,6 @@ config CPU_SPECIFIC_OPTIONS
select TSC_CONSTANT_RATE select TSC_CONSTANT_RATE
select TSC_SYNC_MFENCE select TSC_SYNC_MFENCE
select UDELAY_TSC select UDELAY_TSC
select PER_DEVICE_ACPI_TABLES
select SOC_INTEL_COMMON select SOC_INTEL_COMMON
config BOOTBLOCK_CPU_INIT config BOOTBLOCK_CPU_INIT

1
src/soc/intel/fsp_baytrail/Kconfig
View File

@ -49,7 +49,6 @@ config CPU_SPECIFIC_OPTIONS
select UDELAY_TSC select UDELAY_TSC
select SUPPORT_CPU_UCODE_IN_CBFS select SUPPORT_CPU_UCODE_IN_CBFS
select ROMSTAGE_RTC_INIT select ROMSTAGE_RTC_INIT
select PER_DEVICE_ACPI_TABLES
config SOC_INTEL_FSP_BAYTRAIL_MD config SOC_INTEL_FSP_BAYTRAIL_MD
bool bool

2
src/southbridge/amd/agesa/hudson/lpc.c
View File

@ -328,7 +328,7 @@ static struct pci_operations lops_pci = {
static struct device_operations lpc_ops = { static struct device_operations lpc_ops = {
.read_resources = hudson_lpc_read_resources, .read_resources = hudson_lpc_read_resources,
.set_resources = hudson_lpc_set_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, .write_acpi_tables = acpi_write_hpet,
#endif #endif
.enable_resources = hudson_lpc_enable_resources, .enable_resources = hudson_lpc_enable_resources,

6
src/southbridge/amd/amd8111/lpc.c
View File

@ -11,7 +11,7 @@
#include <pc80/isa-dma.h> #include <pc80/isa-dma.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <arch/ioapic.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/acpi.h>
#include <arch/acpigen.h> #include <arch/acpigen.h>
#include <cpu/amd/powernow.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)); ((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; extern u16 pm_base;
@ -147,7 +147,7 @@ static struct device_operations lpc_ops = {
.set_resources = pci_dev_set_resources, .set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources, .enable_resources = pci_dev_enable_resources,
.init = lpc_init, .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, .write_acpi_tables = acpi_write_hpet,
.acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator, .acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator,
#endif #endif

2
src/southbridge/amd/cimx/sb700/late.c
View File

@ -107,7 +107,7 @@ static struct device_operations lpc_ops = {
.read_resources = lpc_read_resources, .read_resources = lpc_read_resources,
.set_resources = lpc_set_resources, .set_resources = lpc_set_resources,
.enable_resources = lpc_enable_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, .write_acpi_tables = acpi_write_hpet,
#endif #endif
.init = lpc_init, .init = lpc_init,

2
src/southbridge/amd/cimx/sb800/late.c
View File

@ -157,7 +157,7 @@ static struct device_operations lpc_ops = {
.read_resources = lpc_read_resources, .read_resources = lpc_read_resources,
.set_resources = lpc_set_resources, .set_resources = lpc_set_resources,
.enable_resources = pci_dev_enable_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, .write_acpi_tables = acpi_write_hpet,
#endif #endif
.init = lpc_init, .init = lpc_init,

2
src/southbridge/amd/cimx/sb900/late.c
View File

@ -129,7 +129,7 @@ static struct device_operations lpc_ops = {
.set_resources = lpc_set_resources, .set_resources = lpc_set_resources,
.enable_resources = lpc_enable_resources, .enable_resources = lpc_enable_resources,
.init = lpc_init, .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, .write_acpi_tables = acpi_write_hpet,
#endif #endif
.scan_bus = scan_static_bus, .scan_bus = scan_static_bus,

2
src/southbridge/amd/pi/hudson/lpc.c
View File

@ -336,7 +336,7 @@ static struct device_operations lpc_ops = {
.read_resources = hudson_lpc_read_resources, .read_resources = hudson_lpc_read_resources,
.set_resources = hudson_lpc_set_resources, .set_resources = hudson_lpc_set_resources,
.enable_resources = hudson_lpc_enable_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, .write_acpi_tables = acpi_write_hpet,
#endif #endif
.init = lpc_init, .init = lpc_init,

2
src/southbridge/amd/sb600/lpc.c
View File

@ -219,7 +219,7 @@ static void sb600_lpc_enable_resources(device_t dev)
sb600_lpc_enable_childrens_resources(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; extern u16 pm_base;

4
src/southbridge/amd/sb700/lpc.c
View File

@ -265,7 +265,7 @@ static void sb700_lpc_enable_resources(device_t dev)
sb700_lpc_enable_childrens_resources(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) { static void southbridge_acpi_fill_ssdt_generator(void) {
amd_generate_powernow(ACPI_CPU_CONTROL, 6, 1); amd_generate_powernow(ACPI_CPU_CONTROL, 6, 1);
@ -282,7 +282,7 @@ static struct device_operations lpc_ops = {
.read_resources = sb700_lpc_read_resources, .read_resources = sb700_lpc_read_resources,
.set_resources = sb700_lpc_set_resources, .set_resources = sb700_lpc_set_resources,
.enable_resources = sb700_lpc_enable_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, .write_acpi_tables = acpi_write_hpet,
.acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator, .acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator,
#endif #endif

2
src/southbridge/amd/sb800/lpc.c
View File

@ -250,7 +250,7 @@ static struct device_operations lpc_ops = {
.read_resources = sb800_lpc_read_resources, .read_resources = sb800_lpc_read_resources,
.set_resources = sb800_lpc_set_resources, .set_resources = sb800_lpc_set_resources,
.enable_resources = sb800_lpc_enable_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, .write_acpi_tables = acpi_write_hpet,
#endif #endif
.init = lpc_init, .init = lpc_init,

1
src/southbridge/intel/bd82x6x/Kconfig
View File

@ -36,7 +36,6 @@ config SOUTH_BRIDGE_OPTIONS # dummy
select PCIEXP_ASPM select PCIEXP_ASPM
select PCIEXP_COMMON_CLOCK select PCIEXP_COMMON_CLOCK
select SPI_FLASH select SPI_FLASH
select PER_DEVICE_ACPI_TABLES
select COMMON_FADT select COMMON_FADT
config EHCI_BAR config EHCI_BAR

1
src/southbridge/intel/fsp_bd82x6x/Kconfig
View File

@ -32,7 +32,6 @@ config SOUTH_BRIDGE_OPTIONS # dummy
select PCIEXP_ASPM select PCIEXP_ASPM
select PCIEXP_COMMON_CLOCK select PCIEXP_COMMON_CLOCK
select SPI_FLASH select SPI_FLASH
select PER_DEVICE_ACPI_TABLES
select COMMON_FADT select COMMON_FADT
config EHCI_BAR config EHCI_BAR

1
src/southbridge/intel/i3100/Kconfig
View File

@ -2,7 +2,6 @@ config SOUTHBRIDGE_INTEL_I3100
bool bool
select IOAPIC select IOAPIC
select HAVE_HARD_RESET select HAVE_HARD_RESET
select PER_DEVICE_ACPI_TABLES
if SOUTHBRIDGE_INTEL_I3100 if SOUTHBRIDGE_INTEL_I3100

9
src/southbridge/intel/i82371eb/Kconfig
View File

@ -5,12 +5,3 @@ config BOOTBLOCK_SOUTHBRIDGE_INIT
string string
default "southbridge/intel/i82371eb/bootblock.c" default "southbridge/intel/i82371eb/bootblock.c"
depends on SOUTHBRIDGE_INTEL_I82371EB depends on SOUTHBRIDGE_INTEL_I82371EB
if SOUTHBRIDGE_INTEL_I82371EB
config SOUTH_BRIDGE_OPTIONS # dummy
def_bool y
select PER_DEVICE_ACPI_TABLES
endif

1
src/southbridge/intel/i82801ix/Kconfig
View File

@ -27,7 +27,6 @@ config SOUTHBRIDGE_INTEL_I82801IX
select USE_WATCHDOG_ON_BOOT select USE_WATCHDOG_ON_BOOT
select HAVE_SMI_HANDLER select HAVE_SMI_HANDLER
select HAVE_USBDEBUG_OPTIONS select HAVE_USBDEBUG_OPTIONS
select PER_DEVICE_ACPI_TABLES
if SOUTHBRIDGE_INTEL_I82801IX if SOUTHBRIDGE_INTEL_I82801IX

1
src/southbridge/intel/ibexpeak/Kconfig
View File

@ -34,7 +34,6 @@ config SOUTH_BRIDGE_OPTIONS # dummy
select SPI_FLASH select SPI_FLASH
select SOUTHBRIDGE_INTEL_COMMON select SOUTHBRIDGE_INTEL_COMMON
select HAVE_USBDEBUG_OPTIONS select HAVE_USBDEBUG_OPTIONS
select PER_DEVICE_ACPI_TABLES
select COMMON_FADT select COMMON_FADT
config EHCI_BAR config EHCI_BAR

2
src/southbridge/nvidia/ck804/lpc.c
View File

@ -311,7 +311,7 @@ static void ck804_lpc_enable_resources(device_t dev)
ck804_lpc_enable_childrens_resources(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) static void southbridge_acpi_fill_ssdt_generator(void)
{ {

4
src/southbridge/nvidia/mcp55/lpc.c
View File

@ -281,7 +281,7 @@ static const struct pci_driver lpc_driver __pci_driver = {
.devices = lpc_ids, .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) 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, .read_resources = mcp55_lpc_read_resources,
.set_resources = pci_dev_set_resources, .set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_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, .acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator,
.write_acpi_tables = acpi_write_hpet, .write_acpi_tables = acpi_write_hpet,
#endif #endif