summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cpu/amd/agesa_wrapper/family14/model_14_init.c11
-rw-r--r--src/include/cpu/amd/amdfam14.h7
-rw-r--r--src/mainboard/amd/persimmon/get_bus_conf.c18
-rw-r--r--src/mainboard/amd/persimmon/mainboard.c5
-rw-r--r--src/northbridge/amd/agesa_wrapper/family14/northbridge.c2
5 files changed, 6 insertions, 37 deletions
diff --git a/src/cpu/amd/agesa_wrapper/family14/model_14_init.c b/src/cpu/amd/agesa_wrapper/family14/model_14_init.c
index e6b33371cb..c94e2150aa 100644
--- a/src/cpu/amd/agesa_wrapper/family14/model_14_init.c
+++ b/src/cpu/amd/agesa_wrapper/family14/model_14_init.c
@@ -31,7 +31,6 @@
#include <cpu/cpu.h>
#include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h>
-#include <cpu/amd/multicore.h>
#include <cpu/amd/amdfam14.h>
#define MCI_STATUS 0x401
@@ -58,19 +57,15 @@ void wrmsr_amd(u32 index, msr_t msr)
static void model_14_init(device_t dev)
{
- printk(BIOS_DEBUG, "Model 14 Init - a no-op.\n");
+ printk(BIOS_DEBUG, "Model 14 Init.\n");
u8 i;
msr_t msr;
int msrno;
- struct node_core_id id;
#if CONFIG_LOGICAL_CPUS == 1
u32 siblings;
#endif
-// id = get_node_core_id(read_nb_cfg_54()); /* nb_cfg_54 can not be set */
-// printk(BIOS_DEBUG, "nodeid = %02d, coreid = %02d\n", id.nodeid, id.coreid);
-
disable_cache ();
/* Enable access to AMD RdDram and WrDram extension bits */
msr = rdmsr(SYSCFG_MSR);
@@ -100,10 +95,6 @@ static void model_14_init(device_t dev)
/* Enable the local cpu apics */
setup_lapic();
- /* Set the processor name string */
-// init_processor_name();
-
-
#if CONFIG_LOGICAL_CPUS == 1
siblings = cpuid_ecx(0x80000008) & 0xff;
diff --git a/src/include/cpu/amd/amdfam14.h b/src/include/cpu/amd/amdfam14.h
index 1587d16cf5..c4b7e6d143 100644
--- a/src/include/cpu/amd/amdfam14.h
+++ b/src/include/cpu/amd/amdfam14.h
@@ -36,18 +36,11 @@
msr_t rdmsr_amd(u32 index);
void wrmsr_amd(u32 index, msr_t msr);
-//#if defined(__GNUC__)
-//// it can be used to get unitid and coreid it running only
-//struct node_core_id get_node_core_id(u32 nb_cfg_54);
-//struct node_core_id get_node_core_id_x(void);
-//#endif
-
#if defined(__PRE_RAM__)
void wait_all_core0_started(void);
void wait_all_other_cores_started(u32 bsp_apicid);
void wait_all_aps_started(u32 bsp_apicid);
void allow_all_aps_stop(u32 bsp_apicid);
#endif
-u32 get_initial_apicid(void);
#endif /* CPU_AMD_FAM14_H */
diff --git a/src/mainboard/amd/persimmon/get_bus_conf.c b/src/mainboard/amd/persimmon/get_bus_conf.c
index 5f48498bce..cc7fb5d522 100644
--- a/src/mainboard/amd/persimmon/get_bus_conf.c
+++ b/src/mainboard/amd/persimmon/get_bus_conf.c
@@ -42,25 +42,12 @@ u32 pci1234x[] = {
0x0000ff0,
};
-/*
-* HT Chain device num, actually it is unit id base of every ht device in chain,
-* assume every chain only have 4 ht device at most
-*/
-u32 hcdnx[] = {
- 0x20202020,
-};
-
u32 bus_type[256];
-
u32 sbdn_sb800;
-//KZ [092110]extern void get_pci1234(void);
-
static u32 get_bus_conf_done = 0;
-
-
void get_bus_conf(void)
{
u32 apicid_base;
@@ -139,8 +126,5 @@ void get_bus_conf(void)
/* I/O APICs: APIC ID Version State Address */
bus_isa = 10;
apicid_base = CONFIG_MAX_CPUS;
-//#if CONFIG_LOGICAL_CPUS==1
-// apicid_base = get_apicid_base(1);
-//#endif
- apicid_sb800 = apicid_base + 0;
+ apicid_sb800 = apicid_base;
}
diff --git a/src/mainboard/amd/persimmon/mainboard.c b/src/mainboard/amd/persimmon/mainboard.c
index cf478fbaf7..7de76e8467 100644
--- a/src/mainboard/amd/persimmon/mainboard.c
+++ b/src/mainboard/amd/persimmon/mainboard.c
@@ -53,7 +53,8 @@ uint64_t uma_memory_base, uma_memory_size;
*************************************************/
static void persimmon_enable(device_t dev)
{
- printk(BIOS_INFO, "Mainboard Persimmon Enable. dev=0x%p\n", dev);
+ printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
+
#if (CONFIG_GFXUMA == 1)
msr_t msr, msr2;
uint32_t sys_mem;
@@ -110,6 +111,6 @@ int add_mainboard_resources(struct lb_memory *mem)
return 0;
}
struct chip_operations mainboard_ops = {
- CHIP_NAME("AMD PERSIMMON Mainboard")
+ CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard")
.enable_dev = persimmon_enable,
};
diff --git a/src/northbridge/amd/agesa_wrapper/family14/northbridge.c b/src/northbridge/amd/agesa_wrapper/family14/northbridge.c
index 50748eb904..af7d1302d6 100644
--- a/src/northbridge/amd/agesa_wrapper/family14/northbridge.c
+++ b/src/northbridge/amd/agesa_wrapper/family14/northbridge.c
@@ -849,7 +849,7 @@ static struct device_operations cpu_bus_ops = {
.set_resources = cpu_bus_set_resources,
.enable_resources = NULL,
.init = cpu_bus_init,
- .scan_bus = 0,
+ .scan_bus = NULL,
};