sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sb/intel/bd82x6x: Clean up early_thermal.c

Browse Source 
Use proper types in readXp functions, define `PCH_THERMAL_DEV`, clean up
comments a bit, and use `RCBA32_AND_OR` instead of read32/write32.

Tested with BUILD_TIMELESS=1, Asus P8Z77-V LX2 remains identical.

Change-Id: I95e054d6e52706e06e313068e61484f6cb9a64e5
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50038
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons
2021-01-28 14:20:36 +01:00
parent ee7fb34dcb
commit ec99cd9112
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/southbridge/intel/bd82x6x/early_thermal.c
View File

@@ -6,38 +6,35 @@
#include "cpu/intel/model_206ax/model_206ax.h" #include "cpu/intel/model_206ax/model_206ax.h"
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
static void write8p(uintptr_t addr, uint32_t val) static void write8p(uintptr_t addr, uint8_t val)
{ {
write8((u8 *)addr, val); write8((uint8_t *)addr, val);
} }
static void write16p(uintptr_t addr, uint32_t val) static void write16p(uintptr_t addr, uint16_t val)
{ {
write16((u16 *)addr, val); write16((uint16_t *)addr, val);
} }
static uint16_t read16p(uintptr_t addr) static uint16_t read16p(uintptr_t addr)
{ {
return read16((u16 *)addr); return read16((uint16_t *)addr);
} }
/* Temporary address for the thermal BAR */ /* Temporary address for the thermal BAR */
#define TBARB_TEMP 0x40000000 #define TBARB_TEMP 0x40000000
/* Early thermal init, must be done prior to giving ME its memory /* Early thermal init, must be done prior to giving ME its memory
which is done at the end of raminit. */ which is done at the end of raminit */
void early_thermal_init(void) void early_thermal_init(void)
{ {
pci_devfn_t dev; const pci_devfn_t dev = PCH_THERMAL_DEV;
msr_t msr;
dev = PCI_DEV(0x0, 0x1f, 0x6); /* Program address for temporary BAR */
/* Program address for temporary BAR. */
pci_write_config32(dev, 0x40, TBARB_TEMP); pci_write_config32(dev, 0x40, TBARB_TEMP);
pci_write_config32(dev, 0x44, 0x0); pci_write_config32(dev, 0x44, 0x0);
/* Activate temporary BAR. */ /* Activate temporary BAR */
pci_or_config32(dev, 0x40, 5); pci_or_config32(dev, 0x40, 5);
write16p(TBARB_TEMP + 0x04, 0x3a2b); write16p(TBARB_TEMP + 0x04, 0x3a2b);
@@ -48,9 +45,9 @@ void early_thermal_init(void)
write8p(TBARB_TEMP + 0x82, 0x00); write8p(TBARB_TEMP + 0x82, 0x00);
write8p(TBARB_TEMP + 0x01, 0xba); write8p(TBARB_TEMP + 0x01, 0xba);
/* Perform init. */ /* Perform init */
/* Configure TJmax. */ /* Configure TJmax */
msr = rdmsr(MSR_TEMPERATURE_TARGET); const msr_t msr = rdmsr(MSR_TEMPERATURE_TARGET);
write16p(TBARB_TEMP + 0x12, ((msr.lo >> 16) & 0xff) << 6); write16p(TBARB_TEMP + 0x12, ((msr.lo >> 16) & 0xff) << 6);
/* Northbridge temperature slope and offset */ /* Northbridge temperature slope and offset */
write16p(TBARB_TEMP + 0x16, 0x808c); write16p(TBARB_TEMP + 0x16, 0x808c);
@@ -65,5 +62,5 @@ void early_thermal_init(void)
pci_write_config32(dev, 0x40, 0); pci_write_config32(dev, 0x40, 0);
write32(DEFAULT_RCBA + 0x38b0, (read32(DEFAULT_RCBA + 0x38b0) & 0xffff8003) | 0x403c); RCBA32_AND_OR(0x38b0, 0xffff8003, 0x403c);
} }

1
src/southbridge/intel/bd82x6x/pch.h
View File

@@ -85,6 +85,7 @@ void early_usb_init(const struct southbridge_usb_port *portmap);
#define PCH_EHCI1_DEV PCI_DEV(0, 0x1d, 0) #define PCH_EHCI1_DEV PCI_DEV(0, 0x1d, 0)
#define PCH_EHCI2_DEV PCI_DEV(0, 0x1a, 0) #define PCH_EHCI2_DEV PCI_DEV(0, 0x1a, 0)
#define PCH_ME_DEV PCI_DEV(0, 0x16, 0) #define PCH_ME_DEV PCI_DEV(0, 0x16, 0)
#define PCH_THERMAL_DEV PCI_DEV(0, 0x1f, 6)
#define PCH_PCIE_DEV_SLOT 28 #define PCH_PCIE_DEV_SLOT 28
#define PCH_IOAPIC_PCI_BUS 250 #define PCH_IOAPIC_PCI_BUS 250
#define PCH_IOAPIC_PCI_SLOT 31 #define PCH_IOAPIC_PCI_SLOT 31