diff options
author | Tony Luck <tony.luck@intel.com> | 2006-06-05 13:54:14 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-06-05 13:54:14 -0700 |
commit | 76d08bb3f09054edc45326ce5c698a3f6c45f5d0 (patch) | |
tree | 5d0197f8ad8e4f778d6f117bcf49f9467fcdc0dd /include/asm-ia64 | |
parent | 672c6108a51bf559d19595d9f8193dfd81f0f752 (diff) | |
download | linux-stable-76d08bb3f09054edc45326ce5c698a3f6c45f5d0.tar.gz linux-stable-76d08bb3f09054edc45326ce5c698a3f6c45f5d0.tar.bz2 linux-stable-76d08bb3f09054edc45326ce5c698a3f6c45f5d0.zip |
[IA64] Add "model name" to /proc/cpuinfo
Linux ia64 port tried to decode the processor family number
to something human-readable, but Intel brandnames don't change
synchronously with updates to the family number. Adopt a more
i386-like approach and just print the family number in decimal.
Add a new field "model name" that uses PAL_BRAND_INFO to find
the official name for the cpu, or on older systems, falls back
to using the well-known codenames (Merced, McKinley, Madison).
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/asm-ia64')
-rw-r--r-- | include/asm-ia64/pal.h | 10 | ||||
-rw-r--r-- | include/asm-ia64/processor.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/asm-ia64/pal.h b/include/asm-ia64/pal.h index 37e52a2836b0..312109d7be97 100644 --- a/include/asm-ia64/pal.h +++ b/include/asm-ia64/pal.h @@ -78,6 +78,7 @@ #define PAL_VM_TR_READ 261 /* read contents of translation register */ #define PAL_GET_PSTATE 262 /* get the current P-state */ #define PAL_SET_PSTATE 263 /* set the P-state */ +#define PAL_BRAND_INFO 274 /* Processor branding information */ #ifndef __ASSEMBLY__ @@ -1133,6 +1134,15 @@ ia64_pal_set_pstate (u64 pstate_index) return iprv.status; } +/* Processor branding information*/ +static inline s64 +ia64_pal_get_brand_info (char *brand_info) +{ + struct ia64_pal_retval iprv; + PAL_CALL_STK(iprv, PAL_BRAND_INFO, 0, (u64)brand_info, 0); + return iprv.status; +} + /* Cause the processor to enter LIGHT HALT state, where prefetching and execution are * suspended, but cache and TLB coherency is maintained. */ diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h index b3bd58e80690..03100c4272c6 100644 --- a/include/asm-ia64/processor.h +++ b/include/asm-ia64/processor.h @@ -164,6 +164,7 @@ struct cpuinfo_ia64 { __u8 family; __u8 archrev; char vendor[16]; + char *model_name; #ifdef CONFIG_NUMA struct ia64_node_data *node_data; |