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/6237
-gerrit
commit 21a2b73c2b2dbb386021fc963756b2c7f2c70bee Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Mon Jul 7 15:06:00 2014 +0300
AGESA CIMx: Move late init out of get_bus_conf()
Followup deals further with Fam15 case. For unknown reasons calls were commented out for amd/dinar and they remain that way.
Change-Id: Ie0a25fbb6f5378019fbf0f19a02acf024d79817e Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/cpu/amd/agesa/amd_late_init.c | 10 ++++++++++ src/mainboard/amd/dinar/get_bus_conf.c | 7 ------- src/mainboard/amd/inagua/get_bus_conf.c | 6 ------ src/mainboard/amd/persimmon/get_bus_conf.c | 6 ------ src/mainboard/amd/south_station/get_bus_conf.c | 6 ------ src/mainboard/amd/torpedo/get_bus_conf.c | 2 -- src/mainboard/amd/union_station/get_bus_conf.c | 6 ------ src/mainboard/asrock/e350m1/get_bus_conf.c | 6 ------ src/mainboard/asus/m5a88-v/get_bus_conf.c | 6 ------ src/mainboard/gizmosphere/gizmo/get_bus_conf.c | 6 ------ src/mainboard/jetway/nf81-t56n-lf/get_bus_conf.c | 6 ------ src/mainboard/lippert/frontrunner-af/get_bus_conf.c | 6 ------ src/mainboard/lippert/toucan-af/get_bus_conf.c | 6 ------ src/mainboard/supermicro/h8qgi/get_bus_conf.c | 7 ------- src/mainboard/supermicro/h8scm/get_bus_conf.c | 7 ------- src/mainboard/tyan/s8226/get_bus_conf.c | 7 ------- src/southbridge/amd/cimx/sb900/early.c | 4 ++++ 17 files changed, 14 insertions(+), 90 deletions(-)
diff --git a/src/cpu/amd/agesa/amd_late_init.c b/src/cpu/amd/agesa/amd_late_init.c index cf1caf1..83e9ed8 100644 --- a/src/cpu/amd/agesa/amd_late_init.c +++ b/src/cpu/amd/agesa/amd_late_init.c @@ -24,6 +24,10 @@ #include "agesawrapper.h" #include <northbridge/amd/agesa/agesawrapper_call.h>
+#if CONFIG_AMD_SB_CIMX +#include <sb_cimx.h> +#endif + void get_bus_conf(void);
static void agesawrapper_post_device(void *unused) @@ -36,6 +40,12 @@ static void agesawrapper_post_device(void *unused) /* Preparation for write_tables(). */ get_bus_conf();
+#if CONFIG_AMD_SB_CIMX && CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY15 + sb_After_Pci_Init(); +#endif +#if CONFIG_AMD_SB_CIMX + sb_Late_Post(); +#endif if (!acpi_s3_resume_allowed()) return;
diff --git a/src/mainboard/amd/dinar/get_bus_conf.c b/src/mainboard/amd/dinar/get_bus_conf.c index e93ca84..d62e111 100644 --- a/src/mainboard/amd/dinar/get_bus_conf.c +++ b/src/mainboard/amd/dinar/get_bus_conf.c @@ -25,9 +25,6 @@ #include <stdlib.h> #include <cpu/amd/amdfam15.h> #include "agesawrapper.h" -#if CONFIG_AMD_SB_CIMX -#include <sb_cimx.h> -#endif
/* Global variables for MB layouts and these will be shared by irqtable mptable @@ -116,9 +113,5 @@ void get_bus_conf(void) /* I/O APICs: APIC ID Version State Address */ bus_isa = 10;
-#if CONFIG_AMD_SB_CIMX -// sb_After_Pci_Init(); -// sb_Late_Post(); -#endif printk(BIOS_DEBUG, "Mainboard - Get_bus_conf.c - get_bus_conf - End.\n"); } diff --git a/src/mainboard/amd/inagua/get_bus_conf.c b/src/mainboard/amd/inagua/get_bus_conf.c index ac72b48..be113b3 100644 --- a/src/mainboard/amd/inagua/get_bus_conf.c +++ b/src/mainboard/amd/inagua/get_bus_conf.c @@ -25,9 +25,6 @@ #include <stdlib.h> #include <cpu/amd/amdfam14.h> #include "agesawrapper.h" -#if CONFIG_AMD_SB_CIMX -#include <sb_cimx.h> -#endif
/* Global variables for MB layouts and these will be shared by irqtable mptable @@ -99,7 +96,4 @@ void get_bus_conf(void) apicid_base = CONFIG_MAX_CPUS; apicid_sb800 = apicid_base;
-#if CONFIG_AMD_SB_CIMX - sb_Late_Post(); -#endif } diff --git a/src/mainboard/amd/persimmon/get_bus_conf.c b/src/mainboard/amd/persimmon/get_bus_conf.c index c8369e1..b31f687 100644 --- a/src/mainboard/amd/persimmon/get_bus_conf.c +++ b/src/mainboard/amd/persimmon/get_bus_conf.c @@ -26,9 +26,6 @@ #include <cpu/amd/amdfam14.h> #include "agesawrapper.h" #include <arch/ioapic.h> -#if CONFIG_AMD_SB_CIMX -#include <sb_cimx.h> -#endif
/* Global variables for MB layouts and these will be shared by irqtable mptable @@ -109,7 +106,4 @@ void get_bus_conf(void) apicid_sb800 = (io_apic_read(IO_APIC_ADDR, 0x00) >> 24); apicver_sb800 = (io_apic_read(IO_APIC_ADDR, 0x01) & 0xFF);
-#if CONFIG_AMD_SB_CIMX - sb_Late_Post(); -#endif } diff --git a/src/mainboard/amd/south_station/get_bus_conf.c b/src/mainboard/amd/south_station/get_bus_conf.c index 7eedcba8..99b3880 100644 --- a/src/mainboard/amd/south_station/get_bus_conf.c +++ b/src/mainboard/amd/south_station/get_bus_conf.c @@ -25,9 +25,6 @@ #include <stdlib.h> #include <cpu/amd/amdfam14.h> #include "agesawrapper.h" -#if CONFIG_AMD_SB_CIMX -#include <sb_cimx.h> -#endif
/* Global variables for MB layouts and these will be shared by irqtable mptable @@ -102,7 +99,4 @@ void get_bus_conf(void) apicid_base = CONFIG_MAX_CPUS; apicid_sb800 = apicid_base;
-#if CONFIG_AMD_SB_CIMX - sb_Late_Post(); -#endif } diff --git a/src/mainboard/amd/torpedo/get_bus_conf.c b/src/mainboard/amd/torpedo/get_bus_conf.c index 36613f7..b7895e4 100644 --- a/src/mainboard/amd/torpedo/get_bus_conf.c +++ b/src/mainboard/amd/torpedo/get_bus_conf.c @@ -24,7 +24,6 @@ #include <stdint.h> #include <stdlib.h> #include <cpu/amd/amdfam12.h> -#include "sb_cimx.h" #include "agesawrapper.h"
/* Global variables for MB layouts and these will be shared by irqtable mptable @@ -100,6 +99,5 @@ void get_bus_conf(void) /* I/O APICs: APIC ID Version State Address */ bus_isa = 10;
- sb_Late_Post(); printk(BIOS_DEBUG, "Mainboard - %s - %s - End.\n", __FILE__, __func__); } diff --git a/src/mainboard/amd/union_station/get_bus_conf.c b/src/mainboard/amd/union_station/get_bus_conf.c index 7eedcba8..99b3880 100644 --- a/src/mainboard/amd/union_station/get_bus_conf.c +++ b/src/mainboard/amd/union_station/get_bus_conf.c @@ -25,9 +25,6 @@ #include <stdlib.h> #include <cpu/amd/amdfam14.h> #include "agesawrapper.h" -#if CONFIG_AMD_SB_CIMX -#include <sb_cimx.h> -#endif
/* Global variables for MB layouts and these will be shared by irqtable mptable @@ -102,7 +99,4 @@ void get_bus_conf(void) apicid_base = CONFIG_MAX_CPUS; apicid_sb800 = apicid_base;
-#if CONFIG_AMD_SB_CIMX - sb_Late_Post(); -#endif } diff --git a/src/mainboard/asrock/e350m1/get_bus_conf.c b/src/mainboard/asrock/e350m1/get_bus_conf.c index 7eedcba8..99b3880 100644 --- a/src/mainboard/asrock/e350m1/get_bus_conf.c +++ b/src/mainboard/asrock/e350m1/get_bus_conf.c @@ -25,9 +25,6 @@ #include <stdlib.h> #include <cpu/amd/amdfam14.h> #include "agesawrapper.h" -#if CONFIG_AMD_SB_CIMX -#include <sb_cimx.h> -#endif
/* Global variables for MB layouts and these will be shared by irqtable mptable @@ -102,7 +99,4 @@ void get_bus_conf(void) apicid_base = CONFIG_MAX_CPUS; apicid_sb800 = apicid_base;
-#if CONFIG_AMD_SB_CIMX - sb_Late_Post(); -#endif } diff --git a/src/mainboard/asus/m5a88-v/get_bus_conf.c b/src/mainboard/asus/m5a88-v/get_bus_conf.c index 9bb26e6..b312ec1 100644 --- a/src/mainboard/asus/m5a88-v/get_bus_conf.c +++ b/src/mainboard/asus/m5a88-v/get_bus_conf.c @@ -27,9 +27,6 @@ #include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdfam10_sysconf.h> -#if CONFIG_AMD_SB_CIMX -#include <sb_cimx.h> -#endif
/* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. @@ -147,7 +144,4 @@ void get_bus_conf(void) #endif apicid_sb800 = apicid_base + 0;
-#if CONFIG_AMD_SB_CIMX - sb_Late_Post(); -#endif } diff --git a/src/mainboard/gizmosphere/gizmo/get_bus_conf.c b/src/mainboard/gizmosphere/gizmo/get_bus_conf.c index ca20a0c..44d0b0f 100755 --- a/src/mainboard/gizmosphere/gizmo/get_bus_conf.c +++ b/src/mainboard/gizmosphere/gizmo/get_bus_conf.c @@ -26,9 +26,6 @@ #include <stdlib.h> #include <cpu/amd/amdfam14.h> #include "agesawrapper.h" -#if CONFIG_AMD_SB_CIMX -#include <sb_cimx.h> -#endif
/* Global variables for MB layouts and these will be shared by irqtable mptable @@ -101,7 +98,4 @@ void get_bus_conf(void) apicid_base = CONFIG_MAX_CPUS; apicid_sb800 = apicid_base;
-#if CONFIG_AMD_SB_CIMX - sb_Late_Post(); -#endif } diff --git a/src/mainboard/jetway/nf81-t56n-lf/get_bus_conf.c b/src/mainboard/jetway/nf81-t56n-lf/get_bus_conf.c index 43aa984..3992cb7 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/get_bus_conf.c +++ b/src/mainboard/jetway/nf81-t56n-lf/get_bus_conf.c @@ -28,9 +28,6 @@ #include <stdlib.h> #include <string.h>
-#include <southbridge/amd/cimx/sb800/sb_cimx.h> - - /** * Global variables for mainboard layouts. These are shared by irqtable, * mptable and acpi_tables where busnum is default. @@ -110,7 +107,4 @@ void get_bus_conf(void) apicid_sb800 = (io_apic_read(IO_APIC_ADDR, 0x00) >> 24); apicver_sb800 = (io_apic_read(IO_APIC_ADDR, 0x01) & 0xFF);
-#if CONFIG_AMD_SB_CIMX - sb_Late_Post(); -#endif /* CONFIG_AMD_SB_CIMX */ } diff --git a/src/mainboard/lippert/frontrunner-af/get_bus_conf.c b/src/mainboard/lippert/frontrunner-af/get_bus_conf.c index bddcee1..c1a3fc2 100644 --- a/src/mainboard/lippert/frontrunner-af/get_bus_conf.c +++ b/src/mainboard/lippert/frontrunner-af/get_bus_conf.c @@ -25,9 +25,6 @@ #include <stdlib.h> #include <cpu/amd/amdfam14.h> #include "agesawrapper.h" -#if CONFIG_AMD_SB_CIMX -#include <sb_cimx.h> -#endif
/* Global variables for MB layouts and these will be shared by irqtable mptable @@ -100,7 +97,4 @@ void get_bus_conf(void) apicid_base = CONFIG_MAX_CPUS; apicid_sb800 = apicid_base;
-#if CONFIG_AMD_SB_CIMX - sb_Late_Post(); -#endif } diff --git a/src/mainboard/lippert/toucan-af/get_bus_conf.c b/src/mainboard/lippert/toucan-af/get_bus_conf.c index f0de0e5..c49fff1 100644 --- a/src/mainboard/lippert/toucan-af/get_bus_conf.c +++ b/src/mainboard/lippert/toucan-af/get_bus_conf.c @@ -25,9 +25,6 @@ #include <stdlib.h> #include <cpu/amd/amdfam14.h> #include "agesawrapper.h" -#if CONFIG_AMD_SB_CIMX -#include <sb_cimx.h> -#endif
/* Global variables for MB layouts and these will be shared by irqtable mptable @@ -99,7 +96,4 @@ void get_bus_conf(void) apicid_base = CONFIG_MAX_CPUS; apicid_sb800 = apicid_base;
-#if CONFIG_AMD_SB_CIMX - sb_Late_Post(); -#endif } diff --git a/src/mainboard/supermicro/h8qgi/get_bus_conf.c b/src/mainboard/supermicro/h8qgi/get_bus_conf.c index 7a69a7c..bce9737 100644 --- a/src/mainboard/supermicro/h8qgi/get_bus_conf.c +++ b/src/mainboard/supermicro/h8qgi/get_bus_conf.c @@ -25,9 +25,6 @@ #include <stdlib.h> #include "agesawrapper.h" #include <cpu/amd/amdfam10_sysconf.h> -#if CONFIG_AMD_SB_CIMX -#include <sb_cimx.h> -#endif
/* Global variables for MB layouts and these will be shared by irqtable mptable @@ -108,8 +105,4 @@ void get_bus_conf(void) /* I/O APICs: APIC ID Version State Address */ bus_isa = 10;
-#if CONFIG_AMD_SB_CIMX - sb_After_Pci_Init(); - sb_Late_Post(); -#endif } diff --git a/src/mainboard/supermicro/h8scm/get_bus_conf.c b/src/mainboard/supermicro/h8scm/get_bus_conf.c index 932e2de..9a70fca 100644 --- a/src/mainboard/supermicro/h8scm/get_bus_conf.c +++ b/src/mainboard/supermicro/h8scm/get_bus_conf.c @@ -25,9 +25,6 @@ #include <stdlib.h> #include "agesawrapper.h" #include <cpu/amd/amdfam10_sysconf.h> -#if CONFIG_AMD_SB_CIMX -#include <sb_cimx.h> -#endif
/* Global variables for MB layouts and these will be shared by irqtable mptable @@ -108,8 +105,4 @@ void get_bus_conf(void) /* I/O APICs: APIC ID Version State Address */ bus_isa = 10;
-#if CONFIG_AMD_SB_CIMX - sb_After_Pci_Init(); - sb_Late_Post(); -#endif } diff --git a/src/mainboard/tyan/s8226/get_bus_conf.c b/src/mainboard/tyan/s8226/get_bus_conf.c index 508f379..e7529c3 100644 --- a/src/mainboard/tyan/s8226/get_bus_conf.c +++ b/src/mainboard/tyan/s8226/get_bus_conf.c @@ -24,9 +24,6 @@ #include <stdint.h> #include <stdlib.h> #include "agesawrapper.h" -#if CONFIG_AMD_SB_CIMX -#include <sb_cimx.h> -#endif
/* Global variables for MB layouts and these will be shared by irqtable mptable @@ -109,8 +106,4 @@ void get_bus_conf(void) /* I/O APICs: APIC ID Version State Address */ bus_isa = 10;
-#if CONFIG_AMD_SB_CIMX - sb_After_Pci_Init(); - sb_Late_Post(); -#endif } diff --git a/src/southbridge/amd/cimx/sb900/early.c b/src/southbridge/amd/cimx/sb900/early.c index 237137f..6e4e44e 100644 --- a/src/southbridge/amd/cimx/sb900/early.c +++ b/src/southbridge/amd/cimx/sb900/early.c @@ -100,6 +100,7 @@ void sb_before_pci_init(void)
void sb_After_Pci_Init(void) { +#if !CONFIG_BOARD_AMD_DINAR AMDSBCFG sb_early_cfg;
printk(BIOS_SPEW, "SB900 - Early.c - sb_After_Pci_Init - Start.\n"); @@ -111,6 +112,7 @@ void sb_After_Pci_Init(void) // VerifyImage() will fail, LocateImage() take minitues to find the image. sbAfterPciInit(&sb_early_cfg); printk(BIOS_SPEW, "SB900 - Early.c - sb_After_Pci_Init - End.\n"); +#endif }
void sb_Mid_Post_Init(void) @@ -130,6 +132,7 @@ void sb_Mid_Post_Init(void)
void sb_Late_Post(void) { +#if !CONFIG_BOARD_AMD_DINAR AMDSBCFG sb_early_cfg; u8 data;
@@ -160,4 +163,5 @@ void sb_Late_Post(void) }
printk(BIOS_SPEW, "SB900 - Early.c - sb_Late_Post - End.\n"); +#endif }