diff options
| author | Andreas Herrmann <andreas.herrmann3@amd.com> | 2011-04-05 20:33:44 +0200 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2011-04-05 18:51:04 -0400 |
| commit | fd32dd362aae61949e92db89d6a2d6b3fd7cabec (patch) | |
| tree | d61467027a8d22eeb39f144f02935f9ab2caaec8 | |
| parent | 23ac5c6c87710e3e77e1a9ad6d5fd23438797563 (diff) | |
x86info, AMD: Update CPU revisions
Provide just a general model description for all family 10h CPUs. It's
not possible to derive from model/family/stepping whether its an
Phenom or Turion II etc. This information is provided in the processor
name string. (It could be decoded from other CPUID information and
with help of CPU revision guides but that's not yet implemented.)
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
| -rw-r--r-- | AMD/identify.c | 19 | ||||
| -rw-r--r-- | AMD/revision.h | 26 |
2 files changed, 16 insertions, 29 deletions
diff --git a/AMD/identify.c b/AMD/identify.c index 31c89a7..413d404 100644 --- a/AMD/identify.c +++ b/AMD/identify.c @@ -73,22 +73,9 @@ static void set_fam10h_name(struct fam10h_rev *r, struct cpudata *c) return; } - if (r->nameid & _PHENOM) - snprintf(c->name, CPU_NAME_LEN, - "Quad-Core Opteron/Phenom (%s)", - r->rev); - else if (r->nameid & _PHENOM_II) - snprintf(c->name, CPU_NAME_LEN, - "Quad-Core Opteron/Phenom II (%s)", r->rev); - else if (r->nameid & _OPTERON) - snprintf(c->name, CPU_NAME_LEN, - "Quad-Core Opteron (%s)", r->rev); - else if (r->nameid & _OPTERON_SC) - snprintf(c->name, CPU_NAME_LEN, - "Six-Core Opteron (%s)", r->rev); - else if (r->nameid & _ATHLON_II) - snprintf(c->name, CPU_NAME_LEN, - "Athlon II X2 (%s)", r->rev); + snprintf(c->name, CPU_NAME_LEN, + "Phenom/Athlon/Sempron/Turion (II)/Opteron (%s)", + r->rev); } static void set_connector(struct cpudata *c) diff --git a/AMD/revision.h b/AMD/revision.h index dd06e50..577b967 100644 --- a/AMD/revision.h +++ b/AMD/revision.h @@ -121,25 +121,25 @@ struct k8_rev k8_revisions[] = { {0xc0f13, CONN_SOCKET_F, _ATHLON64_FX, "JH-F3"}, }; -#define _OPTERON 0x0001 -#define _PHENOM 0x0002 -#define _PHENOM_II 0x0004 -#define _ATHLON_II 0x0008 -#define _OPTERON_SC 0x0010 - struct fam10h_rev { int eax; - int nameid; const char* rev; }; struct fam10h_rev fam10h_revisions[] = { - {0x0100f2a, _OPTERON, "DR-BA"}, - {0x0100f22, _OPTERON|_PHENOM, "DR-B2"}, - {0x0100f23, _OPTERON|_PHENOM, "DR-B3"}, - {0x0100f42, _OPTERON|_PHENOM_II, "RB-C2"}, - {0x0100f62, _ATHLON_II, "DA-C2"}, - {0x0100f80, _OPTERON_SC, "HY-D0"}, + {0x0100f2a, "DR-BA"}, + {0x0100f22, "DR-B2"}, + {0x0100f23, "DR-B3"}, + {0x0100f42, "RB-C2"}, + {0x0100f43, "RB-C3"}, + {0x0100f52, "BL-C2"}, + {0x0100f53, "BL-C3"}, + {0x0100f62, "DA-C2"}, + {0x0100f63, "DA-C3"}, + {0x0100f80, "HY-D0"}, + {0x0100f81, "HY-D1"}, + {0x0100f91, "HY-D1"}, + {0x0100fa0, "PH-E0"}, }; struct id_string fam11h_revisions[] = { |