erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nb/intel/haswell/early_peg.c: Simplify implementation

Browse source 
Instead of open-coding function-to-DEVEN-bit mapping thrice (using
a different implementation each time), introduce `deven_for_peg()`
to map the PCI function number to the corresponding DEVEN bit. Use
the PCI function number as primary parameter, instead of passing a
`pci_devfn_t` around and getting the PCI function number from that
using two macros.

Change-Id: Ia2f7cdcff3c95f831269fa51f9bfc60bef0907a1
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/91630
Reviewed-by: Alicja Michalska <ahplka19@gmail.com>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2026-03-09 19:52:11 +01:00 • committed by Matt DeVillier
commit 60994cf395
1 changed files with 29 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

71
src/northbridge/intel/haswell/early_peg.c
View file

@ -8,27 +8,22 @@
static bool peg_hidden[MAX_PEG_FUNC];
static void start_peg2_link_training(const pci_devfn_t dev)
static u32 deven_for_peg(const u8 func)
{
u32 mask;
switch (dev) {
case PCI_DEV(0, 1, 2):
mask = DEVEN_D1F2EN;
break;
case PCI_DEV(0, 1, 1):
mask = DEVEN_D1F1EN;
break;
case PCI_DEV(0, 1, 0):
mask = DEVEN_D1F0EN;
break;
default:
printk(BIOS_ERR, "Link training tried on a non-PEG device!\n");
return;
switch (func) {
case 0: return DEVEN_D1F0EN;
case 1: return DEVEN_D1F1EN;
case 2: return DEVEN_D1F2EN;
default: return 0;
}
}
static void start_peg2_link_training(const u8 func)
{
const pci_devfn_t dev = PEG_DEV(func);
pci_update_config32(dev, 0xc24, ~(1 << 16), 1 << 5);
printk(BIOS_DEBUG, "Started PEG1%d link training.\n", PCI_FUNC(PCI_DEV2DEVFN(dev)));
printk(BIOS_DEBUG, "Started PEG1%u link training.\n", func);
/*
* The MRC will perform PCI enumeration, and if it detects a VGA
@ -44,10 +39,20 @@ static void start_peg2_link_training(const pci_devfn_t dev)
* way to fix this problem for good is to implement native init.
*/
if (CONFIG(HASWELL_HIDE_PEG_FROM_MRC)) {
pci_update_config32(HOST_BRIDGE, DEVEN, ~mask, 0);
peg_hidden[PCI_FUNC(PCI_DEV2DEVFN(dev))] = true;
printk(BIOS_DEBUG, "Temporarily hiding PEG1%d.\n",
PCI_FUNC(PCI_DEV2DEVFN(dev)));
pci_and_config32(HOST_BRIDGE, DEVEN, ~deven_for_peg(func));
peg_hidden[func] = true;
printk(BIOS_DEBUG, "Temporarily hiding PEG1%u.\n", func);
}
}
void northbridge_setup_peg(void)
{
const u32 deven = pci_read_config32(HOST_BRIDGE, DEVEN);
for (u8 func = 0; func < MAX_PEG_FUNC; func++) {
if (deven & deven_for_peg(func)) {
start_peg2_link_training(func);
}
}
}
@ -55,27 +60,13 @@ void northbridge_unhide_peg(void)
{
u32 deven = pci_read_config32(HOST_BRIDGE, DEVEN);
for (u8 fn = 0; fn < MAX_PEG_FUNC; fn++) {
if (peg_hidden[fn]) {
deven |= DEVEN_D1F0EN >> fn;
peg_hidden[fn] = false;
printk(BIOS_DEBUG, "Unhiding PEG1%d.\n", fn);
for (u8 func = 0; func < MAX_PEG_FUNC; func++) {
if (peg_hidden[func]) {
deven |= deven_for_peg(func);
peg_hidden[func] = false;
printk(BIOS_DEBUG, "Unhiding PEG1%u.\n", func);
}
}
pci_write_config32(HOST_BRIDGE, DEVEN, deven);
}
void northbridge_setup_peg(void)
{
u32 deven = pci_read_config32(HOST_BRIDGE, DEVEN);
if (deven & DEVEN_D1F2EN)
start_peg2_link_training(PCI_DEV(0, 1, 2));
if (deven & DEVEN_D1F1EN)
start_peg2_link_training(PCI_DEV(0, 1, 1));
if (deven & DEVEN_D1F0EN)
start_peg2_link_training(PCI_DEV(0, 1, 0));
}