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

Commit 63f700aa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xtensa-20170612' of git://github.com/jcmvbkbc/linux-xtensa 

Pull Xtensa fixes from Max Filippov:

 - don't use linux IRQ #0 in legacy irq domains: fixes timer interrupt
   assignment when it's hardware IRQ # is 0 and the kernel is built w/o
   device tree support

 - reduce reservation size for double exception vector literals from 48
   to 20 bytes: fixes build on cores with small user exception vector

 - cleanups: use kmalloc_array instead of kmalloc in simdisk_init and
   seq_puts instead of seq_printf in c_show.

* tag 'xtensa-20170612' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: don't use linux IRQ #0
  xtensa: reduce double exception literal reservation
  xtensa: ISS: Use kmalloc_array() in simdisk_init()
  xtensa: Use seq_puts() in c_show()
parents 2ab99b00 e5c86679

arch/xtensa/include/asm/irq.h

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ static inline void variant_irq_disable(unsigned int irq) { } 
# define PLATFORM_NR_IRQS 0

#endif

#define XTENSA_NR_IRQS XCHAL_NUM_INTERRUPTS

#define NR_IRQS (XTENSA_NR_IRQS + VARIANT_NR_IRQS + PLATFORM_NR_IRQS)

#define NR_IRQS (XTENSA_NR_IRQS + VARIANT_NR_IRQS + PLATFORM_NR_IRQS + 1)

#define XTENSA_PIC_LINUX_IRQ(hwirq) ((hwirq) + 1)



#if VARIANT_NR_IRQS == 0

static inline void variant_init_irq(void) { }

arch/xtensa/kernel/irq.c

+0 −5
Original line number Diff line number Diff line
@@ -34,11 +34,6 @@ asmlinkage void do_IRQ(int hwirq, struct pt_regs *regs) 
{

	int irq = irq_find_mapping(NULL, hwirq);



	if (hwirq >= NR_IRQS) {

		printk(KERN_EMERG "%s: cannot handle IRQ %d\n",

				__func__, hwirq);

	}



#ifdef CONFIG_DEBUG_STACKOVERFLOW

	/* Debugging check for stack overflow: is there less than 1KB free? */

	{

arch/xtensa/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -593,8 +593,7 @@ c_show(struct seq_file *f, void *slot) 
		      (ccount_freq/10000) % 100,

		      loops_per_jiffy/(500000/HZ),

		      (loops_per_jiffy/(5000/HZ)) % 100);



	seq_printf(f,"flags\t\t: "

	seq_puts(f, "flags\t\t: "

#if XCHAL_HAVE_NMI

		     "nmi "

#endif

arch/xtensa/kernel/vmlinux.lds.S

+3 −3
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ SECTIONS 
  SECTION_VECTOR (.KernelExceptionVector.text, KERNEL_VECTOR_VADDR)

  SECTION_VECTOR (.UserExceptionVector.literal, USER_VECTOR_VADDR - 4)

  SECTION_VECTOR (.UserExceptionVector.text, USER_VECTOR_VADDR)

  SECTION_VECTOR (.DoubleExceptionVector.literal, DOUBLEEXC_VECTOR_VADDR - 48)

  SECTION_VECTOR (.DoubleExceptionVector.literal, DOUBLEEXC_VECTOR_VADDR - 20)

  SECTION_VECTOR (.DoubleExceptionVector.text, DOUBLEEXC_VECTOR_VADDR)

#endif
@@ -306,13 +306,13 @@ SECTIONS 
		  .UserExceptionVector.literal)

  SECTION_VECTOR (_DoubleExceptionVector_literal,

		  .DoubleExceptionVector.literal,

		  DOUBLEEXC_VECTOR_VADDR - 48,

		  DOUBLEEXC_VECTOR_VADDR - 20,

		  SIZEOF(.UserExceptionVector.text),

		  .UserExceptionVector.text)

  SECTION_VECTOR (_DoubleExceptionVector_text,

		  .DoubleExceptionVector.text,

		  DOUBLEEXC_VECTOR_VADDR,

		  48,

		  20,

		  .DoubleExceptionVector.literal)



  . = (LOADADDR( .DoubleExceptionVector.text ) + SIZEOF( .DoubleExceptionVector.text ) + 3) & ~ 3;

arch/xtensa/platforms/iss/simdisk.c

+1 −2
Original line number Diff line number Diff line
@@ -317,8 +317,7 @@ static int __init simdisk_init(void) 
	if (simdisk_count > MAX_SIMDISK_COUNT)

		simdisk_count = MAX_SIMDISK_COUNT;



	sddev = kmalloc(simdisk_count * sizeof(struct simdisk),

			GFP_KERNEL);

	sddev = kmalloc_array(simdisk_count, sizeof(*sddev), GFP_KERNEL);

	if (sddev == NULL)

		goto out_unregister;