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

Commit 6e029fe3 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: (28 commits)
  ARM: 6411/1: vexpress: set RAM latencies to 1 cycle for PL310 on ct-ca9x4 tile
  ARM: 6409/1: davinci: map sram using MT_MEMORY_NONCACHED instead of MT_DEVICE
  ARM: 6408/1: omap: Map only available sram memory
  ARM: 6407/1: mmu: Setup MT_MEMORY and MT_MEMORY_NONCACHED L1 entries
  ARM: pxa: remove pr_<level> uses of KERN_<level>
  ARM: pxa168fb: clear enable bit when not active
  ARM: pxa: fix cpu_is_pxa*() not expanding to zero when not configured
  ARM: pxa168: fix corrected reset vector
  ARM: pxa: Use PIO for PI2C communication on Palm27x
  ARM: pxa: Fix Vpac270 gpio_power for MMC
  ARM: 6401/1: plug a race in the alignment trap handler
  ARM: 6406/1: at91sam9g45: fix i2c bus speed
  leds: leds-ns2: fix locking
  ARM: dove: fix __io() definition to use bus based offset
  dmaengine: fix interrupt clearing for mv_xor
  ARM: kirkwood: Unbreak PCIe I/O port
  ARM: Fix build error when using KCONFIG_CONFIG
  ARM: 6383/1: Implement phys_mem_access_prot() to avoid attributes aliasing
  ARM: 6400/1: at91: fix arch_gettimeoffset fallout
  ARM: 6398/1: add proc info for ARM11MPCore/Cortex-A9 from ARM
  ...
parents 26d1e7ce 2de59fea

arch/arm/Kconfig

+26 −1
Original line number Original line Diff line number Diff line
@@ -271,7 +271,6 @@ config ARCH_AT91 
	bool "Atmel AT91"

	bool "Atmel AT91"

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	help

	help

	  This enables support for systems based on the Atmel AT91RM9200,

	  This enables support for systems based on the Atmel AT91RM9200,

	  AT91SAM9 and AT91CAP9 processors.

	  AT91SAM9 and AT91CAP9 processors.
@@ -1051,6 +1050,32 @@ config ARM_ERRATA_460075 
	  ACTLR register. Note that setting specific bits in the ACTLR register

	  ACTLR register. Note that setting specific bits in the ACTLR register

	  may not be available in non-secure mode.

	  may not be available in non-secure mode.





config ARM_ERRATA_742230

	bool "ARM errata: DMB operation may be faulty"

	depends on CPU_V7 && SMP

	help

	  This option enables the workaround for the 742230 Cortex-A9

	  (r1p0..r2p2) erratum. Under rare circumstances, a DMB instruction

	  between two write operations may not ensure the correct visibility

	  ordering of the two writes. This workaround sets a specific bit in

	  the diagnostic register of the Cortex-A9 which causes the DMB

	  instruction to behave as a DSB, ensuring the correct behaviour of

	  the two writes.



config ARM_ERRATA_742231

	bool "ARM errata: Incorrect hazard handling in the SCU may lead to data corruption"

	depends on CPU_V7 && SMP

	help

	  This option enables the workaround for the 742231 Cortex-A9

	  (r2p0..r2p2) erratum. Under certain conditions, specific to the

	  Cortex-A9 MPCore micro-architecture, two CPUs working in SMP mode,

	  accessing some data located in the same cache line, may get corrupted

	  data due to bad handling of the address hazard when the line gets

	  replaced from one of the CPUs at the same time as another CPU is

	  accessing it. This workaround sets specific bits in the diagnostic

	  register of the Cortex-A9 which reduces the linefill issuing

	  capabilities of the processor.



config PL310_ERRATA_588369

config PL310_ERRATA_588369

	bool "Clean & Invalidate maintenance operations do not invalidate clean lines"

	bool "Clean & Invalidate maintenance operations do not invalidate clean lines"

	depends on CACHE_L2X0 && ARCH_OMAP4

	depends on CACHE_L2X0 && ARCH_OMAP4

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -116,5 +116,5 @@ CFLAGS_font.o := -Dstatic= 
$(obj)/font.c: $(FONTC)

$(obj)/font.c: $(FONTC)

	$(call cmd,shipped)

	$(call cmd,shipped)





$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config

$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile $(KCONFIG_CONFIG)

	@sed "$(SEDFLAGS)" < $< > $@
 
	@sed "$(SEDFLAGS)" < $< > $@

arch/arm/include/asm/pgtable.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -317,6 +317,10 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } 
#ifdef CONFIG_ARM_DMA_MEM_BUFFERABLE

#ifdef CONFIG_ARM_DMA_MEM_BUFFERABLE

#define pgprot_dmacoherent(prot) \

#define pgprot_dmacoherent(prot) \

	__pgprot_modify(prot, L_PTE_MT_MASK|L_PTE_EXEC, L_PTE_MT_BUFFERABLE)

	__pgprot_modify(prot, L_PTE_MT_MASK|L_PTE_EXEC, L_PTE_MT_BUFFERABLE)

#define __HAVE_PHYS_MEM_ACCESS_PROT

struct file;

extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,

				     unsigned long size, pgprot_t vma_prot);

#else

#else

#define pgprot_dmacoherent(prot) \

#define pgprot_dmacoherent(prot) \

	__pgprot_modify(prot, L_PTE_MT_MASK|L_PTE_EXEC, L_PTE_MT_UNCACHED)

	__pgprot_modify(prot, L_PTE_MT_MASK|L_PTE_EXEC, L_PTE_MT_UNCACHED)

arch/arm/kernel/entry-common.S

+2 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,8 @@ work_pending: 
	beq	no_work_pending

	beq	no_work_pending

	mov	r0, sp				@ 'regs'

	mov	r0, sp				@ 'regs'

	mov	r2, why				@ 'syscall'

	mov	r2, why				@ 'syscall'

	tst	r1, #_TIF_SIGPENDING		@ delivering a signal?

	movne	why, #0				@ prevent further restarts

	bl	do_notify_resume

	bl	do_notify_resume

	b	ret_slow_syscall		@ Check work again

	b	ret_slow_syscall		@ Check work again

arch/arm/mach-at91/at91sam9g45_devices.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -426,7 +426,7 @@ static struct i2c_gpio_platform_data pdata_i2c0 = { 
	.sda_is_open_drain	= 1,

	.sda_is_open_drain	= 1,

	.scl_pin		= AT91_PIN_PA21,

	.scl_pin		= AT91_PIN_PA21,

	.scl_is_open_drain	= 1,

	.scl_is_open_drain	= 1,

	.udelay			= 2,		/* ~100 kHz */

	.udelay			= 5,		/* ~100 kHz */

};

};





static struct platform_device at91sam9g45_twi0_device = {

static struct platform_device at91sam9g45_twi0_device = {
@@ -440,7 +440,7 @@ static struct i2c_gpio_platform_data pdata_i2c1 = { 
	.sda_is_open_drain	= 1,

	.sda_is_open_drain	= 1,

	.scl_pin		= AT91_PIN_PB11,

	.scl_pin		= AT91_PIN_PB11,

	.scl_is_open_drain	= 1,

	.scl_is_open_drain	= 1,

	.udelay			= 2,		/* ~100 kHz */

	.udelay			= 5,		/* ~100 kHz */

};

};





static struct platform_device at91sam9g45_twi1_device = {

static struct platform_device at91sam9g45_twi1_device = {