Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller: "Various sparc bug fixes, in particular: 1) TSB hashes have to be flushed before TLB on sparc64, from Dave Kleikamp. 2) LEON timer interrupts can get stuck, from Andreas Larsson. 3) Sparc64 needs to handle lack of address-congruence devicetree property, from Bob Picco" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc: tsb must be flushed before tlb sparc,leon: Convert to use devm_ioremap_resource sparc64 address-congruence property sparc32, leon: Enable interrupts before going idle to avoid getting stuck sparc32, leon: Remove separate "ticker" timer for SMP sparc: kernel: using strlcpy() instead of strcpy() arch: sparc: prom: looping issue, need additional length check in the outside looping sparc: remove inline marking of EXPORT_SYMBOL functions sparc: Switch to asm-generic/linkage.h

Author: torvalds

arch/sparc/include/asm/Kbuild

@@ -6,6 +6,7 @@ generic-y += cputime.h
 generic-y += div64.h
 generic-y += emergency-restart.h
 generic-y += exec.h
+generic-y += linkage.h
 generic-y += local64.h
 generic-y += mutex.h
 generic-y += irq_regs.h

arch/sparc/include/asm/leon.h

@@ -135,7 +135,7 @@ static inline int sparc_leon3_cpuid(void)
 
 #ifdef CONFIG_SMP
 # define LEON3_IRQ_IPI_DEFAULT13
-# define LEON3_IRQ_TICKER(leon3_ticker_irq)
+# define LEON3_IRQ_TICKER(leon3_gptimer_irq)
 # define LEON3_IRQ_CROSS_CALL15
 #endif
 

arch/sparc/include/asm/leon_amba.h

@@ -47,6 +47,7 @@ struct amba_prom_registers {
 #define LEON3_GPTIMER_LD 4
 #define LEON3_GPTIMER_IRQEN 8
 #define LEON3_GPTIMER_SEPIRQ 8
+#define LEON3_GPTIMER_TIMERS 0x7
 
 #define LEON23_REG_TIMER_CONTROL_EN 0x00000001 /* 1 = enable counting */
 /* 0 = hold scalar and counter */

arch/sparc/include/asm/linkage.h

@@ -843,7 +843,8 @@ void ldom_reboot(const char *boot_command)
 unsigned long len;
 
 strcpy(full_boot_str, "boot ");
-strcpy(full_boot_str + strlen("boot "), boot_command);
+strlcpy(full_boot_str + strlen("boot "), boot_command,
+sizeof(full_boot_str + strlen("boot ")));
 len = strlen(full_boot_str);
 
 if (reboot_data_supported) {

arch/sparc/kernel/ds.c

@@ -38,7 +38,6 @@ static DEFINE_SPINLOCK(leon_irq_lock);
 
 unsigned long leon3_gptimer_irq; /* interrupt controller irq number */
 unsigned long leon3_gptimer_idx; /* Timer Index (0..6) within Timer Core */
-int leon3_ticker_irq; /* Timer ticker IRQ */
 unsigned int sparc_leon_eirq;
 #define LEON_IMASK(cpu) (&leon3_irqctrl_regs->mask[cpu])
 #define LEON_IACK (&leon3_irqctrl_regs->iclear)
@@ -278,6 +277,9 @@ irqreturn_t leon_percpu_timer_ce_interrupt(int irq, void *unused)
 
 leon_clear_profile_irq(cpu);
 
+if (cpu == boot_cpu_id)
+timer_interrupt(irq, NULL);
+
 ce = &per_cpu(sparc32_clockevent, cpu);
 
 irq_enter();
@@ -299,6 +301,7 @@ void __init leon_init_timers(void)
 int icsel;
 int ampopts;
 int err;
+u32 config;
 
 sparc_config.get_cycles_offset = leon_cycles_offset;
 sparc_config.cs_period = 1000000 / HZ;
@@ -377,23 +380,6 @@ void __init leon_init_timers(void)
 LEON3_BYPASS_STORE_PA(
 &leon3_gptimer_regs->e[leon3_gptimer_idx].ctrl, 0);
 
-#ifdef CONFIG_SMP
-leon3_ticker_irq = leon3_gptimer_irq + 1 + leon3_gptimer_idx;
-
-if (!(LEON3_BYPASS_LOAD_PA(&leon3_gptimer_regs->config) &
- (1<<LEON3_GPTIMER_SEPIRQ))) {
-printk(KERN_ERR "timer not configured with separate irqs\n");
-BUG();
-}
-
-LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].val,
-0);
-LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].rld,
-(((1000000/HZ) - 1)));
-LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].ctrl,
-0);
-#endif
-
 /*
  * The IRQ controller may (if implemented) consist of multiple
  * IRQ controllers, each mapped on a 4Kb boundary.
@@ -416,13 +402,6 @@ void __init leon_init_timers(void)
 if (eirq != 0)
 leon_eirq_setup(eirq);
 
-irq = _leon_build_device_irq(NULL, leon3_gptimer_irq+leon3_gptimer_idx);
-err = request_irq(irq, timer_interrupt, IRQF_TIMER, "timer", NULL);
-if (err) {
-printk(KERN_ERR "unable to attach timer IRQ%d\n", irq);
-prom_halt();
-}
-
 #ifdef CONFIG_SMP
 {
 unsigned long flags;
@@ -439,30 +418,31 @@ void __init leon_init_timers(void)
 }
 #endif
 
-LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].ctrl,
- LEON3_GPTIMER_EN |
- LEON3_GPTIMER_RL |
- LEON3_GPTIMER_LD |
- LEON3_GPTIMER_IRQEN);
+config = LEON3_BYPASS_LOAD_PA(&leon3_gptimer_regs->config);
+if (config & (1 << LEON3_GPTIMER_SEPIRQ))
+leon3_gptimer_irq += leon3_gptimer_idx;
+else if ((config & LEON3_GPTIMER_TIMERS) > 1)
+pr_warn("GPTIMER uses shared irqs, using other timers of the same core will fail.\n");
 
 #ifdef CONFIG_SMP
 /* Install per-cpu IRQ handler for broadcasted ticker */
-irq = leon_build_device_irq(leon3_ticker_irq, handle_percpu_irq,
+irq = leon_build_device_irq(leon3_gptimer_irq, handle_percpu_irq,
  "per-cpu", 0);
 err = request_irq(irq, leon_percpu_timer_ce_interrupt,
- IRQF_PERCPU | IRQF_TIMER, "ticker",
- NULL);
+ IRQF_PERCPU | IRQF_TIMER, "timer", NULL);
+#else
+irq = _leon_build_device_irq(NULL, leon3_gptimer_irq);
+err = request_irq(irq, timer_interrupt, IRQF_TIMER, "timer", NULL);
+#endif
 if (err) {
-printk(KERN_ERR "unable to attach ticker IRQ%d\n", irq);
+pr_err("Unable to attach timer IRQ%d\n", irq);
 prom_halt();
 }
-
-LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].ctrl,
+LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].ctrl,
  LEON3_GPTIMER_EN |
  LEON3_GPTIMER_RL |
  LEON3_GPTIMER_LD |
  LEON3_GPTIMER_IRQEN);
-#endif
 return;
 bad:
 printk(KERN_ERR "No Timer/irqctrl found\n");

arch/sparc/kernel/leon_kernel.c

@@ -536,11 +536,9 @@ static int grpci1_of_probe(struct platform_device *ofdev)
 
 /* find device register base address */
 res = platform_get_resource(ofdev, IORESOURCE_MEM, 0);
-regs = devm_request_and_ioremap(&ofdev->dev, res);
-if (!regs) {
-dev_err(&ofdev->dev, "io-regs mapping failed\n");
-return -EADDRNOTAVAIL;
-}
+regs = devm_ioremap_resource(&ofdev->dev, res);
+if (IS_ERR(regs))
+return PTR_ERR(regs);
 
 /*
  * check that we're in Host Slot and that we can act as a Host Bridge

arch/sparc/kernel/leon_pci_grpci1.c

@@ -47,6 +47,10 @@ void pmc_leon_idle_fixup(void)
  * MMU does not get a TLB miss here by using the MMU BYPASS ASI.
  */
 register unsigned int address = (unsigned int)leon3_irqctrl_regs;
+
+/* Interrupts need to be enabled to not hang the CPU */
+local_irq_enable();
+
 __asm__ __volatile__ (
 "wr	%%g0, %%asr19\n"
 "lda	[%0] %1, %%g0\n"
@@ -60,6 +64,9 @@ void pmc_leon_idle_fixup(void)
  */
 void pmc_leon_idle(void)
 {
+/* Interrupts need to be enabled to not hang the CPU */
+local_irq_enable();
+
 /* For systems without power-down, this will be no-op */
 __asm__ __volatile__ ("wr	%g0, %asr19\n\t");
 }

arch/sparc/kernel/leon_pmc.c

@@ -304,7 +304,7 @@ void __init setup_arch(char **cmdline_p)
 
 /* Initialize PROM console and command line. */
 *cmdline_p = prom_getbootargs();
-strcpy(boot_command_line, *cmdline_p);
+strlcpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE);
 parse_early_param();
 
 boot_flags_init(*cmdline_p);

arch/sparc/kernel/setup_32.c

@@ -555,7 +555,7 @@ void __init setup_arch(char **cmdline_p)
 {
 /* Initialize PROM console and command line. */
 *cmdline_p = prom_getbootargs();
-strcpy(boot_command_line, *cmdline_p);
+strlcpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE);
 parse_early_param();
 
 boot_flags_init(*cmdline_p);