summaryrefslogtreecommitdiff
path: root/src/northbridge/intel/sandybridge/early_dmi.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/northbridge/intel/sandybridge/early_dmi.c')
-rw-r--r--src/northbridge/intel/sandybridge/early_dmi.c168
1 files changed, 84 insertions, 84 deletions
diff --git a/src/northbridge/intel/sandybridge/early_dmi.c b/src/northbridge/intel/sandybridge/early_dmi.c
index 6f17cc1687..d9b7ed27ff 100644
--- a/src/northbridge/intel/sandybridge/early_dmi.c
+++ b/src/northbridge/intel/sandybridge/early_dmi.c
@@ -17,155 +17,155 @@ static void dmi_recipe(void)
return;
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0914 + (i << 5)) |= (1 << 31);
+ dmibar_setbits32(0x0914 + (i << 5), 1 << 31);
}
for (i = 0; i < 4; i++) {
- DMIBAR32(0x0a00 + (i << 4)) &= ~0x0c000000;
- DMIBAR32(0x0a04 + (i << 4)) |= (1 << 11);
+ dmibar_clrbits32(0x0a00 + (i << 4), 3 << 26);
+ dmibar_setbits32(0x0a04 + (i << 4), 1 << 11);
}
- DMIBAR32(0x0c30) = (DMIBAR32(0x0c30) & 0x0fffffff) | (1 << 30);
+ dmibar_clrsetbits32(0x0c30, 0xf << 28, 1 << 30);
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0904 + (i << 5)) &= ~0x01c00000;
- DMIBAR32(0x090c + (i << 5)) &= ~0x000e0000;
+ dmibar_clrbits32(0x0904 + (i << 5), 7 << 22);
+ dmibar_clrbits32(0x090c + (i << 5), 7 << 17);
}
for (i = 0; i < 2; i++) {
- DMIBAR32(0x090c + (i << 5)) &= ~0x01e00000;
+ dmibar_clrbits32(0x090c + (i << 5), 0xf << 21);
}
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0904 + (i << 5)); // !!! = 0x7a1842ec
- DMIBAR32(0x0904 + (i << 5)) = 0x7a1842ec;
- DMIBAR32(0x090c + (i << 5)); // !!! = 0x00000208
- DMIBAR32(0x090c + (i << 5)) = 0x00000128;
+ dmibar_read32(0x0904 + (i << 5)); // !!! = 0x7a1842ec
+ dmibar_write32(0x0904 + (i << 5), 0x7a1842ec);
+ dmibar_read32(0x090c + (i << 5)); // !!! = 0x00000208
+ dmibar_write32(0x090c + (i << 5), 0x00000128);
}
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0700 + (i << 5)); // !!! = 0x46139008
- DMIBAR32(0x0700 + (i << 5)) = 0x46139008;
+ dmibar_read32(0x0700 + (i << 5)); // !!! = 0x46139008
+ dmibar_write32(0x0700 + (i << 5), 0x46139008);
}
- DMIBAR32(0x0c04); // !!! = 0x2e680008
- DMIBAR32(0x0c04) = 0x2e680008;
+ dmibar_read32(0x0c04); // !!! = 0x2e680008
+ dmibar_write32(0x0c04, 0x2e680008);
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0904 + (i << 5)); // !!! = 0x7a1842ec
- DMIBAR32(0x0904 + (i << 5)) = 0x3a1842ec;
+ dmibar_read32(0x0904 + (i << 5)); // !!! = 0x7a1842ec
+ dmibar_write32(0x0904 + (i << 5), 0x3a1842ec);
}
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0910 + (i << 5)); // !!! = 0x00006300
- DMIBAR32(0x0910 + (i << 5)) = 0x00004300;
+ dmibar_read32(0x0910 + (i << 5)); // !!! = 0x00006300
+ dmibar_write32(0x0910 + (i << 5), 0x00004300);
}
for (i = 0; i < 4; i++) {
- DMIBAR32(0x0a00 + (i << 4)); // !!! = 0x03042010
- DMIBAR32(0x0a00 + (i << 4)) = 0x03042018;
+ dmibar_read32(0x0a00 + (i << 4)); // !!! = 0x03042010
+ dmibar_write32(0x0a00 + (i << 4), 0x03042018);
}
- DMIBAR32(0x0c00); // !!! = 0x29700c08
- DMIBAR32(0x0c00) = 0x29700c08;
+ dmibar_read32(0x0c00); // !!! = 0x29700c08
+ dmibar_write32(0x0c00, 0x29700c08);
for (i = 0; i < 4; i++) {
- DMIBAR32(0x0a04 + (i << 4)); // !!! = 0x0c0708f0
- DMIBAR32(0x0a04 + (i << 4)) = 0x0c0718f0;
+ dmibar_read32(0x0a04 + (i << 4)); // !!! = 0x0c0708f0
+ dmibar_write32(0x0a04 + (i << 4), 0x0c0718f0);
}
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0900 + (i << 5)); // !!! = 0x50000000
- DMIBAR32(0x0900 + (i << 5)) = 0x50000000;
+ dmibar_read32(0x0900 + (i << 5)); // !!! = 0x50000000
+ dmibar_write32(0x0900 + (i << 5), 0x50000000);
}
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0908 + (i << 5)); // !!! = 0x51ffffff
- DMIBAR32(0x0908 + (i << 5)) = 0x51ffffff;
+ dmibar_read32(0x0908 + (i << 5)); // !!! = 0x51ffffff
+ dmibar_write32(0x0908 + (i << 5), 0x51ffffff);
}
for (i = 0; i < 4; i++) {
- DMIBAR32(0x0a00 + (i << 4)); // !!! = 0x03042018
- DMIBAR32(0x0a00 + (i << 4)) = 0x03042018;
+ dmibar_read32(0x0a00 + (i << 4)); // !!! = 0x03042018
+ dmibar_write32(0x0a00 + (i << 4), 0x03042018);
}
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0700 + (i << 5)); // !!! = 0x46139008
- DMIBAR32(0x0700 + (i << 5)) = 0x46139008;
+ dmibar_read32(0x0700 + (i << 5)); // !!! = 0x46139008
+ dmibar_write32(0x0700 + (i << 5), 0x46139008);
}
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0904 + (i << 5)); // !!! = 0x3a1842ec
- DMIBAR32(0x0904 + (i << 5)) = 0x3a1846ec;
+ dmibar_read32(0x0904 + (i << 5)); // !!! = 0x3a1842ec
+ dmibar_write32(0x0904 + (i << 5), 0x3a1846ec);
}
for (i = 0; i < 4; i++) {
- DMIBAR32(0x0a00 + (i << 4)); // !!! = 0x03042018
- DMIBAR32(0x0a00 + (i << 4)) = 0x03042018;
+ dmibar_read32(0x0a00 + (i << 4)); // !!! = 0x03042018
+ dmibar_write32(0x0a00 + (i << 4), 0x03042018);
}
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0908 + (i << 5)); // !!! = 0x51ffffff
- DMIBAR32(0x0908 + (i << 5)) = 0x51ffffff;
+ dmibar_read32(0x0908 + (i << 5)); // !!! = 0x51ffffff
+ dmibar_write32(0x0908 + (i << 5), 0x51ffffff);
}
- DMIBAR32(0x0c00); // !!! = 0x29700c08
- DMIBAR32(0x0c00) = 0x29700c08;
+ dmibar_read32(0x0c00); // !!! = 0x29700c08
+ dmibar_write32(0x0c00, 0x29700c08);
- DMIBAR32(0x0c0c); // !!! = 0x16063400
- DMIBAR32(0x0c0c) = 0x00063400;
+ dmibar_read32(0x0c0c); // !!! = 0x16063400
+ dmibar_write32(0x0c0c, 0x00063400);
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0700 + (i << 5)); // !!! = 0x46139008
- DMIBAR32(0x0700 + (i << 5)) = 0x46339008;
+ dmibar_read32(0x0700 + (i << 5)); // !!! = 0x46139008
+ dmibar_write32(0x0700 + (i << 5), 0x46339008);
}
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0700 + (i << 5)); // !!! = 0x46339008
- DMIBAR32(0x0700 + (i << 5)) = 0x45339008;
+ dmibar_read32(0x0700 + (i << 5)); // !!! = 0x46339008
+ dmibar_write32(0x0700 + (i << 5), 0x45339008);
}
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0700 + (i << 5)); // !!! = 0x45339008
- DMIBAR32(0x0700 + (i << 5)) = 0x453b9008;
+ dmibar_read32(0x0700 + (i << 5)); // !!! = 0x45339008
+ dmibar_write32(0x0700 + (i << 5), 0x453b9008);
}
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0700 + (i << 5)); // !!! = 0x453b9008
- DMIBAR32(0x0700 + (i << 5)) = 0x45bb9008;
+ dmibar_read32(0x0700 + (i << 5)); // !!! = 0x453b9008
+ dmibar_write32(0x0700 + (i << 5), 0x45bb9008);
}
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0700 + (i << 5)); // !!! = 0x45bb9008
- DMIBAR32(0x0700 + (i << 5)) = 0x45fb9008;
+ dmibar_read32(0x0700 + (i << 5)); // !!! = 0x45bb9008
+ dmibar_write32(0x0700 + (i << 5), 0x45fb9008);
}
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0914 + (i << 5)); // !!! = 0x9021a080
- DMIBAR32(0x0914 + (i << 5)) = 0x9021a280;
+ dmibar_read32(0x0914 + (i << 5)); // !!! = 0x9021a080
+ dmibar_write32(0x0914 + (i << 5), 0x9021a280);
}
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0914 + (i << 5)); // !!! = 0x9021a080
- DMIBAR32(0x0914 + (i << 5)) = 0x9821a280;
+ dmibar_read32(0x0914 + (i << 5)); // !!! = 0x9021a080
+ dmibar_write32(0x0914 + (i << 5), 0x9821a280);
}
for (i = 0; i < 4; i++) {
- DMIBAR32(0x0a00 + (i << 4)); // !!! = 0x03042018
- DMIBAR32(0x0a00 + (i << 4)) = 0x03242018;
+ dmibar_read32(0x0a00 + (i << 4)); // !!! = 0x03042018
+ dmibar_write32(0x0a00 + (i << 4), 0x03242018);
}
- DMIBAR32(0x0258); // !!! = 0x40000600
- DMIBAR32(0x0258) = 0x60000600;
+ dmibar_read32(0x0258); // !!! = 0x40000600
+ dmibar_write32(0x0258, 0x60000600);
for (i = 0; i < 2; i++) {
- DMIBAR32(0x0904 + (i << 5)); // !!! = 0x3a1846ec
- DMIBAR32(0x0904 + (i << 5)) = 0x2a1846ec;
- DMIBAR32(0x0914 + (i << 5)); // !!! = 0x9821a280
- DMIBAR32(0x0914 + (i << 5)) = 0x98200280;
+ dmibar_read32(0x0904 + (i << 5)); // !!! = 0x3a1846ec
+ dmibar_write32(0x0904 + (i << 5), 0x2a1846ec);
+ dmibar_read32(0x0914 + (i << 5)); // !!! = 0x9821a280
+ dmibar_write32(0x0914 + (i << 5), 0x98200280);
}
- DMIBAR32(DMIL0SLAT); // !!! = 0x00c26460
- DMIBAR32(DMIL0SLAT) = 0x00c2403c;
+ dmibar_read32(DMIL0SLAT); // !!! = 0x00c26460
+ dmibar_write32(DMIL0SLAT, 0x00c2403c);
}
void early_init_dmi(void)
@@ -175,21 +175,21 @@ void early_init_dmi(void)
early_pch_init_native_dmi_pre();
/* Write once settings */
- DMIBAR32(DMILCAP) = (DMIBAR32(DMILCAP) & ~0x3f00f) |
+ dmibar_clrsetbits32(DMILCAP, 0x3f00f,
(2 << 0) | // 5GT/s
(2 << 12) | // L0s 128 ns to less than 256 ns
- (2 << 15); // L1 2 us to less than 4 us
+ (2 << 15)); // L1 2 us to less than 4 us
- DMIBAR8(DMILCTL) |= (1 << 5); // Retrain link
- while (DMIBAR16(DMILSTS) & TXTRN)
+ dmibar_setbits8(DMILCTL, 1 << 5); // Retrain link
+ while (dmibar_read16(DMILSTS) & TXTRN)
;
- DMIBAR8(DMILCTL) |= (1 << 5); // Retrain link
- while (DMIBAR16(DMILSTS) & TXTRN)
+ dmibar_setbits8(DMILCTL, 1 << 5); // Retrain link
+ while (dmibar_read16(DMILSTS) & TXTRN)
;
- const u8 w = (DMIBAR16(DMILSTS) >> 4) & 0x1f;
- const u16 t = (DMIBAR16(DMILSTS) & 0x0f) * 2500;
+ const u8 w = (dmibar_read16(DMILSTS) >> 4) & 0x1f;
+ const u16 t = (dmibar_read16(DMILSTS) & 0x0f) * 2500;
printk(BIOS_DEBUG, "DMI: Running at X%x @ %dMT/s\n", w, t);
/*
@@ -201,16 +201,16 @@ void early_init_dmi(void)
*/
/* Channel 0: Enable, Set ID to 0, map TC0 and TC3 and TC4 to VC0. */
- DMIBAR32(DMIVC0RCTL) = (1 << 31) | (0 << 24) | (0x0c << 1) | 1;
+ dmibar_write32(DMIVC0RCTL, 1 << 31 | 0 << 24 | 0x0c << 1 | 1);
/* Channel 1: Enable, Set ID to 1, map TC1 and TC5 to VC1. */
- DMIBAR32(DMIVC1RCTL) = (1 << 31) | (1 << 24) | (0x11 << 1);
+ dmibar_write32(DMIVC1RCTL, 1 << 31 | 1 << 24 | 0x11 << 1);
/* Channel p: Enable, Set ID to 2, map TC2 and TC6 to VCp */
- DMIBAR32(DMIVCPRCTL) = (1 << 31) | (2 << 24) | (0x22 << 1);
+ dmibar_write32(DMIVCPRCTL, 1 << 31 | 2 << 24 | 0x22 << 1);
/* Channel m: Enable, Set ID to 0, map TC7 to VCm */
- DMIBAR32(DMIVCMRCTL) = (1 << 31) | (7 << 24) | (0x40 << 1);
+ dmibar_write32(DMIVCMRCTL, 1 << 31 | 7 << 24 | 0x40 << 1);
/* Set Extended VC Count (EVCC) to 1 as Channel 1 is active. */
- DMIBAR8(DMIPVCCAP1) |= 1;
+ dmibar_setbits8(DMIPVCCAP1, 1 << 0);
early_pch_init_native_dmi_post();
@@ -218,12 +218,12 @@ void early_init_dmi(void)
* BIOS Requirement: Check if DMI VC Negotiation was successful.
* Wait for virtual channels negotiation pending.
*/
- while (DMIBAR16(DMIVC0RSTS) & VC0NP)
+ while (dmibar_read16(DMIVC0RSTS) & VC0NP)
;
- while (DMIBAR16(DMIVC1RSTS) & VC1NP)
+ while (dmibar_read16(DMIVC1RSTS) & VC1NP)
;
- while (DMIBAR16(DMIVCPRSTS) & VCPNP)
+ while (dmibar_read16(DMIVCPRSTS) & VCPNP)
;
- while (DMIBAR16(DMIVCMRSTS) & VCMNP)
+ while (dmibar_read16(DMIVCMRSTS) & VCMNP)
;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 04:07:55 +0000