diff options
| author | Andreas Herrmann <andreas.herrmann3@amd.com> | 2011-04-05 20:27:45 +0200 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2011-04-05 18:51:04 -0400 |
| commit | cdfb338274c516868e6774ccd40687434b28002c (patch) | |
| tree | beaf8ad00415003b019f4b925b4166150dd225e1 | |
| parent | 2181c7deb8a51df770470159c869fd81b1321619 (diff) | |
x86info, AMD: Update socket type information
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
| -rw-r--r-- | AMD/identify.c | 17 | ||||
| -rw-r--r-- | connector.c | 6 | ||||
| -rw-r--r-- | x86info.h | 6 |
3 files changed, 25 insertions, 4 deletions
diff --git a/AMD/identify.c b/AMD/identify.c index 8d6f491..dd9dd43 100644 --- a/AMD/identify.c +++ b/AMD/identify.c @@ -96,6 +96,11 @@ static void set_connector(struct cpudata *c) unsigned int eax, ebx, ecx, edx; int pkg_id; + if (family(c) == 0x11) { + c->connector = CONN_SOCKET_S1G2; + return; + } + cpuid(c->number, 0x80000001, &eax, &ebx, &ecx, &edx); pkg_id = (ebx >> 28) & 0xf; @@ -104,11 +109,19 @@ static void set_connector(struct cpudata *c) c->connector = CONN_SOCKET_F_R2; break; case 1: - c->connector = CONN_SOCKET_AM2_R2; + c->connector = CONN_SOCKET_AM3; break; case 2: - c->connector = CONN_SOCKET_S1G2; + c->connector = CONN_SOCKET_S1G3; + break; + case 3: + c->connector = CONN_SOCKET_G34; + break; + case 4: + c->connector = CONN_SOCKET_ASB2; break; + case 5: + c->connector = CONN_SOCKET_C32; default: c->connector = 0; } diff --git a/connector.c b/connector.c index 613b2eb..9877569 100644 --- a/connector.c +++ b/connector.c @@ -31,10 +31,14 @@ static struct { {CONN_SOCKET_940, "Socket 940"}, {CONN_SOCKET_S1G1, "Socket S1g1"}, {CONN_SOCKET_S1G2, "Socket S1g2"}, + {CONN_SOCKET_S1G3, "Socket S1g3/S1g4"}, {CONN_SOCKET_F, "Socket F (1207)"}, {CONN_SOCKET_AM2, "Socket AM2"}, {CONN_SOCKET_F_R2, "Socket Fr2 (1207)"}, - {CONN_SOCKET_AM2_R2, "Socket AM2r2"}, + {CONN_SOCKET_AM3, "Socket AM2r2/AM3"}, + {CONN_SOCKET_G34, "Socket G34"}, + {CONN_SOCKET_ASB2, "Socket ASB2"}, + {CONN_SOCKET_C32, "Socket C32"}, /* Intel specific sockets */ {CONN_SOCKET_57B, "Socket 5/7 (320 Pin PGA)"}, {CONN_MOBILE_7, "Mobile Module (320 Lead TCP)"}, @@ -52,8 +52,12 @@ enum connector { CONN_SOCKET_AM2, CONN_SOCKET_S1G1, CONN_SOCKET_S1G2, + CONN_SOCKET_S1G3, CONN_SOCKET_F_R2, - CONN_SOCKET_AM2_R2, + CONN_SOCKET_AM3, + CONN_SOCKET_G34, + CONN_SOCKET_ASB2, + CONN_SOCKET_C32, }; #define CPU_NAME_LEN 80 |