[coreboot-gerrit] Patch set updated for coreboot: 8a30d6a AGESA fam14: Move agesawrapper_amdinitmmio()

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7163

-gerrit

commit 8a30d6a1e0d05cd31b3eef6ebccaf543918fc1b1
Author: Kyösti Mälkki 
Date:   Tue Nov 25 14:03:29 2014 +0200

AGESA fam14: Move agesawrapper_amdinitmmio()

Enabling MMCONF PCI-e configuration access should be done before
    console_init(). This will likely move further to bootblock one day.

Change-Id: I20c93fe6e79ef7e7981b2f1cd3c6b446feea0f4e
    Signed-off-by: Kyösti Mälkki 
---
 src/mainboard/amd/dinar/romstage.c              | 5 ++---
 src/mainboard/amd/inagua/romstage.c             | 5 ++---
 src/mainboard/amd/persimmon/romstage.c          | 5 ++---
 src/mainboard/amd/south_station/romstage.c      | 5 ++---
 src/mainboard/amd/union_station/romstage.c      | 5 ++---
 src/mainboard/asrock/e350m1/romstage.c          | 5 ++---
 src/mainboard/gizmosphere/gizmo/romstage.c      | 5 ++---
 src/mainboard/jetway/nf81-t56n-lf/romstage.c    | 5 ++---
 src/mainboard/lippert/frontrunner-af/romstage.c | 5 ++---
 src/mainboard/lippert/toucan-af/romstage.c      | 5 ++---
 10 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/src/mainboard/amd/dinar/romstage.c b/src/mainboard/amd/dinar/romstage.c
index b1e9a61..c011038 100644
--- a/src/mainboard/amd/dinar/romstage.c
+++ b/src/mainboard/amd/dinar/romstage.c
@@ -43,6 +43,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 {
    u32 val;

+	agesawrapper_amdinitmmio();
+
    if (!cpu_init_detectedx && boot_cpu()) {

post_code(0x30);
@@ -62,9 +64,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)

}

-	post_code(0x32);
-	agesawrapper_amdinitmmio();
-
    /* Halt if there was a built in self test failure */
    post_code(0x33);
    report_bist_failure(bist);
diff --git a/src/mainboard/amd/inagua/romstage.c b/src/mainboard/amd/inagua/romstage.c
index 3a5c761..68822e0 100644
--- a/src/mainboard/amd/inagua/romstage.c
+++ b/src/mainboard/amd/inagua/romstage.c
@@ -54,6 +54,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
     */
    __writemsr (0xc0010062, 0);

+	agesawrapper_amdinitmmio();
+
    if (!cpu_init_detectedx && boot_cpu()) {
    	post_code(0x30);
    	sb_Poweron_Init();
@@ -73,9 +75,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val);
    printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx\n", cpu_init_detectedx);

-	post_code(0x35);
-	agesawrapper_amdinitmmio();
-
    post_code(0x37);
    agesawrapper_amdinitreset();

diff --git a/src/mainboard/amd/persimmon/romstage.c b/src/mainboard/amd/persimmon/romstage.c
index 5434ed3..b0c1624 100644
--- a/src/mainboard/amd/persimmon/romstage.c
+++ b/src/mainboard/amd/persimmon/romstage.c
@@ -60,6 +60,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    /* All cores: set pstate 0 (1600 MHz) early to save a few ms of boot time */
    __writemsr (0xc0010062, 0);

+	agesawrapper_amdinitmmio();
+
    if (!cpu_init_detectedx && boot_cpu()) {
    	post_code(0x30);
    	sb_Poweron_Init();
@@ -78,9 +80,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val);
    printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx\n", cpu_init_detectedx);

-	post_code(0x35);
-	agesawrapper_amdinitmmio();
-
    post_code(0x37);
    agesawrapper_amdinitreset();

diff --git a/src/mainboard/amd/south_station/romstage.c b/src/mainboard/amd/south_station/romstage.c
index 7dcd9b2..727b92d 100644
--- a/src/mainboard/amd/south_station/romstage.c
+++ b/src/mainboard/amd/south_station/romstage.c
@@ -55,6 +55,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    /* All cores: set pstate 0 (1600 MHz) early to save a few ms of boot time */
    __writemsr (0xc0010062, 0);

+	agesawrapper_amdinitmmio();
+
    if (!cpu_init_detectedx && boot_cpu()) {
    	post_code(0x30);
    	sb_Poweron_Init();
@@ -73,9 +75,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val);
    printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx\n", cpu_init_detectedx);

-	post_code(0x35);
-	agesawrapper_amdinitmmio();
-
    post_code(0x37);
    agesawrapper_amdinitreset();

diff --git a/src/mainboard/amd/union_station/romstage.c b/src/mainboard/amd/union_station/romstage.c
index ac583dd..4d31d2b 100644
--- a/src/mainboard/amd/union_station/romstage.c
+++ b/src/mainboard/amd/union_station/romstage.c
@@ -50,6 +50,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    __writemsr (0x20c, (0x0100000000ull - CACHE_ROM_SIZE) | 5);
    __writemsr (0x20d, (0x1000000000ull - CACHE_ROM_SIZE) | 0x800);

+	agesawrapper_amdinitmmio();
+
    if (!cpu_init_detectedx && boot_cpu()) {
    	post_code(0x30);
    	sb_Poweron_Init();
@@ -67,9 +69,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val);
    printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx\n", cpu_init_detectedx);

-	post_code(0x35);
-	agesawrapper_amdinitmmio();
-
    post_code(0x37);
    agesawrapper_amdinitreset();

diff --git a/src/mainboard/asrock/e350m1/romstage.c b/src/mainboard/asrock/e350m1/romstage.c
index c7c71a1..ea59a8d 100644
--- a/src/mainboard/asrock/e350m1/romstage.c
+++ b/src/mainboard/asrock/e350m1/romstage.c
@@ -55,6 +55,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    /* All cores: set pstate 0 (1600 MHz) early to save a few ms of boot time */
    __writemsr(0xc0010062, 0);

+	agesawrapper_amdinitmmio();
+
    if (!cpu_init_detectedx && boot_cpu()) {
    	post_code(0x30);
    	sb_Poweron_Init();
@@ -73,9 +75,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val);
    printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx\n", cpu_init_detectedx);

-	post_code(0x35);
-	agesawrapper_amdinitmmio();
-
    post_code(0x37);
    agesawrapper_amdinitreset();

diff --git a/src/mainboard/gizmosphere/gizmo/romstage.c b/src/mainboard/gizmosphere/gizmo/romstage.c
index 92b5292..5132eef 100755
--- a/src/mainboard/gizmosphere/gizmo/romstage.c
+++ b/src/mainboard/gizmosphere/gizmo/romstage.c
@@ -68,6 +68,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    msr.hi = 0;
    wrmsr (MSR_PSTATE_CONTROL, msr);

+	agesawrapper_amdinitmmio();
+
    if (!cpu_init_detectedx && boot_cpu()) {
    	post_code(0x30);
    	sb_Poweron_Init();
@@ -86,9 +88,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val);
    printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx\n", cpu_init_detectedx);

-	post_code(0x35);
-	agesawrapper_amdinitmmio();
-
    post_code(0x37);
    agesawrapper_amdinitreset();

diff --git a/src/mainboard/jetway/nf81-t56n-lf/romstage.c b/src/mainboard/jetway/nf81-t56n-lf/romstage.c
index 534bdc4..d7fa6bc 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/romstage.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/romstage.c
@@ -76,6 +76,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    /* All cores: set pstate 0 (1600 MHz) early to save a few ms of boot time */
    __writemsr (0xc0010062, 0);

+	agesawrapper_amdinitmmio();
+
    if (!cpu_init_detectedx && boot_cpu()) {
    	post_code(0x30);
    	sb_Poweron_Init();
@@ -94,9 +96,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val);
    printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx\n", cpu_init_detectedx);

-	post_code(0x35);
-	agesawrapper_amdinitmmio();
-
    post_code(0x37);
    agesawrapper_amdinitreset();

diff --git a/src/mainboard/lippert/frontrunner-af/romstage.c b/src/mainboard/lippert/frontrunner-af/romstage.c
index c4bf978..52da850 100644
--- a/src/mainboard/lippert/frontrunner-af/romstage.c
+++ b/src/mainboard/lippert/frontrunner-af/romstage.c
@@ -59,6 +59,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    /* All cores: set pstate 0 (1600 MHz) early to save a few ms of boot time */
    __writemsr (0xc0010062, 0);

+	agesawrapper_amdinitmmio();
+
    if (!cpu_init_detectedx && boot_cpu()) {
    	post_code(0x30);
    	sb_Poweron_Init();
@@ -77,9 +79,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val);
    printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx\n", cpu_init_detectedx);

-	post_code(0x35);
-	agesawrapper_amdinitmmio();
-
    post_code(0x37);
    agesawrapper_amdinitreset();

diff --git a/src/mainboard/lippert/toucan-af/romstage.c b/src/mainboard/lippert/toucan-af/romstage.c
index 9d99894..13d6f66 100644
--- a/src/mainboard/lippert/toucan-af/romstage.c
+++ b/src/mainboard/lippert/toucan-af/romstage.c
@@ -60,6 +60,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    /* All cores: set pstate 0 (1600 MHz) early to save a few ms of boot time */
    __writemsr (0xc0010062, 0);

+	agesawrapper_amdinitmmio();
+
    if (!cpu_init_detectedx && boot_cpu()) {
    	post_code(0x30);
    	sb_Poweron_Init();
@@ -78,9 +80,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
    printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val);
    printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx\n", cpu_init_detectedx);

-	post_code(0x35);
-	agesawrapper_amdinitmmio();
-
    post_code(0x37);
    agesawrapper_amdinitreset();