diff options
Diffstat (limited to 'src/northbridge/amd/amdk8/reset_test.c')
| -rw-r--r-- | src/northbridge/amd/amdk8/reset_test.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/northbridge/amd/amdk8/reset_test.c b/src/northbridge/amd/amdk8/reset_test.c index 9105324f33..7f4336ce5f 100644 --- a/src/northbridge/amd/amdk8/reset_test.c +++ b/src/northbridge/amd/amdk8/reset_test.c @@ -1,4 +1,5 @@ #include <stdint.h> +#include <arch/smp/lapic.h> #define NODE_ID 0x60 #define HT_INIT_CONTROL 0x6c @@ -6,11 +7,13 @@ #define HTIC_BIOSR_Detect (1<<5) #define HTIC_INIT_Detect (1<<6) - static int cpu_init_detected(void) { unsigned long htic; - htic = pci_read_config32(PCI_DEV(0, 0x18, 0), HT_INIT_CONTROL); + device_t dev; + + dev = PCI_DEV(0, 0x18 + lapicid(), 0); + htic = pci_read_config32(dev, HT_INIT_CONTROL); return !!(htic & HTIC_INIT_Detect); } @@ -31,11 +34,11 @@ static int cold_reset_detected(void) return !(htic & HTIC_ColdR_Detect); } -static void distinguish_cpu_resets(unsigned node_id) +static void distinguish_cpu_resets(void) { uint32_t htic; device_t device; - device = PCI_DEV(0, 0x18 + node_id, 0); + device = PCI_DEV(0, 0x18 + lapicid(), 0); htic = pci_read_config32(device, HT_INIT_CONTROL); htic |= HTIC_ColdR_Detect | HTIC_BIOSR_Detect | HTIC_INIT_Detect; pci_write_config32(device, HT_INIT_CONTROL, htic); |