soc/intel/skylake: Wrap lines at 80 columns

Fix the following warning detected by checkpatch:

WARNING: line over 80 characters

TEST=Build for glados

Change-Id: I79341f46ca06ac052f987975ccaf975470d27806
Signed-off-by: Lee Leahy <Leroy.P.Leahy@intel.com>
Reviewed-on: https://review.coreboot.org/18867
Tested-by: build bot (Jenkins)
Reviewed-by: Lee Leahy <leroy.p.leahy@intel.com>
This commit is contained in:
Lee Leahy 2017-03-16 16:44:36 -07:00
parent 573564cca8
commit b439a92939
8 changed files with 39 additions and 22 deletions

View file

@ -192,8 +192,8 @@ static void soc_config_pwrmbase(void)
* *
* Program "PM Base Address Memory Range Limit" PCR[DMI] + 27ACh[31:16] * Program "PM Base Address Memory Range Limit" PCR[DMI] + 27ACh[31:16]
* to the value programmed in PMC PCI Offset 48h bit[31:16], this has an * to the value programmed in PMC PCI Offset 48h bit[31:16], this has an
* implication of making sure the memory allocated to PWRMBASE to be 64KB * implication of making sure the memory allocated to PWRMBASE to be
* in size. * 64KB in size.
*/ */
pcr_write32(PID_DMI, R_PCH_PCR_DMI_PMBASEA, pcr_write32(PID_DMI, R_PCH_PCR_DMI_PMBASEA,
((PCH_PWRM_BASE_ADDRESS & 0xFFFF0000) | ((PCH_PWRM_BASE_ADDRESS & 0xFFFF0000) |

View file

@ -147,14 +147,17 @@ void soc_silicon_init_params(SILICON_INIT_UPD *params)
params->EnableSata = config->EnableSata; params->EnableSata = config->EnableSata;
params->SataMode = config->SataMode; params->SataMode = config->SataMode;
params->LockDownConfigGlobalSmi = config->LockDownConfigGlobalSmi; params->LockDownConfigGlobalSmi = config->LockDownConfigGlobalSmi;
params->LockDownConfigBiosInterface = config->LockDownConfigBiosInterface; params->LockDownConfigBiosInterface =
config->LockDownConfigBiosInterface;
params->LockDownConfigRtcLock = config->LockDownConfigRtcLock; params->LockDownConfigRtcLock = config->LockDownConfigRtcLock;
params->LockDownConfigBiosLock = config->LockDownConfigBiosLock; params->LockDownConfigBiosLock = config->LockDownConfigBiosLock;
params->LockDownConfigSpiEiss = config->LockDownConfigSpiEiss; params->LockDownConfigSpiEiss = config->LockDownConfigSpiEiss;
params->PchConfigSubSystemVendorId = config->PchConfigSubSystemVendorId; params->PchConfigSubSystemVendorId = config->PchConfigSubSystemVendorId;
params->PchConfigSubSystemId = config->PchConfigSubSystemId; params->PchConfigSubSystemId = config->PchConfigSubSystemId;
params->WakeConfigWolEnableOverride = config->WakeConfigWolEnableOverride; params->WakeConfigWolEnableOverride =
params->WakeConfigPcieWakeFromDeepSx = config->WakeConfigPcieWakeFromDeepSx; config->WakeConfigWolEnableOverride;
params->WakeConfigPcieWakeFromDeepSx =
config->WakeConfigPcieWakeFromDeepSx;
params->PmConfigDeepSxPol = config->PmConfigDeepSxPol; params->PmConfigDeepSxPol = config->PmConfigDeepSxPol;
params->PmConfigSlpS3MinAssert = config->PmConfigSlpS3MinAssert; params->PmConfigSlpS3MinAssert = config->PmConfigSlpS3MinAssert;
params->PmConfigSlpS4MinAssert = config->PmConfigSlpS4MinAssert; params->PmConfigSlpS4MinAssert = config->PmConfigSlpS4MinAssert;
@ -162,11 +165,13 @@ void soc_silicon_init_params(SILICON_INIT_UPD *params)
params->PmConfigSlpAMinAssert = config->PmConfigSlpAMinAssert; params->PmConfigSlpAMinAssert = config->PmConfigSlpAMinAssert;
params->PmConfigPciClockRun = config->PmConfigPciClockRun; params->PmConfigPciClockRun = config->PmConfigPciClockRun;
params->PmConfigSlpStrchSusUp = config->PmConfigSlpStrchSusUp; params->PmConfigSlpStrchSusUp = config->PmConfigSlpStrchSusUp;
params->PmConfigPwrBtnOverridePeriod = config->PmConfigPwrBtnOverridePeriod; params->PmConfigPwrBtnOverridePeriod =
config->PmConfigPwrBtnOverridePeriod;
params->PmConfigPwrCycDur = config->PmConfigPwrCycDur; params->PmConfigPwrCycDur = config->PmConfigPwrCycDur;
params->SerialIrqConfigSirqEnable = config->SerialIrqConfigSirqEnable; params->SerialIrqConfigSirqEnable = config->SerialIrqConfigSirqEnable;
params->SerialIrqConfigSirqMode = config->SerialIrqConfigSirqMode; params->SerialIrqConfigSirqMode = config->SerialIrqConfigSirqMode;
params->SerialIrqConfigStartFramePulse = config->SerialIrqConfigStartFramePulse; params->SerialIrqConfigStartFramePulse =
config->SerialIrqConfigStartFramePulse;
params->SkipMpInit = config->FspSkipMpInit; params->SkipMpInit = config->FspSkipMpInit;

View file

@ -265,9 +265,10 @@ struct soc_intel_skylake_config {
u8 LockDownConfigBiosLock; u8 LockDownConfigBiosLock;
/* /*
* Enable InSMM.STS (EISS) in SPI If this bit is set, then WPD must be a * Enable InSMM.STS (EISS) in SPI If this bit is set, then WPD must be a
* '1' and InSMM.STS must be '1' also in order to write to BIOS regions of * '1' and InSMM.STS must be '1' also in order to write to BIOS regions
* SPI Flash. If this bit is clear, then the InSMM.STS is a don't care. The * of SPI Flash. If this bit is clear, then the InSMM.STS is a don't
* BIOS must set the EISS bit while BIOS Guard support is enabled. * care. The BIOS must set the EISS bit while BIOS Guard support is
* enabled.
*/ */
u8 LockDownConfigSpiEiss; u8 LockDownConfigSpiEiss;
/* Subsystem Vendor ID of the PCH devices*/ /* Subsystem Vendor ID of the PCH devices*/
@ -325,7 +326,8 @@ struct soc_intel_skylake_config {
*/ */
u8 PmConfigPciClockRun; u8 PmConfigPciClockRun;
/* /*
* SLP_X Stretching After SUS Well Power Up. Values 0: Disabled, 1: Enabled * SLP_X Stretching After SUS Well Power Up. Values 0: Disabled,
* 1: Enabled
*/ */
u8 PmConfigSlpStrchSusUp; u8 PmConfigSlpStrchSusUp;
/* /*
@ -349,7 +351,9 @@ struct soc_intel_skylake_config {
u8 PmConfigPwrCycDur; u8 PmConfigPwrCycDur;
/* Determines if enable Serial IRQ. Values 0: Disabled, 1: Enabled.*/ /* Determines if enable Serial IRQ. Values 0: Disabled, 1: Enabled.*/
u8 SerialIrqConfigSirqEnable; u8 SerialIrqConfigSirqEnable;
/* Serial IRQ Mode Select. Values: 0: PchQuietMode, 1: PchContinuousMode.*/ /* Serial IRQ Mode Select. Values: 0: PchQuietMode,
* 1: PchContinuousMode.
*/
u8 SerialIrqConfigSirqMode; u8 SerialIrqConfigSirqMode;
/* /*
* Start Frame Pulse Width. * Start Frame Pulse Width.

View file

@ -520,7 +520,8 @@ int soc_skip_ucode_update(u32 current_patch_id, u32 new_patch_id)
* same microcode during CPU initialization. * same microcode during CPU initialization.
*/ */
msr = rdmsr(MTRR_CAP_MSR); msr = rdmsr(MTRR_CAP_MSR);
return (msr.lo & PRMRR_SUPPORTED) && (current_patch_id == new_patch_id - 1); return (msr.lo & PRMRR_SUPPORTED)
&& (current_patch_id == new_patch_id - 1);
} }
/* /*

View file

@ -279,10 +279,12 @@ void intel_me_status(void)
break; break;
case ME_HFS2_PHASE_BUP: /* Bringup Phase */ case ME_HFS2_PHASE_BUP: /* Bringup Phase */
if (hfs2.fields.current_state < ARRAY_SIZE(me_progress_bup_values) if (hfs2.fields.current_state
< ARRAY_SIZE(me_progress_bup_values)
&& me_progress_bup_values[hfs2.fields.current_state]) && me_progress_bup_values[hfs2.fields.current_state])
printk(BIOS_DEBUG, "%s", printk(BIOS_DEBUG, "%s",
me_progress_bup_values[hfs2.fields.current_state]); me_progress_bup_values[
hfs2.fields.current_state]);
else else
printk(BIOS_DEBUG, "0x%02x", hfs2.fields.current_state); printk(BIOS_DEBUG, "0x%02x", hfs2.fields.current_state);
break; break;
@ -335,7 +337,8 @@ void intel_me_status(void)
printk(BIOS_DEBUG, "Corporate\n"); printk(BIOS_DEBUG, "Corporate\n");
break; break;
default: default:
printk(BIOS_DEBUG, "Unknown (0x%x)\n", hfs3.fields.fw_sku); printk(BIOS_DEBUG, "Unknown (0x%x)\n",
hfs3.fields.fw_sku);
} }
} }
} }
@ -494,7 +497,8 @@ static int recv_heci_packet(union mei_header *head, u32 *packet,
} }
/* here is the message */ /* here is the message */
for (index = 0; index < length; index++) for (index = 0; index < length; index++)
packet[index] = me_read_mmio32(MMIO_ME_CB_RW); packet[index] =
me_read_mmio32(MMIO_ME_CB_RW);
rec_msg = 1; rec_msg = 1;
*packet_size = head->fields.length; *packet_size = head->fields.length;

View file

@ -33,7 +33,8 @@ int init_igd_opregion(igd_opregion_t *opregion)
memcpy(&opregion->header.signature, IGD_OPREGION_SIGNATURE, memcpy(&opregion->header.signature, IGD_OPREGION_SIGNATURE,
sizeof(IGD_OPREGION_SIGNATURE) - 1); sizeof(IGD_OPREGION_SIGNATURE) - 1);
memcpy(opregion->header.vbios_version, vbt->coreblock_biosbuild, sizeof(u32)); memcpy(opregion->header.vbios_version, vbt->coreblock_biosbuild,
sizeof(u32));
memcpy(opregion->vbt.gvd1, vbt, vbt->hdr_vbt_size < memcpy(opregion->vbt.gvd1, vbt, vbt->hdr_vbt_size <
sizeof(opregion->vbt.gvd1) ? vbt->hdr_vbt_size : sizeof(opregion->vbt.gvd1) ? vbt->hdr_vbt_size :
sizeof(opregion->vbt.gvd1)); sizeof(opregion->vbt.gvd1));

View file

@ -213,7 +213,8 @@ static void fill_in_relocation_params(device_t dev,
/* SMRR has 32-bits of valid address aligned to 4KiB. */ /* SMRR has 32-bits of valid address aligned to 4KiB. */
params->smrr_base.lo = (params->smram_base & rmask) | MTRR_TYPE_WRBACK; params->smrr_base.lo = (params->smram_base & rmask) | MTRR_TYPE_WRBACK;
params->smrr_base.hi = 0; params->smrr_base.hi = 0;
params->smrr_mask.lo = (~(tseg_size - 1) & rmask) | MTRR_PHYS_MASK_VALID; params->smrr_mask.lo = (~(tseg_size - 1) & rmask)
| MTRR_PHYS_MASK_VALID;
params->smrr_mask.hi = 0; params->smrr_mask.hi = 0;
/* The EMRR and UNCORE_EMRR are at IEDBASE + 2MiB */ /* The EMRR and UNCORE_EMRR are at IEDBASE + 2MiB */
@ -226,7 +227,8 @@ static void fill_in_relocation_params(device_t dev,
*/ */
params->emrr_base.lo = emrr_base | MTRR_TYPE_WRBACK; params->emrr_base.lo = emrr_base | MTRR_TYPE_WRBACK;
params->emrr_base.hi = 0; params->emrr_base.hi = 0;
params->emrr_mask.lo = (~(emrr_size - 1) & rmask) | MTRR_PHYS_MASK_VALID; params->emrr_mask.lo = (~(emrr_size - 1) & rmask)
| MTRR_PHYS_MASK_VALID;
params->emrr_mask.hi = (1 << (phys_bits - 32)) - 1; params->emrr_mask.hi = (1 << (phys_bits - 32)) - 1;
/* UNCORE_EMRR has 39 bits of valid address aligned to 4KiB. */ /* UNCORE_EMRR has 39 bits of valid address aligned to 4KiB. */