Skip to content

Commit

Permalink
sh: Kill off legacy UBC wakeup cruft.
Browse files Browse the repository at this point in the history
This code was added for some ancient SH-4 solution engines with peculiar
boot ROMs that did silly things to the UBC MSTP bits. None of these have
been in the wild for years, and these days the clock framework wraps up
the MSTP bits, meaning that the UBC code is one of the few interfaces
that is stomping MSTP bits underneath the clock framework. At this point
the risks far outweigh any benefit this code provided, so just kill it
off.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Oct 16, 2009
1 parent 78aed4a commit cae19b5
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 93 deletions.
11 changes: 0 additions & 11 deletions arch/sh/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -757,17 +757,6 @@ config ENTRY_OFFSET
default "0x00010000" if PAGE_SIZE_64KB
default "0x00000000"

config UBC_WAKEUP
bool "Wakeup UBC on startup"
depends on CPU_SH4 && !CPU_SH4A
help
Selecting this option will wakeup the User Break Controller (UBC) on
startup. Although the UBC is left in an awake state when the processor
comes up, some boot loaders misbehave by putting the UBC to sleep in a
power saving state, which causes issues with things like ptrace().

If unsure, say N.

choice
prompt "Kernel command line"
optional
Expand Down
11 changes: 0 additions & 11 deletions arch/sh/include/asm/ubc.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,5 @@
#define BRCR_UBDE (1 << 0)
#endif

#ifndef __ASSEMBLY__
/* arch/sh/kernel/cpu/ubc.S */
extern void ubc_sleep(void);

#ifdef CONFIG_UBC_WAKEUP
extern void ubc_wakeup(void);
#else
#define ubc_wakeup() do { } while (0)
#endif
#endif

#endif /* __KERNEL__ */
#endif /* __ASM_SH_UBC_H */
1 change: 0 additions & 1 deletion arch/sh/kernel/cpu/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ obj-$(CONFIG_ARCH_SHMOBILE) += shmobile/

# Common interfaces.

obj-$(CONFIG_UBC_WAKEUP) += ubc.o
obj-$(CONFIG_SH_ADC) += adc.o
obj-$(CONFIG_SH_CLK_CPG) += clock-cpg.o

Expand Down
11 changes: 0 additions & 11 deletions arch/sh/kernel/cpu/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -338,17 +338,6 @@ asmlinkage void __init sh_cpu_init(void)
}
#endif

/*
* Some brain-damaged loaders decided it would be a good idea to put
* the UBC to sleep. This causes some issues when it comes to things
* like PTRACE_SINGLESTEP or doing hardware watchpoints in GDB. So ..
* we wake it up and hope that all is well.
*/
#ifdef CONFIG_SUPERH32
if (raw_smp_processor_id() == 0)
ubc_wakeup();
#endif

speculative_execution_init();
expmask_init();
}
59 changes: 0 additions & 59 deletions arch/sh/kernel/cpu/ubc.S

This file was deleted.

0 comments on commit cae19b5

Please sign in to comment.