Attention is currently required from: Nico Huber, Arthur Heymans, Patrick Rudolph. Hello Nico Huber, Arthur Heymans, Patrick Rudolph,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/55042
to review the following change.
Change subject: nb/intel/sandybridge: Spell out DMI recipe operations ......................................................................
nb/intel/sandybridge: Spell out DMI recipe operations
There's many register writes preceded by a dummy read, which is probably because the code was derived from trace dumps, where a read-modify-write sequence appears as a register read followed by a register write using a slightly different value.
In order to replace the hardcoded register writes with read-modify-write sequences, rewrite the magic values in the code as bitwise operations on the original register values. Bitwise operation values were derived from reference code, and the original register values appear in some comments on the read statements, preceding the revised register writes. Note that one of the comments had an incorrect value, which is most likely because of a copy-paste error.
Tested with BUILD_TIMELESS=1, Asus P8Z77-V LX2 remains identical.
Change-Id: Ie921de004f283b560288a8c2cff277de89440f57 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/northbridge/intel/sandybridge/early_dmi.c 1 file changed, 32 insertions(+), 32 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/55042/1
diff --git a/src/northbridge/intel/sandybridge/early_dmi.c b/src/northbridge/intel/sandybridge/early_dmi.c index d9b7ed2..122dea9 100644 --- a/src/northbridge/intel/sandybridge/early_dmi.c +++ b/src/northbridge/intel/sandybridge/early_dmi.c @@ -24,7 +24,7 @@ dmibar_clrbits32(0x0a00 + (i << 4), 3 << 26); dmibar_setbits32(0x0a04 + (i << 4), 1 << 11); } - dmibar_clrsetbits32(0x0c30, 0xf << 28, 1 << 30); + dmibar_clrsetbits32(0x0c30, 0xf << 28, 4 << 28);
for (i = 0; i < 2; i++) { dmibar_clrbits32(0x0904 + (i << 5), 7 << 22); @@ -37,135 +37,135 @@
for (i = 0; i < 2; i++) { dmibar_read32(0x0904 + (i << 5)); // !!! = 0x7a1842ec - dmibar_write32(0x0904 + (i << 5), 0x7a1842ec); + dmibar_write32(0x0904 + (i << 5), (0x7a1842ec & ~(0x3f << 16)) | 0x18 << 16); dmibar_read32(0x090c + (i << 5)); // !!! = 0x00000208 - dmibar_write32(0x090c + (i << 5), 0x00000128); + dmibar_write32(0x090c + (i << 5), (0x00000208 & ~(0x3f << 5)) | 0x09 << 5); }
for (i = 0; i < 2; i++) { dmibar_read32(0x0700 + (i << 5)); // !!! = 0x46139008 - dmibar_write32(0x0700 + (i << 5), 0x46139008); + dmibar_write32(0x0700 + (i << 5), (0x46139008 & ~0) | 1 << 15); }
dmibar_read32(0x0c04); // !!! = 0x2e680008 - dmibar_write32(0x0c04, 0x2e680008); + dmibar_write32(0x0c04, (0x2e680008 & ~(0xff << 21)) | 0x73 << 21);
for (i = 0; i < 2; i++) { dmibar_read32(0x0904 + (i << 5)); // !!! = 0x7a1842ec - dmibar_write32(0x0904 + (i << 5), 0x3a1842ec); + dmibar_write32(0x0904 + (i << 5), (0x7a1842ec & ~(3 << 29)) | 1 << 29); }
for (i = 0; i < 2; i++) { dmibar_read32(0x0910 + (i << 5)); // !!! = 0x00006300 - dmibar_write32(0x0910 + (i << 5), 0x00004300); + dmibar_write32(0x0910 + (i << 5), (0x00006300 & ~(0xf << 10)) | 0 << 10); }
for (i = 0; i < 4; i++) { dmibar_read32(0x0a00 + (i << 4)); // !!! = 0x03042010 - dmibar_write32(0x0a00 + (i << 4), 0x03042018); + dmibar_write32(0x0a00 + (i << 4), (0x03042010 & ~(0x1f << 1)) | 12 << 1); }
dmibar_read32(0x0c00); // !!! = 0x29700c08 - dmibar_write32(0x0c00, 0x29700c08); + dmibar_write32(0x0c00, (0x29700c08 & ~(1 << 4)) | 0 << 4);
for (i = 0; i < 4; i++) { dmibar_read32(0x0a04 + (i << 4)); // !!! = 0x0c0708f0 - dmibar_write32(0x0a04 + (i << 4), 0x0c0718f0); + dmibar_write32(0x0a04 + (i << 4), (0x0c0708f0 & ~(1 << 12)) | 1 << 12); }
for (i = 0; i < 2; i++) { dmibar_read32(0x0900 + (i << 5)); // !!! = 0x50000000 - dmibar_write32(0x0900 + (i << 5), 0x50000000); + dmibar_write32(0x0900 + (i << 5), (0x50000000 & ~(3 << 26)) | 0 << 26); }
for (i = 0; i < 2; i++) { dmibar_read32(0x0908 + (i << 5)); // !!! = 0x51ffffff - dmibar_write32(0x0908 + (i << 5), 0x51ffffff); + dmibar_write32(0x0908 + (i << 5), (0x51ffffff & ~(3 << 27)) | 2 << 27); }
for (i = 0; i < 4; i++) { dmibar_read32(0x0a00 + (i << 4)); // !!! = 0x03042018 - dmibar_write32(0x0a00 + (i << 4), 0x03042018); + dmibar_write32(0x0a00 + (i << 4), (0x03042018 & ~(3 << 17)) | 2 << 17); }
for (i = 0; i < 2; i++) { dmibar_read32(0x0700 + (i << 5)); // !!! = 0x46139008 - dmibar_write32(0x0700 + (i << 5), 0x46139008); + dmibar_write32(0x0700 + (i << 5), (0x46139008 & ~(1 << 3)) | 1 << 3); }
for (i = 0; i < 2; i++) { dmibar_read32(0x0904 + (i << 5)); // !!! = 0x3a1842ec - dmibar_write32(0x0904 + (i << 5), 0x3a1846ec); + dmibar_write32(0x0904 + (i << 5), (0x3a1842ec & ~(3 << 10)) | 1 << 10); }
for (i = 0; i < 4; i++) { dmibar_read32(0x0a00 + (i << 4)); // !!! = 0x03042018 - dmibar_write32(0x0a00 + (i << 4), 0x03042018); + dmibar_write32(0x0a00 + (i << 4), (0x03042018 & ~(3 << 24)) | 3 << 24); }
for (i = 0; i < 2; i++) { dmibar_read32(0x0908 + (i << 5)); // !!! = 0x51ffffff - dmibar_write32(0x0908 + (i << 5), 0x51ffffff); + dmibar_write32(0x0908 + (i << 5), (0x51ffffff & ~(3 << 30)) | 1 << 30); }
dmibar_read32(0x0c00); // !!! = 0x29700c08 - dmibar_write32(0x0c00, 0x29700c08); + dmibar_write32(0x0c00, (0x29700c08 & ~(0x1f << 25)) | 0x14 << 25);
dmibar_read32(0x0c0c); // !!! = 0x16063400 - dmibar_write32(0x0c0c, 0x00063400); + dmibar_write32(0x0c0c, (0x16063400 & ~(0x3f << 23)) | 0x00 << 23);
for (i = 0; i < 2; i++) { dmibar_read32(0x0700 + (i << 5)); // !!! = 0x46139008 - dmibar_write32(0x0700 + (i << 5), 0x46339008); + dmibar_write32(0x0700 + (i << 5), (0x46139008 & ~(1 << 21)) | 1 << 21); }
for (i = 0; i < 2; i++) { dmibar_read32(0x0700 + (i << 5)); // !!! = 0x46339008 - dmibar_write32(0x0700 + (i << 5), 0x45339008); + dmibar_write32(0x0700 + (i << 5), (0x46339008 & ~(3 << 24)) | 1 << 24); }
for (i = 0; i < 2; i++) { dmibar_read32(0x0700 + (i << 5)); // !!! = 0x45339008 - dmibar_write32(0x0700 + (i << 5), 0x453b9008); + dmibar_write32(0x0700 + (i << 5), (0x45339008 & ~(1 << 19)) | 1 << 19); }
for (i = 0; i < 2; i++) { dmibar_read32(0x0700 + (i << 5)); // !!! = 0x453b9008 - dmibar_write32(0x0700 + (i << 5), 0x45bb9008); + dmibar_write32(0x0700 + (i << 5), (0x453b9008 & ~(1 << 23)) | 1 << 23); }
for (i = 0; i < 2; i++) { dmibar_read32(0x0700 + (i << 5)); // !!! = 0x45bb9008 - dmibar_write32(0x0700 + (i << 5), 0x45fb9008); + dmibar_write32(0x0700 + (i << 5), (0x45bb9008 & ~(1 << 22)) | 1 << 22); }
for (i = 0; i < 2; i++) { dmibar_read32(0x0914 + (i << 5)); // !!! = 0x9021a080 - dmibar_write32(0x0914 + (i << 5), 0x9021a280); + dmibar_write32(0x0914 + (i << 5), (0x9021a080 & ~(1 << 9)) | 1 << 9); }
for (i = 0; i < 2; i++) { - dmibar_read32(0x0914 + (i << 5)); // !!! = 0x9021a080 - dmibar_write32(0x0914 + (i << 5), 0x9821a280); + dmibar_read32(0x0914 + (i << 5)); // !!! = 0x9021a280 + dmibar_write32(0x0914 + (i << 5), (0x9021a280 & ~(1 << 27)) | 1 << 27); }
for (i = 0; i < 4; i++) { dmibar_read32(0x0a00 + (i << 4)); // !!! = 0x03042018 - dmibar_write32(0x0a00 + (i << 4), 0x03242018); + dmibar_write32(0x0a00 + (i << 4), (0x03042018 & ~(1 << 21)) | 1 << 21); }
dmibar_read32(0x0258); // !!! = 0x40000600 - dmibar_write32(0x0258, 0x60000600); + dmibar_write32(0x0258, (0x40000600 & ~(1 << 29)) | 1 << 29);
for (i = 0; i < 2; i++) { dmibar_read32(0x0904 + (i << 5)); // !!! = 0x3a1846ec - dmibar_write32(0x0904 + (i << 5), 0x2a1846ec); + dmibar_write32(0x0904 + (i << 5), (0x3a1846ec & ~(0xf << 25)) | 0x5 << 25); dmibar_read32(0x0914 + (i << 5)); // !!! = 0x9821a280 - dmibar_write32(0x0914 + (i << 5), 0x98200280); + dmibar_write32(0x0914 + (i << 5), (0x9821a280 & ~(0xf << 13)) | 0x0 << 13); }
dmibar_read32(DMIL0SLAT); // !!! = 0x00c26460 - dmibar_write32(DMIL0SLAT, 0x00c2403c); + dmibar_write32(DMIL0SLAT, (0x00c26460 & ~(0xffff << 0)) | 0x403c << 0); }
void early_init_dmi(void)
-
Angel Pons (Code Review)