Change in coreboot[master]: sb/intel/i82801gx: Set FERR# Mux Enable only on mobile platforms

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36201 )

Change subject: sb/intel/i82801gx: Set FERR# Mux Enable only on mobile platforms
......................................................................

sb/intel/i82801gx: Set FERR# Mux Enable only on mobile platforms

This follows the ICH7 datasheets.

Change-Id: Ic8f6db8556662b03efead8c1b9e3074ffe24cd8b
Signed-off-by: Arthur Heymans 
---
M src/southbridge/intel/i82801gx/early_cir.c
1 file changed, 4 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/36201/1

diff --git a/src/southbridge/intel/i82801gx/early_cir.c b/src/southbridge/intel/i82801gx/early_cir.c
index 4f08a43..7543a77 100644
--- a/src/southbridge/intel/i82801gx/early_cir.c
+++ b/src/southbridge/intel/i82801gx/early_cir.c
@@ -29,9 +29,6 @@
    RCBA32(0x0214) = 0x10030549;
    RCBA32(0x0218) = 0x00020504;
    RCBA8(0x0220) = 0xc5;
-	reg32 = RCBA32(GCS);
-	reg32 |= (1 << 6);
-	RCBA32(GCS) = reg32;
    RCBA32_AND_OR(0x3430, ~(3 << 0), 1 << 0);
    RCBA16(0x0200) = 0x2008;
    RCBA8(0x2027) = 0x0d;
@@ -51,5 +48,9 @@
    		reg32 |= (5 << 16);
    		RCBA32(0x2034) = reg32;
    	}
+		/* FERR# MUX Enable (FME) */
+		reg32 = RCBA32(GCS);
+		reg32 |= (1 << 6);
+		RCBA32(GCS) = reg32;
    }
 }

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36201 )

Change subject: sb/intel/i82801gx: Set FERR# Mux Enable only on mobile platforms
......................................................................

Patch Set 2: Code-Review+2

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36201 )

Change subject: sb/intel/i82801gx: Set FERR# Mux Enable only on mobile platforms
......................................................................

Patch Set 2: Code-Review+1

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36201 )

Change subject: sb/intel/i82801gx: Set FERR# Mux Enable only on mobile platforms
......................................................................

sb/intel/i82801gx: Set FERR# Mux Enable only on mobile platforms

This follows the ICH7 datasheets.

Change-Id: Ic8f6db8556662b03efead8c1b9e3074ffe24cd8b
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36201
Reviewed-by: Nico Huber 
Reviewed-by: Paul Menzel 
Tested-by: build bot (Jenkins) 
---
M src/southbridge/intel/i82801gx/early_cir.c
1 file changed, 4 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved
  Paul Menzel: Looks good to me, but someone else must approve

diff --git a/src/southbridge/intel/i82801gx/early_cir.c b/src/southbridge/intel/i82801gx/early_cir.c
index 4f08a43..7543a77 100644
--- a/src/southbridge/intel/i82801gx/early_cir.c
+++ b/src/southbridge/intel/i82801gx/early_cir.c
@@ -29,9 +29,6 @@
    RCBA32(0x0214) = 0x10030549;
    RCBA32(0x0218) = 0x00020504;
    RCBA8(0x0220) = 0xc5;
-	reg32 = RCBA32(GCS);
-	reg32 |= (1 << 6);
-	RCBA32(GCS) = reg32;
    RCBA32_AND_OR(0x3430, ~(3 << 0), 1 << 0);
    RCBA16(0x0200) = 0x2008;
    RCBA8(0x2027) = 0x0d;
@@ -51,5 +48,9 @@
    		reg32 |= (5 << 16);
    		RCBA32(0x2034) = reg32;
    	}
+		/* FERR# MUX Enable (FME) */
+		reg32 = RCBA32(GCS);
+		reg32 |= (1 << 6);
+		RCBA32(GCS) = reg32;
    }
 }