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

soc/apollolake: Allow configuring individual USB ports on GLK 

Allow configuring the limited fields that FSP-S provides.

Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Change-Id: I56c37338eaa978fdb2c63807331493e8aecbdf60
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62056
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Sean Rhodes 2022-02-16 16:50:55 +00:00 committed by Felix Held
parent 532e043b66
commit 3a260ad8f1
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/soc/intel/apollolake/chip.c
View File

@ -536,7 +536,18 @@ static void glk_fsp_silicon_init_params_cb(
#if CONFIG(SOC_INTEL_GEMINILAKE) #if CONFIG(SOC_INTEL_GEMINILAKE)
uint8_t port; uint8_t port;
/*
* UsbPerPortCtl was retired in Fsp 2.0.0+, so PDO programming must be
* enabled to configure individual ports in what Fsp thinks is PEI.
*/
silconfig->UsbPdoProgramming = cfg->usb_config_override;
for (port = 0; port < APOLLOLAKE_USB2_PORT_MAX; port++) { for (port = 0; port < APOLLOLAKE_USB2_PORT_MAX; port++) {
if (cfg->usb_config_override) {
silconfig->PortUsb20Enable[port] = cfg->usb2_port[port].enable;
silconfig->PortUs20bOverCurrentPin[port] = cfg->usb2_port[port].oc_pin;
}
if (!cfg->usb2eye[port].Usb20OverrideEn) if (!cfg->usb2eye[port].Usb20OverrideEn)
continue; continue;
@ -550,6 +561,13 @@ static void glk_fsp_silicon_init_params_cb(
cfg->usb2eye[port].Usb20IUsbTxEmphasisEn; cfg->usb2eye[port].Usb20IUsbTxEmphasisEn;
} }
if (cfg->usb_config_override) {
for (port = 0; port < APOLLOLAKE_USB3_PORT_MAX; port++) {
silconfig->PortUsb30Enable[port] = cfg->usb3_port[port].enable;
silconfig->PortUs30bOverCurrentPin[port] = cfg->usb3_port[port].oc_pin;
}
}
silconfig->Gmm = is_devfn_enabled(SA_GLK_DEVFN_GMM); silconfig->Gmm = is_devfn_enabled(SA_GLK_DEVFN_GMM);
/* On Geminilake, we need to override the default FSP PCIe de-emphasis /* On Geminilake, we need to override the default FSP PCIe de-emphasis