projects/linux·commit f99c6bb6

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

f99c6bb6 · Linus Torvalds <[email protected]> · 2007-02-15 10:01:15 -08:00

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (35 commits)
  sh: rts7751r2d board updates.
  sh: Kill off dead bigsur and ec3104 boards.
  sh: Fixup r7780rp pata_platform for devres conversion.
  sh: Revert TLB miss fast-path changes that broke PTEA parts.
  sh: Compile fix for heartbeat consolidation.
  sh: heartbeat consolidation for banked LEDs.
  sh: define dma noncoherent API functions.
  sh: Missing flush_dcache_all() proto in cacheflush.h.
  sh: Kill dead/unused ISA code from __ioremap().
  sh: Add cpu-features header to asm/Kbuild.
  sh: Move __KERNEL__ up in asm/page.h.
  sh: Fix syscall numbering breakage.
  sh: dcache write-back for R7780RP PIO.
  sh: Switch to local TLB flush variants in additional callsites.
  sh: Local TLB flushing variants for SMP prep.
  sh: Fixup cpu_data references for the non-boot CPUs.
  sh: Use a per-cpu ASID cache.
  sh: add SH_CLK_MD Kconfig default.
  sh: Fixup SHMIN INTC register definitions.
  sh: SH-DMAC compile fixes
  ...
Commit
f99c6bb6e2e9c35bd3dc0b1d0faa28bd6970930d
Parents
e0a04cff · 9c57548f

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

Changes

125 files changed · +2012 −3583

FileStatusAddDelContent
arch/sh/Kconfigmodified+6−11View file
arch/sh/Makefilemodified+1−2View file
arch/sh/boards/bigsur/Makefiledeleted+0−6View before deletion
arch/sh/boards/bigsur/io.cdeleted+0−120View before deletion
arch/sh/boards/bigsur/irq.cdeleted+0−334View before deletion
arch/sh/boards/bigsur/led.cdeleted+0−54View before deletion
arch/sh/boards/bigsur/setup.cdeleted+0−88View before deletion
arch/sh/boards/ec3104/Makefiledeleted+0−6View before deletion
arch/sh/boards/ec3104/io.cdeleted+0−81View before deletion
arch/sh/boards/ec3104/irq.cdeleted+0−196View before deletion
arch/sh/boards/ec3104/setup.cdeleted+0−65View before deletion
arch/sh/boards/mpc1211/Makefilemodified+1−1View file
arch/sh/boards/mpc1211/led.cdeleted+0−63View before deletion
arch/sh/boards/mpc1211/setup.cmodified+27−4View file
arch/sh/boards/renesas/r7780rp/Makefilemodified+0−1View file
arch/sh/boards/renesas/r7780rp/io.cmodified+42−110View file
arch/sh/boards/renesas/r7780rp/led.cdeleted+0−43View before deletion
arch/sh/boards/renesas/r7780rp/setup.cmodified+37−12View file
arch/sh/boards/renesas/rts7751r2d/Makefilemodified+1−2View file
arch/sh/boards/renesas/rts7751r2d/io.cdeleted+0−302View before deletion
arch/sh/boards/renesas/rts7751r2d/irq.cmodified+19−61View file
arch/sh/boards/renesas/rts7751r2d/led.cdeleted+0−44View before deletion
arch/sh/boards/renesas/rts7751r2d/setup.cmodified+83−59View file
arch/sh/boards/se/7206/Makefilemodified+0−2View file
arch/sh/boards/se/7206/led.cdeleted+0−57View before deletion
arch/sh/boards/se/7206/setup.cmodified+27−7View file
arch/sh/boards/se/7300/Makefilemodified+0−2View file
arch/sh/boards/se/7300/led.cdeleted+0−54View before deletion
arch/sh/boards/se/7300/setup.cmodified+31−5View file
arch/sh/boards/se/73180/Makefilemodified+0−2View file
arch/sh/boards/se/73180/led.cdeleted+0−53View before deletion
arch/sh/boards/se/73180/setup.cmodified+27−4View file
arch/sh/boards/se/7343/Makefilemodified+0−2View file
arch/sh/boards/se/7343/led.cdeleted+0−44View before deletion
arch/sh/boards/se/7343/setup.cmodified+19−7View file
arch/sh/boards/se/770x/Makefilemodified+0−1View file
arch/sh/boards/se/770x/irq.cmodified+74−34View file
arch/sh/boards/se/770x/led.cdeleted+0−52View before deletion
arch/sh/boards/se/770x/setup.cmodified+32−11View file
arch/sh/boards/se/7751/Makefilemodified+0−1View file
arch/sh/boards/se/7751/led.cdeleted+0−51View before deletion
arch/sh/boards/se/7751/setup.cmodified+31−5View file
arch/sh/boards/sh03/Makefilemodified+0−1View file
arch/sh/boards/sh03/led.cdeleted+0−48View before deletion
arch/sh/boards/sh03/setup.cmodified+26−4View file
arch/sh/boards/shmin/setup.cmodified+11−1View file
arch/sh/cchips/voyagergx/irq.cmodified+32−38View file
arch/sh/cchips/voyagergx/setup.cmodified+2−2View file
arch/sh/configs/rts7751r2d_defconfigmodified+256−52View file
arch/sh/configs/se7750_defconfigmodified+120−20View file
arch/sh/drivers/Makefilemodified+1−0View file
arch/sh/drivers/dma/dma-sh.cmodified+16−29View file
arch/sh/drivers/heartbeat.cadded+132−0View file
arch/sh/drivers/pci/Makefilemodified+0−1View file
arch/sh/drivers/pci/ops-bigsur.cdeleted+0−83View before deletion
arch/sh/drivers/pci/pci-sh7751.cmodified+0−9View file
arch/sh/kernel/Makefilemodified+2−1View file
arch/sh/kernel/cpu/init.cmodified+24−17View file
arch/sh/kernel/cpu/irq/ipr.cmodified+16−3View file
arch/sh/kernel/cpu/sh2/entry.Smodified+5−7View file
arch/sh/kernel/cpu/sh2/probe.cmodified+16−16View file
arch/sh/kernel/cpu/sh2/setup-sh7619.cmodified+29−33View file
arch/sh/kernel/cpu/sh2a/probe.cmodified+8−8View file
arch/sh/kernel/cpu/sh2a/setup-sh7206.cmodified+43−46View file
arch/sh/kernel/cpu/sh3/entry.Smodified+21−186View file
arch/sh/kernel/cpu/sh3/probe.cmodified+21−21View file
arch/sh/kernel/cpu/sh3/setup-sh7709.cmodified+21−0View file
arch/sh/kernel/cpu/sh4/probe.cmodified+94−89View file
arch/sh/kernel/cpu/sh4/setup-sh7750.cmodified+3−1View file
arch/sh/kernel/cpu/sh4/setup-sh7760.cmodified+51−15View file
arch/sh/kernel/debugtraps.Sadded+41−0View file
arch/sh/kernel/early_printk.cmodified+22−2View file
arch/sh/kernel/entry-common.Smodified+43−76View file
arch/sh/kernel/io_generic.cmodified+7−5View file
arch/sh/kernel/kgdb_stub.cmodified+4−3View file
arch/sh/kernel/process.cmodified+52−43View file
arch/sh/kernel/setup.cmodified+25−24View file
arch/sh/kernel/sh_ksyms.cmodified+0−1View file
arch/sh/kernel/signal.cmodified+3−3View file
arch/sh/kernel/syscalls.Smodified+4−4View file
arch/sh/kernel/traps.cmodified+2−2View file
arch/sh/mm/Kconfigmodified+4−1View file
arch/sh/mm/cache-debugfs.cmodified+2−2View file
arch/sh/mm/cache-sh3.cmodified+4−4View file
arch/sh/mm/cache-sh4.cmodified+44−33View file
arch/sh/mm/cache-sh7705.cmodified+16−13View file
arch/sh/mm/fault.cmodified+87−0View file
arch/sh/mm/init.cmodified+1−6View file
arch/sh/mm/ioremap.cmodified+0−6View file
arch/sh/mm/pg-sh4.cmodified+3−25View file
arch/sh/mm/pg-sh7705.cmodified+5−32View file
arch/sh/mm/tlb-flush.cmodified+80−21View file
arch/sh/mm/tlb-nommu.cmodified+6−13View file
arch/sh/mm/tlb-sh3.cmodified+3−64View file
arch/sh/mm/tlb-sh4.cmodified+2−68View file
arch/sh/oprofile/op_model_sh7750.cmodified+1−1View file
arch/sh/tools/mach-typesmodified+0−1View file
include/asm-sh/Kbuildmodified+2−0View file
include/asm-sh/bigsur/bigsur.hdeleted+0−80View before deletion
include/asm-sh/bigsur/io.hdeleted+0−35View before deletion
include/asm-sh/bigsur/serial.hdeleted+0−24View before deletion
include/asm-sh/bugs.hmodified+3−3View file
include/asm-sh/cacheflush.hmodified+3−0View file
include/asm-sh/cpu-sh3/cacheflush.hmodified+0−2View file
include/asm-sh/cpu-sh4/cacheflush.hmodified+1−12View file
include/asm-sh/cpu-sh4/dma.hmodified+11−0View file
include/asm-sh/dma-mapping.hmodified+4−0View file
include/asm-sh/ec3104/ec3104.hdeleted+0−43View before deletion
include/asm-sh/ec3104/io.hdeleted+0−16View before deletion
include/asm-sh/ec3104/keyboard.hdeleted+0−15View before deletion
include/asm-sh/ec3104/serial.hdeleted+0−20View before deletion
include/asm-sh/irq.hmodified+0−4View file
include/asm-sh/kgdb.hmodified+4−4View file
include/asm-sh/mmu.hmodified+7−13View file
include/asm-sh/mmu_context.hmodified+36−25View file
include/asm-sh/page.hmodified+2−1View file
include/asm-sh/pgtable.hmodified+3−8View file
include/asm-sh/processor.hmodified+4−2View file
include/asm-sh/rts7751r2d.hmodified+4−0View file
include/asm-sh/serial.hmodified+1−10View file
include/asm-sh/thread_info.hmodified+12−4View file
include/asm-sh/tlbflush.hmodified+31−7View file
include/asm-sh/ubc.hmodified+1−1View file
include/asm-sh/unistd.hmodified+10−10View file
include/asm-sh/voyagergx.hmodified+4−1View file

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

arch/sh/Kconfig

View file
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 4f38912..4d16d89 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -135,12 +135,6 @@ config SH_HP6XX
More information (hardware only) at
<http://www.hp.com/jornada/>.
-config SH_EC3104
- bool "EC3104"
- help
- Select EC3104 if configuring for a system with an Eclipse
- International EC3104 chip, e.g. the Harris AD2000.
-
config SH_SATURN
bool "Saturn"
select CPU_SUBTYPE_SH7604
@@ -156,9 +150,6 @@ config SH_DREAMCAST
<http://www.m17n.org/linux-sh/dreamcast/>. There is a
Dreamcast project is at <http://linuxdc.sourceforge.net/>.
-config SH_BIGSUR
- bool "BigSur"
-
config SH_MPC1211
bool "Interface MPC1211"
help
@@ -481,6 +472,7 @@ config SH_PCLK_FREQ
config SH_CLK_MD
int "CPU Mode Pin Setting"
+ default 0
depends on CPU_SUBTYPE_SH7619 || CPU_SUBTYPE_SH7206
help
MD2 - MD0 pin setting.
@@ -510,8 +502,9 @@ source "arch/sh/cchips/Kconfig"
config HEARTBEAT
bool "Heartbeat LED"
depends on SH_MPC1211 || SH_SH03 || \
- SH_BIGSUR || SOLUTION_ENGINE || \
- SH_RTS7751R2D || SH_SH4202_MICRODEV || SH_LANDISK
+ SOLUTION_ENGINE || \
+ SH_RTS7751R2D || SH_SH4202_MICRODEV || SH_LANDISK || \
+ SH_R7780RP
help
Use the power-on LED on your machine as a load meter. The exact
behavior is platform-dependent, but normally the flash frequency is
@@ -596,6 +589,8 @@ menu "Boot options"
config ZERO_PAGE_OFFSET
hex "Zero page offset"
default "0x00004000" if SH_MPC1211 || SH_SH03
+ default "0x00010000" if PAGE_SIZE_64KB
+ default "0x00002000" if PAGE_SIZE_8KB
default "0x00001000"
help
This sets the default offset of zero page.

arch/sh/Makefile

View file
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index c1dbef2..bd9b172 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -35,6 +35,7 @@ endif
endif
cflags-$(CONFIG_CPU_SH2) := -m2
+cflags-$(CONFIG_CPU_SH2A) := -m2a $(call cc-option,-m2a-nofpu,)
cflags-$(CONFIG_CPU_SH3) := -m3
cflags-$(CONFIG_CPU_SH4) := -m4 \
$(call cc-option,-mno-implicit-fp,-m4-nofpu)
@@ -93,10 +94,8 @@ machdir-$(CONFIG_SH_7300_SOLUTION_ENGINE) := se/7300
machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE) := se/7343
machdir-$(CONFIG_SH_73180_SOLUTION_ENGINE) := se/73180
machdir-$(CONFIG_SH_HP6XX) := hp6xx
-machdir-$(CONFIG_SH_EC3104) := ec3104
machdir-$(CONFIG_SH_SATURN) := saturn
machdir-$(CONFIG_SH_DREAMCAST) := dreamcast
-machdir-$(CONFIG_SH_BIGSUR) := bigsur
machdir-$(CONFIG_SH_MPC1211) := mpc1211
machdir-$(CONFIG_SH_SH03) := sh03
machdir-$(CONFIG_SH_SECUREEDGE5410) := snapgear

arch/sh/boards/bigsur/Makefile

View before deletion
diff --git a/arch/sh/boards/bigsur/Makefile b/arch/sh/boards/bigsur/Makefile
deleted file mode 100644
index 0ff9497..0000000
--- a/arch/sh/boards/bigsur/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Makefile for the BigSur specific parts of the kernel
-#
-
-obj-y := setup.o io.o irq.o led.o
-

arch/sh/boards/bigsur/io.c

View before deletion
diff --git a/arch/sh/boards/bigsur/io.c b/arch/sh/boards/bigsur/io.c
deleted file mode 100644
index 23071f9..0000000
--- a/arch/sh/boards/bigsur/io.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * arch/sh/boards/bigsur/io.c
- *
- * By Dustin McIntire ([email protected]) (c)2001
- * Derived from io_hd64465.h, which bore the message:
- * By Greg Banks <[email protected]>
- * (c) 2000 PocketPenguins Inc.
- * and from io_hd64461.h, which bore the message:
- * Copyright 2000 Stuart Menefy ([email protected])
- *
- * May be copied or modified under the terms of the GNU General Public
- * License. See linux/COPYING for more information.
- *
- * IO functions for a Hitachi Big Sur Evaluation Board.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <asm/machvec.h>
-#include <asm/io.h>
-#include <asm/bigsur/bigsur.h>
-
-/* Low iomap maps port 0-1K to addresses in 8byte chunks */
-#define BIGSUR_IOMAP_LO_THRESH 0x400
-#define BIGSUR_IOMAP_LO_SHIFT 3
-#define BIGSUR_IOMAP_LO_MASK ((1<<BIGSUR_IOMAP_LO_SHIFT)-1)
-#define BIGSUR_IOMAP_LO_NMAP (BIGSUR_IOMAP_LO_THRESH>>BIGSUR_IOMAP_LO_SHIFT)
-static u32 bigsur_iomap_lo[BIGSUR_IOMAP_LO_NMAP];
-static u8 bigsur_iomap_lo_shift[BIGSUR_IOMAP_LO_NMAP];
-
-/* High iomap maps port 1K-64K to addresses in 1K chunks */
-#define BIGSUR_IOMAP_HI_THRESH 0x10000
-#define BIGSUR_IOMAP_HI_SHIFT 10
-#define BIGSUR_IOMAP_HI_MASK ((1<<BIGSUR_IOMAP_HI_SHIFT)-1)
-#define BIGSUR_IOMAP_HI_NMAP (BIGSUR_IOMAP_HI_THRESH>>BIGSUR_IOMAP_HI_SHIFT)
-static u32 bigsur_iomap_hi[BIGSUR_IOMAP_HI_NMAP];
-static u8 bigsur_iomap_hi_shift[BIGSUR_IOMAP_HI_NMAP];
-
-void bigsur_port_map(u32 baseport, u32 nports, u32 addr, u8 shift)
-{
- u32 port, endport = baseport + nports;
-
- pr_debug("bigsur_port_map(base=0x%0x, n=0x%0x, addr=0x%08x)\n",
- baseport, nports, addr);
-
- for (port = baseport ;
- port < endport && port < BIGSUR_IOMAP_LO_THRESH ;
- port += (1<<BIGSUR_IOMAP_LO_SHIFT)) {
- pr_debug(" maplo[0x%x] = 0x%08x\n", port, addr);
- bigsur_iomap_lo[port>>BIGSUR_IOMAP_LO_SHIFT] = addr;
- bigsur_iomap_lo_shift[port>>BIGSUR_IOMAP_LO_SHIFT] = shift;
- addr += (1<<(BIGSUR_IOMAP_LO_SHIFT));
- }
-
- for (port = max_t(u32, baseport, BIGSUR_IOMAP_LO_THRESH);
- port < endport && port < BIGSUR_IOMAP_HI_THRESH ;
- port += (1<<BIGSUR_IOMAP_HI_SHIFT)) {
- pr_debug(" maphi[0x%x] = 0x%08x\n", port, addr);
- bigsur_iomap_hi[port>>BIGSUR_IOMAP_HI_SHIFT] = addr;
- bigsur_iomap_hi_shift[port>>BIGSUR_IOMAP_HI_SHIFT] = shift;
- addr += (1<<(BIGSUR_IOMAP_HI_SHIFT));
- }
-}
-EXPORT_SYMBOL(bigsur_port_map);
-
-void bigsur_port_unmap(u32 baseport, u32 nports)
-{
- u32 port, endport = baseport + nports;
-
- pr_debug("bigsur_port_unmap(base=0x%0x, n=0x%0x)\n", baseport, nports);
-
- for (port = baseport ;
- port < endport && port < BIGSUR_IOMAP_LO_THRESH ;
- port += (1<<BIGSUR_IOMAP_LO_SHIFT)) {
- bigsur_iomap_lo[port>>BIGSUR_IOMAP_LO_SHIFT] = 0;
- }
-
- for (port = max_t(u32, baseport, BIGSUR_IOMAP_LO_THRESH);
- port < endport && port < BIGSUR_IOMAP_HI_THRESH ;
- port += (1<<BIGSUR_IOMAP_HI_SHIFT)) {
- bigsur_iomap_hi[port>>BIGSUR_IOMAP_HI_SHIFT] = 0;
- }
-}
-EXPORT_SYMBOL(bigsur_port_unmap);
-
-unsigned long bigsur_isa_port2addr(unsigned long port)
-{
- unsigned long addr = 0;
- unsigned char shift;
-
- /* Physical address not in P0, do nothing */
- if (PXSEG(port)) {
- addr = port;
- /* physical address in P0, map to P2 */
- } else if (port >= 0x30000) {
- addr = P2SEGADDR(port);
- /* Big Sur I/O + HD64465 registers 0x10000-0x30000 */
- } else if (port >= BIGSUR_IOMAP_HI_THRESH) {
- addr = BIGSUR_INTERNAL_BASE + (port - BIGSUR_IOMAP_HI_THRESH);
- /* Handle remapping of high IO/PCI IO ports */
- } else if (port >= BIGSUR_IOMAP_LO_THRESH) {
- addr = bigsur_iomap_hi[port >> BIGSUR_IOMAP_HI_SHIFT];
- shift = bigsur_iomap_hi_shift[port >> BIGSUR_IOMAP_HI_SHIFT];
-
- if (addr != 0)
- addr += (port & BIGSUR_IOMAP_HI_MASK) << shift;
- } else {
- /* Handle remapping of low IO ports */
- addr = bigsur_iomap_lo[port >> BIGSUR_IOMAP_LO_SHIFT];
- shift = bigsur_iomap_lo_shift[port >> BIGSUR_IOMAP_LO_SHIFT];
-
- if (addr != 0)
- addr += (port & BIGSUR_IOMAP_LO_MASK) << shift;
- }
-
- pr_debug("%s(0x%08lx) = 0x%08lx\n", __FUNCTION__, port, addr);
-
- return addr;
-}
-

arch/sh/boards/bigsur/irq.c

View before deletion
diff --git a/arch/sh/boards/bigsur/irq.c b/arch/sh/boards/bigsur/irq.c
deleted file mode 100644
index 1ab04da..0000000
--- a/arch/sh/boards/bigsur/irq.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- *
- * By Dustin McIntire ([email protected]) (c)2001
- *
- * Setup and IRQ handling code for the HD64465 companion chip.
- * by Greg Banks <[email protected]>
- * Copyright (c) 2000 PocketPenguins Inc
- *
- * Derived from setup_hd64465.c which bore the message:
- * Greg Banks <[email protected]>
- * Copyright (c) 2000 PocketPenguins Inc and
- * Copyright (C) 2000 YAEGASHI Takeshi
- * and setup_cqreek.c which bore message:
- * Copyright (C) 2000 Niibe Yutaka
- *
- * May be copied or modified under the terms of the GNU General Public
- * License. See linux/COPYING for more information.
- *
- * IRQ functions for a Hitachi Big Sur Evaluation Board.
- *
- */
-#undef DEBUG
-
-#include <linux/sched.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/param.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/bitops.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#include <asm/bigsur/io.h>
-#include <asm/hd64465/hd64465.h>
-#include <asm/bigsur/bigsur.h>
-
-//#define BIGSUR_DEBUG 3
-#undef BIGSUR_DEBUG
-
-#ifdef BIGSUR_DEBUG
-#define DIPRINTK(n, args...) if (BIGSUR_DEBUG>(n)) printk(args)
-#else
-#define DIPRINTK(n, args...)
-#endif /* BIGSUR_DEBUG */
-
-#ifdef CONFIG_HD64465
-extern int hd64465_irq_demux(int irq);
-#endif /* CONFIG_HD64465 */
-
-
-/*===========================================================*/
-// Big Sur CPLD IRQ Routines
-/*===========================================================*/
-
-/* Level 1 IRQ routines */
-static void disable_bigsur_l1irq(unsigned int irq)
-{
- unsigned char mask;
- unsigned int mask_port = ((irq - BIGSUR_IRQ_LOW)/8) ? BIGSUR_IRLMR1 : BIGSUR_IRLMR0;
- unsigned char bit = (1 << ((irq - MGATE_IRQ_LOW)%8) );
-
- if(irq >= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH) {
- pr_debug("Disable L1 IRQ %d\n", irq);
- DIPRINTK(2,"disable_bigsur_l1irq: IMR=0x%08x mask=0x%x\n",
- mask_port, bit);
-
- /* Disable IRQ - set mask bit */
- mask = inb(mask_port) | bit;
- outb(mask, mask_port);
- return;
- }
- pr_debug("disable_bigsur_l1irq: Invalid IRQ %d\n", irq);
-}
-
-static void enable_bigsur_l1irq(unsigned int irq)
-{
- unsigned char mask;
- unsigned int mask_port = ((irq - BIGSUR_IRQ_LOW)/8) ? BIGSUR_IRLMR1 : BIGSUR_IRLMR0;
- unsigned char bit = (1 << ((irq - MGATE_IRQ_LOW)%8) );
-
- if(irq >= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH) {
- pr_debug("Enable L1 IRQ %d\n", irq);
- DIPRINTK(2,"enable_bigsur_l1irq: IMR=0x%08x mask=0x%x\n",
- mask_port, bit);
- /* Enable L1 IRQ - clear mask bit */
- mask = inb(mask_port) & ~bit;
- outb(mask, mask_port);
- return;
- }
- pr_debug("enable_bigsur_l1irq: Invalid IRQ %d\n", irq);
-}
-
-
-/* Level 2 irq masks and registers for L2 decoding */
-/* Level2 bitmasks for each level 1 IRQ */
-const u32 bigsur_l2irq_mask[] =
- {0x40,0x80,0x08,0x01,0x01,0x3C,0x3E,0xFF,0x40,0x80,0x06,0x03};
-/* Level2 to ISR[n] map for each level 1 IRQ */
-const u32 bigsur_l2irq_reg[] =
- { 2, 2, 3, 3, 1, 2, 1, 0, 1, 1, 3, 2};
-/* Level2 to Level 1 IRQ map */
-const u32 bigsur_l2_l1_map[] =
- {7,7,7,7,7,7,7,7, 4,6,6,6,6,6,8,9, 11,11,5,5,5,5,0,1, 3,10,10,2,-1,-1,-1,-1};
-/* IRQ inactive level (high or low) */
-const u32 bigsur_l2_inactv_state[] = {0x00, 0xBE, 0xFC, 0xF7};
-
-/* CPLD external status and mask registers base and offsets */
-static const u32 isr_base = BIGSUR_IRQ0;
-static const u32 isr_offset = BIGSUR_IRQ0 - BIGSUR_IRQ1;
-static const u32 imr_base = BIGSUR_IMR0;
-static const u32 imr_offset = BIGSUR_IMR0 - BIGSUR_IMR1;
-
-#define REG_NUM(irq) ((irq-BIGSUR_2NDLVL_IRQ_LOW)/8 )
-
-/* Level 2 IRQ routines */
-static void disable_bigsur_l2irq(unsigned int irq)
-{
- unsigned char mask;
- unsigned char bit = 1 << ((irq-BIGSUR_2NDLVL_IRQ_LOW)%8);
- unsigned int mask_port = imr_base - REG_NUM(irq)*imr_offset;
-
- if(irq >= BIGSUR_2NDLVL_IRQ_LOW && irq < BIGSUR_2NDLVL_IRQ_HIGH) {
- pr_debug("Disable L2 IRQ %d\n", irq);
- DIPRINTK(2,"disable_bigsur_l2irq: IMR=0x%08x mask=0x%x\n",
- mask_port, bit);
-
- /* Disable L2 IRQ - set mask bit */
- mask = inb(mask_port) | bit;
- outb(mask, mask_port);
- return;
- }
- pr_debug("disable_bigsur_l2irq: Invalid IRQ %d\n", irq);
-}
-
-static void enable_bigsur_l2irq(unsigned int irq)
-{
- unsigned char mask;
- unsigned char bit = 1 << ((irq-BIGSUR_2NDLVL_IRQ_LOW)%8);
- unsigned int mask_port = imr_base - REG_NUM(irq)*imr_offset;
-
- if(irq >= BIGSUR_2NDLVL_IRQ_LOW && irq < BIGSUR_2NDLVL_IRQ_HIGH) {
- pr_debug("Enable L2 IRQ %d\n", irq);
- DIPRINTK(2,"enable_bigsur_l2irq: IMR=0x%08x mask=0x%x\n",
- mask_port, bit);
-
- /* Enable L2 IRQ - clear mask bit */
- mask = inb(mask_port) & ~bit;
- outb(mask, mask_port);
- return;
- }
- pr_debug("enable_bigsur_l2irq: Invalid IRQ %d\n", irq);
-}
-
-static void mask_and_ack_bigsur(unsigned int irq)
-{
- pr_debug("mask_and_ack_bigsur IRQ %d\n", irq);
- if(irq >= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH)
- disable_bigsur_l1irq(irq);
- else
- disable_bigsur_l2irq(irq);
-}
-
-static void end_bigsur_irq(unsigned int irq)
-{
- pr_debug("end_bigsur_irq IRQ %d\n", irq);
- if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) {
- if(irq >= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH)
- enable_bigsur_l1irq(irq);
- else
- enable_bigsur_l2irq(irq);
- }
-}
-
-static unsigned int startup_bigsur_irq(unsigned int irq)
-{
- u8 mask;
- u32 reg;
-
- pr_debug("startup_bigsur_irq IRQ %d\n", irq);
-
- if(irq >= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH) {
- /* Enable the L1 IRQ */
- enable_bigsur_l1irq(irq);
- /* Enable all L2 IRQs in this L1 IRQ */
- mask = ~(bigsur_l2irq_mask[irq-BIGSUR_IRQ_LOW]);
- reg = imr_base - bigsur_l2irq_reg[irq-BIGSUR_IRQ_LOW] * imr_offset;
- mask &= inb(reg);
- outb(mask,reg);
- DIPRINTK(2,"startup_bigsur_irq: IMR=0x%08x mask=0x%x\n",reg,inb(reg));
- }
- else {
- /* Enable the L2 IRQ - clear mask bit */
- enable_bigsur_l2irq(irq);
- /* Enable the L1 bit masking this L2 IRQ */
- enable_bigsur_l1irq(bigsur_l2_l1_map[irq-BIGSUR_2NDLVL_IRQ_LOW]);
- DIPRINTK(2,"startup_bigsur_irq: L1=%d L2=%d\n",
- bigsur_l2_l1_map[irq-BIGSUR_2NDLVL_IRQ_LOW],irq);
- }
- return 0;
-}
-
-static void shutdown_bigsur_irq(unsigned int irq)
-{
- pr_debug("shutdown_bigsur_irq IRQ %d\n", irq);
- if(irq >= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH)
- disable_bigsur_l1irq(irq);
- else
- disable_bigsur_l2irq(irq);
-}
-
-/* Define the IRQ structures for the L1 and L2 IRQ types */
-static struct hw_interrupt_type bigsur_l1irq_type = {
- .typename = "BigSur-CPLD-Level1-IRQ",
- .startup = startup_bigsur_irq,
- .shutdown = shutdown_bigsur_irq,
- .enable = enable_bigsur_l1irq,
- .disable = disable_bigsur_l1irq,
- .ack = mask_and_ack_bigsur,
- .end = end_bigsur_irq
-};
-
-static struct hw_interrupt_type bigsur_l2irq_type = {
- .typename = "BigSur-CPLD-Level2-IRQ",
- .startup = startup_bigsur_irq,
- .shutdown =shutdown_bigsur_irq,
- .enable = enable_bigsur_l2irq,
- .disable = disable_bigsur_l2irq,
- .ack = mask_and_ack_bigsur,
- .end = end_bigsur_irq
-};
-
-
-static void make_bigsur_l1isr(unsigned int irq) {
-
- /* sanity check first */
- if(irq >= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH) {
- /* save the handler in the main description table */
- irq_desc[irq].chip = &bigsur_l1irq_type;
- irq_desc[irq].status = IRQ_DISABLED;
- irq_desc[irq].action = 0;
- irq_desc[irq].depth = 1;
-
- disable_bigsur_l1irq(irq);
- return;
- }
- pr_debug("make_bigsur_l1isr: bad irq, %d\n", irq);
- return;
-}
-
-static void make_bigsur_l2isr(unsigned int irq) {
-
- /* sanity check first */
- if(irq >= BIGSUR_2NDLVL_IRQ_LOW && irq < BIGSUR_2NDLVL_IRQ_HIGH) {
- /* save the handler in the main description table */
- irq_desc[irq].chip = &bigsur_l2irq_type;
- irq_desc[irq].status = IRQ_DISABLED;
- irq_desc[irq].action = 0;
- irq_desc[irq].depth = 1;
-
- disable_bigsur_l2irq(irq);
- return;
- }
- pr_debug("make_bigsur_l2isr: bad irq, %d\n", irq);
- return;
-}
-
-/* The IRQ's will be decoded as follows:
- * If a level 2 handler exists and there is an unmasked active
- * IRQ, the 2nd level handler will be called.
- * If a level 2 handler does not exist for the active IRQ
- * the 1st level handler will be called.
- */
-
-int bigsur_irq_demux(int irq)
-{
- int dmux_irq = irq;
- u8 mask, actv_irqs;
- u32 reg_num;
-
- DIPRINTK(3,"bigsur_irq_demux, irq=%d\n", irq);
- /* decode the 1st level IRQ */
- if(irq >= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH) {
- /* Get corresponding L2 ISR bitmask and ISR number */
- mask = bigsur_l2irq_mask[irq-BIGSUR_IRQ_LOW];
- reg_num = bigsur_l2irq_reg[irq-BIGSUR_IRQ_LOW];
- /* find the active IRQ's (XOR with inactive level)*/
- actv_irqs = inb(isr_base-reg_num*isr_offset) ^
- bigsur_l2_inactv_state[reg_num];
- /* decode active IRQ's */
- actv_irqs = actv_irqs & mask & ~(inb(imr_base-reg_num*imr_offset));
- /* if NEZ then we have an active L2 IRQ */
- if(actv_irqs) dmux_irq = ffz(~actv_irqs) + reg_num*8+BIGSUR_2NDLVL_IRQ_LOW;
- /* if no 2nd level IRQ action, but has 1st level, use 1st level handler */
- if(!irq_desc[dmux_irq].action && irq_desc[irq].action)
- dmux_irq = irq;
- DIPRINTK(1,"bigsur_irq_demux: irq=%d dmux_irq=%d mask=0x%04x reg=%d\n",
- irq, dmux_irq, mask, reg_num);
- }
-#ifdef CONFIG_HD64465
- dmux_irq = hd64465_irq_demux(dmux_irq);
-#endif /* CONFIG_HD64465 */
- DIPRINTK(3,"bigsur_irq_demux, demux_irq=%d\n", dmux_irq);
-
- return dmux_irq;
-}
-
-/*===========================================================*/
-// Big Sur Init Routines
-/*===========================================================*/
-void __init init_bigsur_IRQ(void)
-{
- int i;
-
- if (!MACH_BIGSUR) return;
-
- /* Create ISR's for Big Sur CPLD IRQ's */
- /*==============================================================*/
- for(i=BIGSUR_IRQ_LOW;i<BIGSUR_IRQ_HIGH;i++)
- make_bigsur_l1isr(i);
-
- printk(KERN_INFO "Big Sur CPLD L1 interrupts %d to %d.\n",
- BIGSUR_IRQ_LOW,BIGSUR_IRQ_HIGH);
-
- for(i=BIGSUR_2NDLVL_IRQ_LOW;i<BIGSUR_2NDLVL_IRQ_HIGH;i++)
- make_bigsur_l2isr(i);
-
- printk(KERN_INFO "Big Sur CPLD L2 interrupts %d to %d.\n",
- BIGSUR_2NDLVL_IRQ_LOW,BIGSUR_2NDLVL_IRQ_HIGH);
-
-}

arch/sh/boards/bigsur/led.c

View before deletion
diff --git a/arch/sh/boards/bigsur/led.c b/arch/sh/boards/bigsur/led.c
deleted file mode 100644
index d221439..0000000
--- a/arch/sh/boards/bigsur/led.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * linux/arch/sh/boards/bigsur/led.c
- *
- * By Dustin McIntire ([email protected]) (c)2001
- * Derived from led_se.c and led.c, which bore the message:
- * Copyright (C) 2000 Stuart Menefy <[email protected]>
- *
- * May be copied or modified under the terms of the GNU General Public
- * License. See linux/COPYING for more information.
- *
- * This file contains Big Sur specific LED code.
- */
-
-#include <asm/io.h>
-#include <asm/bigsur/bigsur.h>
-
-static void mach_led(int position, int value)
-{
- int word;
-
- word = bigsur_inl(BIGSUR_CSLR);
- if (value) {
- bigsur_outl(word & ~BIGSUR_LED, BIGSUR_CSLR);
- } else {
- bigsur_outl(word | BIGSUR_LED, BIGSUR_CSLR);
- }
-}
-
-#ifdef CONFIG_HEARTBEAT
-
-#include <linux/sched.h>
-
-/* Cycle the LED on/off */
-void heartbeat_bigsur(void)
-{
- static unsigned cnt = 0, period = 0, dist = 0;
-

This diff is incomplete. Download the complete patch.

arch/sh/boards/bigsur/setup.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/ec3104/Makefile

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/ec3104/io.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/ec3104/irq.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/ec3104/setup.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/mpc1211/Makefile

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/mpc1211/led.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/mpc1211/setup.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/renesas/r7780rp/Makefile

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/renesas/r7780rp/io.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/renesas/r7780rp/led.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/renesas/r7780rp/setup.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/renesas/rts7751r2d/Makefile

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/renesas/rts7751r2d/io.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/renesas/rts7751r2d/irq.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/renesas/rts7751r2d/led.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/renesas/rts7751r2d/setup.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/7206/Makefile

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/7206/led.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/7206/setup.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/7300/Makefile

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/7300/led.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/7300/setup.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/73180/Makefile

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/73180/led.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/73180/setup.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/7343/Makefile

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/7343/led.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/7343/setup.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/770x/Makefile

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/770x/irq.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/770x/led.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/770x/setup.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/7751/Makefile

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/7751/led.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/se/7751/setup.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/sh03/Makefile

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/sh03/led.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/boards/sh03/setup.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/boards/shmin/setup.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/cchips/voyagergx/irq.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/cchips/voyagergx/setup.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/configs/rts7751r2d_defconfig

View file

This diff is incomplete. Download the complete patch.

arch/sh/configs/se7750_defconfig

View file

This diff is incomplete. Download the complete patch.

arch/sh/drivers/Makefile

View file

This diff is incomplete. Download the complete patch.

arch/sh/drivers/dma/dma-sh.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/drivers/heartbeat.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/drivers/pci/Makefile

View file

This diff is incomplete. Download the complete patch.

arch/sh/drivers/pci/ops-bigsur.c

View before deletion

This diff is incomplete. Download the complete patch.

arch/sh/drivers/pci/pci-sh7751.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/Makefile

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/cpu/init.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/cpu/irq/ipr.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/cpu/sh2/entry.S

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/cpu/sh2/probe.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/cpu/sh2/setup-sh7619.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/cpu/sh2a/probe.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/cpu/sh2a/setup-sh7206.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/cpu/sh3/entry.S

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/cpu/sh3/probe.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/cpu/sh3/setup-sh7709.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/cpu/sh4/probe.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/cpu/sh4/setup-sh7750.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/cpu/sh4/setup-sh7760.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/debugtraps.S

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/early_printk.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/entry-common.S

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/io_generic.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/kgdb_stub.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/process.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/setup.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/sh_ksyms.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/signal.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/syscalls.S

View file

This diff is incomplete. Download the complete patch.

arch/sh/kernel/traps.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/mm/Kconfig

View file

This diff is incomplete. Download the complete patch.

arch/sh/mm/cache-debugfs.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/mm/cache-sh3.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/mm/cache-sh4.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/mm/cache-sh7705.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/mm/fault.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/mm/init.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/mm/ioremap.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/mm/pg-sh4.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/mm/pg-sh7705.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/mm/tlb-flush.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/mm/tlb-nommu.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/mm/tlb-sh3.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/mm/tlb-sh4.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/oprofile/op_model_sh7750.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/tools/mach-types

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/Kbuild

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/bigsur/bigsur.h

View before deletion

This diff is incomplete. Download the complete patch.

include/asm-sh/bigsur/io.h

View before deletion

This diff is incomplete. Download the complete patch.

include/asm-sh/bigsur/serial.h

View before deletion

This diff is incomplete. Download the complete patch.

include/asm-sh/bugs.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/cacheflush.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/cpu-sh3/cacheflush.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/cpu-sh4/cacheflush.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/cpu-sh4/dma.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/dma-mapping.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/ec3104/ec3104.h

View before deletion

This diff is incomplete. Download the complete patch.

include/asm-sh/ec3104/io.h

View before deletion

This diff is incomplete. Download the complete patch.

include/asm-sh/ec3104/keyboard.h

View before deletion

This diff is incomplete. Download the complete patch.

include/asm-sh/ec3104/serial.h

View before deletion

This diff is incomplete. Download the complete patch.

include/asm-sh/irq.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/kgdb.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/mmu.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/mmu_context.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/page.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/pgtable.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/processor.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/rts7751r2d.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/serial.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/thread_info.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/tlbflush.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/ubc.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/unistd.h

View file

This diff is incomplete. Download the complete patch.

include/asm-sh/voyagergx.h

View file

This diff is incomplete. Download the complete patch.