diff options
| author | Arne Georg Gleditsch <arne.gleditsch@numascale.com> | 2010-03-10 03:43:05 +0000 |
|---|---|---|
| committer | Zheng Bao <Zheng.Bao@amd.com> | 2010-03-10 03:43:05 +0000 |
| commit | bc259d09d342f09987c65290422009615a8287a7 (patch) | |
| tree | d196eca916b402b6875c668ed18fb99ec7c9bac5 /src/northbridge | |
| parent | a51021b9a11ab0910fb3fa827c0dd094a89960bb (diff) | |
The following patch implements Opteron Fam 10 rev D (aka Istanbul)
support for coreboot. I have not updated MAX_CPUS for all fam10
mainboards, but it might make sense to multiply those by 1.5.
Signed-off-by: Arne Georg Gleditsch <arne.gleditsch@numascale.com>
I assume the line
pci_write_config32(NODE_PCI(nodeid, 0), 0x168, dword);
should be put outside the loop.
Everything seems to be fine. I don't have Istanbul to test. I have
read every changes and they all look good.
Acked-by: Zheng Bao <zheng.bao@amd.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5200 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/northbridge')
| -rw-r--r-- | src/northbridge/amd/amdfam10/northbridge.c | 2 | ||||
| -rw-r--r-- | src/northbridge/amd/amdfam10/raminit_amdmct.c | 3 | ||||
| -rw-r--r-- | src/northbridge/amd/amdmct/amddefs.h | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c index e7ac7efc11..86f3e5224f 100644 --- a/src/northbridge/amd/amdfam10/northbridge.c +++ b/src/northbridge/amd/amdfam10/northbridge.c @@ -1364,6 +1364,8 @@ static u32 cpu_bus_scan(device_t dev, u32 max) if (dev && dev->enabled) { j = pci_read_config32(dev, 0xe8); cores_found = (j >> 12) & 3; // dev is func 3 + if (siblings > 3) + cores_found |= (j >> 13) & 4; printk_debug(" %s siblings=%d\n", dev_path(dev), cores_found); } diff --git a/src/northbridge/amd/amdfam10/raminit_amdmct.c b/src/northbridge/amd/amdfam10/raminit_amdmct.c index c9f0c27b0b..21f1e188e5 100644 --- a/src/northbridge/amd/amdfam10/raminit_amdmct.c +++ b/src/northbridge/amd/amdfam10/raminit_amdmct.c @@ -150,6 +150,9 @@ u32 mctGetLogicalCPUID(u32 Node) case 0x10062: ret = AMD_DA_C2; break; + case 0x10080: + ret = AMD_HY_D0; + break; default: /* FIXME: mabe we should die() here. */ print_err("FIXME! CPU Version unknown or not supported! \n"); diff --git a/src/northbridge/amd/amdmct/amddefs.h b/src/northbridge/amd/amdmct/amddefs.h index 004e4cf50d..1b75888b12 100644 --- a/src/northbridge/amd/amdmct/amddefs.h +++ b/src/northbridge/amd/amdmct/amddefs.h @@ -42,6 +42,7 @@ #define AMD_DR_B3 0x00800000 /* Barcelona B3 */ #define AMD_RB_C2 0x01000000 /* Shanghai C2 */ #define AMD_DA_C2 0x02000000 /* XXXX C2 */ +#define AMD_HY_D0 0x04000000 /* Istanbul D0 */ /* * Groups - Create as many as you wish, from the above public values @@ -59,7 +60,7 @@ #define AMD_DR_LT_B3 (AMD_DR_B0 | AMD_DR_B1 | AMD_DR_B2 | AMD_DR_BA) #define AMD_DR_GT_B0 (AMD_DR_ALL & ~(AMD_DR_B0)) #define AMD_DR_ALL (AMD_DR_Bx) -#define AMD_FAM10_ALL (AMD_DR_ALL | AMD_RB_C2) +#define AMD_FAM10_ALL (AMD_DR_ALL | AMD_RB_C2 | AMD_HY_D0) #define AMD_FAM10_GT_B0 (AMD_FAM10_ALL & ~(AMD_DR_B0)) /* |