[coreboot] [patch] The correct way to calculate the cores in AMD fam10

[Bao, Zheng]

The number of cores is got by reading the bit 15,13,12 of [0,24,3,e8].
The bit 15 seems to be a new feature when CPU started to have more that
4
cores.

Signed-off-by: Zheng Bao <zheng.bao at amd.com>


Index: src/northbridge/amd/amdht/h3ncmn.c
===================================================================
--- src/northbridge/amd/amdht/h3ncmn.c	(revision 5679)
+++ src/northbridge/amd/amdht/h3ncmn.c	(working copy)
@@ -555,16 +555,17 @@
 	u8 i;
 
 	ASSERT((node < nb->maxNodes));
-	/* Read CmpCap */
+	/* Read CmpCap [2][1:0] */
 	AmdPCIReadBits(MAKE_SBDFO(makePCISegmentFromNode(node),
 				makePCIBusFromNode(node),
 				makePCIDeviceFromNode(node),
 				CPU_NB_FUNC_03,
 				REG_NB_CAPABILITY_3XE8),
-				13, 12, &temp);
+				15, 12, &temp);
 
+	/* bit[15,13,12] composes the cores */
 	/* Support Downcoring */
-	cores = temp + 1;
+	cores = ((temp & 8) >> 1) + (temp & 3) + 1;
 	AmdPCIReadBits (MAKE_SBDFO(makePCISegmentFromNode(node),
 					makePCIBusFromNode(node),
 					makePCIDeviceFromNode(node),
-------------- next part --------------
A non-text attachment was scrubbed...
Name: amd_fam10_calculate_cores.patch
Type: application/octet-stream
Size: 1011 bytes
Desc: amd_fam10_calculate_cores.patch
URL: <http://www.coreboot.org/pipermail/coreboot/attachments/20100802/8b8051cb/attachment.obj>