Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300

bdab2250 · Linus Torvalds <[email protected]> · 2010-10-27 18:53:26 -07:00

* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300: (44 commits)
  MN10300: Save frame pointer in thread_info struct rather than global var
  MN10300: Change "Matsushita" to "Panasonic".
  MN10300: Create a defconfig for the ASB2364 board
  MN10300: Update the ASB2303 defconfig
  MN10300: ASB2364: Add support for SMSC911X and SMC911X
  MN10300: ASB2364: Handle the IRQ multiplexer in the FPGA
  MN10300: Generic time support
  MN10300: Specify an ELF HWCAP flag for MN10300 Atomic Operations Unit support
  MN10300: Map userspace atomic op regs as a vmalloc page
  MN10300: And Panasonic AM34 subarch and implement SMP
  MN10300: Delete idle_timestamp from irq_cpustat_t
  MN10300: Make various interrupt priority settings configurable
  MN10300: Optimise do_csum()
  MN10300: Implement atomic ops using atomic ops unit
  MN10300: Make the FPU operate in non-lazy mode under SMP
  MN10300: SMP TLB flushing
  MN10300: Use the [ID]PTEL2 registers rather than [ID]PTEL for TLB control
  MN10300: Make the use of PIDR to mark TLB entries controllable
  MN10300: Rename __flush_tlb*() to local_flush_tlb*()
  MN10300: AM34 erratum requires MMUCTR read and write on exception entry
  ...

Commit: bdab225015fbbb45ccd8913f5d7c01b2bf67d8b2
Parents: 7c5814c7 · 7c7fcf76

Merge commit. Changes below are compared with the first parent: 7c5814c7.

Changes

144 files changed · +9274 −1813

File	Status	Add	Del	Content
Kbuild	modified	+1	−1	View file
MAINTAINERS	modified	+1	−1	View file
arch/mn10300/Kconfig	modified	+219	−60	View file
arch/mn10300/Makefile	modified	+6	−0	View file
arch/mn10300/boot/compressed/head.S	modified	+67	−2	View file
arch/mn10300/configs/asb2303_defconfig	modified	+2	−0	View file
arch/mn10300/configs/asb2364_defconfig	added	+98	−0	View file
arch/mn10300/include/asm/atomic.h	modified	+350	−0	View file
arch/mn10300/include/asm/bitops.h	modified	+7	−7	View file
arch/mn10300/include/asm/cache.h	modified	+9	−5	View file
arch/mn10300/include/asm/cacheflush.h	modified	+109	−55	View file
arch/mn10300/include/asm/cpu-regs.h	modified	+77	−14	View file
arch/mn10300/include/asm/dmactl-regs.h	modified	+1	−86	View file
arch/mn10300/include/asm/elf.h	modified	+10	−2	View file
arch/mn10300/include/asm/exceptions.h	modified	+4	−4	View file
arch/mn10300/include/asm/fpu.h	modified	+104	−53	View file
arch/mn10300/include/asm/frame.inc	modified	+13	−7	View file
arch/mn10300/include/asm/gdb-stub.h	modified	+1	−1	View file
arch/mn10300/include/asm/hardirq.h	modified	+2	−1	View file
arch/mn10300/include/asm/highmem.h	modified	+2	−2	View file
arch/mn10300/include/asm/intctl-regs.h	modified	+20	−17	View file
arch/mn10300/include/asm/io.h	modified	+13	−0	View file
arch/mn10300/include/asm/irq.h	modified	+10	−2	View file
arch/mn10300/include/asm/irq_regs.h	modified	+5	−1	View file
arch/mn10300/include/asm/irqflags.h	modified	+102	−9	View file
arch/mn10300/include/asm/mmu_context.h	modified	+48	−25	View file
arch/mn10300/include/asm/pgalloc.h	modified	+0	−1	View file
arch/mn10300/include/asm/pgtable.h	modified	+52	−36	View file
arch/mn10300/include/asm/processor.h	modified	+39	−27	View file
arch/mn10300/include/asm/ptrace.h	modified	+2	−11	View file
arch/mn10300/include/asm/reset-regs.h	modified	+1	−1	View file
arch/mn10300/include/asm/rtc.h	modified	+0	−11	View file
arch/mn10300/include/asm/rwlock.h	added	+125	−0	View file
arch/mn10300/include/asm/serial-regs.h	modified	+41	−10	View file
arch/mn10300/include/asm/serial.h	modified	+4	−4	View file
arch/mn10300/include/asm/smp.h	modified	+89	−2	View file
arch/mn10300/include/asm/smsc911x.h	added	+1	−0	View file
arch/mn10300/include/asm/spinlock.h	modified	+178	−1	View file
arch/mn10300/include/asm/spinlock_types.h	added	+20	−0	View file
arch/mn10300/include/asm/system.h	modified	+22	−51	View file
arch/mn10300/include/asm/thread_info.h	modified	+14	−4	View file
arch/mn10300/include/asm/timer-regs.h	modified	+175	−16	View file
arch/mn10300/include/asm/timex.h	modified	+16	−4	View file
arch/mn10300/include/asm/tlbflush.h	modified	+124	−50	View file
arch/mn10300/include/asm/uaccess.h	modified	+2	−4	View file
arch/mn10300/kernel/Makefile	modified	+10	−5	View file
arch/mn10300/kernel/asm-offsets.c	modified	+10	−1	View file
arch/mn10300/kernel/cevt-mn10300.c	added	+131	−0	View file
arch/mn10300/kernel/csrc-mn10300.c	added	+35	−0	View file
arch/mn10300/kernel/entry.S	modified	+98	−48	View file
arch/mn10300/kernel/fpu-low.S	modified	+163	−102	View file
arch/mn10300/kernel/fpu-nofpu-low.S	added	+39	−0	View file
arch/mn10300/kernel/fpu-nofpu.c	added	+30	−0	View file
arch/mn10300/kernel/fpu.c	modified	+56	−85	View file
arch/mn10300/kernel/gdb-io-serial-low.S	modified	+3	−2	View file
arch/mn10300/kernel/gdb-io-serial.c	modified	+27	−10	View file
arch/mn10300/kernel/gdb-io-ttysm.c	modified	+13	−11	View file
arch/mn10300/kernel/gdb-stub.c	modified	+6	−11	View file
arch/mn10300/kernel/head.S	modified	+198	−4	View file
arch/mn10300/kernel/internal.h	modified	+25	−0	View file
arch/mn10300/kernel/irq.c	modified	+246	−30	View file
arch/mn10300/kernel/kprobes.c	modified	+4	−0	View file
arch/mn10300/kernel/mn10300-serial-low.S	modified	+3	−3	View file
arch/mn10300/kernel/mn10300-serial.c	modified	+181	−29	View file
arch/mn10300/kernel/mn10300-watchdog-low.S	modified	+8	−1	View file
arch/mn10300/kernel/mn10300-watchdog.c	modified	+61	−39	View file
arch/mn10300/kernel/process.c	modified	+47	−14	View file
arch/mn10300/kernel/profile.c	modified	+1	−1	View file
arch/mn10300/kernel/rtc.c	modified	+10	−31	View file
arch/mn10300/kernel/setup.c	modified	+43	−36	View file
arch/mn10300/kernel/signal.c	modified	+11	−9	View file
arch/mn10300/kernel/smp-low.S	added	+97	−0	View file
arch/mn10300/kernel/smp.c	added	+1152	−0	View file
arch/mn10300/kernel/switch_to.S	modified	+3	−4	View file
arch/mn10300/kernel/time.c	modified	+85	−27	View file
arch/mn10300/kernel/traps.c	modified	+13	−29	View file
arch/mn10300/lib/bitops.c	modified	+2	−2	View file
arch/mn10300/lib/delay.c	modified	+4	−4	View file
arch/mn10300/lib/do_csum.S	modified	+22	−27	View file
arch/mn10300/mm/Kconfig.cache	added	+101	−0	View file
arch/mn10300/mm/Makefile	modified	+12	−2	View file
arch/mn10300/mm/cache-flush-by-reg.S	added	+308	−0	View file
arch/mn10300/mm/cache-flush-mn10300.S → arch/mn10300/mm/cache-flush-by-tag.S	renamed	+101	−42	View file
arch/mn10300/mm/cache-flush-icache.c	added	+155	−0	View file
arch/mn10300/mm/cache-inv-by-reg.S	added	+356	−0	View file
arch/mn10300/mm/cache-inv-by-tag.S	added	+348	−0	View file
arch/mn10300/mm/cache-inv-icache.c	added	+129	−0	View file
arch/mn10300/mm/cache-mn10300.S	deleted	+0	−289	View before deletion
arch/mn10300/mm/cache-smp-flush.c	added	+156	−0	View file
arch/mn10300/mm/cache-smp-inv.c	added	+153	−0	View file
arch/mn10300/mm/cache-smp.c	added	+105	−0	View file
arch/mn10300/mm/cache-smp.h	added	+69	−0	View file
arch/mn10300/mm/cache.c	modified	+5	−90	View file
arch/mn10300/mm/fault.c	modified	+4	−13	View file
arch/mn10300/mm/init.c	modified	+23	−3	View file
arch/mn10300/mm/misalignment.c	modified	+1	−2	View file
arch/mn10300/mm/mmu-context.c	modified	+11	−30	View file
arch/mn10300/mm/pgtable.c	modified	+1	−1	View file
arch/mn10300/mm/tlb-mn10300.S	modified	+45	−14	View file
arch/mn10300/mm/tlb-smp.c	added	+214	−0	View file
arch/mn10300/proc-mn103e010/include/proc/cache.h	modified	+9	−0	View file
arch/mn10300/proc-mn103e010/include/proc/clock.h	modified	+0	−2	View file
arch/mn10300/proc-mn103e010/include/proc/dmactl-regs.h	added	+102	−0	View file
arch/mn10300/proc-mn103e010/include/proc/intctl-regs.h	added	+29	−0	View file
arch/mn10300/proc-mn103e010/include/proc/proc.h	modified	+1	−1	View file
arch/mn10300/proc-mn103e010/proc-init.c	modified	+37	−0	View file
arch/mn10300/proc-mn2ws0050/Makefile	added	+5	−0	View file
arch/mn10300/proc-mn2ws0050/include/proc/cache.h	added	+48	−0	View file
arch/mn10300/proc-mn2ws0050/include/proc/clock.h	added	+20	−0	View file
arch/mn10300/proc-mn2ws0050/include/proc/dmactl-regs.h	added	+103	−0	View file
arch/mn10300/proc-mn2ws0050/include/proc/intctl-regs.h	added	+29	−0	View file
arch/mn10300/proc-mn2ws0050/include/proc/irq.h	added	+49	−0	View file
arch/mn10300/proc-mn2ws0050/include/proc/nand-regs.h	added	+120	−0	View file
arch/mn10300/proc-mn2ws0050/include/proc/proc.h	added	+18	−0	View file
arch/mn10300/proc-mn2ws0050/include/proc/smp-regs.h	added	+51	−0	View file
arch/mn10300/proc-mn2ws0050/proc-init.c	added	+134	−0	View file
arch/mn10300/unit-asb2303/include/unit/clock.h	modified	+2	−23	View file
arch/mn10300/unit-asb2303/include/unit/serial.h	modified	+5	−0	View file
arch/mn10300/unit-asb2303/include/unit/timex.h	modified	+62	−47	View file
arch/mn10300/unit-asb2303/unit-init.c	modified	+9	−1	View file
arch/mn10300/unit-asb2305/include/unit/clock.h	modified	+2	−23	View file
arch/mn10300/unit-asb2305/include/unit/serial.h	modified	+5	−0	View file
arch/mn10300/unit-asb2305/include/unit/timex.h	modified	+62	−47	View file
arch/mn10300/unit-asb2305/pci-asb2305.c	modified	+6	−10	View file
arch/mn10300/unit-asb2305/pci.c	modified	+1	−1	View file
arch/mn10300/unit-asb2305/unit-init.c	modified	+4	−2	View file
arch/mn10300/unit-asb2364/Makefile	added	+12	−0	View file
arch/mn10300/unit-asb2364/include/unit/clock.h	added	+29	−0	View file
arch/mn10300/unit-asb2364/include/unit/fpga-regs.h	added	+52	−0	View file
arch/mn10300/unit-asb2364/include/unit/irq.h	added	+35	−0	View file
arch/mn10300/unit-asb2364/include/unit/leds.h	added	+54	−0	View file
arch/mn10300/unit-asb2364/include/unit/serial.h	added	+151	−0	View file
arch/mn10300/unit-asb2364/include/unit/smsc911x.h	added	+171	−0	View file
arch/mn10300/unit-asb2364/include/unit/timex.h	added	+159	−0	View file
arch/mn10300/unit-asb2364/irq-fpga.c	added	+96	−0	View file
arch/mn10300/unit-asb2364/leds.c	added	+98	−0	View file
arch/mn10300/unit-asb2364/smsc911x.c	added	+58	−0	View file
arch/mn10300/unit-asb2364/unit-init.c	added	+88	−0	View file
drivers/net/Kconfig	modified	+10	−2	View file
drivers/net/smsc911x.c	modified	+2	−1	View file
drivers/net/smsc911x.h	modified	+11	−0	View file
include/linux/smp.h	modified	+10	−9	View file
kernel/smp.c	modified	+4	−4	View file
mm/maccess.c	modified	+1	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Kbuild

View file

diff --git a/Kbuild b/Kbuild
index 431f7ca..b00037a 100644
--- a/Kbuild
+++ b/Kbuild
@@ -53,7 +53,7 @@ targets += arch/$(SRCARCH)/kernel/asm-offsets.s
 # Default sed regexp - multiline due to syntax constraints
 define sed-y
 	"/^->/{s:->#\(.*\):/* \1 */:; \
-	s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 (\2) /* \3 */:; \
+	s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \
 	s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
 	s:->::; p;}"
 endef

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index debde01..1e6b6bd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4448,7 +4448,7 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/platform/x86/panasonic-laptop.c
 
-PANASONIC MN10300/AM33 PORT
+PANASONIC MN10300/AM33/AM34 PORT
 M:	David Howells <[email protected]>
 M:	Koichi Yasutake <[email protected]>
 L:	[email protected] (moderated for non-subscribers)

arch/mn10300/Kconfig

View file

diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 7c2a2f7..365766a 100644
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -9,8 +9,19 @@ config MN10300
 	def_bool y
 	select HAVE_OPROFILE
 
-config AM33
-	def_bool y
+config AM33_2
+	def_bool n
+
+config AM33_3
+	def_bool n
+
+config AM34_2
+	def_bool n
+	select MN10300_HAS_ATOMIC_OPS_UNIT
+	select MN10300_HAS_CACHE_SNOOP
+
+config ERRATUM_NEED_TO_RELOAD_MMUCTR
+	def_bool y if AM33_3 || AM34_2
 
 config MMU
 	def_bool y
@@ -37,7 +48,7 @@ config GENERIC_CALIBRATE_DELAY
 	def_bool y
 
 config GENERIC_CMOS_UPDATE
-        def_bool y
+        def_bool n
 
 config GENERIC_FIND_NEXT_BIT
 	def_bool y
@@ -45,6 +56,27 @@ config GENERIC_FIND_NEXT_BIT
 config GENERIC_HWEIGHT
 	def_bool y
 
+config GENERIC_TIME
+	def_bool y
+
+config GENERIC_CLOCKEVENTS
+	def_bool y
+
+config GENERIC_CLOCKEVENTS_BUILD
+	def_bool y
+	depends on GENERIC_CLOCKEVENTS
+
+config GENERIC_CLOCKEVENTS_BROADCAST
+	bool
+
+config CEVT_MN10300
+       def_bool y
+       depends on GENERIC_CLOCKEVENTS
+
+config CSRC_MN10300
+       def_bool y
+       depends on GENERIC_TIME
+
 config GENERIC_BUG
 	def_bool y
 
@@ -61,18 +93,14 @@ config GENERIC_HARDIRQS
 config HOTPLUG_CPU
 	def_bool n
 
-config HZ
-	int
-	default 1000
-
-mainmenu "Matsushita MN10300/AM33 Kernel Configuration"
+mainmenu "Panasonic MN10300/AM33 Kernel Configuration"
 
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
 
 
-menu "Matsushita MN10300 system setup"
+menu "Panasonic MN10300 system setup"
 
 choice
 	prompt "Unit type"
@@ -87,6 +115,10 @@ config MN10300_UNIT_ASB2303
 config MN10300_UNIT_ASB2305
 	bool "ASB2305"
 
+config MN10300_UNIT_ASB2364
+	bool "ASB2364"
+	select SMSC911X_ARCH_HOOKS if SMSC911X
+
 endchoice
 
 choice
@@ -99,57 +131,51 @@ choice
 config MN10300_PROC_MN103E010
 	bool "MN103E010"
 	depends on MN10300_UNIT_ASB2303 || MN10300_UNIT_ASB2305
+	select AM33_2
+	select MN10300_PROC_HAS_TTYSM0
+	select MN10300_PROC_HAS_TTYSM1
+	select MN10300_PROC_HAS_TTYSM2
+
+config MN10300_PROC_MN2WS0050
+	bool "MN2WS0050"
+	depends on MN10300_UNIT_ASB2364
+	select AM34_2
 	select MN10300_PROC_HAS_TTYSM0
 	select MN10300_PROC_HAS_TTYSM1
 	select MN10300_PROC_HAS_TTYSM2
 
 endchoice
 
-choice
-	prompt "Processor core support"
-	default MN10300_CPU_AM33V2
+config MN10300_HAS_ATOMIC_OPS_UNIT
+	def_bool n
 	help
-	  This option specifies the processor core for which the kernel will be
-	  compiled. It affects the instruction set used.
-
-config MN10300_CPU_AM33V2
-	bool "AM33v2"
-
-endchoice
+	  This should be enabled if the processor has an atomic ops unit
+	  capable of doing LL/SC equivalent operations.
 
 config FPU
 	bool "FPU present"
 	default y
-	depends on MN10300_PROC_MN103E010
+	depends on MN10300_PROC_MN103E010 || MN10300_PROC_MN2WS0050
 
-choice
-	prompt "CPU Caching mode"
-	default MN10300_CACHE_WBACK
+config LAZY_SAVE_FPU
+	bool "Save FPU state lazily"
+	default y
+	depends on FPU && !SMP
 	help
-	  This option determines the caching mode for the kernel.
-
-	  Write-Back caching mode involves the all reads and writes causing
-	  the affected cacheline to be read into the cache first before being
-	  operated upon. Memory is not then updated by a write until the cache
-	  is filled and a cacheline needs to be displaced from the cache to
-	  make room. Only at that point is it written back.
-
-	  Write-Through caching only fetches cachelines from memory on a
-	  read. Writes always get written directly to memory. If the affected
-	  cacheline is also in cache, it will be updated too.
-
-	  The final option is to turn of caching entirely.
+	  Enable this to be lazy in the saving of the FPU state to the owning
+	  task's thread struct.  This is useful if most tasks on the system
+	  don't use the FPU as only those tasks that use it will pass it
+	  between them, and the state needn't be saved for a task that isn't
+	  using it.
 
-config MN10300_CACHE_WBACK
-	bool "Write-Back"
+	  This can't be so easily used on SMP as the process that owns the FPU
+	  state on a CPU may be currently running on another CPU, so for the
+	  moment, it is disabled.
 
-config MN10300_CACHE_WTHRU
-	bool "Write-Through"
+source "arch/mn10300/mm/Kconfig.cache"
 
-config MN10300_CACHE_DISABLED
-	bool "Disabled"
-
-endchoice
+config MN10300_TLB_USE_PIDR
+	def_bool y
 
 menu "Memory layout options"
 
@@ -170,24 +196,55 @@ config KERNEL_TEXT_ADDRESS
 
 config KERNEL_ZIMAGE_BASE_ADDRESS
 	hex "Base address of compressed vmlinux image"
-	default "0x90700000"
+	default "0x50700000"
 
+config BOOT_STACK_OFFSET
+	hex
+	default	"0xF00"	if SMP
+	default	"0xFF0" if !SMP
+
+config BOOT_STACK_SIZE
+	hex
+	depends on SMP
+	default	"0x100"
 endmenu
 
-config PREEMPT
-	bool "Preemptible Kernel"
-	help
-	  This option reduces the latency of the kernel when reacting to
-	  real-time or interactive events by allowing a low priority process to
-	  be preempted even if it is in kernel mode executing a system call.
-	  This allows applications to run more reliably even when the system is
-	  under load.
+config SMP
+	bool "Symmetric multi-processing support"
+	default y
+	depends on MN10300_PROC_MN2WS0038 || MN10300_PROC_MN2WS0050
+	---help---
+	  This enables support for systems with more than one CPU. If you have
+	  a system with only one CPU, like most personal computers, say N. If
+	  you have a system with more than one CPU, say Y.
+
+	  If you say N here, the kernel will run on single and multiprocessor
+	  machines, but will use only one CPU of a multiprocessor machine. If
+	  you say Y here, the kernel will run on many, but not all,
+	  singleprocessor machines. On a singleprocessor machine, the kernel
+	  will run faster if you say N here.
 
-	  Say Y here if you are building a kernel for a desktop, embedded
-	  or real-time system.  Say N if you are unsure.
+	  See also <file:Documentation/i386/IO-APIC.txt>,
+	  <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  If you don't know what to do here, say N.
+
+config NR_CPUS
+	int
+	depends on SMP
+	default "2"
+
+config USE_GENERIC_SMP_HELPERS
+	bool
+	depends on SMP
+	default y
+
+source "kernel/Kconfig.preempt"
 
 config MN10300_CURRENT_IN_E2
 	bool "Hold current task address in E2 register"
+	depends on !SMP
 	default y
 	help
 	  This option removes the E2/R2 register from the set available to gcc
@@ -209,12 +266,15 @@ config MN10300_USING_JTAG
 	  suppresses the use of certain hardware debugging features, such as
 	  single-stepping, which are taken over completely by the JTAG unit.
 
+source "kernel/Kconfig.hz"
+source "kernel/time/Kconfig"
+
 config MN10300_RTC
 	bool "Using MN10300 RTC"
-	depends on MN10300_PROC_MN103E010
+	depends on MN10300_PROC_MN103E010 || MN10300_PROC_MN2WS0050
+	select GENERIC_CMOS_UPDATE
 	default n
 	help
-
 	  This option enables support for the RTC, thus enabling time to be
 	  tracked, even when system is powered down. This is available on-chip
 	  on the MN103E010.
@@ -306,14 +366,23 @@ config MN10300_TTYSM1
 
 choice
 	prompt "Select the timer to supply the clock for SIF1"
-	default MN10300_TTYSM0_TIMER9
+	default MN10300_TTYSM1_TIMER12 \
+		if !(AM33_2 || AM33_3)
+	default MN10300_TTYSM1_TIMER9 \
+		if AM33_2 || AM33_3
 	depends on MN10300_TTYSM1
 
+config MN10300_TTYSM1_TIMER12
+	bool "Use timer 12 (16-bit)"
+	depends on !(AM33_2 || AM33_3)
+
 config MN10300_TTYSM1_TIMER9
 	bool "Use timer 9 (16-bit)"
+	depends on AM33_2 || AM33_3
 
 config MN10300_TTYSM1_TIMER3
 	bool "Use timer 3 (8-bit)"
+	depends on AM33_2 || AM33_3
 
 endchoice
 
@@ -328,17 +397,107 @@ config MN10300_TTYSM2
 
 choice
 	prompt "Select the timer to supply the clock for SIF2"
-	default MN10300_TTYSM0_TIMER10
+	default MN10300_TTYSM2_TIMER3 \
+		if !(AM33_2 || AM33_3)
+	default MN10300_TTYSM2_TIMER10 \
+		if AM33_2 || AM33_3
 	depends on MN10300_TTYSM2
 
+config MN10300_TTYSM2_TIMER9
+	bool "Use timer 9 (16-bit)"
+	depends on !(AM33_2 || AM33_3)
+
+config MN10300_TTYSM2_TIMER1
+	bool "Use timer 1 (8-bit)"
+	depends on !(AM33_2 || AM33_3)
+
+config MN10300_TTYSM2_TIMER3
+	bool "Use timer 3 (8-bit)"
+	depends on !(AM33_2 || AM33_3)
+
 config MN10300_TTYSM2_TIMER10
 	bool "Use timer 10 (16-bit)"
+	depends on AM33_2 || AM33_3
 
 endchoice
 
 config MN10300_TTYSM2_CTS
 	bool "Enable the use of the CTS line /dev/ttySM2"
-	depends on MN10300_TTYSM2
+	depends on MN10300_TTYSM2 && AM33_2
+
+endmenu
+
+menu "Interrupt request priority options"
+
+comment "[!] NOTE: A lower number/level indicates a higher priority (0 is highest, 6 is lowest)"
+
+comment "____Non-maskable interrupt levels____"
+comment "The following must be set to a higher priority than local_irq_disable() and on-chip serial"
+
+config GDBSTUB_IRQ_LEVEL
+	int "GDBSTUB interrupt priority"
+	depends on GDBSTUB
+	range 0 1 if LINUX_CLI_LEVEL = 2
+	range 0 2 if LINUX_CLI_LEVEL = 3
+	range 0 3 if LINUX_CLI_LEVEL = 4
+	range 0 4 if LINUX_CLI_LEVEL = 5
+	range 0 5 if LINUX_CLI_LEVEL = 6
+	default 0
+
+comment "The following must be set to a higher priority than local_irq_disable()"
+
+config MN10300_SERIAL_IRQ_LEVEL
+	int "MN10300 on-chip serial interrupt priority"
+	depends on MN10300_TTYSM
+	range 1 1 if LINUX_CLI_LEVEL = 2
+	range 1 2 if LINUX_CLI_LEVEL = 3
+	range 1 3 if LINUX_CLI_LEVEL = 4
+	range 1 4 if LINUX_CLI_LEVEL = 5
+	range 1 5 if LINUX_CLI_LEVEL = 6
+	default 1
+
+comment "-"
+comment "____Maskable interrupt levels____"
+
+config LINUX_CLI_LEVEL
+	int "The highest interrupt priority excluded by local_irq_disable() (2-6)"
+	range 2 6
+	default 2
+	help
+	  local_irq_disable() doesn't actually disable maskable interrupts -
+	  what it does is restrict the levels of interrupt which are permitted
+	  (a lower level indicates a higher priority) by lowering the value in
+	  EPSW.IM from 7.  Any interrupt is permitted for which the level is
+	  lower than EPSW.IM.
+
+	  Certain interrupts, such as GDBSTUB and virtual MN10300 on-chip
+	  serial DMA interrupts are allowed to interrupt normal disabled
+	  sections.
+
+comment "The following must be set to a equal to or lower priority than LINUX_CLI_LEVEL"
+
+config TIMER_IRQ_LEVEL
+	int "Kernel timer interrupt priority"
+	range LINUX_CLI_LEVEL 6
+	default 4
+
+config PCI_IRQ_LEVEL
+	int "PCI interrupt priority"
+	depends on PCI
+	range LINUX_CLI_LEVEL 6
+	default 5
+
+config ETHERNET_IRQ_LEVEL
+	int "Ethernet interrupt priority"
+	depends on SMC91X || SMC911X || SMSC911X
+	range LINUX_CLI_LEVEL 6
+	default 6
+
+config EXT_SERIAL_IRQ_LEVEL
+	int "External serial port interrupt priority"
+	depends on SERIAL_8250
+	range LINUX_CLI_LEVEL 6
+	default 6
 
 endmenu
 

arch/mn10300/Makefile

View file

diff --git a/arch/mn10300/Makefile b/arch/mn10300/Makefile
index ac5c6bd..7120282 100644
--- a/arch/mn10300/Makefile
+++ b/arch/mn10300/Makefile
@@ -36,6 +36,9 @@ endif
 ifeq ($(CONFIG_MN10300_PROC_MN103E010),y)
 PROCESSOR	:= mn103e010
 endif
+ifeq ($(CONFIG_MN10300_PROC_MN2WS0050),y)
+PROCESSOR	:= mn2ws0050
+endif
 
 ifeq ($(CONFIG_MN10300_UNIT_ASB2303),y)
 UNIT		:= asb2303
@@ -43,6 +46,9 @@ endif
 ifeq ($(CONFIG_MN10300_UNIT_ASB2305),y)
 UNIT		:= asb2305
 endif
+ifeq ($(CONFIG_MN10300_UNIT_ASB2364),y)
+UNIT		:= asb2364
+endif
 
 
 head-y		:= arch/mn10300/kernel/head.o arch/mn10300/kernel/init_task.o

arch/mn10300/boot/compressed/head.S

View file

diff --git a/arch/mn10300/boot/compressed/head.S b/arch/mn10300/boot/compressed/head.S
index 502e1eb..7b50345 100644
--- a/arch/mn10300/boot/compressed/head.S
+++ b/arch/mn10300/boot/compressed/head.S
@@ -14,10 +14,29 @@
 
 #include <linux/linkage.h>
 #include <asm/cpu-regs.h>
+#include <asm/cache.h>
+#ifdef CONFIG_SMP
+#include <proc/smp-regs.h>
+#endif
 
 	.globl startup_32
 startup_32:
-	# first save off parameters from bootloader
+#ifdef CONFIG_SMP
+	#
+	# Secondary CPUs jump directly to the kernel entry point
+	#
+	# Must save primary CPU's D0-D2 registers as they hold boot parameters
+	#
+	mov	(CPUID), d3
+	and	CPUID_MASK,d3
+	beq	startup_primary
+	mov	CONFIG_KERNEL_TEXT_ADDRESS,a0
+	jmp	(a0)
+
+startup_primary:
+#endif /* CONFIG_SMP */
+
+	# first save parameters from bootloader
 	mov	param_save_area,a0
 	mov	d0,(a0)
 	mov	d1,(4,a0)
@@ -37,8 +56,15 @@ startup_32:
 	mov	(a0),d0
 	btst	CHCTR_ICBUSY|CHCTR_DCBUSY,d0		# wait till not busy
 	lne
-	mov	CHCTR_ICEN|CHCTR_DCEN|CHCTR_DCWTMD,d0	# writethru dcache
+
+#ifdef CONFIG_MN10300_CACHE_ENABLED
+#ifdef CONFIG_MN10300_CACHE_WBACK
+	mov	CHCTR_ICEN|CHCTR_DCEN|CHCTR_DCWTMD_WRBACK,d0
+#else
+	mov	CHCTR_ICEN|CHCTR_DCEN|CHCTR_DCWTMD_WRTHROUGH,d0
+#endif /* WBACK */
 	movhu	d0,(a0)					# enable
+#endif /* !ENABLED */
 
 	# clear the BSS area
 	mov	__bss_start,a0
@@ -54,6 +80,9 @@ bssclear_end:
 
 	# decompress the kernel
 	call	decompress_kernel[],0
+#ifdef CONFIG_MN10300_CACHE_WBACK
+	call	mn10300_dcache_flush_inv[],0
+#endif
 
 	# disable caches again
 	mov	CHCTR,a0
@@ -69,10 +98,46 @@ bssclear_end:
 	mov	(4,a0),d1
 	mov	(8,a0),d2
 
+	# jump to the kernel proper entry point
 	mov	a3,sp
 	mov	CONFIG_KERNEL_TEXT_ADDRESS,a0
 	jmp	(a0)
 
+
+###############################################################################
+#
+# Cache flush routines
+#
+###############################################################################
+#ifdef CONFIG_MN10300_CACHE_WBACK
+mn10300_dcache_flush_inv:
+	movhu	(CHCTR),d0
+	btst	CHCTR_DCEN,d0
+	beq	mn10300_dcache_flush_inv_end
+
+	mov	L1_CACHE_NENTRIES,d1
+	clr	a1
+
+mn10300_dcache_flush_inv_loop:
+	mov	(DCACHE_PURGE_WAY0(0),a1),d0	# unconditional purge
+	mov	(DCACHE_PURGE_WAY1(0),a1),d0	# unconditional purge
+	mov	(DCACHE_PURGE_WAY2(0),a1),d0	# unconditional purge
+	mov	(DCACHE_PURGE_WAY3(0),a1),d0	# unconditional purge
+
+	add	L1_CACHE_BYTES,a1
+	add	-1,d1
+	bne	mn10300_dcache_flush_inv_loop
+
+mn10300_dcache_flush_inv_end:
+	ret	[],0
+#endif /* CONFIG_MN10300_CACHE_WBACK */
+
+
+###############################################################################
+#
+# Data areas
+#
+###############################################################################
 	.data
 	.align		4
 param_save_area:

arch/mn10300/configs/asb2303_defconfig

View file

diff --git a/arch/mn10300/configs/asb2303_defconfig b/arch/mn10300/configs/asb2303_defconfig
index d80dfcb..3f749b6 100644
--- a/arch/mn10300/configs/asb2303_defconfig
+++ b/arch/mn10300/configs/asb2303_defconfig
@@ -12,6 +12,8 @@ CONFIG_SLAB=y
 CONFIG_PROFILING=y
 # CONFIG_BLOCK is not set
 CONFIG_PREEMPT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_MN10300_RTC=y
 CONFIG_MN10300_TTYSM_CONSOLE=y
 CONFIG_MN10300_TTYSM0=y

arch/mn10300/configs/asb2364_defconfig

View file

diff --git a/arch/mn10300/configs/asb2364_defconfig b/arch/mn10300/configs/asb2364_defconfig
new file mode 100644
index 0000000..83ce2f2
--- /dev/null
+++ b/arch/mn10300/configs/asb2364_defconfig
@@ -0,0 +1,98 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_NS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_RELAY=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_EMBEDDED=y
+# CONFIG_KALLSYMS is not set
+# CONFIG_VM_EVENT_COUNTERS is not set