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

PCIEXP_ASPM: Unify code with other PCI-e tuning 

Error reporting can be enabled together with ASPM, there
is no other use for function return value.

Change-Id: I58081fac0df5205a5aea65d735d34b375c2af9cd
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/17654
Tested-by: build bot (Jenkins)
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Kyösti Mälkki 2016-11-29 16:08:38 +02:00
parent d0a648e18a
commit df96a702ba
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/device/pciexp_device.c
View File

@ -325,15 +325,8 @@ static int pciexp_aspm_latency(device_t root, unsigned root_cap,
/* /*
* Enable ASPM on PCIe root port and endpoint. * Enable ASPM on PCIe root port and endpoint.
*
* Returns APMC value:
* -1 = Error
* 0 = no ASPM
* 1 = L0s Enabled
* 2 = L1 Enabled
* 3 = L0s and L1 Enabled
*/ */
static enum aspm_type pciexp_enable_aspm(device_t root, unsigned root_cap, static void pciexp_enable_aspm(device_t root, unsigned root_cap,
device_t endp, unsigned endp_cap) device_t endp, unsigned endp_cap)
{ {
const char *aspm_type_str[] = { "None", "L0s", "L1", "L0s and L1" }; const char *aspm_type_str[] = { "None", "L0s", "L1", "L0s and L1" };
@ -369,10 +362,14 @@ static enum aspm_type pciexp_enable_aspm(device_t root, unsigned root_cap,
lnkctl = pci_read_config16(endp, endp_cap + PCI_EXP_LNKCTL); lnkctl = pci_read_config16(endp, endp_cap + PCI_EXP_LNKCTL);
lnkctl |= apmc; lnkctl |= apmc;
pci_write_config16(endp, endp_cap + PCI_EXP_LNKCTL, lnkctl); pci_write_config16(endp, endp_cap + PCI_EXP_LNKCTL, lnkctl);
/* Enable ASPM role based error reporting. */
devcap = pci_read_config32(endp, endp_cap + PCI_EXP_DEVCAP);
devcap |= PCI_EXP_DEVCAP_RBER;
pci_write_config32(endp, endp_cap + PCI_EXP_DEVCAP, devcap);
} }
printk(BIOS_INFO, "ASPM: Enabled %s\n", aspm_type_str[apmc]); printk(BIOS_INFO, "ASPM: Enabled %s\n", aspm_type_str[apmc]);
return apmc;
} }
#endif /* CONFIG_PCIEXP_ASPM */ #endif /* CONFIG_PCIEXP_ASPM */
@ -406,14 +403,7 @@ static void pciexp_tune_dev(device_t dev)
#if CONFIG_PCIEXP_ASPM #if CONFIG_PCIEXP_ASPM
/* Check for and enable ASPM */ /* Check for and enable ASPM */
enum aspm_type apmc = pciexp_enable_aspm(root, root_cap, dev, cap); pciexp_enable_aspm(root, root_cap, dev, cap);
if (apmc != PCIE_ASPM_NONE) {
/* Enable ASPM role based error reporting. */
u32 reg32 = pci_read_config32(dev, cap + PCI_EXP_DEVCAP);
reg32 |= PCI_EXP_DEVCAP_RBER;
pci_write_config32(dev, cap + PCI_EXP_DEVCAP, reg32);
}
#endif #endif
} }