Skip to content

L
linux
Commit 5a92c3df authored by Russell King's avatar Russell King
Browse files
Options

[ARM] Remove CPU manufacturer string. 

The CPU ID no longer contains sufficient information to reliably
determine the manufacturer of a specific part.  To prevent #ifdef
madness appearing in the per-CPU support files, it is better to
remove the CPU manufacturer string entirely.
parent 60e7fd5e
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 162 deletions
arch/arm/kernel/setup.c
View file @ 5a92c3df
......@@ -81,7 +81,7 @@ unsigned long phys_initrd_start __initdata = 0;
unsigned long phys_initrd_size __initdata = 0;
static struct meminfo meminfo __initdata = { 0, };
static struct proc_info_item proc_info;
static const char *cpu_name;
static const char *machine_name;
static char command_line[COMMAND_LINE_SIZE];
......@@ -275,7 +275,7 @@ static void __init setup_processor(void)
while (1);
}
proc_info = *list->info;
cpu_name = list->cpu_name;
#ifdef MULTI_CPU
processor = *list->proc;
......@@ -287,9 +287,9 @@ static void __init setup_processor(void)
cpu_user = *list->user;
#endif
printk("CPU: %s %s revision %d (ARMv%s)\n",
proc_info.manufacturer, proc_info.cpu_name,
(int)processor_id & 15, proc_arch[cpu_architecture()]);
printk("CPU: %s [%08x] revision %d (ARMv%s)\n",
cpu_name, processor_id, (int)processor_id & 15,
proc_arch[cpu_architecture()]);
dump_cpu_info();
......@@ -723,9 +723,8 @@ static int c_show(struct seq_file *m, void *v)
{
int i;
seq_printf(m, "Processor\t: %s %s rev %d (%s)\n",
proc_info.manufacturer, proc_info.cpu_name,
(int)processor_id & 15, elf_platform);
seq_printf(m, "Processor\t: %s rev %d (%s)\n",
cpu_name, (int)processor_id & 15, elf_platform);
seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
loops_per_jiffy / (500000/HZ),
......
arch/arm/mm/proc-arm1020.S
View file @ 5a92c3df
......@@ -420,8 +420,6 @@ ENTRY(cpu_arm1020_set_pte)
mov pc, lr
cpu_manu_name:
.asciz "ARM/VLSI"
ENTRY(cpu_arm1020_name)
.ascii "Arm1020"
#ifndef CONFIG_CPU_ICACHE_DISABLE
......@@ -518,15 +516,9 @@ arm1020_processor_functions:
.size arm1020_processor_functions, . - arm1020_processor_functions
.type cpu_arm1020_info, #object
cpu_arm1020_info:
.long cpu_manu_name
.long cpu_arm1020_name
.size cpu_arm1020_info, . - cpu_arm1020_info
.type cpu_arch_name, #object
cpu_arch_name:
.asciz "armv4"
.asciz "armv4t"
.size cpu_arch_name, . - cpu_arch_name
.type cpu_elf_name, #object
......@@ -546,7 +538,7 @@ __arm1020_proc_info:
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
.long cpu_arm1020_info
.long cpu_arm1020_name
.long arm1020_processor_functions
.long v4wbi_tlb_fns
.long v4wb_user_fns
......
arch/arm/mm/proc-arm2_3.S
View file @ 5a92c3df
......@@ -276,10 +276,12 @@ _arm3_xchg_4: swp r0, r0, [r1]
_arm2_3_check_bugs:
bics pc, lr, #0x04000000 @ Clear FIQ disable bit
armvlsi_name: .asciz "ARM/VLSI"
_arm2_name: .asciz "ARM 2"
_arm250_name: .asciz "ARM 250"
_arm3_name: .asciz "ARM 3"
cpu_arm2_name:
.asciz "ARM 2"
cpu_arm250_name:
.asciz "ARM 250"
cpu_arm3_name:
.asciz "ARM 3"
__INIT
/*
......@@ -295,10 +297,6 @@ arm2_processor_functions:
.word _arm2_xchg_1
.word _arm2_xchg_4
cpu_arm2_info:
.long armvlsi_name
.long _arm2_name
.globl arm250_processor_functions
arm250_processor_functions:
.word _arm2_3_check_bugs
......@@ -308,10 +306,6 @@ arm250_processor_functions:
.word _arm3_xchg_1
.word _arm3_xchg_4
cpu_arm250_info:
.long armvlsi_name
.long _arm250_name
.globl arm3_processor_functions
arm3_processor_functions:
.word _arm2_3_check_bugs
......@@ -321,10 +315,6 @@ arm3_processor_functions:
.word _arm3_xchg_1
.word _arm3_xchg_4
cpu_arm3_info:
.long armvlsi_name
.long _arm3_name
arm2_arch_name: .asciz "armv1"
arm3_arch_name: .asciz "armv2"
arm2_elf_name: .asciz "v1"
......@@ -340,7 +330,7 @@ arm3_elf_name: .asciz "v2"
.long arm2_arch_name
.long arm2_elf_name
.long 0
.long cpu_arm2_info
.long cpu_arm2_name
.long arm2_processor_functions
.long 0
.long 0
......@@ -352,7 +342,7 @@ arm3_elf_name: .asciz "v2"
.long arm3_arch_name
.long arm3_elf_name
.long 0
.long cpu_arm250_info
.long cpu_arm250_name
.long arm250_processor_functions
.long 0
.long 0
......@@ -364,7 +354,7 @@ arm3_elf_name: .asciz "v2"
.long arm3_arch_name
.long arm3_elf_name
.long 0
.long cpu_arm3_info
.long cpu_arm3_name
.long arm3_processor_functions
.long 0
.long 0
......
arch/arm/mm/proc-arm6_7.S
View file @ 5a92c3df
......@@ -287,14 +287,12 @@ ENTRY(cpu_arm7_reset)
mcr p15, 0, r1, c1, c0, 0 @ turn off MMU etc
mov pc, r0
cpu_armvlsi_name:
.asciz "ARM/VLSI"
cpu_arm6_name: .asciz "ARM 6"
cpu_arm6_name: .asciz "ARM6"
cpu_arm610_name:
.asciz "ARM 610"
cpu_arm7_name: .asciz "ARM 7"
.asciz "ARM610"
cpu_arm7_name: .asciz "ARM7"
cpu_arm710_name:
.asciz "ARM 710"
.asciz "ARM710"
.align
__INIT
......@@ -387,30 +385,6 @@ ENTRY(arm7_processor_functions)
.size arm7_processor_functions, . - arm7_processor_functions
.type cpu_arm6_info, #object
cpu_arm6_info:
.long cpu_armvlsi_name
.long cpu_arm6_name
.size cpu_arm6_info, . - cpu_arm6_info
.type cpu_arm610_info, #object
cpu_arm610_info:
.long cpu_armvlsi_name
.long cpu_arm610_name
.size cpu_arm610_info, . - cpu_Arm610_info
.type cpu_arm7_info, #object
cpu_arm7_info:
.long cpu_armvlsi_name
.long cpu_arm7_name
.size cpu_arm7_info, . - cpu_arm7_info
.type cpu_arm710_info, #object
cpu_arm710_info:
.long cpu_armvlsi_name
.long cpu_arm710_name
.size cpu_arm710_info, . - cpu_arm710_info
.type cpu_arch_name, #object
cpu_arch_name: .asciz "armv3"
.size cpu_arch_name, . - cpu_arch_name
......@@ -431,7 +405,7 @@ __arm6_proc_info:
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP | HWCAP_26BIT
.long cpu_arm6_info
.long cpu_arm6_name
.long arm6_processor_functions
.long v3_tlb_fns
.long v3_user_fns
......@@ -446,7 +420,7 @@ __arm610_proc_info:
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP | HWCAP_26BIT
.long cpu_arm610_info
.long cpu_arm610_name
.long arm6_processor_functions
.long v3_tlb_fns
.long v3_user_fns
......@@ -461,7 +435,7 @@ __arm7_proc_info:
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP | HWCAP_26BIT
.long cpu_arm7_info
.long cpu_arm7_name
.long arm7_processor_functions
.long v3_tlb_fns
.long v3_user_fns
......@@ -476,7 +450,7 @@ __arm710_proc_info:
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP | HWCAP_26BIT
.long cpu_arm710_info
.long cpu_arm710_name
.long arm7_processor_functions
.long v3_tlb_fns
.long v3_user_fns
......
arch/arm/mm/proc-arm720.S
View file @ 5a92c3df
......@@ -168,8 +168,6 @@ ENTRY(cpu_arm720_reset)
mov pc, r0
cpu_armvlsi_name:
.asciz "ARM"
cpu_arm720_name:
.asciz "ARM720T"
.align
......@@ -223,14 +221,8 @@ ENTRY(arm720_processor_functions)
.size arm720_processor_functions, . - arm720_processor_functions
.type cpu_arm720_info, #object
cpu_arm720_info:
.long cpu_armvlsi_name
.long cpu_arm720_name
.size cpu_arm720_info, . - cpu_arm720_info
.type cpu_arch_name, #object
cpu_arch_name: .asciz "armv4"
cpu_arch_name: .asciz "armv4t"
.size cpu_arch_name, . - cpu_arch_name
.type cpu_elf_name, #object
......@@ -253,7 +245,7 @@ __arm720_proc_info:
.long cpu_arch_name @ arch_name
.long cpu_elf_name @ elf_name
.long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB @ elf_hwcap
.long cpu_arm720_info @ info
.long cpu_arm720_name @ name
.long arm720_processor_functions
.long v4_tlb_fns
.long v4wt_user_fns
......
arch/arm/mm/proc-arm920.S
View file @ 5a92c3df
......@@ -419,8 +419,6 @@ ENTRY(cpu_arm920_set_pte)
mov pc, lr
cpu_manu_name:
.asciz "ARM/CIRRUS"
ENTRY(cpu_arm920_name)
.ascii "Arm920T"
#ifndef CONFIG_CPU_ICACHE_DISABLE
......@@ -506,15 +504,9 @@ arm920_processor_functions:
.size arm920_processor_functions, . - arm920_processor_functions
.type cpu_arm920_info, #object
cpu_arm920_info:
.long cpu_manu_name
.long cpu_arm920_name
.size cpu_arm920_info, . - cpu_arm920_info
.type cpu_arch_name, #object
cpu_arch_name:
.asciz "armv4"
.asciz "armv4t"
.size cpu_arch_name, . - cpu_arch_name
.type cpu_elf_name, #object
......@@ -534,7 +526,7 @@ __arm920_proc_info:
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
.long cpu_arm920_info
.long cpu_arm920_name
.long arm920_processor_functions
.long v4wbi_tlb_fns
.long v4wb_user_fns
......
arch/arm/mm/proc-arm922.S
View file @ 5a92c3df
......@@ -418,8 +418,6 @@ ENTRY(cpu_arm922_set_pte)
mov pc, lr
cpu_manu_name:
.asciz "ARM/ALTERA"
ENTRY(cpu_arm922_name)
.ascii "Arm922T"
#ifndef CONFIG_CPU_ICACHE_DISABLE
......@@ -505,15 +503,9 @@ arm922_processor_functions:
.size arm922_processor_functions, . - arm922_processor_functions
.type cpu_arm922_info, #object
cpu_arm922_info:
.long cpu_manu_name
.long cpu_arm922_name
.size cpu_arm922_info, . - cpu_arm922_info
.type cpu_arch_name, #object
cpu_arch_name:
.asciz "armv4"
.asciz "armv4t"
.size cpu_arch_name, . - cpu_arch_name
.type cpu_elf_name, #object
......@@ -533,7 +525,7 @@ __arm922_proc_info:
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
.long cpu_arm922_info
.long cpu_arm922_name
.long arm922_processor_functions
.long v4wbi_tlb_fns
.long v4wb_user_fns
......
arch/arm/mm/proc-arm926.S
View file @ 5a92c3df
......@@ -403,8 +403,6 @@ ENTRY(cpu_arm926_set_pte)
mov pc, lr
cpu_manu_name:
.asciz "ARM"
ENTRY(cpu_arm926_name)
.ascii "ARM926EJ-S"
#ifndef CONFIG_CPU_ICACHE_DISABLE
......@@ -503,12 +501,6 @@ arm926_processor_functions:
.size arm926_processor_functions, . - arm926_processor_functions
.type cpu_arm926_info, #object
cpu_arm926_info:
.long cpu_manu_name
.long cpu_arm926_name
.size cpu_arm926_info, . - cpu_arm926_info
.type cpu_arch_name, #object
cpu_arch_name:
.asciz "armv5tej"
......@@ -532,7 +524,7 @@ __arm926_proc_info:
.long cpu_elf_name
.long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB | \
HWCAP_FAST_MULT | HWCAP_JAVA
.long cpu_arm926_info
.long cpu_arm926_name
.long arm926_processor_functions
.long v4wbi_tlb_fns
.long v4wb_user_fns
......
arch/arm/mm/proc-sa110.S
View file @ 5a92c3df
......@@ -473,8 +473,6 @@ ENTRY(cpu_sa1100_set_pte)
mov pc, lr
cpu_manu_name:
.asciz "Intel"
cpu_sa110_name:
.asciz "StrongARM-110"
cpu_sa1100_name:
......@@ -547,13 +545,6 @@ ENTRY(sa110_processor_functions)
.size sa110_processor_functions, . - sa110_processor_functions
.type cpu_sa110_info, #object
cpu_sa110_info:
.long cpu_manu_name
.long cpu_sa110_name
.size cpu_sa110_info, . - cpu_sa110_info
/*
* SA1100 and SA1110 share the same function calls
*/
......@@ -587,16 +578,6 @@ ENTRY(sa1100_processor_functions)
.size sa1100_processor_functions, . - sa1100_processor_functions
cpu_sa1100_info:
.long cpu_manu_name
.long cpu_sa1100_name
.size cpu_sa1100_info, . - cpu_sa1100_info
cpu_sa1110_info:
.long cpu_manu_name
.long cpu_sa1110_name
.size cpu_sa1110_info, . - cpu_sa1110_info
.type cpu_arch_name, #object
cpu_arch_name:
.asciz "armv4"
......@@ -620,7 +601,7 @@ __sa110_proc_info:
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP | HWCAP_HALF | HWCAP_26BIT | HWCAP_FAST_MULT
.long cpu_sa110_info
.long cpu_sa110_name
.long sa110_processor_functions
.long v4wb_tlb_fns
.long v4wb_user_fns
......@@ -637,7 +618,7 @@ __sa1100_proc_info:
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP | HWCAP_HALF | HWCAP_26BIT | HWCAP_FAST_MULT
.long cpu_sa1100_info
.long cpu_sa1100_name
.long sa1100_processor_functions
.long v4wb_tlb_fns
.long v4_mc_user_fns
......@@ -652,7 +633,7 @@ __sa1110_proc_info:
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP | HWCAP_HALF | HWCAP_26BIT | HWCAP_FAST_MULT
.long cpu_sa1110_info
.long cpu_sa1110_name
.long sa1100_processor_functions
.long v4wb_tlb_fns
.long v4_mc_user_fns
......
arch/arm/mm/proc-xscale.S
View file @ 5a92c3df
......@@ -651,9 +651,6 @@ ENTRY(cpu_xscale_set_pte)
.ltorg
cpu_manu_name:
.asciz "Intel"
cpu_80200_name:
.asciz "XScale-80200"
......@@ -723,24 +720,6 @@ ENTRY(xscale_processor_functions)
.word cpu_xscale_set_pte
.size xscale_processor_functions, . - xscale_processor_functions
.type cpu_80200_info, #object
cpu_80200_info:
.long cpu_manu_name
.long cpu_80200_name
.size cpu_80200_info, . - cpu_80200_info
.type cpu_pxa250_info, #object
cpu_pxa250_info:
.long cpu_manu_name
.long cpu_pxa250_name
.size cpu_pxa250_info, . - cpu_pxa250_info
.type cpu_pxa210_info, #object
cpu_pxa210_info:
.long cpu_manu_name
.long cpu_pxa210_name
.size cpu_pxa210_info, . - cpu_pxa210_info
.type cpu_arch_name, #object
cpu_arch_name:
.asciz "armv5te"
......@@ -763,7 +742,7 @@ __80200_proc_info:
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
.long cpu_80200_info
.long cpu_80200_name
.long xscale_processor_functions
.long v4wbi_tlb_fns
.long xscale_mc_user_fns
......@@ -778,7 +757,7 @@ __pxa250_proc_info:
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
.long cpu_pxa250_info
.long cpu_pxa250_name
.long xscale_processor_functions
.long v4wbi_tlb_fns
.long xscale_mc_user_fns
......@@ -793,7 +772,7 @@ __pxa210_proc_info:
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
.long cpu_pxa210_info
.long cpu_pxa210_name
.long xscale_processor_functions
.long v4wbi_tlb_fns
.long xscale_mc_user_fns
......
include/asm-arm/procinfo.h
View file @ 5a92c3df
......@@ -16,11 +16,6 @@ struct cpu_tlb_fns;
struct cpu_user_fns;
struct processor;
struct proc_info_item {
const char *manufacturer;
const char *cpu_name;
};
/*
* Note! struct processor is always defined if we're
* using MULTI_CPU, otherwise this entry is unused,
......@@ -38,7 +33,7 @@ struct proc_info_list {
const char *arch_name;
const char *elf_name;
unsigned int elf_hwcap;
struct proc_info_item *info;
const char *cpu_name;
struct processor *proc;
struct cpu_tlb_fns *tlb;
struct cpu_user_fns *user;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7