mirrors
/
memtest86plus
mirror of https://github.com/memtest86plus/memtest86plus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor fixes on previously added temperature code

This commit is contained in:
Sam DEMEULEMEESTER 2022-03-17 02:12:40 +01:00 committed by Sam Demeulemeester
parent f9690813ca
commit 04c3c485a1
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
system/pci.c
View File

@ -246,17 +246,13 @@ void pci_config_write32(int bus, int dev, int func, int reg, uint32_t value)
uint32_t amd_smn_read(uint32_t adr)
{
pci_config_write32(0, 0, 0, 0x60, adr);
return pci_config_read32(0, 0, 0, 0x64);
}
void amd_smn_write(uint32_t adr, uint32_t data)
{
pci_config_write32(0, 0, 0, 0x60, adr);
pci_config_write32(0, 0, 0, 0x64, data);
}
}

7
system/temperature.c
View File

@ -61,18 +61,15 @@ int get_cpu_temperature(void)
} else if (cpuid_info.vendor_id.str[0] == 'A' && cpuid_info.version.extendedFamily >= 8) {
// Grab CPU Temp. for ZEN CPUs using SNM
uint32_t tval = amd_smn_read(SMN_THM_TCON_CUR_TMP);
float offset;
float offset = 0;
if((tval >> 19) & 0x01)
{
if((tval >> 19) & 0x01) {
offset = -49.0f;
}
return offset + 0.125f * (float)((tval >> 21) & 0x7FF);
}
return 0;