Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5538
-gerrit
commit f2288e89943d0480ff56685397812fecd3e97ee7 Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Thu Apr 17 15:07:32 2014 +0300
AMD AGESA cimx/sb800: Drop APIC_ID_OFFSET and MAX_PHYSICAL_CPUS
All boards had APIC_ID_OFFSET=0 and MAX_PHYSICAL_CPUS=1.
Change-Id: I6f08ea6de92a2af79fb3a99c5edd942b3a321c43 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/mainboard/amd/inagua/Kconfig | 8 -------- src/mainboard/amd/persimmon/Kconfig | 8 -------- src/mainboard/amd/south_station/Kconfig | 8 -------- src/mainboard/amd/union_station/Kconfig | 8 -------- src/mainboard/asrock/e350m1/Kconfig | 8 -------- src/mainboard/gizmosphere/gizmo/Kconfig | 8 -------- src/mainboard/jetway/nf81-t56n-lf/Kconfig | 8 -------- src/mainboard/lippert/frontrunner-af/Kconfig | 8 -------- src/mainboard/lippert/toucan-af/Kconfig | 8 -------- src/southbridge/amd/cimx/sb800/late.c | 5 +++++ 10 files changed, 5 insertions(+), 72 deletions(-)
diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig index 8ce4aae..6713ce7 100644 --- a/src/mainboard/amd/inagua/Kconfig +++ b/src/mainboard/amd/inagua/Kconfig @@ -39,10 +39,6 @@ config MAINBOARD_DIR string default amd/inagua
-config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "Inagua" @@ -55,10 +51,6 @@ config MAX_CPUS int default 2
-config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig index e4ae8d0..e09a170 100644 --- a/src/mainboard/amd/persimmon/Kconfig +++ b/src/mainboard/amd/persimmon/Kconfig @@ -39,10 +39,6 @@ config MAINBOARD_DIR string default amd/persimmon
-config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "Persimmon" @@ -55,10 +51,6 @@ config MAX_CPUS int default 2
-config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig index d7e848d..346a556 100644 --- a/src/mainboard/amd/south_station/Kconfig +++ b/src/mainboard/amd/south_station/Kconfig @@ -39,10 +39,6 @@ config MAINBOARD_DIR string default amd/south_station
-config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "Southstation" @@ -55,10 +51,6 @@ config MAX_CPUS int default 4
-config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig index 7d9f115..69f6548 100644 --- a/src/mainboard/amd/union_station/Kconfig +++ b/src/mainboard/amd/union_station/Kconfig @@ -38,10 +38,6 @@ config MAINBOARD_DIR string default amd/union_station
-config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "Unionstation" @@ -54,10 +50,6 @@ config MAX_CPUS int default 4
-config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig index e430688..561f4bc 100644 --- a/src/mainboard/asrock/e350m1/Kconfig +++ b/src/mainboard/asrock/e350m1/Kconfig @@ -39,10 +39,6 @@ config MAINBOARD_DIR string default asrock/e350m1
-config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "E350M1" @@ -55,10 +51,6 @@ config MAX_CPUS int default 2
-config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/gizmosphere/gizmo/Kconfig b/src/mainboard/gizmosphere/gizmo/Kconfig index 85eddfb..a4252e3 100755 --- a/src/mainboard/gizmosphere/gizmo/Kconfig +++ b/src/mainboard/gizmosphere/gizmo/Kconfig @@ -39,10 +39,6 @@ config MAINBOARD_DIR string default gizmosphere/gizmo
-config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "Gizmo" @@ -55,10 +51,6 @@ config MAX_CPUS int default 2
-config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/jetway/nf81-t56n-lf/Kconfig b/src/mainboard/jetway/nf81-t56n-lf/Kconfig index badf590..85d7558 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/Kconfig +++ b/src/mainboard/jetway/nf81-t56n-lf/Kconfig @@ -40,10 +40,6 @@ config MAINBOARD_DIR string default jetway/nf81-t56n-lf
-config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "NF81-T56N-LF" @@ -56,10 +52,6 @@ config MAX_CPUS int default 2
-config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig index d4beecf..f598882 100644 --- a/src/mainboard/lippert/frontrunner-af/Kconfig +++ b/src/mainboard/lippert/frontrunner-af/Kconfig @@ -43,10 +43,6 @@ config MAINBOARD_DIR string default lippert/frontrunner-af
-config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "FrontRunner-AF" @@ -59,10 +55,6 @@ config MAX_CPUS int default 2
-config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig index d984a08..7660acb 100644 --- a/src/mainboard/lippert/toucan-af/Kconfig +++ b/src/mainboard/lippert/toucan-af/Kconfig @@ -45,10 +45,6 @@ config MAINBOARD_DIR string default lippert/toucan-af
-config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "Toucan-AF" @@ -61,10 +57,6 @@ config MAX_CPUS int default 2
-config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c index 3a534cd..219118a 100644 --- a/src/southbridge/amd/cimx/sb800/late.c +++ b/src/southbridge/amd/cimx/sb800/late.c @@ -370,6 +370,10 @@ static void sb800_enable(device_t dev) case (0x14 << 3) | 0: /* 0:14:0 SMBUS */ printk(BIOS_INFO, "sm_init().\n"); clear_ioapic(IO_APIC_ADDR); +#if CONFIG_CPU_AMD_AGESA + /* Assign the ioapic ID the next available number after the processor core local APIC IDs */ + setup_ioapic(IO_APIC_ADDR, CONFIG_MAX_CPUS); +#else /* I/O APIC IDs are normally limited to 4-bits. Enforce this limit. */ #if (CONFIG_APIC_ID_OFFSET == 0 && CONFIG_MAX_CPUS * CONFIG_MAX_PHYSICAL_CPUS < 16) /* Assign the ioapic ID the next available number after the processor core local APIC IDs */ @@ -380,6 +384,7 @@ static void sb800_enable(device_t dev) #else #error "The processor APIC IDs must be lifted to make room for the I/O APIC ID" #endif +#endif break;
case (0x14 << 3) | 1: /* 0:14:1 IDE */