sh cleanups
cover sh cleanups
This is a relatively small patch set for cleaning up some of the sh code. There's also a board update for some of the recent changes in here, so the defconfig update for that ends up taking a bit of space..
Let me know if there's something you want dropped, otherwise please consider for -mm. Against current git.
PATCH 1/11 sh: SH4-202 microdev updates.
A few trivial updates for the microdev board support code:
- Update for __IO_PREFIX changes.
- Consolidate headers into a single microdev.h.
- Update the microdev_defconfig.
- Add init values for the S1D13806 used by s1d13xxxfb.
---
arch/sh/boards/superh/microdev/io.c | 192 +++++++-------- arch/sh/boards/superh/microdev/irq.c | 2 arch/sh/boards/superh/microdev/setup.c | 168 ++++++++++++- arch/sh/configs/microdev_defconfig | 410 ++++++++++++++++++++------------ include/asm-sh/microdev.h | 80 ++++++ include/asm-sh/microdev/io.h | 53 ---- include/asm-sh/microdev/irq.h | 72 ------ 7 files changed, 583 insertions(+), 394 deletions(-) create mode 100644 include/asm-sh/microdev.h delete mode 100644 include/asm-sh/microdev/io.h delete mode 100644 include/asm-sh/microdev/irq.h
4b4cde7ece5afa9d186ede183d2d865d1cd10758
arch/sh/boards/superh/microdev/io.c +95 -97
@@ -16,7 +16,7 @@#include <linux/pci.h> #include <linux/wait.h> #include <asm/io.h> -#include <asm/mach/io.h> +#include <asm/microdev.h> /* * we need to have a 'safe' address to re-direct all I/O requests
@@ -52,8 +52,90 @@#define IO_ISP1161_PHYS 0xa7700000ul/* Physical address of Philips ISP1161x USB chip */ #define IO_SUPERIO_PHYS 0xa7800000ul/* Physical address of SMSC FDC37C93xAPM SuperIO chip */ -#define PORT2ADDR (x) (microdev_isa_port2addr(x)) +/* +* map I/O ports to memory-mapped addresses +*/ +static unsigned long microdev_isa_port2addr (unsigned long offset) +{ +unsigned long result; + +if ((offset >=IO_LAN91C111_BASE ) && + (offset <IO_LAN91C111_BASE +IO_LAN91C111_EXTENT )) { +/* +* SMSC LAN91C111 Ethernet chip +*/ + result =IO_LAN91C111_PHYS + offset -IO_LAN91C111_BASE ; + }else if ((offset >=IO_SUPERIO_BASE ) && + (offset <IO_SUPERIO_BASE +IO_SUPERIO_EXTENT )) { +/* +* SMSC FDC37C93xAPM SuperIO chip +* +* Configuration Registers +*/ + result =IO_SUPERIO_PHYS + (offset <<1 ); +#if 0 + } else if (offset == KBD_DATA_REG || offset == KBD_CNTL_REG || + offset ==KBD_STATUS_REG ) { +/* +* SMSC FDC37C93xAPM SuperIO chip +* +* PS/2 Keyboard + Mouse (ports 0x60 and 0x64). +*/ + result =IO_SUPERIO_PHYS + (offset <<1 ); +#endif + }else if (((offset >=IO_IDE1_BASE ) && + (offset <IO_IDE1_BASE +IO_IDE_EXTENT )) || + (offset ==IO_IDE1_MISC )) { +/* +* SMSC FDC37C93xAPM SuperIO chip +* +* IDE #1 +*/ + result =IO_SUPERIO_PHYS + (offset <<1 ); + }else if (((offset >=IO_IDE2_BASE ) && + (offset <IO_IDE2_BASE +IO_IDE_EXTENT )) || + (offset ==IO_IDE2_MISC )) { +/* +* SMSC FDC37C93xAPM SuperIO chip +* +* IDE #2 +*/ + result =IO_SUPERIO_PHYS + (offset <<1 ); + }else if ((offset >=IO_SERIAL1_BASE ) && + (offset <IO_SERIAL1_BASE +IO_SERIAL_EXTENT )) { +/* +* SMSC FDC37C93xAPM SuperIO chip +* +* Serial #1 +*/ + result =IO_SUPERIO_PHYS + (offset <<1 ); + }else if ((offset >=IO_SERIAL2_BASE ) && + (offset <IO_SERIAL2_BASE +IO_SERIAL_EXTENT )) { +/* +* SMSC FDC37C93xAPM SuperIO chip +* +* Serial #2 +*/ + result =IO_SUPERIO_PHYS + (offset <<1 ); + }else if ((offset >=IO_ISP1161_BASE ) && + (offset <IO_ISP1161_BASE +IO_ISP1161_EXTENT )) { +/* +* Philips USB ISP1161x chip +*/ + result =IO_ISP1161_PHYS + offset -IO_ISP1161_BASE ; + }else { +/* +* safe default. +*/ +printk ("Warning: unexpected port in %s( offset = 0x%lx )\n" , + __FUNCTION__, offset); + result =PVR ; + } + +return result; +} +#define PORT2ADDR (x) (microdev_isa_port2addr(x))static inline void delay (void ) {
@@ -94,6 +176,17 @@ unsigned int microdev_inl(unsigned longreturn *(volatile unsigned int *)PORT2ADDR (port); } +void microdev_outw (unsigned short b,unsigned long port) +{ +#ifdef CONFIG_PCI +if (port >=PCIBIOS_MIN_IO ) { +microdev_pci_outw (b, port); +return ; + } +#endif + *(volatile unsigned short *)PORT2ADDR (port) = b; +} +void microdev_outb (unsigned char b,unsigned long port) {#ifdef CONFIG_PCI
@@ -158,17 +251,6 @@ void microdev_outb(unsigned char b, unsi } } -void microdev_outw (unsigned short b,unsigned long port) -{ -#ifdef CONFIG_PCI -if (port >=PCIBIOS_MIN_IO ) { -microdev_pci_outw (b, port); -return ; - } -#endif - *(volatile unsigned short *)PORT2ADDR (port) = b; -} -void microdev_outl (unsigned int b,unsigned long port) {#ifdef CONFIG_PCI
@@ -284,87 +366,3 @@ void microdev_outsl(unsigned long port,while (count--) *port_addr = *buf++; } - -/* -* map I/O ports to memory-mapped addresses -*/ -unsigned long microdev_isa_port2addr (unsigned long offset) -{ -unsigned long result; - -if ((offset >=IO_LAN91C111_BASE ) && - (offset <IO_LAN91C111_BASE +IO_LAN91C111_EXTENT )) { -/* -* SMSC LAN91C111 Ethernet chip -*/ - result =IO_LAN91C111_PHYS + offset -IO_LAN91C111_BASE ; - }else if ((offset >=IO_SUPERIO_BASE ) && - (offset <IO_SUPERIO_BASE +IO_SUPERIO_EXTENT )) { -/* -* SMSC FDC37C93xAPM SuperIO chip -* -* Configuration Registers -*/ - result =IO_SUPERIO_PHYS + (offset <<1 ); -#if 0 - } else if (offset == KBD_DATA_REG || offset == KBD_CNTL_REG || - offset ==KBD_STATUS_REG ) { -/* -* SMSC FDC37C93xAPM SuperIO chip -* -* PS/2 Keyboard + Mouse (ports 0x60 and 0x64). -*/ - result =IO_SUPERIO_PHYS + (offset <<1 ); -#endif - }else if (((offset >=IO_IDE1_BASE ) && - (offset <IO_IDE1_BASE +IO_IDE_EXTENT )) || - (offset ==IO_IDE1_MISC )) { -/* -* SMSC FDC37C93xAPM SuperIO chip -* -* IDE #1 -*/ - result =IO_SUPERIO_PHYS + (offset <<1 ); - }else if (((offset >=IO_IDE2_BASE ) && - (offset <IO_IDE2_BASE +IO_IDE_EXTENT )) || - (offset ==IO_IDE2_MISC )) { -/* -* SMSC FDC37C93xAPM SuperIO chip -* -* IDE #2 -*/ - result =IO_SUPERIO_PHYS + (offset <<1 ); - }else if ((offset >=IO_SERIAL1_BASE ) && - (offset <IO_SERIAL1_BASE +IO_SERIAL_EXTENT )) { -/* -* SMSC FDC37C93xAPM SuperIO chip -* -* Serial #1 -*/ - result =IO_SUPERIO_PHYS + (offset <<1 ); - }else if ((offset >=IO_SERIAL2_BASE ) && - (offset <IO_SERIAL2_BASE +IO_SERIAL_EXTENT )) { -/* -* SMSC FDC37C93xAPM SuperIO chip -* -* Serial #2 -*/ - result =IO_SUPERIO_PHYS + (offset <<1 ); - }else if ((offset >=IO_ISP1161_BASE ) && - (offset <IO_ISP1161_BASE +IO_ISP1161_EXTENT )) { -/* -* Philips USB ISP1161x chip -*/ - result =IO_ISP1161_PHYS + offset -IO_ISP1161_BASE ; - }else { -/* -* safe default. -*/ -printk ("Warning: unexpected port in %s( offset = 0x%lx )\n" , - __FUNCTION__, offset); - result =PVR ; - } - -return result; -} -
arch/sh/boards/superh/microdev/irq.c +1 -1
@@ -15,7 +15,7 @@#include <asm/system.h> #include <asm/io.h> -#include <asm/mach/irq.h> +#include <asm/microdev.h> #define NUM_EXTERNAL_IRQS 16/* IRL0 .. IRL15 */
arch/sh/boards/superh/microdev/setup.c +155 -13
204 lines not on this page · raw message
arch/sh/configs/microdev_defconfig +252 -158
691 lines not on this page · raw message
include/asm-sh/microdev.h new file +80 -0
80 lines not on this page · raw message
include/asm-sh/microdev/io.h deleted +0 -53
53 lines not on this page · raw message
include/asm-sh/microdev/irq.h deleted +0 -72
72 lines not on this page · raw message
PATCH 2/11 sh: Make peripheral clock frequency setting mandatory.
In reply to Paul MundtPretty much every subtype does this now anyways, and as we depend on it in a few places being set to something sensible quite early on, it's better for a new subtype to simply set a sensible default.
---
arch/sh/Kconfig | 6 ------ arch/sh/kernel/cpu/clock.c | 13 +------------ 2 files changed, 1 insertions(+), 18 deletions(-)
e3efa1355438864fd56f850604722dc62d2aaa1b
arch/sh/Kconfig +0 -6
@@ -396,14 +396,8 @@ source "arch/sh/boards/renesas/hs7751rvo source "arch/sh/boards/renesas/rts7751r2d/Kconfig" -config SH_PCLK_FREQ_BOOL - bool "Set default pclk frequency" - default y if !SH_RTC - default n - config SH_PCLK_FREQ int "Peripheral clock frequency (in Hz)" - depends on SH_PCLK_FREQ_BOOL default "50000000" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7780 default "60000000" if CPU_SUBTYPE_SH7751 default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || CPU_SUBTYPE_SH7760
arch/sh/kernel/cpu/clock.c +1 -12
@@ -38,9 +38,7 @@ static DECLARE_MUTEX(clock_list_sem);static struct clk master_clk = { .name ="master_clk" , .flags =CLK_ALWAYS_ENABLED |CLK_RATE_PROPAGATES , -#ifdef CONFIG_SH_PCLK_FREQ_BOOL .rate =CONFIG_SH_PCLK_FREQ , -#endif };static struct clk module_clk = {
@@ -227,16 +225,7 @@ int __init clk_init(void) {int i, ret =0 ; -if (unlikely (!master_clk.rate)) -/* -* NOTE: This will break if the default divisor has been -* changed. -* -* No one should be changing the default on us however, -* expect that a sane value for CONFIG_SH_PCLK_FREQ will -* be defined in the event of a different divisor. -*/ - master_clk.rate =get_timer_frequency () *4 ; +BUG_ON (unlikely (!master_clk.rate));for (i =0 ; i <ARRAY_SIZE (onchip_clocks); i++) {struct clk *clk = onchip_clocks[i];
PATCH 3/11 sh: Move TRA/EXPEVT/INTEVT definitions for reuse.
In reply to Paul MundtCurrently entry.S is home to these definitions, so we move them somewhere more sensible. IPR IRQ handling depends on being to read from INTEVT.
---
arch/sh/kernel/entry.S | 18 +----------------- include/asm-sh/cpu-sh3/mmu_context.h | 10 ++++++++++ include/asm-sh/cpu-sh4/mmu_context.h | 8 ++++++++ 3 files changed, 19 insertions(+), 17 deletions(-)
93492826e1280557092be3ecd5159d85cc4f6e31
arch/sh/kernel/entry.S +1 -17
@@ -16,6 +16,7 @@ #include <linux/config.h> #include <asm/asm-offsets.h> #include <asm/thread_info.h> +#include <asm/cpu/mmu_context.h> #include <asm/unistd.h> #if !defined(CONFIG_NFSD) && !defined(CONFIG_NFSD_MODULE)
@@ -75,23 +76,6 @@ ENOSYS = 38 EINVAL = 22 -#if defined(CONFIG_CPU_SH3) -TRA = 0xffffffd0 -EXPEVT = 0xffffffd4 -#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \ - defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705) -INTEVT = 0xa4000000 ! INTEVTE2(0xa4000000) -#else -INTEVT = 0xffffffd8 -#endif -MMU_TEA = 0xfffffffc ! TLB Exception Address Register -#elif defined(CONFIG_CPU_SH4) -TRA = 0xff000020 -EXPEVT = 0xff000024 -INTEVT = 0xff000028 -MMU_TEA = 0xff00000c ! TLB Exception Address Register -#endif - #if defined(CONFIG_KGDB_NMI) NMI_VEC = 0x1c0 ! Must catch early for debounce #endif
include/asm-sh/cpu-sh3/mmu_context.h +10 -0
@@ -24,5 +24,15 @@#define MMU_NTLB_WAYS 4#define MMU_CONTROL_INIT 0x007/* SV=0, TF=1, IX=1, AT=1 */ +#define TRA 0xffffffd0 +#define EXPEVT 0xffffffd4 + +#if defined(CONFIG_CPU_SUBTYPE_SH7707 ) || defined(CONFIG_CPU_SUBTYPE_SH7709 ) || \ + defined(CONFIG_CPU_SUBTYPE_SH7300 ) || defined(CONFIG_CPU_SUBTYPE_SH7705 ) +#define INTEVT 0xa4000000/* INTEVTE2(0xa4000000) */ +#else +#define INTEVT 0xffffffd8 +#endif +#endif /* __ASM_CPU_SH3_MMU_CONTEXT_H */
include/asm-sh/cpu-sh4/mmu_context.h +8 -0
@@ -23,7 +23,11 @@#define MMU_PAGE_ASSOC_BIT 0x80#define MMU_NTLB_ENTRIES 64/* for 7750 */ +#ifdef CONFIG_SH_STORE_QUEUES +#define MMU_CONTROL_INIT 0x05/* SQMD=0, SV=0, TI=1, AT=1 */ +#else #define MMU_CONTROL_INIT 0x205/* SQMD=1, SV=0, TI=1, AT=1 */ +#endif #define MMU_ITLB_DATA_ARRAY 0xF3000000#define MMU_UTLB_DATA_ARRAY 0xF7000000
@@ -35,5 +39,9 @@#define MMU_I_ENTRY_SHIFT 8#define MMU_ITLB_VALID 0x100 +#define TRA 0xff000020 +#define EXPEVT 0xff000024 +#define INTEVT 0xff000028 +#endif /* __ASM_CPU_SH4_MMU_CONTEXT_H */
PATCH 4/11 sh: Cleanup struct sh_cpuinfo for clock framework changes.
In reply to Paul MundtNow that the clock framework changes have been integrated, the manual clock accounting that was done in sh_cpuinfo can be dropped.
Also correct a bug with running past the end of the CPU flags when there's a mismatch between the added flags and printed ones.
---
arch/sh/kernel/setup.c | 38 +++++++++++++++----------------------- include/asm-sh/processor.h | 36 +++++++++++++++--------------------- 2 files changed, 30 insertions(+), 44 deletions(-)
3e717e73a0c3ab7cbb26725b39b5ab1429cae266
arch/sh/kernel/setup.c +15 -23
@@ -22,10 +22,10 @@#include <linux/cpu.h> #include <asm/uaccess.h> #include <asm/io.h> -#include <asm/io_generic.h> #include <asm/sections.h> #include <asm/irq.h> #include <asm/setup.h> +#include <asm/clock.h> #ifdef CONFIG_SH_KGDB #include <asm/kgdb.h>
@@ -41,7 +41,7 @@ extern void * __rd_start, * __rd_end;* This value will be used at the very early stage of serial setup. * The bigger value means no problem. */ -struct sh_cpuinfo boot_cpu_data = {CPU_SH_NONE ,0 ,10000000 , }; +struct sh_cpuinfo boot_cpu_data = {CPU_SH_NONE ,10000000 , };struct screen_info screen_info;#if defined(CONFIG_SH_UNKNOWN )
@@ -273,10 +273,10 @@ void __init setup_arch(char **cmdline_p) init_mm.end_data = (unsigned long ) _edata; init_mm.brk = (unsigned long ) _end; - code_resource.start =virt_to_bus (_text); - code_resource.end =virt_to_bus (_etext)-1 ; - data_resource.start =virt_to_bus (_etext); - data_resource.end =virt_to_bus (_edata)-1 ; + code_resource.start = (unsigned long )virt_to_phys (_text); + code_resource.end = (unsigned long )virt_to_phys (_etext)-1 ; + data_resource.start = (unsigned long )virt_to_phys (_etext); + data_resource.end = (unsigned long )virt_to_phys (_edata)-1 ;sh_mv_setup (cmdline_p);
@@ -435,6 +435,9 @@ static const char *cpu_name[] = { [CPU_ST40GX1] = "ST40GX1", [CPU_SH4_202] = "SH4-202", [CPU_SH4_501] = "SH4-501", + [CPU_SH7770] = "SH7770", + [CPU_SH7780] = "SH7780", + [CPU_SH7781] = "SH7781", [CPU_SH_NONE] = "Unknown" };
@@ -445,7 +448,7 @@ const char *get_cpu_subtype(void)#ifdef CONFIG_PROC_FS static const char *cpu_flags[] = { -"none" ,"fpu" ,"p2flush" ,"mmuassoc" ,"dsp" ,"perfctr" , +"none" ,"fpu" ,"p2flush" ,"mmuassoc" ,"dsp" ,"perfctr" ,"ptea" ,NULL };static void show_cpuflags (struct seq_file *m)
@@ -459,7 +462,7 @@ static void show_cpuflags(struct seq_filreturn ; } -for (i =0 ; i < cpu_data->flags; i++) +for (i =0 ; cpu_flags[i]; i++)if ((cpu_data->flags & (1 << i)))seq_printf (m," %s" , cpu_flags[i+1 ]);
@@ -472,7 +475,8 @@ static void show_cacheinfo(struct seq_fi cache_size = info.ways * info.sets * info.linesz; -seq_printf (m,"%s size\t: %dKiB\n" , type, cache_size >>10 ); +seq_printf (m,"%s size\t: %2dKiB (%d-way)\n" , + type, cache_size >>10 , info.ways); }/*
@@ -511,21 +515,9 @@ static int show_cpuinfo(struct seq_file boot_cpu_data.loops_per_jiffy/(500000 /HZ ), (boot_cpu_data.loops_per_jiffy/(5000/HZ)) % 100); -#define PRINT_CLOCK (name, value) \ - seq_printf(m, name " clock\t: %d.%02dMHz\n", \ - ((value) / 1000000), ((value) % 1000000)/10000) - -PRINT_CLOCK ("cpu" , boot_cpu_data.cpu_clock); -PRINT_CLOCK ("bus" , boot_cpu_data.bus_clock); -#ifdef CONFIG_CPU_SUBTYPE_ST40STB1 -PRINT_CLOCK ("memory" , boot_cpu_data.memory_clock); -#endif -PRINT_CLOCK ("module" , boot_cpu_data.module_clock); - -return 0 ; +return show_clocks (m); } -static void *c_start (struct seq_file *m,loff_t *pos) {return *pos <NR_CPUS ? cpu_data + *pos :NULL ;
@@ -596,7 +588,7 @@ static int __init kgdb_parse_options(cha options += map->namelen +1 ; options = (*options ==',' ) ? options+1 : options; - +/* Read optional parameters (baud/parity/bits) */ baud =simple_strtoul (options, &options,10 );if (baud !=0 ) {
include/asm-sh/processor.h +15 -21
@@ -12,7 +12,6 @@#include <asm/page.h> #include <asm/types.h> #include <asm/cache.h> -#include <linux/threads.h> #include <asm/ptrace.h> /*
@@ -30,7 +29,7 @@* CPU type and hardware bug flags. Kept separately for each CPU. * * Each one of these also needs a CONFIG_CPU_SUBTYPE_xxx entry -* in arch/sh/Kconfig, as well as an entry in arch/sh/kernel/setup.c +* in arch/sh/mm/Kconfig, as well as an entry in arch/sh/kernel/setup.c * for parsing the subtype in get_cpu_subtype(). */ enum cpu_type {
@@ -44,7 +43,7 @@ enum cpu_type {/* SH-4 types */ CPU_SH7750 ,CPU_SH7750S ,CPU_SH7750R ,CPU_SH7751 ,CPU_SH7751R ,CPU_SH7760 ,CPU_ST40RA ,CPU_ST40GX1 ,CPU_SH4_202 ,CPU_SH4_501 , -CPU_SH73180 , +CPU_SH73180 ,CPU_SH7770 ,CPU_SH7780 ,CPU_SH7781 ,/* Unknown subtype */ CPU_SH_NONE
@@ -52,14 +51,8 @@ enum cpu_type {struct sh_cpuinfo {enum cpu_type type; -char hard_math;unsigned long loops_per_jiffy; -unsigned int cpu_clock, master_clock, bus_clock, module_clock; -#ifdef CONFIG_CPU_SUBTYPE_ST40STB1 -unsigned int memory_clock; -#endif -struct cache_info icache;struct cache_info dcache;
@@ -131,7 +124,7 @@ union sh_fpu_union {struct sh_fpu_soft_struct soft; }; -/* +/* * Processor flags */
@@ -140,6 +133,7 @@ union sh_fpu_union {#define CPU_HAS_MMU_PAGE_ASSOC 0x0004/* SH3: TLB way selection bit support */ #define CPU_HAS_DSP 0x0008/* SH-DSP: DSP support */ #define CPU_HAS_PERF_COUNTER 0x0010/* Hardware performance counters */ +#define CPU_HAS_PTEA 0x0020/* PTEA register */ struct thread_struct {unsigned long sp;
@@ -160,10 +154,10 @@ extern int ubc_usercnt;#define INIT_THREAD { \ sizeof(init_stack) + (long) &init_stack,/* sp */ \0 ,/* pc */ \ -0 ,0 , \ -0 , \ -0 , \ - {{{0,}},} /* fpu state */ \ +0 ,0 , \ +0 , \ +0 , \ + {{{0,}},} /* fpu state */ \ }/*
@@ -171,7 +165,7 @@ extern int ubc_usercnt;*/ #define start_thread (regs, new_pc, new_sp) \ set_fs(USER_DS); \ - regs->pr = 0; \ + regs->pr = 0; \ regs->sr = SR_FD;/* User mode. */ \ regs->pc = new_pc; \ regs->regs[15 ] = new_sp
@@ -239,16 +233,16 @@ extern void save_fpu(struct task_struct#define save_fpu (tsk) do { } while (0)#endif -#define unlazy_fpu (tsk, regs) do { \ +#define unlazy_fpu (tsk, regs) do { \ if (test_tsk_thread_flag(tsk, TIF_USEDFPU)) { \ - save_fpu(tsk, regs); \ + save_fpu(tsk, regs); \ } \ } while (0) -#define clear_fpu (tsk, regs) do { \ - if (test_tsk_thread_flag(tsk, TIF_USEDFPU)) { \ - clear_tsk_thread_flag(tsk, TIF_USEDFPU); \ - release_fpu(regs); \ +#define clear_fpu (tsk, regs) do { \ + if (test_tsk_thread_flag(tsk, TIF_USEDFPU)) { \ + clear_tsk_thread_flag(tsk, TIF_USEDFPU); \ + release_fpu(regs); \ } \ } while (0)
PATCH 5/11 sh: unknown mach-type updates.
In reply to Paul MundtTrivial cleanup of the unknown machine type for some of the recent machvec changes.
---
arch/sh/boards/unknown/Makefile | 2 + arch/sh/boards/unknown/io.c | 46 --------------------------- arch/sh/boards/unknown/mach.c | 67 --------------------------------------- arch/sh/boards/unknown/setup.c | 12 ++++++- arch/sh/kernel/setup.c | 13 ++------ 5 files changed, 16 insertions(+), 124 deletions(-) delete mode 100644 arch/sh/boards/unknown/io.c delete mode 100644 arch/sh/boards/unknown/mach.c
eaa4999ab033f852a67796317073a2d14f31c04d
arch/sh/boards/unknown/Makefile +1 -1
@@ -2,5 +2,5 @@ # Makefile for unknown SH boards # -obj-y := mach.o io.o setup.o +obj-y := setup.o
arch/sh/boards/unknown/io.c deleted +0 -46
46 lines not on this page · raw message
arch/sh/boards/unknown/mach.c deleted +0 -67
67 lines not on this page · raw message
arch/sh/boards/unknown/setup.c +11 -1
@@ -7,10 +7,20 @@* License. See linux/COPYING for more information. * * Setup code for an unknown machine (internal peripherials only) +* +* This is the simplest of all boards, and serves only as a quick and dirty +* method to start debugging a new board during bring-up until proper board +* setup code is written. */ -#include <linux/config.h> #include <linux/init.h> +#include <asm/machvec.h> +#include <asm/irq.h> + +struct sh_machine_vector mv_unknown __initmv = { + .mv_nr_irqs =NR_IRQS , +}; +ALIAS_MV (unknown) const char *get_system_type(void) {
arch/sh/kernel/setup.c +4 -9
@@ -186,7 +186,7 @@ static inline void parse_cmdline (char *static int __init sh_mv_setup (char **cmdline_p) { -#if defined(CONFIG_SH_UNKNOWN ) +#ifdef CONFIG_SH_UNKNOWN extern struct sh_machine_vector mv_unknown;#endif struct sh_machine_vector *mv =NULL ;
@@ -196,7 +196,7 @@ static int __init sh_mv_setup(char **cmdparse_cmdline (cmdline_p, mv_name, &mv, &mv_io_base, &mv_mmio_enable); -#ifdef CONFIG_SH_GENERIC +#ifdef CONFIG_SH_UNKNOWN if (mv ==NULL ) { mv = &mv_unknown;if (*mv_name !='\0' ) {
@@ -206,9 +206,6 @@ static int __init sh_mv_setup(char **cmd } sh_mv = *mv;#endif -#ifdef CONFIG_SH_UNKNOWN - sh_mv = mv_unknown; -#endif /* * Manually walk the vec, fill in anything that the board hasn't yet
@@ -231,10 +228,8 @@ static int __init sh_mv_setup(char **cmdmv_set (readb);mv_set (readw);mv_set (readl);mv_set (writeb);mv_set (writew);mv_set (writel); -mv_set (ioremap); -mv_set (iounmap); - -mv_set (isa_port2addr); +mv_set (ioport_map); +mv_set (ioport_unmap);mv_set (irq_demux);#ifdef CONFIG_SH_UNKNOWN
PATCH 6/11 sh: drop maskpos from make_ipr_irq(), remove duplicate irq definitions.
In reply to Paul MundtClean up some of the subtype IRQ definitions for IPR IRQ, and consolidate the make_ipr_irq() definitions by dropping maskpos. SH-4A was the only thing interested in the maskpos, and this should be handled through INTC2 rather than IPR.
---
arch/sh/kernel/cpu/irq/ipr.c | 59 +++++++++++++++++++++--------------------- include/asm-sh/irq-sh73180.h | 36 +------------------------- include/asm-sh/irq-sh7780.h | 23 ---------------- include/asm-sh/irq.h | 10 ++++++- 4 files changed, 38 insertions(+), 90 deletions(-)
f8f931cba083eba8848230eb02d3e815009daec9
arch/sh/kernel/cpu/irq/ipr.c +29 -30
@@ -108,8 +108,7 @@ static void end_ipr_irq(unsigned int irqenable_ipr_irq (irq); } -void make_ipr_irq (unsigned int irq,unsigned int addr,int pos, -int priority,int maskpos) +void make_ipr_irq (unsigned int irq,unsigned int addr,int pos,int priority) {disable_irq_nosync (irq); ipr_data[irq].addr = addr;
@@ -123,44 +122,44 @@ void make_ipr_irq(unsigned int irq, unsivoid __init init_IRQ (void ) {#ifndef CONFIG_CPU_SUBTYPE_SH7780 -make_ipr_irq (TIMER_IRQ ,TIMER_IPR_ADDR ,TIMER_IPR_POS ,TIMER_PRIORITY ,0 ); -make_ipr_irq (TIMER1_IRQ ,TIMER1_IPR_ADDR ,TIMER1_IPR_POS ,TIMER1_PRIORITY ,0 ); +make_ipr_irq (TIMER_IRQ ,TIMER_IPR_ADDR ,TIMER_IPR_POS ,TIMER_PRIORITY ); +make_ipr_irq (TIMER1_IRQ ,TIMER1_IPR_ADDR ,TIMER1_IPR_POS ,TIMER1_PRIORITY );#if defined(CONFIG_SH_RTC ) -make_ipr_irq (RTC_IRQ ,RTC_IPR_ADDR ,RTC_IPR_POS ,RTC_PRIORITY ,0 ); +make_ipr_irq (RTC_IRQ ,RTC_IPR_ADDR ,RTC_IPR_POS ,RTC_PRIORITY );#endif #ifdef SCI_ERI_IRQ -make_ipr_irq (SCI_ERI_IRQ ,SCI_IPR_ADDR ,SCI_IPR_POS ,SCI_PRIORITY ,0 ); -make_ipr_irq (SCI_RXI_IRQ ,SCI_IPR_ADDR ,SCI_IPR_POS ,SCI_PRIORITY ,0 ); -make_ipr_irq (SCI_TXI_IRQ ,SCI_IPR_ADDR ,SCI_IPR_POS ,SCI_PRIORITY ,0 ); +make_ipr_irq (SCI_ERI_IRQ ,SCI_IPR_ADDR ,SCI_IPR_POS ,SCI_PRIORITY ); +make_ipr_irq (SCI_RXI_IRQ ,SCI_IPR_ADDR ,SCI_IPR_POS ,SCI_PRIORITY ); +make_ipr_irq (SCI_TXI_IRQ ,SCI_IPR_ADDR ,SCI_IPR_POS ,SCI_PRIORITY );#endif #ifdef SCIF1_ERI_IRQ -make_ipr_irq (SCIF1_ERI_IRQ ,SCIF1_IPR_ADDR ,SCIF1_IPR_POS ,SCIF1_PRIORITY ,0 ); -make_ipr_irq (SCIF1_RXI_IRQ ,SCIF1_IPR_ADDR ,SCIF1_IPR_POS ,SCIF1_PRIORITY ,0 ); -make_ipr_irq (SCIF1_BRI_IRQ ,SCIF1_IPR_ADDR ,SCIF1_IPR_POS ,SCIF1_PRIORITY ,0 ); -make_ipr_irq (SCIF1_TXI_IRQ ,SCIF1_IPR_ADDR ,SCIF1_IPR_POS ,SCIF1_PRIORITY ,0 ); +make_ipr_irq (SCIF1_ERI_IRQ ,SCIF1_IPR_ADDR ,SCIF1_IPR_POS ,SCIF1_PRIORITY ); +make_ipr_irq (SCIF1_RXI_IRQ ,SCIF1_IPR_ADDR ,SCIF1_IPR_POS ,SCIF1_PRIORITY ); +make_ipr_irq (SCIF1_BRI_IRQ ,SCIF1_IPR_ADDR ,SCIF1_IPR_POS ,SCIF1_PRIORITY ); +make_ipr_irq (SCIF1_TXI_IRQ ,SCIF1_IPR_ADDR ,SCIF1_IPR_POS ,SCIF1_PRIORITY );#endif #if defined(CONFIG_CPU_SUBTYPE_SH7300 ) -make_ipr_irq (SCIF0_IRQ ,SCIF0_IPR_ADDR ,SCIF0_IPR_POS ,SCIF0_PRIORITY ,0 ); -make_ipr_irq (DMTE2_IRQ ,DMA1_IPR_ADDR ,DMA1_IPR_POS ,DMA1_PRIORITY ,0 ); -make_ipr_irq (DMTE3_IRQ ,DMA1_IPR_ADDR ,DMA1_IPR_POS ,DMA1_PRIORITY ,0 ); -make_ipr_irq (VIO_IRQ ,VIO_IPR_ADDR ,VIO_IPR_POS ,VIO_PRIORITY ,0 ); +make_ipr_irq (SCIF0_IRQ ,SCIF0_IPR_ADDR ,SCIF0_IPR_POS ,SCIF0_PRIORITY ); +make_ipr_irq (DMTE2_IRQ ,DMA1_IPR_ADDR ,DMA1_IPR_POS ,DMA1_PRIORITY ); +make_ipr_irq (DMTE3_IRQ ,DMA1_IPR_ADDR ,DMA1_IPR_POS ,DMA1_PRIORITY ); +make_ipr_irq (VIO_IRQ ,VIO_IPR_ADDR ,VIO_IPR_POS ,VIO_PRIORITY );#endif #ifdef SCIF_ERI_IRQ -make_ipr_irq (SCIF_ERI_IRQ ,SCIF_IPR_ADDR ,SCIF_IPR_POS ,SCIF_PRIORITY ,0 ); -make_ipr_irq (SCIF_RXI_IRQ ,SCIF_IPR_ADDR ,SCIF_IPR_POS ,SCIF_PRIORITY ,0 ); -make_ipr_irq (SCIF_BRI_IRQ ,SCIF_IPR_ADDR ,SCIF_IPR_POS ,SCIF_PRIORITY ,0 ); -make_ipr_irq (SCIF_TXI_IRQ ,SCIF_IPR_ADDR ,SCIF_IPR_POS ,SCIF_PRIORITY ,0 ); +make_ipr_irq (SCIF_ERI_IRQ ,SCIF_IPR_ADDR ,SCIF_IPR_POS ,SCIF_PRIORITY ); +make_ipr_irq (SCIF_RXI_IRQ ,SCIF_IPR_ADDR ,SCIF_IPR_POS ,SCIF_PRIORITY ); +make_ipr_irq (SCIF_BRI_IRQ ,SCIF_IPR_ADDR ,SCIF_IPR_POS ,SCIF_PRIORITY ); +make_ipr_irq (SCIF_TXI_IRQ ,SCIF_IPR_ADDR ,SCIF_IPR_POS ,SCIF_PRIORITY );#endif #ifdef IRDA_ERI_IRQ -make_ipr_irq (IRDA_ERI_IRQ ,IRDA_IPR_ADDR ,IRDA_IPR_POS ,IRDA_PRIORITY ,0 ); -make_ipr_irq (IRDA_RXI_IRQ ,IRDA_IPR_ADDR ,IRDA_IPR_POS ,IRDA_PRIORITY ,0 ); -make_ipr_irq (IRDA_BRI_IRQ ,IRDA_IPR_ADDR ,IRDA_IPR_POS ,IRDA_PRIORITY ,0 ); -make_ipr_irq (IRDA_TXI_IRQ ,IRDA_IPR_ADDR ,IRDA_IPR_POS ,IRDA_PRIORITY ,0 ); +make_ipr_irq (IRDA_ERI_IRQ ,IRDA_IPR_ADDR ,IRDA_IPR_POS ,IRDA_PRIORITY ); +make_ipr_irq (IRDA_RXI_IRQ ,IRDA_IPR_ADDR ,IRDA_IPR_POS ,IRDA_PRIORITY ); +make_ipr_irq (IRDA_BRI_IRQ ,IRDA_IPR_ADDR ,IRDA_IPR_POS ,IRDA_PRIORITY ); +make_ipr_irq (IRDA_TXI_IRQ ,IRDA_IPR_ADDR ,IRDA_IPR_POS ,IRDA_PRIORITY );#endif #if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \
@@ -175,12 +174,12 @@ void __init init_IRQ(void)* You should set corresponding bits of PFC to "00" * to enable these interrupts. */ -make_ipr_irq (IRQ0_IRQ ,IRQ0_IPR_ADDR ,IRQ0_IPR_POS ,IRQ0_PRIORITY ,0 ); -make_ipr_irq (IRQ1_IRQ ,IRQ1_IPR_ADDR ,IRQ1_IPR_POS ,IRQ1_PRIORITY ,0 ); -make_ipr_irq (IRQ2_IRQ ,IRQ2_IPR_ADDR ,IRQ2_IPR_POS ,IRQ2_PRIORITY ,0 ); -make_ipr_irq (IRQ3_IRQ ,IRQ3_IPR_ADDR ,IRQ3_IPR_POS ,IRQ3_PRIORITY ,0 ); -make_ipr_irq (IRQ4_IRQ ,IRQ4_IPR_ADDR ,IRQ4_IPR_POS ,IRQ4_PRIORITY ,0 ); -make_ipr_irq (IRQ5_IRQ ,IRQ5_IPR_ADDR ,IRQ5_IPR_POS ,IRQ5_PRIORITY ,0 ); +make_ipr_irq (IRQ0_IRQ ,IRQ0_IPR_ADDR ,IRQ0_IPR_POS ,IRQ0_PRIORITY ); +make_ipr_irq (IRQ1_IRQ ,IRQ1_IPR_ADDR ,IRQ1_IPR_POS ,IRQ1_PRIORITY ); +make_ipr_irq (IRQ2_IRQ ,IRQ2_IPR_ADDR ,IRQ2_IPR_POS ,IRQ2_PRIORITY ); +make_ipr_irq (IRQ3_IRQ ,IRQ3_IPR_ADDR ,IRQ3_IPR_POS ,IRQ3_PRIORITY ); +make_ipr_irq (IRQ4_IRQ ,IRQ4_IPR_ADDR ,IRQ4_IPR_POS ,IRQ4_PRIORITY ); +make_ipr_irq (IRQ5_IRQ ,IRQ5_IPR_ADDR ,IRQ5_IPR_POS ,IRQ5_PRIORITY );#endif #endif
include/asm-sh/irq-sh73180.h +1 -35
@@ -25,11 +25,6 @@#undef DMA_IPR_POS#undef DMA_PRIORITY -#undef NR_IRQS - -#undef __irq_demux -#undef irq_demux -#undef INTC_IMCR0#undef INTC_IMCR1#undef INTC_IMCR2
@@ -229,33 +224,6 @@#define SIU_IPR_POS 1#define SIU_PRIORITY 3 - -/* ONCHIP_NR_IRQS */ -#define NR_IRQS 109 - -/* In a generic kernel, NR_IRQS is an upper bound, and we should use -* ACTUAL_NR_IRQS (which uses the machine vector) to get the correct value. -*/ -#define ACTUAL_NR_IRQS NR_IRQS - - -extern void disable_irq (unsigned int ); -extern void disable_irq_nosync (unsigned int ); -extern void enable_irq (unsigned int ); - -/* -* Simple Mask Register Support -*/ -extern void make_maskreg_irq (unsigned int irq); -extern unsigned short *irq_mask_register; - -/* -* Function for "on chip support modules". -*/ -extern void make_ipr_irq (unsigned int irq,unsigned int addr, -int pos,int priority); -extern void make_imask_irq (unsigned int irq); -#define PORT_PACR 0xA4050100UL#define PORT_PBCR 0xA4050102UL#define PORT_PCCR 0xA4050104UL
@@ -343,8 +311,6 @@ extern void make_imask_irq(unsigned int#define IRQ6_PRIORITY 1#define IRQ7_PRIORITY 1 -extern int shmse_irq_demux (int irq); -#define __irq_demux (irq) shmse_irq_demux(irq) -#define irq_demux (irq) __irq_demux(irq) +int shmse_irq_demux (int irq);#endif /* __ASM_SH_IRQ_SH73180_H */
include/asm-sh/irq-sh7780.h +0 -23
@@ -299,29 +299,6 @@#define GPIO_IPR_POS 2#define GPIO_PRIORITY 3 -/* ONCHIP_NR_IRQS */ -#define NR_IRQS 150/* 111 + 16 */ - -/* In a generic kernel, NR_IRQS is an upper bound, and we should use -* ACTUAL_NR_IRQS (which uses the machine vector) to get the correct value. -*/ -#define ACTUAL_NR_IRQS NR_IRQS - -extern void disable_irq (unsigned int ); -extern void disable_irq_nosync (unsigned int ); -extern void enable_irq (unsigned int ); - -/* -* Simple Mask Register Support -*/ -extern void make_maskreg_irq (unsigned int irq); -extern unsigned short *irq_mask_register; - -/* -* Function for "on chip support modules". -*/ -extern void make_imask_irq (unsigned int irq); -#define INTC_TMU0_MSK 0#define INTC_TMU3_MSK 1#define INTC_RTC_MSK 2
include/asm-sh/irq.h +8 -2
@@ -245,6 +245,7 @@#endif /* ST40STB1 */ #endif /* 775x / SH4-202 / ST40STB1 */ +#endif /* 7780 */ /* NR_IRQS is made from three components: * 1. ONCHIP_NR_IRQS - number of IRLS + on-chip peripherial modules
@@ -274,8 +275,11 @@# define ONCHIP_NR_IRQS 72#elif defined(CONFIG_CPU_SUBTYPE_ST40STB1 )# define ONCHIP_NR_IRQS 144 -#elif defined(CONFIG_CPU_SUBTYPE_SH7300 ) +#elif defined(CONFIG_CPU_SUBTYPE_SH7300 ) || \ + defined(CONFIG_CPU_SUBTYPE_SH73180 )# define ONCHIP_NR_IRQS 109 +#elif defined(CONFIG_CPU_SUBTYPE_SH7780 ) +# define ONCHIP_NR_IRQS 111#elif defined(CONFIG_SH_UNKNOWN )/* Most be last */ # define ONCHIP_NR_IRQS 144#endif
@@ -306,6 +310,8 @@# define OFFCHIP_NR_IRQS 96#elif defined (CONFIG_SH_TITAN )# define OFFCHIP_NR_IRQS 4 +#elif defined(CONFIG_SH_R7780RP ) +# define OFFCHIP_NR_IRQS 16#elif defined(CONFIG_SH_UNKNOWN )# define OFFCHIP_NR_IRQS 16/* Must also be last */ #else
@@ -550,7 +556,7 @@ extern int ipr_irq_demux(int irq);#define INTC_ICR_IRLM (1<<7)#endif -#else +#ifdef CONFIG_CPU_SUBTYPE_SH7780 #include <asm/irq-sh7780.h> #endif
PATCH 9/11 sh: Add missing timers directory rule to build.
In reply to Paul MundtThis should have been part of the timer framework support that was merged earlier, but looks to have been accidentally omitted.
---
arch/sh/kernel/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
1e8f7de2d6e5dad3db913b8ff15c4d20c8555c33
arch/sh/kernel/Makefile +1 -1
@@ -8,7 +8,7 @@ obj-y := process.o signal.o entry.o trap ptrace.o setup.o time.o sys_sh.o semaphore.o \ io.o io_generic.o sh_ksyms.o -obj-y += cpu/ +obj-y += cpu/ timers/ obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_CF_ENABLER) += cf-enabler.o
PATCH 7/11 sh: convert voyagergx to platform device, drop sh-bus.
In reply to Paul MundtTrivial patch updating the voyagergx cchip code to reference a platform device instead, now that the dma mask is taken care of. Given this, there's no longer any reason to drag around the SH-bus code, so kill that off entirely.
---
arch/sh/cchips/voyagergx/consistent.c | 15 +-- arch/sh/cchips/voyagergx/irq.c | 7 + arch/sh/kernel/cpu/Makefile | 2 arch/sh/kernel/cpu/bus.c | 197 --------------------------------- include/asm-sh/bus-sh.h | 66 ----------- 5 files changed, 12 insertions(+), 275 deletions(-) delete mode 100644 arch/sh/kernel/cpu/bus.c delete mode 100644 include/asm-sh/bus-sh.h
29a11ff14a7ec1409a7e3e8b62e5830d2dd1f080
arch/sh/cchips/voyagergx/consistent.c +5 -10
@@ -15,7 +15,7 @@#include <linux/module.h> #include <linux/device.h> #include <asm/io.h> -#include <asm/bus-sh.h> +struct voya_alloc_entry {struct list_head list;
@@ -30,12 +30,13 @@ static LIST_HEAD(voya_alloc_list);#define OHCI_HCCA_SIZE 0x100#define OHCI_SRAM_SIZE 0x10000 +#define VOYAGER_OHCI_NAME "voyager-ohci" +void *voyagergx_consistent_alloc (struct device *dev,size_t size,dma_addr_t *handle,gfp_t flag) {struct list_head *list = &voya_alloc_list;struct voya_alloc_entry *entry; -struct sh_dev *shdev =to_sh_dev (dev);unsigned long start, end;unsigned long flags;
@@ -46,9 +47,7 @@ void *voyagergx_consistent_alloc(struct* * Everything else goes through consistent_alloc(). */ -if (!dev || dev->bus != &sh_bus_types[SH_BUS_VIRT ] || - (dev->bus == &sh_bus_types[SH_BUS_VIRT ] && - shdev->dev_id !=SH_DEV_ID_USB_OHCI )) +if (!dev ||strcmp (dev->driver->name,VOYAGER_OHCI_NAME ))return NULL ; start =OHCI_SRAM_START +OHCI_HCCA_SIZE ;
@@ -98,12 +97,9 @@ int voyagergx_consistent_free(struct dev void *vaddr, dma_addr_t handle) {struct voya_alloc_entry *entry; -struct sh_dev *shdev =to_sh_dev (dev);unsigned long flags; -if (!dev || dev->bus != &sh_bus_types[SH_BUS_VIRT ] || - (dev->bus == &sh_bus_types[SH_BUS_VIRT ] && - shdev->dev_id !=SH_DEV_ID_USB_OHCI )) +if (!dev ||strcmp (dev->driver->name,VOYAGER_OHCI_NAME ))return -EINVAL ;spin_lock_irqsave (&voya_list_lock, flags);
@@ -123,4 +119,3 @@ int voyagergx_consistent_free(struct devEXPORT_SYMBOL (voyagergx_consistent_alloc);EXPORT_SYMBOL (voyagergx_consistent_free); -
arch/sh/cchips/voyagergx/irq.c +6 -1
@@ -163,7 +163,12 @@ int voyagergx_irq_demux(int irq)return irq; } -static struct irqaction irq0 = { voyagergx_interrupt,SA_INTERRUPT ,0 ,"VOYAGERGX" ,NULL ,NULL }; +static struct irqaction irq0 = { + .name ="voyagergx" , + .handler = voyagergx_interrupt, + .flags =SA_INTERRUPT , + .mask =CPU_MASK_NONE , +};void __init setup_voyagergx_irq (void ) {
arch/sh/kernel/cpu/Makefile +1 -1
@@ -2,7 +2,7 @@ # Makefile for the Linux/SuperH CPU-specifc backends. # -obj-y += irq/ init.o bus.o clock.o +obj-y += irq/ init.o clock.o obj-$(CONFIG_CPU_SH2) += sh2/ obj-$(CONFIG_CPU_SH3) += sh3/
arch/sh/kernel/cpu/bus.c deleted +0 -197
197 lines not on this page · raw message
include/asm-sh/bus-sh.h deleted +0 -66
66 lines not on this page · raw message
PATCH 11/11 sh/sh64: Fix bogus TIOCGICOUNT definitions.
In reply to Paul MundtAs reported by Russell King, sh and sh64 currently have bogus definitions for TIOCGICOUNT, particularly referencing a kernel only structure. Switch to using a sensible ioctl value.
---
include/asm-sh/ioctls.h | 2 +- include/asm-sh64/ioctls.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
60ddf0b381277105382046b3181e00046b0f2137
include/asm-sh/ioctls.h +1 -1
@@ -94,6 +94,6 @@#define TIOCSERSETMULTI _IOW('T', 91, struct serial_multiport_struct)/* 0x545B */ /* Set multiport config */ #define TIOCMIWAIT _IO('T', 92)/* 0x545C */ /* wait for a change on serial input line(s) */ -#define TIOCGICOUNT _IOR('T', 93, struct async_icount)/* 0x545D */ /* read serial port inline interrupt counts */ +#define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ #endif /* __ASM_SH_IOCTLS_H */
include/asm-sh64/ioctls.h +1 -1
@@ -111,6 +111,6 @@#define TIOCSERSETMULTI 0x40a8545b/* _IOW('T', 91, struct serial_multiport_struct) 0x545B */ /* Set multiport config */ #define TIOCMIWAIT 0x545c/* _IO('T', 92) wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x802c545d/* _IOR('T', 93, struct async_icount) 0x545D */ /* read serial port inline interrupt counts */ +#define TIOCGICOUNT 0x545d/* read serial port inline interrupt counts */ #endif /* __ASM_SH64_IOCTLS_H */
PATCH 10/11 sh: machine_halt()/machine_power_off() cleanups.
In reply to Paul Mundtmachine_halt() managed to trigger the soft lockup detection due to not disabling interrupts before going to sleep, so correct that.
machine_power_off() should be using pm_power_off, which lets us drop the board-specific hacks from here.
---
arch/sh/kernel/process.c | 54 ++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 28 deletions(-)
38550502f429e90b18c2d05cd976593b63d164f0
arch/sh/kernel/process.c +26 -28
@@ -15,21 +15,18 @@#include <linux/unistd.h> #include <linux/mm.h> #include <linux/elfcore.h> -#include <linux/slab.h> #include <linux/a.out.h> +#include <linux/slab.h> +#include <linux/pm.h> #include <linux/ptrace.h> #include <linux/platform.h> #include <linux/kallsyms.h> +#include <linux/kexec.h> #include <asm/io.h> #include <asm/uaccess.h> #include <asm/mmu_context.h> #include <asm/elf.h> -#if defined(CONFIG_SH_HS7751RVOIP ) -#include <asm/hs7751rvoip/hs7751rvoip.h> -#elif defined(CONFIG_SH_RTS7751R2D ) -#include <asm/rts7751r2d/rts7751r2d.h> -#endif static int hlt_counter=0 ;
@@ -37,6 +34,11 @@ int ubc_usercnt = 0;#define HARD_IDLE_TIMEOUT (HZ / 3) +void (*pm_idle)(void ); + +void (*pm_power_off)(void ); +EXPORT_SYMBOL (pm_power_off); +void disable_hlt (void ) { hlt_counter++;
@@ -51,17 +53,25 @@ void enable_hlt(void)EXPORT_SYMBOL (enable_hlt); +void default_idle (void ) +{ +if (!hlt_counter) +cpu_sleep (); +else +cpu_relax (); +} +void cpu_idle (void ) {/* endless idle loop with no priority at all */ while (1 ) { -if (hlt_counter) { -while (!need_resched ()) -cpu_relax (); - }else { -while (!need_resched ()) -cpu_sleep (); - } +void (*idle)(void ) = pm_idle; + +if (!idle) + idle = default_idle; + +while (!need_resched ()) +idle ();preempt_enable_no_resched ();schedule ();
@@ -88,28 +98,16 @@ void machine_restart(char * __unused)void machine_halt (void ) { -#if defined(CONFIG_SH_HS7751RVOIP ) -unsigned short value; +local_irq_disable (); - value =ctrl_inw (PA_OUTPORTR ); -ctrl_outw ((value &0xffdf ),PA_OUTPORTR ); -#elif defined(CONFIG_SH_RTS7751R2D ) -ctrl_outw (0x0001 ,PA_POWOFF ); -#endif while (1 )cpu_sleep (); }void machine_power_off (void ) { -#if defined(CONFIG_SH_HS7751RVOIP ) -unsigned short value; - - value =ctrl_inw (PA_OUTPORTR ); -ctrl_outw ((value &0xffdf ),PA_OUTPORTR ); -#elif defined(CONFIG_SH_RTS7751R2D ) -ctrl_outw (0x0001 ,PA_POWOFF ); -#endif +if (pm_power_off) +pm_power_off (); }void show_regs (struct pt_regs * regs)
PATCH 8/11 sh: sh-sci clock framework updates.
In reply to Paul MundtA couple of updates for the sh-sci serial driver:
- Update for clock framework on sh.
- Fix a compile error introduced by some h8300 changes.
- Add SH7770/SH7780 subtype support.
---
drivers/serial/sh-sci.c | 225 +++++++++++++++++++++++++++++++++--------------- drivers/serial/sh-sci.h | 114 ++++++++++++++---------- 2 files changed, 223 insertions(+), 116 deletions(-)
da11fe2659737503709e2159a596224b08e002b8
drivers/serial/sh-sci.c +157 -68
@@ -42,6 +42,7 @@#include <linux/delay.h> #include <linux/console.h> #include <linux/bitops.h> +#include <linux/generic_serial.h> #ifdef CONFIG_CPU_FREQ #include <linux/notifier.h>
@@ -53,7 +54,9 @@#include <asm/irq.h> #include <asm/uaccess.h> -#include <linux/generic_serial.h> +#if defined(CONFIG_SUPERH ) && !defined(CONFIG_SUPERH64 ) +#include <asm/clock.h> +#endif #ifdef CONFIG_SH_STANDARD_BIOS #include <asm/sh_bios.h>
@@ -86,9 +89,11 @@ static void sci_stop_rx(struct uart_portstatic int sci_request_irq (struct sci_port *port);static void sci_free_irq (struct sci_port *port); -static struct sci_port sci_ports[SCI_NPORTS ]; +static struct sci_port sci_ports[];static struct uart_driver sci_uart_driver; +#define SCI_NPORTS sci_uart_driver.nr +#if defined(CONFIG_SH_STANDARD_BIOS ) || defined(CONFIG_SH_KGDB )static void handle_error (struct uart_port *port)
@@ -168,7 +173,7 @@ static void put_string(struct sci_port *int usegdb=0 ;#ifdef CONFIG_SH_STANDARD_BIOS -/* This call only does a trap the first time it is +/* This call only does a trap the first time it is * called, and so is safe to do here unconditionally */ usegdb |=sh_bios_in_gdb_mode ();
@@ -324,47 +329,46 @@ static void sci_init_pins_sci(struct uar/* tx mark output*/ H8300_SCI_DR (ch) |= h8300_sci_pins[ch].tx; } -#else -static void sci_init_pins_sci (struct uart_port *port,unsigned int cflag) -{ -}#endif #endif #if defined(SCIF_ONLY) || defined(SCI_AND_SCIF) -#if defined(CONFIG_CPU_SH3) -/* For SH7705, SH7707, SH7709, SH7709A, SH7729, SH7300*/ +#if defined(CONFIG_CPU_SUBTYPE_SH7300) +/* SH7300 doesn't use RTS/CTS */ +static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag) +{ + sci_out(port, SCFCR, 0); +} +#elif defined(CONFIG_CPU_SH3) +/* For SH7705, SH7707, SH7709, SH7709A, SH7729 */ static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag) { unsigned int fcr_val = 0; -#if !defined(CONFIG_CPU_SUBTYPE_SH7300) /* SH7300 doesn't use RTS/CTS */ - { - unsigned short data; + unsigned short data; + + /* We need to set SCPCR to enable RTS/CTS */ + data = ctrl_inw(SCPCR); + /* Clear out SCP7MD1,0, SCP6MD1,0, SCP4MD1,0*/ + ctrl_outw(data & 0x0fcf, SCPCR); - /* We need to set SCPCR to enable RTS/CTS */ - data = ctrl_inw(SCPCR); - /* Clear out SCP7MD1,0, SCP6MD1,0, SCP4MD1,0*/ - ctrl_outw(data&0x0fcf, SCPCR); - } if (cflag & CRTSCTS) fcr_val |= SCFCR_MCE; else { - unsigned short data; - /* We need to set SCPCR to enable RTS/CTS */ data = ctrl_inw(SCPCR); /* Clear out SCP7MD1,0, SCP4MD1,0, Set SCP6MD1,0 = {01} (output) */ - ctrl_outw((data&0x0fcf)|0x1000, SCPCR); + ctrl_outw((data & 0x0fcf) | 0x1000, SCPCR); data = ctrl_inb(SCPDR); /* Set /RTS2 (bit6) = 0 */ - ctrl_outb(data&0xbf, SCPDR); + ctrl_outb(data & 0xbf, SCPDR); } -#endif + sci_out(port, SCFCR, fcr_val); } +#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) static void sci_init_pins_irda(struct uart_port *port, unsigned int cflag) { unsigned int fcr_val = 0;
@@ -374,7 +378,7 @@ static void sci_init_pins_irda(struct ua sci_out(port, SCFCR, fcr_val); } - +#endif #else /* For SH7750 */
@@ -385,7 +389,11 @@ static void sci_init_pins_scif(struct uaif (cflag &CRTSCTS ) { fcr_val |=SCFCR_MCE ; }else { +#ifdef CONFIG_CPU_SUBTYPE_SH7780 +ctrl_outw (0x0080 ,SCSPTR0 );/* Set RTS = 1 */ +#else ctrl_outw (0x0080 ,SCSPTR2 );/* Set RTS = 1 */ +#endif }sci_out (port,SCFCR , fcr_val); }
@@ -422,7 +430,11 @@ static void sci_transmit_chars(struct ua#if !defined(SCI_ONLY )if (port->type ==PORT_SCIF ) { +#if defined(CONFIG_CPU_SUBTYPE_SH7760 ) || defined(CONFIG_CPU_SUBTYPE_SH7780 ) + txroom =SCIF_TXROOM_MAX - (sci_in (port,SCTFDR ) &0x7f ); +#else txroom =SCIF_TXROOM_MAX - (sci_in (port,SCFDR )>>8 ); +#endif }else { txroom = (sci_in (port, SCxSR) &SCI_TDRE )?1 :0 ; }
@@ -491,7 +503,11 @@ static inline void sci_receive_chars(strwhile (1 ) {#if !defined(SCI_ONLY )if (port->type ==PORT_SCIF ) { +#if defined(CONFIG_CPU_SUBTYPE_SH7760 ) || defined(CONFIG_CPU_SUBTYPE_SH7780 ) + count =sci_in (port,SCRFDR ) &0x7f ; +#else count =sci_in (port,SCFDR )&SCIF_RFDC_MASK ; +#endif }else { count = (sci_in (port, SCxSR)&SCxSR_RDxF (port))?1 :0 ; }
@@ -652,7 +668,7 @@ static inline int sci_handle_breaks(strustruct tty_struct *tty = port->info->tty;struct sci_port *s = &sci_ports[port->line]; - if (!s->break_flag && status & SCxSR_BRK(port)) +if (!s->break_flag && status &SCxSR_BRK (port)) {#if defined(CONFIG_CPU_SH3 )/* Debounce break */ s->break_flag =1 ;
@@ -783,6 +799,7 @@ static int sci_notifier(struct notifier_ (phase == CPUFREQ_RESUMECHANGE)){for (i =0 ; i <SCI_NPORTS ; i++) {struct uart_port *port = &sci_ports[i].port; +struct clk *clk;/* * Update the uartclk per-port if frequency has
@@ -795,7 +812,9 @@ static int sci_notifier(struct notifier_* * Clean this up later.. */ - port->uartclk = current_cpu_data.module_clock *16 ; + clk =clk_get ("module_clk" ); + port->uartclk =clk_get_rate (clk) *16 ; +clk_put (clk); } printk("%s: got a postchange notification for cpu %d (old %d, new %d)\n",
@@ -1008,15 +1027,20 @@ static void sci_set_termios(struct uart_sci_out (port,SCSMR , smr_val);switch (baud) { -case 0 : t =-1 ;break ; -case 2400 : t =BPS_2400 ;break ; -case 4800 : t =BPS_4800 ;break ; -case 9600 : t =BPS_9600 ;break ; -case 19200 : t =BPS_19200 ;break ; -case 38400 : t =BPS_38400 ;break ; -case 57600 : t =BPS_57600 ;break ; -case 115200 : t =BPS_115200 ;break ; -default : t =SCBRR_VALUE (baud);break ; +case 0 : + t =-1 ; +break ; +default : + { +#if defined(CONFIG_SUPERH ) && !defined(CONFIG_SUPERH64 ) +struct clk *clk =clk_get ("module_clk" ); + t =SCBRR_VALUE (baud,clk_get_rate (clk)); +clk_put (clk); +#else + t =SCBRR_VALUE (baud); +#endif + } +break ; }if (t >0 ) {
@@ -1030,7 +1054,9 @@ static void sci_set_termios(struct uart_udelay ((1000000 +(baud-1 )) / baud);/* Wait one bit interval */ } - s->init_pins (port, termios->c_cflag); +if (likely (s->init_pins)) + s->init_pins (port, termios->c_cflag); +sci_out (port,SCSCR ,SCSCR_INIT (port));if ((termios->c_cflag &CREAD ) !=0 )
@@ -1107,7 +1133,7 @@ static struct uart_ops sci_uart_ops = { .verify_port = sci_verify_port, }; -static struct sci_port sci_ports[SCI_NPORTS] = { +static struct sci_port sci_ports[] = { #if defined(CONFIG_CPU_SUBTYPE_SH7708) { .port = {
@@ -1121,7 +1147,6 @@ static struct sci_port sci_ports[SCI_NPO }, .type = PORT_SCI, .irqs = SCI_IRQS, - .init_pins = sci_init_pins_sci, },#elif defined(CONFIG_CPU_SUBTYPE_SH7705 ) {
@@ -1165,7 +1190,6 @@ static struct sci_port sci_ports[SCI_NPO }, .type = PORT_SCI, .irqs = SCI_IRQS, - .init_pins = sci_init_pins_sci, }, { .port = {
@@ -1225,7 +1249,7 @@ static struct sci_port sci_ports[SCI_NPO .irqs = SH73180_SCIF_IRQS, .init_pins = sci_init_pins_scif, }, -#elif defined(CONFIG_SH_RTS7751R2D ) +#elif defined(CONFIG_CPU_SUBTYPE_SH4_202 ) { .port = { .membase = (void *)0xffe80000,
@@ -1253,7 +1277,6 @@ static struct sci_port sci_ports[SCI_NPO }, .type = PORT_SCI, .irqs = SCI_IRQS, - .init_pins = sci_init_pins_sci, }, { .port = {
@@ -1312,21 +1335,6 @@ static struct sci_port sci_ports[SCI_NPO .irqs = SH7760_SCIF2_IRQS, .init_pins = sci_init_pins_scif, }, -#elif defined(CONFIG_CPU_SUBTYPE_SH4_202 ) - { - .port = { - .membase = (void *)0xffe80000, - .mapbase = 0xffe80000, - .iotype = SERIAL_IO_MEM, - .irq = 43, - .ops = &sci_uart_ops, - .flags = ASYNC_BOOT_AUTOCONF, - .line = 0, - }, - .type = PORT_SCIF, - .irqs = SH4_SCIF_IRQS, - .init_pins = sci_init_pins_scif, - },#elif defined(CONFIG_CPU_SUBTYPE_ST40STB1 ) { .port = {
@@ -1455,6 +1463,78 @@ static struct sci_port sci_ports[SCI_NPO .irqs = H8S_SCI_IRQS2, .init_pins = sci_init_pins_sci, }, +#elif defined(CONFIG_CPU_SUBTYPE_SH7770 ) + { + .port = { + .membase = (void *)0xff923000, + .mapbase = 0xff923000, + .iotype = SERIAL_IO_MEM, + .irq = 61, + .ops = &sci_uart_ops, + .flags = ASYNC_BOOT_AUTOCONF, + .line = 0, + }, + .type = PORT_SCIF, + .irqs = SH7770_SCIF0_IRQS, + .init_pins = sci_init_pins_scif, + }, + { + .port = { + .membase = (void *)0xff924000, + .mapbase = 0xff924000, + .iotype = SERIAL_IO_MEM, + .irq = 62, + .ops = &sci_uart_ops, + .flags = ASYNC_BOOT_AUTOCONF, + .line = 1, + }, + .type = PORT_SCIF, + .irqs = SH7770_SCIF1_IRQS, + .init_pins = sci_init_pins_scif, + }, + { + .port = { + .membase = (void *)0xff925000, + .mapbase = 0xff925000, + .iotype = SERIAL_IO_MEM, + .irq = 63, + .ops = &sci_uart_ops, + .flags = ASYNC_BOOT_AUTOCONF, + .line = 2, + }, + .type = PORT_SCIF, + .irqs = SH7770_SCIF2_IRQS, + .init_pins = sci_init_pins_scif, + }, +#elif defined(CONFIG_CPU_SUBTYPE_SH7780) + { + .port = { + .membase = (void *)0xffe00000, + .mapbase = 0xffe00000, + .iotype = SERIAL_IO_MEM, + .irq = 43, + .ops = &sci_uart_ops, + .flags = ASYNC_BOOT_AUTOCONF, + .line = 0, + }, + .type = PORT_SCIF, + .irqs = SH7780_SCIF0_IRQS, + .init_pins = sci_init_pins_scif, + }, + { + .port = { + .membase = (void *)0xffe10000, + .mapbase = 0xffe10000, + .iotype = SERIAL_IO_MEM, + .irq = 79, + .ops = &sci_uart_ops, + .flags = ASYNC_BOOT_AUTOCONF, + .line = 1, + }, + .type = PORT_SCIF, + .irqs = SH7780_SCIF1_IRQS, + .init_pins = sci_init_pins_scif, + },#else #error "CPU subtype not defined"#endif
@@ -1480,9 +1560,6 @@ static int __init serial_console_setup(sint flow ='n' ;int ret; -if (co->index >=SCI_NPORTS ) - co->index =0 ; - serial_console_port = &sci_ports[co->index]; port = &serial_console_port->port; port->type = serial_console_port->type;
@@ -1496,14 +1573,21 @@ static int __init serial_console_setup(s* We need to set the initial uartclk here, since otherwise it will * only ever be setup at sci_init() time. */ -#if !defined(__H8300H__) && !defined(__H8300S__) - port->uartclk = current_cpu_data.module_clock *16 ; -#else +#if defined(__H8300H__) || defined(__H8300S__) port->uartclk =CONFIG_CPU_CLOCK ; -#endif +#if defined(__H8300S__)h8300_sci_enable (port, sci_enable);#endif +#elif defined(CONFIG_SUPERH64 ) + port->uartclk = current_cpu_info.module_clock *16 ; +#else + { +struct clk *clk =clk_get ("module_clk" ); + port->uartclk =clk_get_rate (clk) *16 ; +clk_put (clk); + } +#endif if (options)uart_parse_options (options, &baud, &parity, &bits, &flow);
@@ -1566,7 +1653,7 @@ int __init kgdb_console_setup(struct conint parity ='n' ;int flow ='n' ; -if (co->index >=SCI_NPORTS || co->index != kgdb_portnum) +if (co->index != kgdb_portnum) co->index = kgdb_portnum;if (options)
@@ -1606,7 +1693,7 @@ console_initcall(kgdb_console_init);#elif defined(CONFIG_SERIAL_SH_SCI_CONSOLE )#define SCI_CONSOLE &serial_console#else -#define SCI_CONSOLE 0 +#define SCI_CONSOLE 0#endif static char banner[] __initdata =
@@ -1621,7 +1708,6 @@ static struct uart_driver sci_uart_drive .dev_name = "ttySC", .major = SCI_MAJOR, .minor = SCI_MINOR_START, - .nr = SCI_NPORTS, .cons = SCI_CONSOLE, };
@@ -1631,15 +1717,21 @@ static int __init sci_init(void)printk ("%s" , banner); + sci_uart_driver.nr =ARRAY_SIZE (sci_ports); + ret =uart_register_driver (&sci_uart_driver);if (ret ==0 ) {for (chan =0 ; chan <SCI_NPORTS ; chan++) {struct sci_port *sciport = &sci_ports[chan]; -#if !defined(__H8300H__) && !defined(__H8300S__) - sciport->port.uartclk = (current_cpu_data.module_clock *16 ); -#else +#if defined(__H8300H__) || defined(__H8300S__) sciport->port.uartclk =CONFIG_CPU_CLOCK ; +#elif defined(CONFIG_SUPERH64 ) + sciport->port.uartclk = current_cpu_info.module_clock *16 ; +#else +struct clk *clk =clk_get ("module_clk" ); + sciport->port.uartclk =clk_get_rate (clk) *16 ; +clk_put (clk);#endif uart_add_one_port (&sci_uart_driver, &sciport->port); sciport->break_timer.data = (unsigned long )sciport;
drivers/serial/sh-sci.h +66 -48
260 lines not on this page · raw message
Re: [PATCH 2/11] sh: Make peripheral clock frequency setting mandatory.
In reply to Paul Mundtarch/sh/kernel/cpu/clock.c int __init clk_init(void) · line 228
Quoted 2 lines · Paul Mundt
arch/sh/kernel/cpu/clock.c +1
-0+BUG_ON (unlikely (!master_clk.rate));
BUG_ON() already does unlikely().