[coreboot-gerrit] Patch set updated for coreboot: 7dab609 intel/i945: Only write CID, PN and TCID once

[Mono Moosbart (mono@posteo.de)]

Mono Moosbart (mono at posteo.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5387

-gerrit

commit 7dab609e9f582f9872d43b5c5e9e17e7dcff1f17
Author: Mono <mono at posteo.de>
Date:   Sat Mar 15 21:27:18 2014 +0100

    intel/i945: Only write CID, PN and TCID once
    
    Component ID (CID) in Element Self Description Register (ESD)
    can be written once only. The current implementation tries
    to write CID three times. The second and third write operations
    have no effect. Moreover, the current implementation does not
    make sure the read-only bits remain unchanged.
    
    The same is true for Target Port Number (PN) and
    Target Component ID (TCID) in Upstream Link Descriptor Register (ULD).
    The current implementation tries to write those bits twice. The second
    operation is ignored.
    
    Change-Id: Iea731951af2411cbada77ccdcaacca239e4ffdc6
    Signed-off-by: Mono <mono at posteo.de>
---
 src/northbridge/intel/i945/early_init.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/northbridge/intel/i945/early_init.c b/src/northbridge/intel/i945/early_init.c
index 57232af..d04a17c 100644
--- a/src/northbridge/intel/i945/early_init.c
+++ b/src/northbridge/intel/i945/early_init.c
@@ -310,7 +310,6 @@ static void ich7_setup_dmi_rcrb(void)
 
 	RCBA32(V0CTL) = 0x80000001;
 	RCBA32(V1CAP) = 0x03128010;
-	RCBA32(ESD) = 0x00000810;
 	RCBA32(RP1D) = 0x01000003;
 	RCBA32(RP2D) = 0x02000002;
 	RCBA32(RP3D) = 0x03000002;
@@ -332,10 +331,6 @@ static void ich7_setup_dmi_rcrb(void)
 	reg32 |= (0x40 << 1) | (4 << 17) | (1 << 24) | (1 << 31);
 	RCBA32(V1CTL) = reg32;
 
-	RCBA32(ESD) |= (2 << 16);
-
-	RCBA32(ULD) |= (1 << 24) | (1 << 16);
-
 	RCBA32(ULBA) = DEFAULT_DMIBAR;
 
 	RCBA32(RP1D) |= (2 << 16);
@@ -845,8 +840,10 @@ static void i945_setup_root_complex_topology(void)
 
 static void ich7_setup_root_complex_topology(void)
 {
-	RCBA32(0x104) = 0x00000802;
-	RCBA32(0x110) = 0x00000001;
+	/* Component ID (CID), Write-Once bit */
+	RCBA32(ESD) |= (2 << 16);
+	/* Target Port Number (PN) and Target Component ID (TCID), Write-Once bits */
+	RCBA32(ULD) |= (1 << 24) | (1 << 16);
 	RCBA32(0x114) = 0x00000000;
 	RCBA32(0x118) = 0x00000000;
 }