Patrick Rudolph has uploaded this change for review.
sb/intel/sandybridge/early_pch: Make DMI init more readable
Add a few comments and use known register values.
Untested.
Change-Id: I404515b77a22324f55581f117d79630be4ba64dd
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
---
M src/northbridge/intel/sandybridge/sandybridge.h
M src/southbridge/intel/bd82x6x/early_pch.c
M src/southbridge/intel/bd82x6x/pch.h
3 files changed, 123 insertions(+), 71 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/32071/1
diff --git a/src/northbridge/intel/sandybridge/sandybridge.h b/src/northbridge/intel/sandybridge/sandybridge.h
index 72b2805..2b12521 100644
--- a/src/northbridge/intel/sandybridge/sandybridge.h
+++ b/src/northbridge/intel/sandybridge/sandybridge.h
@@ -175,12 +175,23 @@
#define DMIPVCCCTL 0x00c /* 16bit */
#define DMIVC0RCAP 0x010 /* 32bit */
-#define DMIVC0RCTL0 0x014 /* 32bit */
+#define DMIVC0RCTL 0x014 /* 32bit */
#define DMIVC0RSTS 0x01a /* 16bit */
+#define VC0NP 0x2
#define DMIVC1RCAP 0x01c /* 32bit */
#define DMIVC1RCTL 0x020 /* 32bit */
#define DMIVC1RSTS 0x026 /* 16bit */
+#define VC1NP 0x2
+
+#define DMIVCPRCTL 0x02c /* 16bit */
+
+#define DMIVCPRSTS 0x032 /* 16bit */
+#define VCPNP 0x2
+
+#define DMIVCMRCTL 0x0038 /* 32 bit */
+#define DMIVCMRSTS 0x003e /* 16 bit */
+#define VCMNP 0x2
#define DMILE1D 0x050 /* 32bit */
#define DMILE1A 0x058 /* 64bit */
@@ -190,7 +201,7 @@
#define DMILCAP 0x084 /* 32bit */
#define DMILCTL 0x088 /* 16bit */
#define DMILSTS 0x08a /* 16bit */
-
+#define TXTRN (1 << 11)
#define DMICTL1 0x0f0 /* 32bit */
#define DMICTL2 0x0fc /* 32bit */
diff --git a/src/southbridge/intel/bd82x6x/early_pch.c b/src/southbridge/intel/bd82x6x/early_pch.c
index 1bcb2ac..e4462c1 100644
--- a/src/southbridge/intel/bd82x6x/early_pch.c
+++ b/src/southbridge/intel/bd82x6x/early_pch.c
@@ -39,6 +39,7 @@
static u32
read_iobp(u32 address)
{
+ volatile u32 tmp;
u32 ret;
write32(DEFAULT_RCBA + IOBPIRI, address);
@@ -54,6 +55,8 @@
static void
write_iobp(u32 address, u32 val)
{
+ volatile u32 tmp;
+
/* this function was probably pch_iobp_update with the andvalue
* being 0. So either the IOBP read can be removed or this function
* and the pch_iobp_update function in ramstage could be merged */
@@ -69,36 +72,28 @@
read8(DEFAULT_RCBA + IOBPS); // call wait_iobp() instead here?
}
-
static void
init_dmi (void)
{
int i;
- write32 (DEFAULT_DMIBAR + 0x0914,
- read32 (DEFAULT_DMIBAR + 0x0914) | 0x80000000);
- write32 (DEFAULT_DMIBAR + 0x0934,
- read32 (DEFAULT_DMIBAR + 0x0934) | 0x80000000);
- for (i = 0; i < 4; i++)
- {
- write32 (DEFAULT_DMIBAR + 0x0a00 + (i << 4),
- read32 (DEFAULT_DMIBAR + 0x0a00 + (i << 4)) & 0xf3ffffff);
- write32 (DEFAULT_DMIBAR + 0x0a04 + (i << 4),
- read32 (DEFAULT_DMIBAR + 0x0a04 + (i << 4)) | 0x800);
+ DMIBAR32(0x0914) |= 0x80000000;
+ DMIBAR32(0x0934) |= 0x80000000;
+
+ for (i = 0; i < 4; i++) {
+ DMIBAR32(0x0a00 + (i << 4)) &= 0xf3ffffff;
+ DMIBAR32(0x0a04 + (i << 4)) |= 0x800;
}
- write32 (DEFAULT_DMIBAR + 0x0c30, (read32 (DEFAULT_DMIBAR + 0x0c30)
- & 0xfffffff) | 0x40000000);
- for (i = 0; i < 2; i++)
- {
- write32 (DEFAULT_DMIBAR + 0x0904 + (i << 5),
- read32 (DEFAULT_DMIBAR + 0x0904 + (i << 5)) & 0xfe3fffff);
- write32 (DEFAULT_DMIBAR + 0x090c + (i << 5),
- read32 (DEFAULT_DMIBAR + 0x090c + (i << 5)) & 0xfff1ffff);
+ DMIBAR32(0x0c30) = (DMIBAR32(0x0c30) & 0xfffffff) | 0x40000000;
+
+ for (i = 0; i < 2; i++) {
+ DMIBAR32(0x0904 + (i << 5)) &= 0xfe3fffff;
+ DMIBAR32(0x090c + (i << 5)) &= 0xfff1ffff;
}
- write32 (DEFAULT_DMIBAR + 0x090c,
- read32 (DEFAULT_DMIBAR + 0x090c) & 0xfe1fffff);
- write32 (DEFAULT_DMIBAR + 0x092c,
- read32 (DEFAULT_DMIBAR + 0x092c) & 0xfe1fffff);
+
+ DMIBAR32(0x090c) &= 0xfe1fffff;
+ DMIBAR32(0x092c) &= 0xfe1fffff;
+
read32 (DEFAULT_DMIBAR + 0x0904); // !!! = 0x7a1842ec
write32 (DEFAULT_DMIBAR + 0x0904, 0x7a1842ec);
read32 (DEFAULT_DMIBAR + 0x090c); // !!! = 0x00000208
@@ -227,33 +222,45 @@
write32 (DEFAULT_DMIBAR + 0x0934, 0x98200280);
read32 (DEFAULT_DMIBAR + 0x022c); // !!! = 0x00c26460
write32 (DEFAULT_DMIBAR + 0x022c, 0x00c2403c);
- read8 (DEFAULT_RCBA + 0x21a4); // !!! = 0x42
- read32 (DEFAULT_RCBA + 0x21a4); // !!! = 0x00012c42
- read32 (DEFAULT_RCBA + 0x2340); // !!! = 0x0013001b
- write32 (DEFAULT_RCBA + 0x2340, 0x003a001b);
- read8 (DEFAULT_RCBA + 0x21b0); // !!! = 0x01
- write8 (DEFAULT_RCBA + 0x21b0, 0x02);
- read32 (DEFAULT_DMIBAR + 0x0084); // !!! = 0x0041ac41
- write32 (DEFAULT_DMIBAR + 0x0084, 0x0041ac42);
- read8 (DEFAULT_DMIBAR + 0x0088); // !!! = 0x00
- write8 (DEFAULT_DMIBAR + 0x0088, 0x20);
- read16 (DEFAULT_DMIBAR + 0x008a); // !!! = 0x0041
- read8 (DEFAULT_DMIBAR + 0x0088); // !!! = 0x00
- write8 (DEFAULT_DMIBAR + 0x0088, 0x20);
- read16 (DEFAULT_DMIBAR + 0x008a); // !!! = 0x0042
- read16 (DEFAULT_DMIBAR + 0x008a); // !!! = 0x0042
+ /* Link Capabilities Register */
+ RCBA32(0x21a4) |= (3 << 10) | // L0s and L1 entry supported
+ (2 << 12) | // L0s 128 ns to less than 256 ns
+ (1 << 15); // 1 us to less than 2 us
- read32 (DEFAULT_DMIBAR + 0x0014); // !!! = 0x8000007f
- write32 (DEFAULT_DMIBAR + 0x0014, 0x80000019);
- read32 (DEFAULT_DMIBAR + 0x0020); // !!! = 0x01000000
- write32 (DEFAULT_DMIBAR + 0x0020, 0x81000022);
- read32 (DEFAULT_DMIBAR + 0x002c); // !!! = 0x02000000
- write32 (DEFAULT_DMIBAR + 0x002c, 0x82000044);
- read32 (DEFAULT_DMIBAR + 0x0038); // !!! = 0x07000080
- write32 (DEFAULT_DMIBAR + 0x0038, 0x87000080);
- read8 (DEFAULT_DMIBAR + 0x0004); // !!! = 0x00
- write8 (DEFAULT_DMIBAR + 0x0004, 0x01);
+ RCBA8(0x2340) = (RCBA8(0x2340) & ~0xff0000) | (0x3a << 16);
+ RCBA8(0x21b0) = (RCBA8(0x21b0) & ~3) | 2;
+
+ /* Write once settings. */
+ DMIBAR16(DMILCAP) = (DMIBAR16(DMILCAP) & ~0x3f00f) |
+ (0x2 << 0) | // 5GT/s
+ (0x2 << 12) | // L0s 128 ns to less than 256 ns
+ (0x3 << 15); // L1 4 us to less than 8 us
+
+ DMIBAR8(DMILCTL) |= 0x20; // Retrain link
+ while (DMIBAR16(DMILSTS) & TXTRN)
+ ;
+
+ DMIBAR8(DMILCTL) |= 0x20; // Retrain link
+ while (DMIBAR16(DMILSTS) & TXTRN)
+ ;
+
+ const u8 w = (DMIBAR16(DMILSTS) >> 4) & 0x1f;
+ const u16 t = (DMIBAR16(DMILSTS) & 0xf) * 2500;
+
+ printk(BIOS_DEBUG, "DMI: Running at X%x @ %dMT/s\n", w, t);
+
+ /* Set traffic class */
+ DMIBAR32(DMIVC0RCTL) = (DMIBAR32(DMIVC0RCTL) & ~0x7e) | 0x18;
+ /* Enable channel 1 and set traffic class */
+ DMIBAR32(DMIVC1RCTL) = (DMIBAR32(DMIVC1RCTL) & ~0x7e) | 0x80000022;
+ /* Enable channel private and set traffic class */
+ DMIBAR32(DMIVCPRCTL) = (DMIBAR32(DMIVCPRCTL) & ~0x7e) | 0x80000044;
+ /* Enable channel m */
+ DMIBAR32(DMIVCMRCTL) = DMIBAR32(DMIVCMRCTL) | 0x80000000;
+
+ /* Set Extended VC Count (EVCC) to 1 */
+ DMIBAR8(DMIPVCCAP1) |= 1;
read32 (DEFAULT_RCBA + 0x0050); // !!! = 0x01200654
write32 (DEFAULT_RCBA + 0x0050, 0x01200654);
@@ -262,32 +269,64 @@
read32 (DEFAULT_RCBA + 0x0050); // !!! = 0x012a0654
read8 (DEFAULT_RCBA + 0x1114); // !!! = 0x00
write8 (DEFAULT_RCBA + 0x1114, 0x05);
- read32 (DEFAULT_RCBA + 0x2014); // !!! = 0x80000011
- write32 (DEFAULT_RCBA + 0x2014, 0x80000019);
- read32 (DEFAULT_RCBA + 0x2020); // !!! = 0x00000000
- write32 (DEFAULT_RCBA + 0x2020, 0x81000022);
- read32 (DEFAULT_RCBA + 0x2020); // !!! = 0x81000022
- read32 (DEFAULT_RCBA + 0x2030); // !!! = 0x00000000
- write32 (DEFAULT_RCBA + 0x2030, 0x82000044);
- read32 (DEFAULT_RCBA + 0x2030); // !!! = 0x82000044
- read32 (DEFAULT_RCBA + 0x2040); // !!! = 0x00000000
- write32 (DEFAULT_RCBA + 0x2040, 0x87000080);
- read32 (DEFAULT_RCBA + 0x0050); // !!! = 0x012a0654
- write32 (DEFAULT_RCBA + 0x0050, 0x812a0654);
- read32 (DEFAULT_RCBA + 0x0050); // !!! = 0x812a0654
- read16 (DEFAULT_RCBA + 0x201a); // !!! = 0x0000
- read16 (DEFAULT_RCBA + 0x2026); // !!! = 0x0000
- read16 (DEFAULT_RCBA + 0x2036); // !!! = 0x0000
- read16 (DEFAULT_RCBA + 0x2046); // !!! = 0x0000
- read16 (DEFAULT_DMIBAR + 0x001a); // !!! = 0x0000
- read16 (DEFAULT_DMIBAR + 0x0026); // !!! = 0x0000
- read16 (DEFAULT_DMIBAR + 0x0032); // !!! = 0x0000
- read16 (DEFAULT_DMIBAR + 0x003e); // !!! = 0x0000
+
+ /* Virtual Channel 0 Resource Control Register. Set Transaction class */
+ RCBA32(0x2014) |= 8;
+
+ /* Virtual Channel 1 Resource Control Register.
+ * Enable channel.
+ * Set Virtual Channel Identifier.
+ * Set Transaction class.
+ */
+ RCBA32(0x2020) = 0x81000022;
+
+ /* Virtual Channel private Resource Control Register.
+ * Enable channel.
+ * Set Virtual Channel Identifier.
+ * Set Transaction class.
+ */
+ RCBA32(0x2030) = 0x82000044;
+
+ /* Virtual Channel extendend Resource Control Register.
+ * Enable channel.
+ * Set Virtual Channel Identifier.
+ * Set Transaction class.
+ */
+ RCBA32(0x2040) = 0x87000080;
+
+ /* Lock Virtual Channel Resource control register. */
+ RCBA32(0x0050) |= 0x80000000;
+
+ /* Virtual Channel 0 Resource Status Register */
+ if (RCBA16(0x201a) & VCNEGPND)
+ printk(BIOS_ERR, "ERR: Virtual Channel 0, Negotiation"
+ "with ingress port is pending\n");
+ /* Virtual Channel 1 Resource Status Register */
+ if (RCBA16(0x2026) & VCNEGPND)
+ printk(BIOS_ERR, "ERR: Virtual Channel 1, Negotiation"
+ "with ingress port is pending\n");
+ if (RCBA16(0x2036) & VCNEGPND)
+ printk(BIOS_ERR, "ERR: Virtual Channel private, Negotiation"
+ "with ingress port is pending\n");
+ if (RCBA16(0x2046) & VCNEGPND)
+ printk(BIOS_ERR, "ERR: Virtual Channel m, Negotiation"
+ "with ingress port is pending\n");
+
+ /* BIOS Requirement: Check if DMI VC Negotiation was successful. */
+ if (DMIBAR16(DMIVC0RSTS) & VC0NP)
+ printk(BIOS_ERR, "ERR: Virtual Channel 0, Negotiation Pending\n");
+ if (DMIBAR16(DMIVC1RSTS) & VC1NP)
+ printk(BIOS_ERR, "ERR: Virtual Channel 1, Negotiation Pending\n");
+ if (DMIBAR16(DMIVCPRSTS) & VCPNP)
+ printk(BIOS_ERR, "ERR: Virtual Channel private, Negotiation Pending\n");
+ if (DMIBAR16(DMIVCMRSTS) & VCMNP)
+ printk(BIOS_ERR, "ERR: Virtual Channel m, Negotiation Pending\n");
}
void
early_pch_init_native (void)
{
+ volatile u32 tmp;
pci_write_config8 (SOUTHBRIDGE, 0xa6,
pci_read_config8 (SOUTHBRIDGE, 0xa6) | 2);
diff --git a/src/southbridge/intel/bd82x6x/pch.h b/src/southbridge/intel/bd82x6x/pch.h
index 21b6031..f3ad469 100644
--- a/src/southbridge/intel/bd82x6x/pch.h
+++ b/src/southbridge/intel/bd82x6x/pch.h
@@ -310,6 +310,8 @@
#define IOTR2 0x1e90 /* 64bit */
#define IOTR3 0x1e98 /* 64bit */
+#define VCNEGPND 2
+
#define TCTL 0x3000 /* 8bit */
#define NOINT 0
To view, visit change 32071. To unsubscribe, or for help writing mail filters, visit settings.