Commit 6dab7ede authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 

Pull ARM fixes from Russell King:
 "The largest thing in this set of changes is bringing back some of the
  ARMv3 code to fix a compile problem noticed on RiscPC, which we still
  support, even though we only support ARMv4 there.

  (The reason is that the system bus doesn't support ARMv4 half-word
  accesses, so we need the ARMv3 library code for this platform.)

  The rest are all quite minor fixes."

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: 7490/1: Drop duplicate select for GENERIC_IRQ_PROBE
  ARM: Bring back ARMv3 IO and user access code
  ARM: 7489/1: errata: fix workaround for erratum #720789 on UP systems
  ARM: 7488/1: mm: use 5 bits for swapfile type encoding
  ARM: 7487/1: mm: avoid setting nG bit for user mappings that aren't present
  ARM: 7486/1: sched_clock: update epoch_cyc on resume
  ARM: 7484/1: Don't enable GENERIC_LOCKBREAK with ticket spinlocks
  ARM: 7483/1: vfp: only advertise VFPv4 in hwcaps if CONFIG_VFPv3 is enabled
  ARM: 7482/1: topology: fix section mismatch warning for init_cpu_topology
parents d9ec0fdc 89868730

arch/arm/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ config ARM 
	select HARDIRQS_SW_RESEND

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_PROBE

	select ARCH_WANT_IPC_PARSE_VERSION

	select HARDIRQS_SW_RESEND

	select CPU_PM if (SUSPEND || CPU_IDLE)
@@ -126,11 +125,6 @@ config TRACE_IRQFLAGS_SUPPORT 
	bool

	default y



config GENERIC_LOCKBREAK

	bool

	default y

	depends on SMP && PREEMPT



config RWSEM_GENERIC_SPINLOCK

	bool

	default y

arch/arm/include/asm/pgtable.h

+21 −19
Original line number Diff line number Diff line
@@ -195,6 +195,18 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd) 


#define pte_clear(mm,addr,ptep)	set_pte_ext(ptep, __pte(0), 0)



#define pte_none(pte)		(!pte_val(pte))

#define pte_present(pte)	(pte_val(pte) & L_PTE_PRESENT)

#define pte_write(pte)		(!(pte_val(pte) & L_PTE_RDONLY))

#define pte_dirty(pte)		(pte_val(pte) & L_PTE_DIRTY)

#define pte_young(pte)		(pte_val(pte) & L_PTE_YOUNG)

#define pte_exec(pte)		(!(pte_val(pte) & L_PTE_XN))

#define pte_special(pte)	(0)



#define pte_present_user(pte) \

	((pte_val(pte) & (L_PTE_PRESENT | L_PTE_USER)) == \

	 (L_PTE_PRESENT | L_PTE_USER))



#if __LINUX_ARM_ARCH__ < 6

static inline void __sync_icache_dcache(pte_t pteval)

{
@@ -206,25 +218,15 @@ extern void __sync_icache_dcache(pte_t pteval); 
static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,

			      pte_t *ptep, pte_t pteval)

{

	if (addr >= TASK_SIZE)

		set_pte_ext(ptep, pteval, 0);

	else {

	unsigned long ext = 0;



	if (addr < TASK_SIZE && pte_present_user(pteval)) {

		__sync_icache_dcache(pteval);

		set_pte_ext(ptep, pteval, PTE_EXT_NG);

	}

		ext |= PTE_EXT_NG;

	}



#define pte_none(pte)		(!pte_val(pte))

#define pte_present(pte)	(pte_val(pte) & L_PTE_PRESENT)

#define pte_write(pte)		(!(pte_val(pte) & L_PTE_RDONLY))

#define pte_dirty(pte)		(pte_val(pte) & L_PTE_DIRTY)

#define pte_young(pte)		(pte_val(pte) & L_PTE_YOUNG)

#define pte_exec(pte)		(!(pte_val(pte) & L_PTE_XN))

#define pte_special(pte)	(0)



#define pte_present_user(pte) \

	((pte_val(pte) & (L_PTE_PRESENT | L_PTE_USER)) == \

	 (L_PTE_PRESENT | L_PTE_USER))

	set_pte_ext(ptep, pteval, ext);

}



#define PTE_BIT_FUNC(fn,op) \

static inline pte_t pte_##fn(pte_t pte) { pte_val(pte) op; return pte; }
@@ -251,13 +253,13 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
 *

 *   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1

 *   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

 *   <--------------- offset --------------------> <- type --> 0 0 0

 *   <--------------- offset ----------------------> < type -> 0 0 0

 *

 * This gives us up to 63 swap files and 32GB per swap file.  Note that

 * This gives us up to 31 swap files and 64GB per swap file.  Note that

 * the offset field is always non-zero.

 */

#define __SWP_TYPE_SHIFT	3

#define __SWP_TYPE_BITS		6

#define __SWP_TYPE_BITS		5

#define __SWP_TYPE_MASK		((1 << __SWP_TYPE_BITS) - 1)

#define __SWP_OFFSET_SHIFT	(__SWP_TYPE_BITS + __SWP_TYPE_SHIFT)

arch/arm/include/asm/sched_clock.h

+2 −0
Original line number Diff line number Diff line
@@ -10,5 +10,7 @@ 


extern void sched_clock_postinit(void);

extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate);

extern void setup_sched_clock_needs_suspend(u32 (*read)(void), int bits,

		unsigned long rate);



#endif

arch/arm/kernel/sched_clock.c

+24 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ struct clock_data { 
	u32 epoch_cyc_copy;

	u32 mult;

	u32 shift;

	bool suspended;

	bool needs_suspend;

};



static void sched_clock_poll(unsigned long wrap_ticks);
@@ -49,6 +51,9 @@ static unsigned long long cyc_to_sched_clock(u32 cyc, u32 mask) 
	u64 epoch_ns;

	u32 epoch_cyc;



	if (cd.suspended)

		return cd.epoch_ns;



	/*

	 * Load the epoch_cyc and epoch_ns atomically.  We do this by

	 * ensuring that we always write epoch_cyc, epoch_ns and
@@ -98,6 +103,13 @@ static void sched_clock_poll(unsigned long wrap_ticks) 
	update_sched_clock();

}



void __init setup_sched_clock_needs_suspend(u32 (*read)(void), int bits,

		unsigned long rate)

{

	setup_sched_clock(read, bits, rate);

	cd.needs_suspend = true;

}



void __init setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate)

{

	unsigned long r, w;
@@ -169,11 +181,23 @@ void __init sched_clock_postinit(void) 
static int sched_clock_suspend(void)

{

	sched_clock_poll(sched_clock_timer.data);

	if (cd.needs_suspend)

		cd.suspended = true;

	return 0;

}



static void sched_clock_resume(void)

{

	if (cd.needs_suspend) {

		cd.epoch_cyc = read_sched_clock();

		cd.epoch_cyc_copy = cd.epoch_cyc;

		cd.suspended = false;

	}

}



static struct syscore_ops sched_clock_ops = {

	.suspend = sched_clock_suspend,

	.resume = sched_clock_resume,

};



static int __init sched_clock_syscore_init(void)

arch/arm/kernel/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ void store_cpu_topology(unsigned int cpuid) 
 * init_cpu_topology is called at boot when only one cpu is running

 * which prevent simultaneous write access to cpu_topology array

 */

void init_cpu_topology(void)

void __init init_cpu_topology(void)

{

	unsigned int cpu;

CRA Git | Maintained and supported by SUSTech CRA and CCSE