[coreboot-gerrit] Change in coreboot[master]: soc/intel/skylake: Refactor PEG configuration

[Michael Niewöhner (Code Review)]

Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44368 )

Change subject: soc/intel/skylake: Refactor PEG configuration
......................................................................

soc/intel/skylake: Refactor PEG configuration

Simplify some if-blocks which are used for the configuration, enablement
and disablement of the PEG devices.

This changes the logic of the code, since it configures PegxEnable
before the if-blocks, where x is the number of the PEG device, and the
further configuration of the PEG devices depends on the enablement of
PegxEnable.

Change-Id: I6dd88ce752ce8f0255c424d0e5b2d8ef918885a1
Signed-off-by: Felix Singer 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44368
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
Reviewed-by: Michael Niewöhner
---
M src/soc/intel/skylake/romstage/romstage.c
1 file changed, 6 insertions(+), 12 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved
  Michael Niewöhner: Looks good to me, approved

diff --git a/src/soc/intel/skylake/romstage/romstage.c b/src/soc/intel/skylake/romstage/romstage.c
index 9add1e6..cefe742 100644
--- a/src/soc/intel/skylake/romstage/romstage.c
+++ b/src/soc/intel/skylake/romstage/romstage.c
@@ -171,10 +171,8 @@
     * in FSP
     */
    dev = pcidev_path_on_root(SA_DEVFN_PEG0); /* PEG 0:1:0 */
-	if (!dev || !dev->enabled)
-		m_cfg->Peg0Enable = 0;
-	else if (dev->enabled) {
-		m_cfg->Peg0Enable = dev->enabled;
+	m_cfg->Peg0Enable = dev && dev->enabled;
+	if (m_cfg->Peg0Enable) {
    	m_cfg->Peg0MaxLinkWidth = config->Peg0MaxLinkWidth;
    	/* Use maximum possible link speed */
    	m_cfg->Peg0MaxLinkSpeed = 0;
@@ -186,10 +184,8 @@
    }

dev = pcidev_path_on_root(SA_DEVFN_PEG1); /* PEG 0:1:1 */
-	if (!dev || !dev->enabled)
-		m_cfg->Peg1Enable = 0;
-	else if (dev->enabled) {
-		m_cfg->Peg1Enable = dev->enabled;
+	m_cfg->Peg1Enable = dev && dev->enabled;
+	if (m_cfg->Peg1Enable) {
    	m_cfg->Peg1MaxLinkWidth = config->Peg1MaxLinkWidth;
    	m_cfg->Peg1MaxLinkSpeed = 0;
    	m_cfg->Peg1PowerDownUnusedLanes = 1;
@@ -198,10 +194,8 @@
    }

dev = pcidev_path_on_root(SA_DEVFN_PEG2); /* PEG 0:1:2 */
-	if (!dev || !dev->enabled)
-		m_cfg->Peg2Enable = 0;
-	else if (dev->enabled) {
-		m_cfg->Peg2Enable = dev->enabled;
+	m_cfg->Peg2Enable = dev && dev->enabled;
+	if (m_cfg->Peg2Enable) {
    	m_cfg->Peg2MaxLinkWidth = config->Peg2MaxLinkWidth;
    	m_cfg->Peg2MaxLinkSpeed = 0;
    	m_cfg->Peg2PowerDownUnusedLanes = 1;