nb/intel/haswell/pcie.c: Introduce helper variable

Introduce a helper variable to avoid some redundancy and to reduce the
diffstat noise in follow-up changes.

Tested with BUILD_TIMELESS=1, Asrock B85M Pro4 remains identical.

Change-Id: I490675aaddd2b5a13d990664431f79a605999254
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55689
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Angel Pons 2021-06-20 14:07:22 +02:00 committed by Patrick Georgi
parent 24e14f9437
commit 6e0dd4e4ff
1 changed files with 6 additions and 4 deletions

View File

@ -54,7 +54,9 @@ static void peg_enable(struct device *dev)
assert(func < ARRAY_SIZE(config->peg_cfg)); assert(func < ARRAY_SIZE(config->peg_cfg));
const bool slot_implemented = !config->peg_cfg[func].is_onboard; const struct peg_config *peg_cfg = &config->peg_cfg[func];
const bool slot_implemented = !peg_cfg->is_onboard;
if (slot_implemented) { if (slot_implemented) {
/* Default is 1, but register is R/WO and needs to be written to once */ /* Default is 1, but register is R/WO and needs to be written to once */
@ -69,7 +71,7 @@ static void peg_enable(struct device *dev)
/* Physical slot number (zero for ports connected to onboard devices) */ /* Physical slot number (zero for ports connected to onboard devices) */
slotcap &= ~(0x1fff << 19); slotcap &= ~(0x1fff << 19);
if (slot_implemented) { if (slot_implemented) {
uint16_t slot_number = config->peg_cfg[func].phys_slot_number & 0x1fff; uint16_t slot_number = peg_cfg->phys_slot_number & 0x1fff;
if (slot_number == 0) { if (slot_number == 0) {
/* Slot number must be non-zero and unique */ /* Slot number must be non-zero and unique */
slot_number = func + 1; slot_number = func + 1;
@ -79,9 +81,9 @@ static void peg_enable(struct device *dev)
/* Default to 1.0 watt scale */ /* Default to 1.0 watt scale */
slotcap &= ~(3 << 15); slotcap &= ~(3 << 15);
slotcap |= (config->peg_cfg[func].power_limit_scale & 3) << 15; slotcap |= (peg_cfg->power_limit_scale & 3) << 15;
uint8_t power_limit_value = config->peg_cfg[func].power_limit_value; uint8_t power_limit_value = peg_cfg->power_limit_value;
if (power_limit_value == 0) { if (power_limit_value == 0) {
/* Default to 75 watts */ /* Default to 75 watts */
power_limit_value = 75; power_limit_value = 75;