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

cpu/amd/family_10h-family_15h: Fix incorrect revision detection 

The revision detection code for AMD Family 10h/15h was modified
to use a 64-bit value instead of 32-bit in order to accomodate
additional processor revisions.  The FIDVID code was not updated
at that point, leading to incorrect revision use during FIDVID.

Change-Id: I7a881a94d62ed455415f9dfc887fd698ac919429
Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Reviewed-on: http://review.coreboot.org/12026
Tested-by: build bot (Jenkins)
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
Timothy Pearson 2015-08-02 21:31:48 -05:00 committed by Martin Roth
parent a40f64f7fb
commit 5173bb7d9d
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/cpu/amd/family_10h-family_15h/fidvid.c
View File

@ -371,9 +371,9 @@ static void recalculateVsSlamTimeSettingOnCorePre(device_t dev)
pci_write_config32(dev, 0xd8, dtemp); pci_write_config32(dev, 0xd8, dtemp);
} }
static u32 nb_clk_did(int node, u32 cpuRev,u8 procPkg) { static u32 nb_clk_did(uint8_t node, uint64_t cpuRev, uint8_t procPkg) {
u8 link0isGen3 = 0; uint8_t link0isGen3 = 0;
u8 offset; uint8_t offset;
if (AMD_CpuFindCapability(node, 0, &offset)) { if (AMD_CpuFindCapability(node, 0, &offset)) {
link0isGen3 = (AMD_checkLinkType(node, 0, offset) & HTPHY_LINKTYPE_HT3 ); link0isGen3 = (AMD_checkLinkType(node, 0, offset) & HTPHY_LINKTYPE_HT3 );
} }
@ -442,7 +442,7 @@ static u32 power_up_down(int node, u8 procPkg) {
return dword; return dword;
} }
static void config_clk_power_ctrl_reg0(int node, u32 cpuRev, u8 procPkg) { static void config_clk_power_ctrl_reg0(uint8_t node, uint64_t cpuRev, uint8_t procPkg) {
device_t dev = NODE_PCI(node, 3); device_t dev = NODE_PCI(node, 3);
/* Program fields in Clock Power/Control register0 (F3xD4) */ /* Program fields in Clock Power/Control register0 (F3xD4) */
@ -456,7 +456,7 @@ static void config_clk_power_ctrl_reg0(int node, u32 cpuRev, u8 procPkg) {
* ClkRampHystCtl=HW default * ClkRampHystCtl=HW default
* ClkRampHystSel=1111b * ClkRampHystSel=1111b
*/ */
u32 dword= pci_read_config32(dev, 0xd4); uint32_t dword= pci_read_config32(dev, 0xd4);
dword &= CPTC0_MASK; dword &= CPTC0_MASK;
dword |= NB_CLKDID_ALL | LNK_PLL_LOCK | CLK_RAMP_HYST_SEL_VAL; dword |= NB_CLKDID_ALL | LNK_PLL_LOCK | CLK_RAMP_HYST_SEL_VAL;
dword |= (nb_clk_did(node,cpuRev,procPkg) << NB_CLKDID_SHIFT); dword |= (nb_clk_did(node,cpuRev,procPkg) << NB_CLKDID_SHIFT);
@ -467,9 +467,9 @@ static void config_clk_power_ctrl_reg0(int node, u32 cpuRev, u8 procPkg) {
} }
static void config_power_ctrl_misc_reg(device_t dev,u32 cpuRev, u8 procPkg) { static void config_power_ctrl_misc_reg(device_t dev, uint64_t cpuRev, uint8_t procPkg) {
/* check PVI/SVI */ /* check PVI/SVI */
u32 dword = pci_read_config32(dev, 0xa0); uint32_t dword = pci_read_config32(dev, 0xa0);
/* BKDG r31116 2010-04-22 2.4.1.7 step b F3xA0[VSSlamVidMod] */ /* BKDG r31116 2010-04-22 2.4.1.7 step b F3xA0[VSSlamVidMod] */
/* PllLockTime and PsiVidEn set in ruleset in defaults.h */ /* PllLockTime and PsiVidEn set in ruleset in defaults.h */
@ -500,14 +500,14 @@ static void config_power_ctrl_misc_reg(device_t dev,u32 cpuRev, u8 procPkg) {
pci_write_config32(dev, 0xa0, dword); pci_write_config32(dev, 0xa0, dword);
} }
static void config_nb_syn_ptr_adj(device_t dev, u32 cpuRev) { static void config_nb_syn_ptr_adj(device_t dev, uint64_t cpuRev) {
/* Note the following settings are additional from the ported /* Note the following settings are additional from the ported
* function setFidVidRegs() * function setFidVidRegs()
*/ */
/* adjust FIFO between nb and core clocks to max allowed /* adjust FIFO between nb and core clocks to max allowed
values (min latency) */ values (min latency) */
u32 nbPstate = pci_read_config32(dev,0x1f0) & NB_PSTATE_MASK; uint32_t nbPstate = pci_read_config32(dev,0x1f0) & NB_PSTATE_MASK;
u8 nbSynPtrAdj; uint8_t nbSynPtrAdj;
if ((cpuRev & (AMD_DR_Bx | AMD_DA_Cx | AMD_FAM15_ALL) ) if ((cpuRev & (AMD_DR_Bx | AMD_DA_Cx | AMD_FAM15_ALL) )
|| ((cpuRev & AMD_RB_C3) && (nbPstate != 0))) { || ((cpuRev & AMD_RB_C3) && (nbPstate != 0))) {
nbSynPtrAdj = 5; nbSynPtrAdj = 5;
@ -515,14 +515,14 @@ static void config_nb_syn_ptr_adj(device_t dev, u32 cpuRev) {
nbSynPtrAdj = 6; nbSynPtrAdj = 6;
} }
u32 dword = pci_read_config32(dev, 0xdc); uint32_t dword = pci_read_config32(dev, 0xdc);
dword &= ~NB_SYN_PTR_ADJ_MASK; dword &= ~NB_SYN_PTR_ADJ_MASK;
dword |= nbSynPtrAdj << NB_SYN_PTR_ADJ_POS; dword |= nbSynPtrAdj << NB_SYN_PTR_ADJ_POS;
/* NbsynPtrAdj set to 5 or 6 per BKDG (needs reset) */ /* NbsynPtrAdj set to 5 or 6 per BKDG (needs reset) */
pci_write_config32(dev, 0xdc, dword); pci_write_config32(dev, 0xdc, dword);
} }
static void config_acpi_pwr_state_ctrl_regs(device_t dev, u32 cpuRev, u8 procPkg) { static void config_acpi_pwr_state_ctrl_regs(device_t dev, uint64_t cpuRev, uint8_t procPkg) {
if (is_fam15h()) { if (is_fam15h()) {
/* Family 15h BKDG Rev. 3.14 D18F3x80 recommended settings */ /* Family 15h BKDG Rev. 3.14 D18F3x80 recommended settings */
pci_write_config32(dev, 0x80, 0xe20be281); pci_write_config32(dev, 0x80, 0xe20be281);
@ -531,8 +531,8 @@ static void config_acpi_pwr_state_ctrl_regs(device_t dev, u32 cpuRev, u8 procPkg
pci_write_config32(dev, 0x84, 0x01e200e2); pci_write_config32(dev, 0x84, 0x01e200e2);
} else { } else {
/* step 1, chapter 2.4.2.6 of AMD Fam 10 BKDG #31116 Rev 3.48 22.4.2010 */ /* step 1, chapter 2.4.2.6 of AMD Fam 10 BKDG #31116 Rev 3.48 22.4.2010 */
u32 dword; uint32_t dword;
u32 c1= 1; uint32_t c1= 1;
if (cpuRev & (AMD_DR_Bx)) { if (cpuRev & (AMD_DR_Bx)) {
// will coreboot ever enable cache scrubbing ? // will coreboot ever enable cache scrubbing ?
// if it does, will it be enough to check the current state // if it does, will it be enough to check the current state
@ -565,7 +565,7 @@ static void config_acpi_pwr_state_ctrl_regs(device_t dev, u32 cpuRev, u8 procPkg
* which is easier * which is easier
*/ */
u32 smaf001 = 0xE6; uint32_t smaf001 = 0xE6;
if (cpuRev & AMD_DR_Bx ) { if (cpuRev & AMD_DR_Bx ) {
smaf001 = 0xA6; smaf001 = 0xA6;
} else { } else {
@ -575,7 +575,7 @@ static void config_acpi_pwr_state_ctrl_regs(device_t dev, u32 cpuRev, u8 procPkg
} }
#endif #endif
} }
u32 fidvidChange = 0; uint32_t fidvidChange = 0;
if (((cpuRev & AMD_DA_Cx) && (procPkg & AMD_PKGTYPE_S1gX)) if (((cpuRev & AMD_DA_Cx) && (procPkg & AMD_PKGTYPE_S1gX))
|| (cpuRev & AMD_RB_C3) ) { || (cpuRev & AMD_RB_C3) ) {
fidvidChange=0x0B; fidvidChange=0x0B;