diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-04-16 09:43:40 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-04-20 20:03:55 +0200 |
| commit | a6c525a7d5ad0dedc31dcc9719be6bc5fbc743dd (patch) | |
| tree | e789fe63a0581050c35f07806d6854ed7f82d08d /src/mainboard/amd/dinar | |
| parent | 35546deba642d3bb341d329fc1b9711727a5c50e (diff) | |
AMD AGESA cimx/sb700: Drop APIC_ID_OFFSET and MAX_PHYSICAL_CPUS
Following boards use cimx/sb700:
amd/dinar
supermicro/h8qgi
supermicro/h8scm
tyan/s8226
Only amd/dinar had APIC_ID_OFFSET defined, thus all had 0x0.
There was a nonsense preprocessor directive (MAX_CPUS * MAX_PHYSICAL_CPUS >= 1).
Except for tyan, (MAX_CPUS * MAX_PHYSICAL_CPUS) % 256 == 0.
Together with documented 4-bit restriction for APIC ID field, this APIC ID
programming matches with MP tables and ACPI tables.
I believe this would also fix cases of cimx/sb700 with MAX_CPUS<16, which
we do not have in the tree.
Change-Id: If8d65e95788ba02fc8d331a7af03a4d0d8cf5c69
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5539
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Diffstat (limited to 'src/mainboard/amd/dinar')
| -rw-r--r-- | src/mainboard/amd/dinar/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/amd/dinar/acpi_tables.c | 11 | ||||
| -rw-r--r-- | src/mainboard/amd/dinar/mptable.c | 11 |
3 files changed, 10 insertions, 20 deletions
diff --git a/src/mainboard/amd/dinar/Kconfig b/src/mainboard/amd/dinar/Kconfig index b5434b42b3..6768a57dac 100644 --- a/src/mainboard/amd/dinar/Kconfig +++ b/src/mainboard/amd/dinar/Kconfig @@ -42,10 +42,6 @@ config MAINBOARD_DIR string default amd/dinar -config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "Dinar" @@ -58,10 +54,6 @@ config MAX_CPUS int default 64 -config MAX_PHYSICAL_CPUS - int - default 16 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/amd/dinar/acpi_tables.c b/src/mainboard/amd/dinar/acpi_tables.c index c4a42dc1d6..b0105651ea 100644 --- a/src/mainboard/amd/dinar/acpi_tables.c +++ b/src/mainboard/amd/dinar/acpi_tables.c @@ -73,12 +73,11 @@ unsigned long acpi_fill_madt(unsigned long current) * For systems with < 16 APICs, put the Local-APICs at 0..n and * put the IO-APICs at (n + 1)..z */ -#if CONFIG_MAX_CPUS >= 16 - apicid_sb700 = 0x0; -#else - apicid_sb700 = CONFIG_MAX_CPUS + 1 -#endif - apicid_rd890 = apicid_sb700 + 1; + if (CONFIG_MAX_CPUS >= 16) + apicid_sb700 = 0x0; + else + apicid_sb700 = CONFIG_MAX_CPUS + 1; + apicid_rd890 = apicid_sb700 + 1; /* create all subtables for processors */ current = acpi_create_madt_lapics(current); diff --git a/src/mainboard/amd/dinar/mptable.c b/src/mainboard/amd/dinar/mptable.c index 60779f8fa9..5f9e83bdac 100644 --- a/src/mainboard/amd/dinar/mptable.c +++ b/src/mainboard/amd/dinar/mptable.c @@ -58,12 +58,11 @@ static void *smp_write_config_table(void *v) * For systems with < 16 APICs, put the Local-APICs at 0..n and * put the IO-APICs at (n + 1)..z */ -#if CONFIG_MAX_CPUS >= 16 - apicid_sb700 = 0x0; -#else - apicid_sb700 = CONFIG_MAX_CPUS + 1 -#endif - apicid_rd890 = apicid_sb700 + 1; + if (CONFIG_MAX_CPUS >= 16) + apicid_sb700 = 0x0; + else + apicid_sb700 = CONFIG_MAX_CPUS + 1; + apicid_rd890 = apicid_sb700 + 1; //bus_sb700[0], TODO: why bus_sb700[0] use same value of bus_rd890[0] assigned by get_pci1234(), instead of 0. dev = dev_find_slot(0, PCI_DEVFN(sbdn_sb700 + 0x14, 0)); |