Skip to content

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

[ARM] Remove check_bugs() 

check_bugs() has never been used to detect buggy ARM CPUs.  Therefore
is no point in passing it to the per-cpu support code.
parent d37d9068
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 113 deletions
arch/arm/mm/proc-arm1020.S
View file @ ef76bbd2
...@@ -65,15 +65,6 @@ ...@@ -65,15 +65,6 @@
#define CACHE_DLIMIT 32768 #define CACHE_DLIMIT 32768
.text .text
/*
* cpu_arm1020_check_bugs()
*/
ENTRY(cpu_arm1020_check_bugs)
mrs ip, cpsr
bic ip, ip, #PSR_F_BIT
msr cpsr, ip
mov pc, lr
/* /*
* cpu_arm1020_proc_init() * cpu_arm1020_proc_init()
*/ */
...@@ -486,7 +477,6 @@ __arm1020_setup: ...@@ -486,7 +477,6 @@ __arm1020_setup:
.type arm1020_processor_functions, #object .type arm1020_processor_functions, #object
arm1020_processor_functions: arm1020_processor_functions:
.word v4t_early_abort .word v4t_early_abort
.word cpu_arm1020_check_bugs
.word cpu_arm1020_proc_init .word cpu_arm1020_proc_init
.word cpu_arm1020_proc_fin .word cpu_arm1020_proc_fin
.word cpu_arm1020_reset .word cpu_arm1020_reset
......
arch/arm/mm/proc-arm2_3.S
View file @ ef76bbd2
...@@ -273,9 +273,6 @@ _arm2_xchg_4: mov r2, pc ...@@ -273,9 +273,6 @@ _arm2_xchg_4: mov r2, pc
_arm3_xchg_4: swp r0, r0, [r1] _arm3_xchg_4: swp r0, r0, [r1]
movs pc, lr movs pc, lr
_arm2_3_check_bugs:
bics pc, lr, #0x04000000 @ Clear FIQ disable bit
cpu_arm2_name: cpu_arm2_name:
.asciz "ARM 2" .asciz "ARM 2"
cpu_arm250_name: cpu_arm250_name:
...@@ -290,7 +287,6 @@ cpu_arm3_name: ...@@ -290,7 +287,6 @@ cpu_arm3_name:
*/ */
.globl arm2_processor_functions .globl arm2_processor_functions
arm2_processor_functions: arm2_processor_functions:
.word _arm2_3_check_bugs
.word _arm2_proc_init .word _arm2_proc_init
.word _arm2_proc_fin .word _arm2_proc_fin
.word _arm2_set_pgd .word _arm2_set_pgd
...@@ -299,7 +295,6 @@ arm2_processor_functions: ...@@ -299,7 +295,6 @@ arm2_processor_functions:
.globl arm250_processor_functions .globl arm250_processor_functions
arm250_processor_functions: arm250_processor_functions:
.word _arm2_3_check_bugs
.word _arm2_proc_init .word _arm2_proc_init
.word _arm2_proc_fin .word _arm2_proc_fin
.word _arm2_set_pgd .word _arm2_set_pgd
...@@ -308,7 +303,6 @@ arm250_processor_functions: ...@@ -308,7 +303,6 @@ arm250_processor_functions:
.globl arm3_processor_functions .globl arm3_processor_functions
arm3_processor_functions: arm3_processor_functions:
.word _arm2_3_check_bugs
.word _arm3_proc_init .word _arm3_proc_init
.word _arm3_proc_fin .word _arm3_proc_fin
.word _arm3_set_pgd .word _arm3_set_pgd
......
arch/arm/mm/proc-arm6_7.S
View file @ ef76bbd2
...@@ -188,20 +188,6 @@ Ldata_lateldrpostreg: ...@@ -188,20 +188,6 @@ Ldata_lateldrpostreg:
addeq r7, r0, r2 addeq r7, r0, r2
b Ldata_saver7 b Ldata_saver7
/*
* Function: arm6_7_check_bugs (void)
* : arm6_7_proc_init (void)
* : arm6_7_proc_fin (void)
*
* Notes : This processor does not require these
*/
ENTRY(cpu_arm6_check_bugs)
ENTRY(cpu_arm7_check_bugs)
mrs ip, cpsr
bic ip, ip, #PSR_F_BIT
msr cpsr, ip
mov pc, lr
ENTRY(cpu_arm6_proc_init) ENTRY(cpu_arm6_proc_init)
ENTRY(cpu_arm7_proc_init) ENTRY(cpu_arm7_proc_init)
mov pc, lr mov pc, lr
...@@ -313,7 +299,6 @@ __arm7_setup: mov r0, #0 ...@@ -313,7 +299,6 @@ __arm7_setup: mov r0, #0
.type arm6_processor_functions, #object .type arm6_processor_functions, #object
ENTRY(arm6_processor_functions) ENTRY(arm6_processor_functions)
.word cpu_arm6_data_abort .word cpu_arm6_data_abort
.word cpu_arm6_check_bugs
.word cpu_arm6_proc_init .word cpu_arm6_proc_init
.word cpu_arm6_proc_fin .word cpu_arm6_proc_fin
.word cpu_arm6_reset .word cpu_arm6_reset
...@@ -346,7 +331,6 @@ ENTRY(arm6_processor_functions) ...@@ -346,7 +331,6 @@ ENTRY(arm6_processor_functions)
.type arm7_processor_functions, #object .type arm7_processor_functions, #object
ENTRY(arm7_processor_functions) ENTRY(arm7_processor_functions)
.word cpu_arm7_data_abort .word cpu_arm7_data_abort
.word cpu_arm7_check_bugs
.word cpu_arm7_proc_init .word cpu_arm7_proc_init
.word cpu_arm7_proc_fin .word cpu_arm7_proc_fin
.word cpu_arm7_reset .word cpu_arm7_reset
......
arch/arm/mm/proc-arm720.S
View file @ ef76bbd2
...@@ -38,18 +38,11 @@ ...@@ -38,18 +38,11 @@
#include <asm/hardware.h> #include <asm/hardware.h>
/* /*
* Function: arm720_check_bugs (void) * Function: arm720_proc_init (void)
* : arm720_proc_init (void)
* : arm720_proc_fin (void) * : arm720_proc_fin (void)
* *
* Notes : This processor does not require these * Notes : This processor does not require these
*/ */
ENTRY(cpu_arm720_check_bugs)
mrs ip, cpsr
bic ip, ip, #PSR_F_BIT
msr cpsr, ip
mov pc, lr
ENTRY(cpu_arm720_dcache_clean_area) ENTRY(cpu_arm720_dcache_clean_area)
ENTRY(cpu_arm720_proc_init) ENTRY(cpu_arm720_proc_init)
mov pc, lr mov pc, lr
...@@ -156,7 +149,6 @@ __arm720_setup: mov r0, #0 ...@@ -156,7 +149,6 @@ __arm720_setup: mov r0, #0
.type arm720_processor_functions, #object .type arm720_processor_functions, #object
ENTRY(arm720_processor_functions) ENTRY(arm720_processor_functions)
.word v4t_late_abort .word v4t_late_abort
.word cpu_arm720_check_bugs
.word cpu_arm720_proc_init .word cpu_arm720_proc_init
.word cpu_arm720_proc_fin .word cpu_arm720_proc_fin
.word cpu_arm720_reset .word cpu_arm720_reset
......
arch/arm/mm/proc-arm920.S
View file @ ef76bbd2
...@@ -57,15 +57,6 @@ ...@@ -57,15 +57,6 @@
.text .text
/*
* cpu_arm920_check_bugs()
*/
ENTRY(cpu_arm920_check_bugs)
mrs ip, cpsr
bic ip, ip, #PSR_F_BIT
msr cpsr, ip
mov pc, lr
/* /*
* cpu_arm920_proc_init() * cpu_arm920_proc_init()
*/ */
...@@ -426,7 +417,6 @@ __arm920_setup: ...@@ -426,7 +417,6 @@ __arm920_setup:
.type arm920_processor_functions, #object .type arm920_processor_functions, #object
arm920_processor_functions: arm920_processor_functions:
.word v4t_early_abort .word v4t_early_abort
.word cpu_arm920_check_bugs
.word cpu_arm920_proc_init .word cpu_arm920_proc_init
.word cpu_arm920_proc_fin .word cpu_arm920_proc_fin
.word cpu_arm920_reset .word cpu_arm920_reset
......
arch/arm/mm/proc-arm922.S
View file @ ef76bbd2
...@@ -59,15 +59,6 @@ ...@@ -59,15 +59,6 @@
.text .text
/*
* cpu_arm922_check_bugs()
*/
ENTRY(cpu_arm922_check_bugs)
mrs ip, cpsr
bic ip, ip, #PSR_F_BIT
msr cpsr, ip
mov pc, lr
/* /*
* cpu_arm922_proc_init() * cpu_arm922_proc_init()
*/ */
...@@ -430,7 +421,6 @@ __arm922_setup: ...@@ -430,7 +421,6 @@ __arm922_setup:
.type arm922_processor_functions, #object .type arm922_processor_functions, #object
arm922_processor_functions: arm922_processor_functions:
.word v4t_early_abort .word v4t_early_abort
.word cpu_arm922_check_bugs
.word cpu_arm922_proc_init .word cpu_arm922_proc_init
.word cpu_arm922_proc_fin .word cpu_arm922_proc_fin
.word cpu_arm922_reset .word cpu_arm922_reset
......
arch/arm/mm/proc-arm926.S
View file @ ef76bbd2
...@@ -49,15 +49,6 @@ ...@@ -49,15 +49,6 @@
#define CACHE_DLINESIZE 32 #define CACHE_DLINESIZE 32
.text .text
/*
* cpu_arm926_check_bugs()
*/
ENTRY(cpu_arm926_check_bugs)
mrs ip, cpsr
bic ip, ip, #PSR_F_BIT
msr cpsr, ip
mov pc, lr
/* /*
* cpu_arm926_proc_init() * cpu_arm926_proc_init()
*/ */
...@@ -445,7 +436,6 @@ __arm926_setup: ...@@ -445,7 +436,6 @@ __arm926_setup:
.type arm926_processor_functions, #object .type arm926_processor_functions, #object
arm926_processor_functions: arm926_processor_functions:
.word v5tej_early_abort .word v5tej_early_abort
.word cpu_arm926_check_bugs
.word cpu_arm926_proc_init .word cpu_arm926_proc_init
.word cpu_arm926_proc_fin .word cpu_arm926_proc_fin
.word cpu_arm926_reset .word cpu_arm926_reset
......
arch/arm/mm/proc-sa110.S
View file @ ef76bbd2
...@@ -42,15 +42,6 @@ flush_base: ...@@ -42,15 +42,6 @@ flush_base:
.long FLUSH_BASE .long FLUSH_BASE
.text .text
/*
* cpu_sa110_check_bugs()
*/
ENTRY(cpu_sa110_check_bugs)
mrs ip, cpsr
bic ip, ip, #PSR_F_BIT
msr cpsr, ip
mov pc, lr
/* /*
* cpu_sa110_proc_init() * cpu_sa110_proc_init()
*/ */
...@@ -222,7 +213,6 @@ __sa110_setup: ...@@ -222,7 +213,6 @@ __sa110_setup:
.type sa110_processor_functions, #object .type sa110_processor_functions, #object
ENTRY(sa110_processor_functions) ENTRY(sa110_processor_functions)
.word v4_early_abort .word v4_early_abort
.word cpu_sa110_check_bugs
.word cpu_sa110_proc_init .word cpu_sa110_proc_init
.word cpu_sa110_proc_fin .word cpu_sa110_proc_fin
.word cpu_sa110_reset .word cpu_sa110_reset
......
arch/arm/mm/proc-sa1100.S
View file @ ef76bbd2
...@@ -54,15 +54,6 @@ flush_base: ...@@ -54,15 +54,6 @@ flush_base:
.long FLUSH_BASE .long FLUSH_BASE
.text .text
/*
* cpu_sa1100_check_bugs()
*/
ENTRY(cpu_sa1100_check_bugs)
mrs ip, cpsr
bic ip, ip, #PSR_F_BIT
msr cpsr, ip
mov pc, lr
__INIT __INIT
/* /*
...@@ -251,7 +242,6 @@ __sa1100_setup: ...@@ -251,7 +242,6 @@ __sa1100_setup:
.type sa1100_processor_functions, #object .type sa1100_processor_functions, #object
ENTRY(sa1100_processor_functions) ENTRY(sa1100_processor_functions)
.word v4_early_abort .word v4_early_abort
.word cpu_sa1100_check_bugs
.word cpu_sa1100_proc_init .word cpu_sa1100_proc_init
.word cpu_sa1100_proc_fin .word cpu_sa1100_proc_fin
.word cpu_sa1100_reset .word cpu_sa1100_reset
......
arch/arm/mm/proc-xscale.S
View file @ ef76bbd2
...@@ -107,15 +107,6 @@ clean_addr: .word CLEAN_ADDR ...@@ -107,15 +107,6 @@ clean_addr: .word CLEAN_ADDR
.text .text
/*
* cpu_xscale_check_bugs()
*/
ENTRY(cpu_xscale_check_bugs)
mrs ip, cpsr
bic ip, ip, #PSR_F_BIT
msr cpsr, ip
mov pc, lr
/* /*
* cpu_xscale_proc_init() * cpu_xscale_proc_init()
* *
...@@ -621,7 +612,6 @@ __xscale_setup: ...@@ -621,7 +612,6 @@ __xscale_setup:
.type xscale_processor_functions, #object .type xscale_processor_functions, #object
ENTRY(xscale_processor_functions) ENTRY(xscale_processor_functions)
.word xscale_abort .word xscale_abort
.word cpu_xscale_check_bugs
.word cpu_xscale_proc_init .word cpu_xscale_proc_init
.word cpu_xscale_proc_fin .word cpu_xscale_proc_fin
.word cpu_xscale_reset .word cpu_xscale_reset
......
include/asm-arm/bugs.h
View file @ ef76bbd2
/* /*
* linux/include/asm-arm/bugs.h * linux/include/asm-arm/bugs.h
* *
* Copyright (C) 1995 Russell King * Copyright (C) 1995-2003 Russell King
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
...@@ -12,6 +12,6 @@ ...@@ -12,6 +12,6 @@
#include <asm/proc-fns.h> #include <asm/proc-fns.h>
#define check_bugs() cpu_check_bugs() #define check_bugs() do { } while (0)
#endif #endif
include/asm-arm/cpu-multi26.h
View file @ ef76bbd2
...@@ -19,8 +19,6 @@ struct task_struct; ...@@ -19,8 +19,6 @@ struct task_struct;
* relies on it. * relies on it.
*/ */
extern struct processor { extern struct processor {
/* check for any bugs */
void (*_check_bugs)(void);
/* Set up any processor specifics */ /* Set up any processor specifics */
void (*_proc_init)(void); void (*_proc_init)(void);
/* Disable any processor specifics */ /* Disable any processor specifics */
...@@ -36,7 +34,6 @@ extern const struct processor arm2_processor_functions; ...@@ -36,7 +34,6 @@ extern const struct processor arm2_processor_functions;
extern const struct processor arm250_processor_functions; extern const struct processor arm250_processor_functions;
extern const struct processor arm3_processor_functions; extern const struct processor arm3_processor_functions;
#define cpu_check_bugs() processor._check_bugs()
#define cpu_proc_init() processor._proc_init() #define cpu_proc_init() processor._proc_init()
#define cpu_proc_fin() processor._proc_fin() #define cpu_proc_fin() processor._proc_fin()
#define cpu_do_idle() do { } while (0) #define cpu_do_idle() do { } while (0)
......
include/asm-arm/cpu-multi32.h
View file @ ef76bbd2
...@@ -23,10 +23,6 @@ extern struct processor { ...@@ -23,10 +23,6 @@ extern struct processor {
* get data abort address/flags * get data abort address/flags
*/ */
void (*_data_abort)(unsigned long pc); void (*_data_abort)(unsigned long pc);
/*
* check for any bugs
*/
void (*_check_bugs)(void);
/* /*
* Set up any processor specifics * Set up any processor specifics
*/ */
...@@ -62,7 +58,6 @@ extern struct processor { ...@@ -62,7 +58,6 @@ extern struct processor {
void (*set_pte)(pte_t *ptep, pte_t pte); void (*set_pte)(pte_t *ptep, pte_t pte);
} processor; } processor;
#define cpu_check_bugs() processor._check_bugs()
#define cpu_proc_init() processor._proc_init() #define cpu_proc_init() processor._proc_init()
#define cpu_proc_fin() processor._proc_fin() #define cpu_proc_fin() processor._proc_fin()
#define cpu_reset(addr) processor.reset(addr) #define cpu_reset(addr) processor.reset(addr)
......
include/asm-arm/cpu-single.h
View file @ ef76bbd2
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
* function pointers for this lot. Otherwise, we can optimise the * function pointers for this lot. Otherwise, we can optimise the
* table away. * table away.
*/ */
#define cpu_check_bugs __cpu_fn(CPU_NAME,_check_bugs)
#define cpu_proc_init __cpu_fn(CPU_NAME,_proc_init) #define cpu_proc_init __cpu_fn(CPU_NAME,_proc_init)
#define cpu_proc_fin __cpu_fn(CPU_NAME,_proc_fin) #define cpu_proc_fin __cpu_fn(CPU_NAME,_proc_fin)
#define cpu_reset __cpu_fn(CPU_NAME,_reset) #define cpu_reset __cpu_fn(CPU_NAME,_reset)
...@@ -39,7 +38,6 @@ ...@@ -39,7 +38,6 @@
struct mm_struct; struct mm_struct;
/* declare all the functions as extern */ /* declare all the functions as extern */
extern void cpu_check_bugs(void);
extern void cpu_proc_init(void); extern void cpu_proc_init(void);
extern void cpu_proc_fin(void); extern void cpu_proc_fin(void);
extern int cpu_do_idle(void); extern int cpu_do_idle(void);
......
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