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

soc/amd/stoneyridge: use is_dev_enabled(DEV_PTR()) 

Since we have chipset devicetrees for both SoCs supported by the
Stoneyridge code, we can use the DEV_PTR macro instead of using
pcidev_path_on_root to get the device struct pointer. We can also use
the is_dev_enabled function instead of checking the value of the enabled
element of the device struct directly.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Ifb787750ebc6aa2fef9d3be0e84e6afcffdc2ac1
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79671
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Held 2023-12-20 22:47:03 +01:00 committed by Shelley Chen
parent 1b60e5c5c9
commit 727ee66756
4 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/soc/amd/stoneyridge/BiosCallOuts.c
View File

@ -37,7 +37,6 @@ AGESA_STATUS agesa_fch_initenv(uint32_t Func, uintptr_t FchData,
void *ConfigPtr) void *ConfigPtr)
{ {
AMD_CONFIG_PARAMS *StdHeader = ConfigPtr; AMD_CONFIG_PARAMS *StdHeader = ConfigPtr;
const struct device *dev = pcidev_path_on_root(SATA_DEVFN);
if (StdHeader->Func == AMD_INIT_ENV) { if (StdHeader->Func == AMD_INIT_ENV) {
FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData; FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData;
@ -52,7 +51,7 @@ AGESA_STATUS agesa_fch_initenv(uint32_t Func, uintptr_t FchData,
/* SATA configuration */ /* SATA configuration */
FchParams_env->Sata.SataClass = CONFIG_STONEYRIDGE_SATA_MODE; FchParams_env->Sata.SataClass = CONFIG_STONEYRIDGE_SATA_MODE;
if (dev && dev->enabled) { if (is_dev_enabled(DEV_PTR(sata))) {
switch ((SATA_CLASS)CONFIG_STONEYRIDGE_SATA_MODE) { switch ((SATA_CLASS)CONFIG_STONEYRIDGE_SATA_MODE) {
case SataRaid: case SataRaid:
case SataAhci: case SataAhci:

8
src/soc/amd/stoneyridge/fch.c
View File

@ -125,8 +125,6 @@ void fch_init(void *chip_info)
static void set_sb_aoac(struct aoac_devs *aoac) static void set_sb_aoac(struct aoac_devs *aoac)
{ {
const struct device *sd, *sata;
aoac->ic0e = is_aoac_device_enabled(FCH_AOAC_DEV_I2C0); aoac->ic0e = is_aoac_device_enabled(FCH_AOAC_DEV_I2C0);
aoac->ic1e = is_aoac_device_enabled(FCH_AOAC_DEV_I2C1); aoac->ic1e = is_aoac_device_enabled(FCH_AOAC_DEV_I2C1);
aoac->ic2e = is_aoac_device_enabled(FCH_AOAC_DEV_I2C2); aoac->ic2e = is_aoac_device_enabled(FCH_AOAC_DEV_I2C2);
@ -137,10 +135,8 @@ static void set_sb_aoac(struct aoac_devs *aoac)
aoac->xhce = is_aoac_device_enabled(FCH_AOAC_DEV_USB3); aoac->xhce = is_aoac_device_enabled(FCH_AOAC_DEV_USB3);
/* Rely on these being in sync with devicetree */ /* Rely on these being in sync with devicetree */
sd = pcidev_path_on_root(SD_DEVFN); aoac->sd_e = is_dev_enabled(DEV_PTR(sdhci)) ? 1 : 0;
aoac->sd_e = sd && sd->enabled ? 1 : 0; aoac->st_e = is_dev_enabled(DEV_PTR(sata)) ? 1 : 0;
sata = pcidev_path_on_root(SATA_DEVFN);
aoac->st_e = sata && sata->enabled ? 1 : 0;
aoac->espi = 1; aoac->espi = 1;
} }

6
src/soc/amd/stoneyridge/fch_agesa.c
View File

@ -26,9 +26,8 @@ static inline int sb_ide_enable(void)
void SetFchResetParams(FCH_RESET_INTERFACE *params) void SetFchResetParams(FCH_RESET_INTERFACE *params)
{ {
const struct device *dev = pcidev_path_on_root(SATA_DEVFN);
params->Xhci0Enable = CONFIG(STONEYRIDGE_XHCI_ENABLE); params->Xhci0Enable = CONFIG(STONEYRIDGE_XHCI_ENABLE);
if (dev && dev->enabled) { if (is_dev_enabled(DEV_PTR(sata))) {
params->SataEnable = sb_sata_enable(); params->SataEnable = sb_sata_enable();
params->IdeEnable = sb_ide_enable(); params->IdeEnable = sb_ide_enable();
} else { } else {
@ -39,10 +38,9 @@ void SetFchResetParams(FCH_RESET_INTERFACE *params)
void SetFchEnvParams(FCH_INTERFACE *params) void SetFchEnvParams(FCH_INTERFACE *params)
{ {
const struct device *dev = pcidev_path_on_root(SATA_DEVFN);
params->AzaliaController = AzEnable; params->AzaliaController = AzEnable;
params->SataClass = CONFIG_STONEYRIDGE_SATA_MODE; params->SataClass = CONFIG_STONEYRIDGE_SATA_MODE;
if (dev && dev->enabled) { if (is_dev_enabled(DEV_PTR(sata))) {
params->SataEnable = is_sata_config(); params->SataEnable = is_sata_config();
params->IdeEnable = !params->SataEnable; params->IdeEnable = !params->SataEnable;
params->SataIdeMode = (CONFIG_STONEYRIDGE_SATA_MODE == params->SataIdeMode = (CONFIG_STONEYRIDGE_SATA_MODE ==

3
src/soc/amd/stoneyridge/northbridge.c
View File

@ -322,8 +322,7 @@ __weak void set_board_env_params(GNB_ENV_CONFIGURATION *params) { }
void SetNbEnvParams(GNB_ENV_CONFIGURATION *params) void SetNbEnvParams(GNB_ENV_CONFIGURATION *params)
{ {
const struct device *dev = SOC_IOMMU_DEV; params->IommuSupport = is_dev_enabled(DEV_PTR(iommu));
params->IommuSupport = dev && dev->enabled;
set_board_env_params(params); set_board_env_params(params);
} }