GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/intel/haswell: Replace `DMIBAR64` and `EPBAR64` 

While 64-bit writes seem to work properly, there could be unknown
side-effects in some cases, e.g. when running in long mode. Since
reference code uses two 32-bit writes, follow suit.

Change-Id: I48ed3d94c7865b3a3cce52108e99cf1656b57fc2
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51855
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2021-03-26 12:20:46 +01:00 committed by Nico Huber
parent 498f1285d2
commit 7adfe80469
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/northbridge/intel/haswell/haswell.h
View File

@ -82,16 +82,12 @@
* EPBAR - Egress Port Root Complex Register Block * EPBAR - Egress Port Root Complex Register Block
*/ */
#define EPBAR64(x) (*((volatile u64 *)((uintptr_t)CONFIG_FIXED_EPBAR_MMIO_BASE + (x))))
#include "registers/epbar.h" #include "registers/epbar.h"
/* /*
* DMIBAR * DMIBAR
*/ */
#define DMIBAR64(x) (*((volatile u64 *)((uintptr_t)CONFIG_FIXED_DMIBAR_MMIO_BASE + (x))))
#include "registers/dmibar.h" #include "registers/dmibar.h"
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__

12
src/northbridge/intel/haswell/northbridge.c
View File

@ -469,7 +469,8 @@ static void northbridge_topology_init(void)
reg32 &= ~(0xff << 16); reg32 &= ~(0xff << 16);
reg32 |= 1 | (1 << 16); reg32 |= 1 | (1 << 16);
EPBAR32(EPLE1D) = reg32; EPBAR32(EPLE1D) = reg32;
EPBAR64(EPLE1A) = CONFIG_FIXED_DMIBAR_MMIO_BASE; EPBAR32(EPLE1A) = CONFIG_FIXED_DMIBAR_MMIO_BASE;
EPBAR32(EPLE1A + 4) = 0;
for (unsigned int i = 0; i <= 2; i++) { for (unsigned int i = 0; i <= 2; i++) {
const struct device *const dev = pcidev_on_root(1, i); const struct device *const dev = pcidev_on_root(1, i);
@ -477,7 +478,8 @@ static void northbridge_topology_init(void)
if (!dev || !dev->enabled) if (!dev || !dev->enabled)
continue; continue;
EPBAR64(eple_a[i]) = (u64)PCI_DEV(0, 1, i); EPBAR32(eple_a[i]) = (u32)PCI_DEV(0, 1, i);
EPBAR32(eple_a[i] + 4) = 0;
reg32 = EPBAR32(eple_d[i]); reg32 = EPBAR32(eple_d[i]);
reg32 &= ~(0xff << 16); reg32 &= ~(0xff << 16);
@ -503,9 +505,11 @@ static void northbridge_topology_init(void)
reg32 &= ~(0xffff << 16); reg32 &= ~(0xffff << 16);
reg32 |= 1 | (2 << 16); reg32 |= 1 | (2 << 16);
DMIBAR32(DMILE1D) = reg32; DMIBAR32(DMILE1D) = reg32;
DMIBAR64(DMILE1A) = CONFIG_FIXED_RCBA_MMIO_BASE; DMIBAR32(DMILE1A) = CONFIG_FIXED_RCBA_MMIO_BASE;
DMIBAR32(DMILE1A + 4) = 0;
DMIBAR64(DMILE2A) = CONFIG_FIXED_EPBAR_MMIO_BASE; DMIBAR32(DMILE2A) = CONFIG_FIXED_EPBAR_MMIO_BASE;
DMIBAR32(DMILE2A + 4) = 0;
reg32 = DMIBAR32(DMILE2D); reg32 = DMIBAR32(DMILE2D);
reg32 &= ~(0xff << 16); reg32 &= ~(0xff << 16);
reg32 |= 1 | (1 << 16); reg32 |= 1 | (1 << 16);