Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0a6da1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: GIC: don't disable software generated interrupts
  ARM: 6472/1: vexpress ct-ca9x4: only set twd_base if local timers are being used
  ARM: arch/arm/kernel/traps.c: Convert sprintf_symbol to %pS
  ARM: arch/arm/kernel/hw_breakpoint.c: Convert WARN_ON to WARN
  ARM: 6462/1: EP93xx: Document DMA M2P API
  ARM: 6470/1: atomic64: use generic implementation for OABI configurations
  ARM: 6469/1: perf-events: squash compiler warning
  ARM: 6468/1: backtrace: fix calculation of thread stack base
  ARM: Fix DMA coherent allocator alignment
  ARM: orion5x/kirkwood/mv78xx0: fix MPP configuration corner cases
  [ARM] TS-78xxx NAND resource type should be IORESOURCE_MEM
  ARM: pxa/saar: fix the building failure caused by typo
  ARM: pxa/cm-x2xx: remove duplicate call to pxa27x_init_irq
  ARM: pxa: fix the missing definition of IRQ_BOARD_END
  ARM: mmp: fix cpuid detection on mmp2
  [ARM] Kirkwood: restrict the scope of the PCIe reset workaround
  [ARM] Kirkwood: fix timer initialization for LaCie boards
  [ARM] Kirkwood: enhance TCLK detection
parents 7803c054 9395f6ea

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ config ARM 
	select HAVE_MEMBLOCK

	select RTC_LIB

	select SYS_SUPPORTS_APM_EMULATION

	select GENERIC_ATOMIC64 if (!CPU_32v6K)

	select GENERIC_ATOMIC64 if (!CPU_32v6K || !AEABI)

	select HAVE_OPROFILE if (HAVE_PERF_EVENTS)

	select HAVE_ARCH_KGDB

	select HAVE_KPROBES if (!XIP_KERNEL)

arch/arm/common/gic.c

+24 −4
Original line number Diff line number Diff line
@@ -251,15 +251,16 @@ void __init gic_dist_init(unsigned int gic_nr, void __iomem *base, 
		writel(cpumask, base + GIC_DIST_TARGET + i * 4 / 4);



	/*

	 * Set priority on all interrupts.

	 * Set priority on all global interrupts.

	 */

	for (i = 0; i < max_irq; i += 4)

	for (i = 32; i < max_irq; i += 4)

		writel(0xa0a0a0a0, base + GIC_DIST_PRI + i * 4 / 4);



	/*

	 * Disable all interrupts.

	 * Disable all interrupts.  Leave the PPI and SGIs alone

	 * as these enables are banked registers.

	 */

	for (i = 0; i < max_irq; i += 32)

	for (i = 32; i < max_irq; i += 32)

		writel(0xffffffff, base + GIC_DIST_ENABLE_CLEAR + i * 4 / 32);



	/*
@@ -277,11 +278,30 @@ void __init gic_dist_init(unsigned int gic_nr, void __iomem *base, 


void __cpuinit gic_cpu_init(unsigned int gic_nr, void __iomem *base)

{

	void __iomem *dist_base;

	int i;



	if (gic_nr >= MAX_GIC_NR)

		BUG();



	dist_base = gic_data[gic_nr].dist_base;

	BUG_ON(!dist_base);



	gic_data[gic_nr].cpu_base = base;



	/*

	 * Deal with the banked PPI and SGI interrupts - disable all

	 * PPI interrupts, ensure all SGI interrupts are enabled.

	 */

	writel(0xffff0000, dist_base + GIC_DIST_ENABLE_CLEAR);

	writel(0x0000ffff, dist_base + GIC_DIST_ENABLE_SET);



	/*

	 * Set priority on PPI and SGI interrupts

	 */

	for (i = 0; i < 32; i += 4)

		writel(0xa0a0a0a0, dist_base + GIC_DIST_PRI + i * 4 / 4);



	writel(0xf0, base + GIC_CPU_PRIMASK);

	writel(1, base + GIC_CPU_CTRL);

}

arch/arm/include/asm/hardware/it8152.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ extern unsigned long it8152_base_address; 
  IT8152_PD_IRQ(1)  USB (USBR)

  IT8152_PD_IRQ(0)  Audio controller (ACR)

 */

#define IT8152_IRQ(x)   (IRQ_BOARD_END + (x))

#define IT8152_IRQ(x)   (IRQ_BOARD_START + (x))



/* IRQ-sources in 3 groups - local devices, LPC (serial), and external PCI */

#define IT8152_LD_IRQ_COUNT     9

arch/arm/kernel/hw_breakpoint.c

+1 −2
Original line number Diff line number Diff line
@@ -748,8 +748,7 @@ static int hw_breakpoint_pending(unsigned long addr, unsigned int fsr, 
		breakpoint_handler(addr, regs);

		break;

	case ARM_ENTRY_ASYNC_WATCHPOINT:

		WARN_ON("Asynchronous watchpoint exception taken. "

			"Debugging results may be unreliable");

		WARN(1, "Asynchronous watchpoint exception taken. Debugging results may be unreliable\n");

	case ARM_ENTRY_SYNC_WATCHPOINT:

		watchpoint_handler(addr, regs);

		break;

arch/arm/kernel/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -1749,7 +1749,7 @@ static inline int armv7_pmnc_has_overflowed(unsigned long pmnc) 
static inline int armv7_pmnc_counter_has_overflowed(unsigned long pmnc,

					enum armv7_counters counter)

{

	int ret;

	int ret = 0;



	if (counter == ARMV7_CYCLE_COUNTER)

		ret = pmnc & ARMV7_FLAG_C;