From ef03afa405b049a172146aab93cfb81fb21f3945 Mon Sep 17 00:00:00 2001 From: "arch import user (historical)" Date: Wed, 6 Jul 2005 17:15:30 +0000 Subject: Revision: linuxbios@linuxbios.org--devel/freebios--devel--2.0--patch-34 Creator: Yinghai Lu AMD D0/E0 Opteron new mem mapping support, AMD E Opteron mem hole support,AMD K8 Four Ranks DIMM support git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1950 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/amd/dualcore/Config.lb | 5 + src/cpu/amd/dualcore/amd_sibling.c | 244 +++++++++++++++++++++++++++++++++++++ src/cpu/amd/dualcore/dualcore.c | 99 +++++++++++++++ src/cpu/amd/dualcore/dualcore_id.c | 45 +++++++ 4 files changed, 393 insertions(+) create mode 100644 src/cpu/amd/dualcore/Config.lb create mode 100644 src/cpu/amd/dualcore/amd_sibling.c create mode 100644 src/cpu/amd/dualcore/dualcore.c create mode 100644 src/cpu/amd/dualcore/dualcore_id.c (limited to 'src/cpu/amd/dualcore') diff --git a/src/cpu/amd/dualcore/Config.lb b/src/cpu/amd/dualcore/Config.lb new file mode 100644 index 0000000000..dd8dd09963 --- /dev/null +++ b/src/cpu/amd/dualcore/Config.lb @@ -0,0 +1,5 @@ +uses CONFIG_LOGICAL_CPUS + +if CONFIG_LOGICAL_CPUS + object amd_sibling.o +end diff --git a/src/cpu/amd/dualcore/amd_sibling.c b/src/cpu/amd/dualcore/amd_sibling.c new file mode 100644 index 0000000000..da5928ab14 --- /dev/null +++ b/src/cpu/amd/dualcore/amd_sibling.c @@ -0,0 +1,244 @@ +/* 2004.12 yhlu add dual core support */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../model_fxx/model_fxx_msr.h" +#include "../../../northbridge/amd/amdk8/cpu_rev.c" + +static int first_time = 1; +static int disable_siblings = !CONFIG_LOGICAL_CPUS; + + +int is_e0_later_in_bsp(int nodeid) +{ + uint32_t val; + uint32_t val_old; + int e0_later; + if(nodeid==0) { // we don't need to do that for node 0 in core0/node0 + return !is_cpu_pre_e0(); + } + // d0 will be treated as e0 with this methods, but the d0 nb_cfg_54 always 0 + device_t dev; + dev = dev_find_slot(0, PCI_DEVFN(0x18+nodeid,2)); + if(!dev) return 0; + val_old = pci_read_config32(dev, 0x80); + val = val_old; + val |= (1<<3); + pci_write_config32(dev, 0x80, val); + val = pci_read_config32(dev, 0x80); + e0_later = !!(val & (1<<3)); + if(e0_later) { // pre_e0 bit 3 always be 0 and can not be changed + pci_write_config32(dev, 0x80, val_old); // restore it + } + + return e0_later; +} + +unsigned int read_nb_cfg_54(void) +{ + msr_t msr; + msr = rdmsr(NB_CFG_MSR); + return ( ( msr.hi >> (54-32)) & 1); +} + +struct node_core_id get_node_core_id(unsigned int nb_cfg_54) { + struct node_core_id id; + // get the apicid via cpuid(1) ebx[27:24] + if(nb_cfg_54) { + // when NB_CFG[54] is set, nodid = ebx[27:25], coreid = ebx[24] + id.coreid = (cpuid_ebx(1) >> 24) & 0xf; + id.nodeid = (id.coreid>>1); + id.coreid &= 1; + } else { // single core should be here too + // when NB_CFG[54] is clear, nodeid = ebx[26:24], coreid = ebx[27] + id.nodeid = (cpuid_ebx(1) >> 24) & 0xf; + id.coreid = (id.nodeid>>3); + id.nodeid &= 7; + } + return id; + + +} + +static int get_max_siblings(int nodes) +{ + device_t dev; + int nodeid; + int siblings=0; + + //get max siblings from all the nodes + for(nodeid=0; nodeid> 12) & 3; + if(siblings < j) { + siblings = j; + } + } + + return siblings; +} + +static void enable_apic_ext_id(int nodes) +{ + device_t dev; + int nodeid; + + //enable APIC_EXIT_ID all the nodes + for(nodeid=0; nodeid>4) & 7) + 1; + + siblings = get_max_siblings(nodes); + + if(bsp_apic_id > 0) { // io apic could start from 0 + return 0; + } else if(pci_read_config32(dev, 0x68) & ( (1<<17) | (1<<18)) ) { // enabled ext id but bsp = 0 + if(!disable_siblings) { return siblings + 1; } + else { return 1; } + } + + nb_cfg_54 = read_nb_cfg_54(); + +#if 0 + //it is for all e0 single core and nc_cfg_54 low is set, but in the auto.c stage we do not set that bit for it. + if(nb_cfg_54 && (!disable_siblings) && (siblings == 0)) { + //we need to check if e0 single core is there + int i; + for(i=0; i0) ) { + /* for 8 way dual core, we will used up apicid 16:16, actualy 16 is not allowed by current kernel + and the kernel will try to get one that is small than 16 to make io apic work. + I don't know when the kernel can support 256 apic id. (APIC_EXT_ID is enabled) */ + + //4:10 for two way 8:12 for four way 16:16 for eight way + //Use CONFIG_MAX_PHYSICAL_CPUS instead of nodes for better consistency? + apicid_base = nb_cfg_54 ? (siblings+1) * nodes : 8 * siblings + nodes; + + } + else { + apicid_base = nodes; + } + + if((apicid_base+ioapic_num-1)>0xf) { + // We need to enable APIC EXT ID + printk_info("if the IO APIC device doesn't support 256 apic id, \r\n you need to set ENABLE_APIC_EXT_ID in auto.c so you can spare 16 id for ioapic\r\n"); + enable_apic_ext_id(nodes); + } + + return apicid_base; +} +#if 0 +void amd_sibling_init(device_t cpu) +{ + unsigned i, siblings; + struct cpuid_result result; + unsigned nb_cfg_54; + struct node_core_id id; + + /* On the bootstrap processor see if I want sibling cpus enabled */ + if (first_time) { + first_time = 0; + get_option(&disable_siblings, "dual_core"); + } + result = cpuid(0x80000008); + /* See how many sibling cpus we have */ + /* Is dualcore supported */ + siblings = (result.ecx & 0xff); + if ( siblings < 1) { + return; + } + +#if 1 + printk_debug("CPU: %u %d siblings\n", + cpu->path.u.apic.apic_id, + siblings); +#endif + + nb_cfg_54 = read_nb_cfg_54(); +#if 1 + id = get_node_core_id(nb_cfg_54); // pre e0 nb_cfg_54 can not be set + + /* See if I am a sibling cpu */ + //if ((cpu->path.u.apic.apic_id>>(nb_cfg_54?0:3)) & siblings ) { // siblings = 1, 3, 7, 15,.... + //if ( ( (cpu->path.u.apic.apic_id>>(nb_cfg_54?0:3)) % (siblings+1) ) != 0 ) { + if(id.coreid != 0) { + if (disable_siblings) { + cpu->enabled = 0; + } + return; + } +#endif + + /* I am the primary cpu start up my siblings */ + + for(i = 1; i <= siblings; i++) { + struct device_path cpu_path; + device_t new; + /* Build the cpu device path */ + cpu_path.type = DEVICE_PATH_APIC; + cpu_path.u.apic.apic_id = cpu->path.u.apic.apic_id + i * (nb_cfg_54?1:8); + + /* See if I can find the cpu */ + new = find_dev_path(cpu->bus, &cpu_path); + /* Allocate the new cpu device structure */ + if(!new) { + new = alloc_dev(cpu->bus, &cpu_path); + new->enabled = 1; + new->initialized = 0; + } + +#if 1 + printk_debug("CPU: %u has sibling %u\n", + cpu->path.u.apic.apic_id, + new->path.u.apic.apic_id); +#endif + /* Start the new cpu */ + if(new->enabled && !new->initialized) + start_cpu(new); + } + +} +#endif + diff --git a/src/cpu/amd/dualcore/dualcore.c b/src/cpu/amd/dualcore/dualcore.c new file mode 100644 index 0000000000..1c3b2751a5 --- /dev/null +++ b/src/cpu/amd/dualcore/dualcore.c @@ -0,0 +1,99 @@ +/* 2004.12 yhlu add dual core support */ + + +#ifndef SET_NB_CFG_54 +#define SET_NB_CFG_54 1 +#endif + +#include "cpu/amd/dualcore/dualcore_id.c" + +static inline unsigned get_core_num_in_bsp(unsigned nodeid) +{ + return ((pci_read_config32(PCI_DEV(0, 0x18+nodeid, 3), 0xe8)>>12) & 3); +} + +static inline +#if SET_NB_CFG_54 == 1 + uint8_t +#else + void +#endif + set_apicid_cpuid_lo(void) { +#if SET_NB_CFG_54 + //for pre_e0, even we set nb_cfg_54, but it will still be 0 + //for e0 later you should use get_node_id(read_nb_cfg_54()) even for single core cpu + //get siblings via cpuid(0x80000008) ecx[7:0] + #if CONFIG_MAX_PHYSICAL_CPUS != 8 + if( get_core_num_in_bsp(0) == 0) { + /*first node only has one core, pre_e0 + all e0 single core installed don't need enable lo too, + So if mixing e0 single core and dual core, + don't put single core in first socket */ + return 0; + } + #endif + + if(read_option(CMOS_VSTART_dual_core, CMOS_VLEN_dual_core, 0) != 0) { // disable dual_core + return 0; + } + + // set the NB_CFG[54]=1; why the OS will be happy with that ??? + msr_t msr; + msr = rdmsr(NB_CFG_MSR); + msr.hi |= (1<<(54-32)); // InitApicIdCpuIdLo + wrmsr(NB_CFG_MSR, msr); + + return 1; + +#endif + +} + +static inline void real_start_other_core(unsigned nodeid) +{ + uint32_t dword; + // set PCI_DEV(0, 0x18+nodeid, 3), 0x44 bit 27 to redirect all MC4 accesses and error logging to core0 + dword = pci_read_config32(PCI_DEV(0, 0x18+nodeid, 3), 0x44); + dword |= 1<<27; // NbMcaToMstCpuEn bit + pci_write_config32(PCI_DEV(0, 0x18+nodeid, 3), 0x44, dword); + // set PCI_DEV(0, 0x18+nodeid, 0), 0x68 bit 5 to start core1 + dword = pci_read_config32(PCI_DEV(0, 0x18+nodeid, 0), 0x68); + dword |= 1<<5; + pci_write_config32(PCI_DEV(0, 0x18+nodeid, 0), 0x68, dword); +} + +//it is running on core0 of every node +static inline void start_other_core(unsigned nodeid) { + + if(read_option(CMOS_VSTART_dual_core, CMOS_VLEN_dual_core, 0) != 0) { // disable dual_core + return; + } + + if( get_core_num() >0) { // defined in dualcore_id.c + real_start_other_core(nodeid); + } +} + +static inline unsigned get_nodes(void) +{ + return ((pci_read_config32(PCI_DEV(0, 0x18, 0), 0x60)>>4) & 7) + 1; +} + +//it is running on core0 of node0 +static inline void start_other_cores(void) { + unsigned nodes; + unsigned nodeid; + + if(read_option(CMOS_VSTART_dual_core, CMOS_VLEN_dual_core, 0) != 0) { // disable dual_core + return; + } + + nodes = get_nodes(); + + for(nodeid=0; nodeid 0) { + real_start_other_core(nodeid); + } + } + +} diff --git a/src/cpu/amd/dualcore/dualcore_id.c b/src/cpu/amd/dualcore/dualcore_id.c new file mode 100644 index 0000000000..feab682851 --- /dev/null +++ b/src/cpu/amd/dualcore/dualcore_id.c @@ -0,0 +1,45 @@ +/* 2004.12 yhlu add dual core support */ + +#include +#include "cpu/amd/model_fxx/model_fxx_msr.h" + +static inline unsigned int read_nb_cfg_54(void) +{ + msr_t msr; + msr = rdmsr(NB_CFG_MSR); + return ( ( msr.hi >> (54-32)) & 1); +} + +struct node_core_id { + unsigned nodeid; + unsigned coreid; +}; + +static inline struct node_core_id get_node_core_id(unsigned nb_cfg_54) { + struct node_core_id id; + // get the apicid via cpuid(1) ebx[27:24] + if( nb_cfg_54) { + // when NB_CFG[54] is set, nodid = ebx[27:25], coreid = ebx[24] + id.coreid = (cpuid_ebx(1) >> 24) & 0xf; + id.nodeid = (id.coreid>>1); + id.coreid &= 1; + } + else + { + // when NB_CFG[54] is clear, nodeid = ebx[26:24], coreid = ebx[27] + id.nodeid = (cpuid_ebx(1) >> 24) & 0xf; + id.coreid = (id.nodeid>>3); + id.nodeid &= 7; + } + return id; +} + +static inline unsigned get_core_num(void) +{ + return (cpuid_ecx(0x80000008) & 0xff); +} + +static inline struct node_core_id get_node_core_id_x(void) { + return get_node_core_id( read_nb_cfg_54() ); +} + -- cgit v1.2.3