Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

Pull SuperH updates from Paul Mundt.

* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (25 commits)
  sh: Support I/O space swapping where needed.
  sh: use set_current_blocked() and block_sigmask()
  sh: no need to reset handler if SA_ONESHOT
  sh: intc: Fix up section mismatch for intc_ack_data
  sh: select ARCH_DISCARD_MEMBLOCK.
  sh: Consolidate duplicate _32/_64 unistd definitions.
  sh: ecovec: switch SDHI controllers to card polling
  sh: Avoid exporting unimplemented syscalls.
  sh: add platform_device for RSPI in setup-sh7757
  SH: pci-sh7780: enable big-endian operation.
  serial: sh-sci: fix a race of DMA submit_tx on transfer
  sh: dma: Collect up CHCR of SH7763, SH7764, SH7780 and SH7785
  sh: dma: Collect up CHCR of SH7723 and SH7730
  sh/next: Fix build fail by asm/system.h in asm/bitops.h
  arch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and free_irq are compatible
  sh: cpufreq: Wire up scaling_available_freqs support.
  sh: cpufreq: notify about rate rounding fallback.
  sh: cpufreq: Support CPU clock frequency table.
  sh: cpufreq: struct device lookup from CPU topology.
  sh: cpufreq: percpu struct clk accounting.
  ...

6 files changed, 130 insertions, 102 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
index 2875e8be4f72..c8836cffa216 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
@@ -680,6 +680,25 @@ static struct platform_device spi1_device = {
         .resource       = spi1_resources,
 };
 
+static struct resource rspi_resources[] = {
+        {
+                .start  = 0xfe480000,
+                .end    = 0xfe4800ff,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = 220,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device rspi_device = {
+        .name   = "rspi",
+        .id     = 2,
+        .num_resources  = ARRAY_SIZE(rspi_resources),
+        .resource       = rspi_resources,
+};
+
 static struct resource usb_ehci_resources[] = {
         [0] = {
                 .start  = 0xfe4f1000,
@@ -740,6 +759,7 @@ static struct platform_device *sh7757_devices[] __initdata = {
         &dma3_device,
         &spi0_device,
         &spi1_device,
+        &rspi_device,
         &usb_ehci_device,
         &usb_ohci_device,
 };
diff --git a/arch/sh/kernel/cpufreq.c b/arch/sh/kernel/cpufreq.c
index 0fffacea6ed9..e68b45b6f3f9 100644
--- a/arch/sh/kernel/cpufreq.c
+++ b/arch/sh/kernel/cpufreq.c
@@ -3,7 +3,7 @@
  *
  * cpufreq driver for the SuperH processors.
  *
- * Copyright (C) 2002 - 2007 Paul Mundt
+ * Copyright (C) 2002 - 2012 Paul Mundt
  * Copyright (C) 2002 M. R. Brown
  *
  * Clock framework bits from arch/avr32/mach-at32ap/cpufreq.c
@@ -14,6 +14,8 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
+#define pr_fmt(fmt) "cpufreq: " fmt
+
 #include <linux/types.h>
 #include <linux/cpufreq.h>
 #include <linux/kernel.h>
@@ -21,15 +23,18 @@
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/cpumask.h>
+#include <linux/cpu.h>
 #include <linux/smp.h>
 #include <linux/sched.h>        /* set_cpus_allowed() */
 #include <linux/clk.h>
+#include <linux/percpu.h>
+#include <linux/sh_clk.h>
 
-static struct clk *cpuclk;
+static DEFINE_PER_CPU(struct clk, sh_cpuclk);
 
 static unsigned int sh_cpufreq_get(unsigned int cpu)
 {
-        return (clk_get_rate(cpuclk) + 500) / 1000;
+        return (clk_get_rate(&per_cpu(sh_cpuclk, cpu)) + 500) / 1000;
 }
 
 /*
@@ -40,8 +45,10 @@ static int sh_cpufreq_target(struct cpufreq_policy *policy,
                              unsigned int relation)
 {
         unsigned int cpu = policy->cpu;
+        struct clk *cpuclk = &per_cpu(sh_cpuclk, cpu);
         cpumask_t cpus_allowed;
         struct cpufreq_freqs freqs;
+        struct device *dev;
         long freq;
 
         if (!cpu_online(cpu))
@@ -52,13 +59,15 @@ static int sh_cpufreq_target(struct cpufreq_policy *policy,
 
         BUG_ON(smp_processor_id() != cpu);
 
+        dev = get_cpu_device(cpu);
+
         /* Convert target_freq from kHz to Hz */
         freq = clk_round_rate(cpuclk, target_freq * 1000);
 
         if (freq < (policy->min * 1000) || freq > (policy->max * 1000))
                 return -EINVAL;
 
-        pr_debug("cpufreq: requested frequency %u Hz\n", target_freq * 1000);
+        dev_dbg(dev, "requested frequency %u Hz\n", target_freq * 1000);
 
         freqs.cpu       = cpu;
         freqs.old       = sh_cpufreq_get(cpu);
@@ -70,78 +79,112 @@ static int sh_cpufreq_target(struct cpufreq_policy *policy,
         clk_set_rate(cpuclk, freq);
         cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
 
-        pr_debug("cpufreq: set frequency %lu Hz\n", freq);
+        dev_dbg(dev, "set frequency %lu Hz\n", freq);
+
+        return 0;
+}
+
+static int sh_cpufreq_verify(struct cpufreq_policy *policy)
+{
+        struct clk *cpuclk = &per_cpu(sh_cpuclk, policy->cpu);
+        struct cpufreq_frequency_table *freq_table;
+
+        freq_table = cpuclk->nr_freqs ? cpuclk->freq_table : NULL;
+        if (freq_table)
+                return cpufreq_frequency_table_verify(policy, freq_table);
+
+        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
+                                     policy->cpuinfo.max_freq);
+
+        policy->min = (clk_round_rate(cpuclk, 1) + 500) / 1000;
+        policy->max = (clk_round_rate(cpuclk, ~0UL) + 500) / 1000;
+
+        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
+                                     policy->cpuinfo.max_freq);
 
         return 0;
 }
 
 static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
-        if (!cpu_online(policy->cpu))
+        unsigned int cpu = policy->cpu;
+        struct clk *cpuclk = &per_cpu(sh_cpuclk, cpu);
+        struct cpufreq_frequency_table *freq_table;
+        struct device *dev;
+
+        if (!cpu_online(cpu))
                 return -ENODEV;
 
-        cpuclk = clk_get(NULL, "cpu_clk");
+        dev = get_cpu_device(cpu);
+
+        cpuclk = clk_get(dev, "cpu_clk");
         if (IS_ERR(cpuclk)) {
-                printk(KERN_ERR "cpufreq: couldn't get CPU#%d clk\n",
-                       policy->cpu);
+                dev_err(dev, "couldn't get CPU clk\n");
                 return PTR_ERR(cpuclk);
         }
 
-        /* cpuinfo and default policy values */
-        policy->cpuinfo.min_freq = (clk_round_rate(cpuclk, 1) + 500) / 1000;
-        policy->cpuinfo.max_freq = (clk_round_rate(cpuclk, ~0UL) + 500) / 1000;
-        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
+        policy->cur = policy->min = policy->max = sh_cpufreq_get(cpu);
 
-        policy->cur             = sh_cpufreq_get(policy->cpu);
-        policy->min             = policy->cpuinfo.min_freq;
-        policy->max             = policy->cpuinfo.max_freq;
+        freq_table = cpuclk->nr_freqs ? cpuclk->freq_table : NULL;
+        if (freq_table) {
+                int result;
 
-        /*
-         * Catch the cases where the clock framework hasn't been wired up
-         * properly to support scaling.
-         */
-        if (unlikely(policy->min == policy->max)) {
-                printk(KERN_ERR "cpufreq: clock framework rate rounding "
-                       "not supported on CPU#%d.\n", policy->cpu);
+                result = cpufreq_frequency_table_cpuinfo(policy, freq_table);
+                if (!result)
+                        cpufreq_frequency_table_get_attr(freq_table, cpu);
+        } else {
+                dev_notice(dev, "no frequency table found, falling back "
+                           "to rate rounding.\n");
 
-                clk_put(cpuclk);
-                return -EINVAL;
+                policy->cpuinfo.min_freq =
+                        (clk_round_rate(cpuclk, 1) + 500) / 1000;
+                policy->cpuinfo.max_freq =
+                        (clk_round_rate(cpuclk, ~0UL) + 500) / 1000;
         }
 
-        printk(KERN_INFO "cpufreq: CPU#%d Frequencies - Minimum %u.%03u MHz, "
+        policy->min = policy->cpuinfo.min_freq;
+        policy->max = policy->cpuinfo.max_freq;
+
+        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
+
+        dev_info(dev, "CPU Frequencies - Minimum %u.%03u MHz, "
                "Maximum %u.%03u MHz.\n",
-               policy->cpu, policy->min / 1000, policy->min % 1000,
+               policy->min / 1000, policy->min % 1000,
                policy->max / 1000, policy->max % 1000);
 
         return 0;
 }
 
-static int sh_cpufreq_verify(struct cpufreq_policy *policy)
+static int sh_cpufreq_cpu_exit(struct cpufreq_policy *policy)
 {
-        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
-                                     policy->cpuinfo.max_freq);
-        return 0;
-}
+        unsigned int cpu = policy->cpu;
+        struct clk *cpuclk = &per_cpu(sh_cpuclk, cpu);
 
-static int sh_cpufreq_exit(struct cpufreq_policy *policy)
-{
+        cpufreq_frequency_table_put_attr(cpu);
         clk_put(cpuclk);
+
         return 0;
 }
 
+static struct freq_attr *sh_freq_attr[] = {
+        &cpufreq_freq_attr_scaling_available_freqs,
+        NULL,
+};
+
 static struct cpufreq_driver sh_cpufreq_driver = {
         .owner          = THIS_MODULE,
         .name           = "sh",
-        .init           = sh_cpufreq_cpu_init,
-        .verify         = sh_cpufreq_verify,
-        .target         = sh_cpufreq_target,
         .get            = sh_cpufreq_get,
-        .exit           = sh_cpufreq_exit,
+        .target         = sh_cpufreq_target,
+        .verify         = sh_cpufreq_verify,
+        .init           = sh_cpufreq_cpu_init,
+        .exit           = sh_cpufreq_cpu_exit,
+        .attr           = sh_freq_attr,
 };
 
 static int __init sh_cpufreq_module_init(void)
 {
-        printk(KERN_INFO "cpufreq: SuperH CPU frequency driver.\n");
+        pr_notice("SuperH CPU frequency driver.\n");
         return cpufreq_register_driver(&sh_cpufreq_driver);
 }
 
diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c
index 0bc58866add1..5901fba3176e 100644
--- a/arch/sh/kernel/signal_32.c
+++ b/arch/sh/kernel/signal_32.c
@@ -57,12 +57,13 @@ sys_sigsuspend(old_sigset_t mask,
                unsigned long r5, unsigned long r6, unsigned long r7,
                struct pt_regs __regs)
 {
-        mask &= _BLOCKABLE;
-        spin_lock_irq(&current->sighand->siglock);
+        sigset_t blocked;
+
         current->saved_sigmask = current->blocked;
-        siginitset(&current->blocked, mask);
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
+
+        mask &= _BLOCKABLE;
+        siginitset(&blocked, mask);
+        set_current_blocked(&blocked);
 
         current->state = TASK_INTERRUPTIBLE;
         schedule();
@@ -239,11 +240,7 @@ asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5,
                 goto badframe;
 
         sigdelsetmask(&set, ~_BLOCKABLE);
-
-        spin_lock_irq(&current->sighand->siglock);
-        current->blocked = set;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
+        set_current_blocked(&set);
 
         if (restore_sigcontext(regs, &frame->sc, &r0))
                 goto badframe;
@@ -273,10 +270,7 @@ asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
                 goto badframe;
 
         sigdelsetmask(&set, ~_BLOCKABLE);
-        spin_lock_irq(&current->sighand->siglock);
-        current->blocked = set;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
+        set_current_blocked(&set);
 
         if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &r0))
                 goto badframe;
@@ -547,17 +541,8 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
         else
                 ret = setup_frame(sig, ka, oldset, regs);
 
-        if (ka->sa.sa_flags & SA_ONESHOT)
-                ka->sa.sa_handler = SIG_DFL;
-
-        if (ret == 0) {
-                spin_lock_irq(&current->sighand->siglock);
-                sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
-                if (!(ka->sa.sa_flags & SA_NODEFER))
-                        sigaddset(&current->blocked,sig);
-                recalc_sigpending();
-                spin_unlock_irq(&current->sighand->siglock);
-        }
+        if (ret == 0)
+                block_sigmask(ka, sig);
 
         return ret;
 }
diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c
index 6b5603fe274b..3c9a6f7dcdce 100644
--- a/arch/sh/kernel/signal_64.c
+++ b/arch/sh/kernel/signal_64.c
@@ -159,14 +159,13 @@ sys_sigsuspend(old_sigset_t mask,
                unsigned long r6, unsigned long r7,
                struct pt_regs * regs)
 {
-        sigset_t saveset;
+        sigset_t saveset, blocked;
 
-        mask &= _BLOCKABLE;
-        spin_lock_irq(&current->sighand->siglock);
         saveset = current->blocked;
-        siginitset(&current->blocked, mask);
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
+
+        mask &= _BLOCKABLE;
+        siginitset(&blocked, mask);
+        set_current_blocked(&blocked);
 
         REF_REG_RET = -EINTR;
         while (1) {
@@ -198,11 +197,8 @@ sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize,
         if (copy_from_user(&newset, unewset, sizeof(newset)))
                 return -EFAULT;
         sigdelsetmask(&newset, ~_BLOCKABLE);
-        spin_lock_irq(&current->sighand->siglock);
         saveset = current->blocked;
-        current->blocked = newset;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
+        set_current_blocked(&newset);
 
         REF_REG_RET = -EINTR;
         while (1) {
@@ -408,11 +404,7 @@ asmlinkage int sys_sigreturn(unsigned long r2, unsigned long r3,
                 goto badframe;
 
         sigdelsetmask(&set, ~_BLOCKABLE);
-
-        spin_lock_irq(&current->sighand->siglock);
-        current->blocked = set;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
+        set_current_blocked(&set);
 
         if (restore_sigcontext(regs, &frame->sc, &ret))
                 goto badframe;
@@ -445,10 +437,7 @@ asmlinkage int sys_rt_sigreturn(unsigned long r2, unsigned long r3,
                 goto badframe;
 
         sigdelsetmask(&set, ~_BLOCKABLE);
-        spin_lock_irq(&current->sighand->siglock);
-        current->blocked = set;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
+        set_current_blocked(&set);
 
         if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &ret))
                 goto badframe;
@@ -734,17 +723,8 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
         else
                 ret = setup_frame(sig, ka, oldset, regs);
 
-        if (ka->sa.sa_flags & SA_ONESHOT)
-                ka->sa.sa_handler = SIG_DFL;
-
-        if (ret == 0) {
-                spin_lock_irq(&current->sighand->siglock);
-                sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
-                if (!(ka->sa.sa_flags & SA_NODEFER))
-                        sigaddset(&current->blocked,sig);
-                recalc_sigpending();
-                spin_unlock_irq(&current->sighand->siglock);
-        }
+        if (ret == 0)
+                block_sigmask(ka, sig);
 
         return ret;
 }
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S
index ee56a9b1a981..4b68f0f79761 100644
--- a/arch/sh/kernel/syscalls_32.S
+++ b/arch/sh/kernel/syscalls_32.S
@@ -204,8 +204,8 @@ ENTRY(sys_call_table)
         .long sys_capset           /* 185 */
         .long sys_sigaltstack
         .long sys_sendfile
-        .long sys_ni_syscall    /* streams1 */
-        .long sys_ni_syscall    /* streams2 */
+        .long sys_ni_syscall    /* getpmsg */
+        .long sys_ni_syscall    /* putpmsg */
         .long sys_vfork            /* 190 */
         .long sys_getrlimit
         .long sys_mmap2
@@ -259,8 +259,8 @@ ENTRY(sys_call_table)
         .long sys_futex         /* 240 */
         .long sys_sched_setaffinity
         .long sys_sched_getaffinity
-        .long sys_ni_syscall
-        .long sys_ni_syscall
+        .long sys_ni_syscall    /* reserved for set_thread_area */
+        .long sys_ni_syscall    /* reserved for get_thread_area */
         .long sys_io_setup      /* 245 */
         .long sys_io_destroy
         .long sys_io_getevents
diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S
index 9af7de26fb71..0956345b36ef 100644
--- a/arch/sh/kernel/syscalls_64.S
+++ b/arch/sh/kernel/syscalls_64.S
@@ -208,8 +208,8 @@ sys_call_table:
         .long sys_capset                /* 185 */
         .long sys_sigaltstack
         .long sys_sendfile
-        .long sys_ni_syscall    /* streams1 */
-        .long sys_ni_syscall    /* streams2 */
+        .long sys_ni_syscall    /* getpmsg */
+        .long sys_ni_syscall    /* putpmsg */
         .long sys_vfork                 /* 190 */
         .long sys_getrlimit
         .long sys_mmap2
@@ -296,8 +296,8 @@ sys_call_table:
         .long sys_futex
         .long sys_sched_setaffinity
         .long sys_sched_getaffinity     /* 270 */
-        .long sys_ni_syscall
-        .long sys_ni_syscall
+        .long sys_ni_syscall            /* reserved for set_thread_area */
+        .long sys_ni_syscall            /* reserved for get_thread_area */
         .long sys_io_setup
         .long sys_io_destroy
         .long sys_io_getevents          /* 275 */