src/cpu: Fix checkpatch warning: no spaces at the start of a line

Change-Id: Iabdaaaee49e8c5cead304cda66412aa36a2ffd19
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/20729
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
This commit is contained in:
Martin Roth 2017-07-23 16:07:31 -06:00
parent 015082dff3
commit e5f2d4c44c
3 changed files with 34 additions and 34 deletions

View File

@ -20,31 +20,31 @@
UINT64 UINT64
MsrRead ( MsrRead (
IN UINT32 MsrAddress IN UINT32 MsrAddress
); );
VOID VOID
MsrWrite ( MsrWrite (
IN UINT32 MsrAddress, IN UINT32 MsrAddress,
IN UINT64 Value IN UINT64 Value
); );
UINT64 UINT64
MsrRead ( MsrRead (
IN UINT32 MsrAddress IN UINT32 MsrAddress
) )
{ {
return __readmsr (MsrAddress); return __readmsr (MsrAddress);
} }
VOID VOID
MsrWrite ( MsrWrite (
IN UINT32 MsrAddress, IN UINT32 MsrAddress,
IN UINT64 Value IN UINT64 Value
) )
{ {
__writemsr (MsrAddress, Value); __writemsr (MsrAddress, Value);
} }
#if !IS_ENABLED(CONFIG_BOARD_AMD_DINAR) #if !IS_ENABLED(CONFIG_BOARD_AMD_DINAR)

View File

@ -310,7 +310,7 @@ static void recalculateVsSlamTimeSettingOnCorePre(pci_devfn_t dev)
msr = rdmsr(0xC0010064); msr = rdmsr(0xC0010064);
highVoltageVid = (u8) ((msr.lo >> PS_CPU_VID_SHFT) & 0x7F); highVoltageVid = (u8) ((msr.lo >> PS_CPU_VID_SHFT) & 0x7F);
if (!(msr.hi & 0x80000000)) { if (!(msr.hi & 0x80000000)) {
printk(BIOS_ERR,"P-state info in MSRC001_0064 is invalid !!!\n"); printk(BIOS_ERR,"P-state info in MSRC001_0064 is invalid !!!\n");
highVoltageVid = (u8) ((pci_read_config32(dev, 0x1E0) highVoltageVid = (u8) ((pci_read_config32(dev, 0x1E0)
>> PS_CPU_VID_SHFT) & 0x7F); >> PS_CPU_VID_SHFT) & 0x7F);
} }
@ -340,7 +340,7 @@ static void recalculateVsSlamTimeSettingOnCorePre(pci_devfn_t dev)
/* If SVI, we only care about CPU VID. /* If SVI, we only care about CPU VID.
* If PVI, determine the higher voltage b/t NB and CPU * If PVI, determine the higher voltage b/t NB and CPU
* BKDG 2.4.1.7 (a) * BKDG 2.4.1.7 (a)
*/ */
if (pviModeFlag) { if (pviModeFlag) {
bValue = (u8) ((msr.lo >> PS_NB_VID_SHFT) & 0x7F); bValue = (u8) ((msr.lo >> PS_NB_VID_SHFT) & 0x7F);
if (lowVoltageVid > bValue) if (lowVoltageVid > bValue)
@ -685,8 +685,8 @@ static void waitCurrentPstate(u32 target_pstate) {
} }
static void set_pstate(u32 nonBoostedPState) { static void set_pstate(u32 nonBoostedPState) {
msr_t msr; msr_t msr;
uint8_t skip_wait; uint8_t skip_wait;
// Transition P0 for calling core. // Transition P0 for calling core.
msr = rdmsr(0xC0010062); msr = rdmsr(0xC0010062);
@ -735,23 +735,23 @@ static void UpdateSinglePlaneNbVid(void)
} }
static void fixPsNbVidBeforeWR(u32 newNbVid, u32 coreid, u32 dev, u8 pviMode) static void fixPsNbVidBeforeWR(u32 newNbVid, u32 coreid, u32 dev, u8 pviMode)
{ {
msr_t msr; msr_t msr;
u8 startup_pstate; u8 startup_pstate;
/* This function sets NbVid before the warm reset. /* This function sets NbVid before the warm reset.
* Get StartupPstate from MSRC001_0071. * Get StartupPstate from MSRC001_0071.
* Read Pstate register pointed by [StartupPstate]. * Read Pstate register pointed by [StartupPstate].
* and copy its content to P0 and P1 registers. * and copy its content to P0 and P1 registers.
* Copy newNbVid to P0[NbVid]. * Copy newNbVid to P0[NbVid].
* transition to P1 on all cores, * transition to P1 on all cores,
* then transition to P0 on core 0. * then transition to P0 on core 0.
* Wait for MSRC001_0063[CurPstate] = 000b on core 0. * Wait for MSRC001_0063[CurPstate] = 000b on core 0.
* see BKDG rev 3.48 2.4.2.9.1 BIOS NB COF and VID Configuration * see BKDG rev 3.48 2.4.2.9.1 BIOS NB COF and VID Configuration
* for SVI and Single-Plane PVI Systems * for SVI and Single-Plane PVI Systems
*/ */
msr = rdmsr(0xc0010071); msr = rdmsr(0xc0010071);
startup_pstate = (msr.hi >> (32 - 32)) & 0x07; startup_pstate = (msr.hi >> (32 - 32)) & 0x07;
/* Copy startup pstate to P1 and P0 MSRs. Set the maxvid for /* Copy startup pstate to P1 and P0 MSRs. Set the maxvid for
@ -768,7 +768,7 @@ static void fixPsNbVidBeforeWR(u32 newNbVid, u32 coreid, u32 dev, u8 pviMode)
* PstatMaxVal is going to be 0 on cold reset anyway ? * PstatMaxVal is going to be 0 on cold reset anyway ?
*/ */
if (!(pci_read_config32(dev, 0xdc) & (~PS_MAX_VAL_MASK))) { if (!(pci_read_config32(dev, 0xdc) & (~PS_MAX_VAL_MASK))) {
printk(BIOS_ERR,"F3xDC[PstateMaxVal] is zero. Northbridge voltage setting will fail. fixPsNbVidBeforeWR in fidvid.c needs fixing. See AMD # 31116 rev 3.48 BKDG 2.4.2.9.1\n"); printk(BIOS_ERR,"F3xDC[PstateMaxVal] is zero. Northbridge voltage setting will fail. fixPsNbVidBeforeWR in fidvid.c needs fixing. See AMD # 31116 rev 3.48 BKDG 2.4.2.9.1\n");
}; };
msr.lo &= ~0xFE000000; // clear nbvid msr.lo &= ~0xFE000000; // clear nbvid
@ -784,7 +784,7 @@ static void fixPsNbVidBeforeWR(u32 newNbVid, u32 coreid, u32 dev, u8 pviMode)
if (coreid == 0) { if (coreid == 0) {
set_pstate(0); set_pstate(0);
} }
/* missing step 7 (restore PstateMax to 0 if needed) because /* missing step 7 (restore PstateMax to 0 if needed) because
* we skipped step 2 * we skipped step 2
@ -1010,7 +1010,7 @@ void init_fidvid_stage2(u32 apicid, u32 nodeid)
} }
/* write newNbVid to P-state Reg's NbVid if its NbDid=0 */ /* write newNbVid to P-state Reg's NbVid if its NbDid=0 */
fixPsNbVidAfterWR(nbvid, NbVidUpdateAll,pvimode); fixPsNbVidAfterWR(nbvid, NbVidUpdateAll,pvimode);
} else { /* !nb_cof_vid_update */ } else { /* !nb_cof_vid_update */
if (pvimode) if (pvimode)
UpdateSinglePlaneNbVid(); UpdateSinglePlaneNbVid();
} }

View File

@ -92,10 +92,10 @@ static void model_10xxx_init(device_t dev)
disable_cache(); disable_cache();
for (i = 0x2; i < 0x10; i++) { for (i = 0x2; i < 0x10; i++) {
wrmsr(0x00000200 | i, msr); wrmsr(0x00000200 | i, msr);
} }
enable_cache(); enable_cache();
/* Set up other MTRRs */ /* Set up other MTRRs */
amd_setup_mtrrs(); amd_setup_mtrrs();