Commit 477093b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-v5.5-rc1' of git://git.monstr.eu/linux-2.6-microblaze 

Pull Microblaze updates from Michal Simek:

 - extend DTB space

 - defconfig update

 - clean up rescheduling logic

 - enable SPARSE_IRQ

* tag 'microblaze-v5.5-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Increase max dtb size to 64K from 32K
  microblaze: Enable SPARSE_IRQ
  microblaze: defconfig: Enable devtmps and tmpfs
  microblaze: entry: Remove unneeded need_resched() loop
parents 6a0e20cd 22648c98

arch/microblaze/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ config MICROBLAZE 
	select VIRT_TO_BUS

	select CPU_NO_EFFICIENT_FFS

	select MMU_GATHER_NO_RANGE if MMU

	select SPARSE_IRQ



# Endianness selection

choice

arch/microblaze/configs/mmu_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ CONFIG_INET=y 
# CONFIG_IPV6 is not set

CONFIG_BRIDGE=m

CONFIG_PCI=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_MTD=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y
@@ -73,6 +75,7 @@ CONFIG_UIO_PDRV_GENIRQ=y 
CONFIG_UIO_DMEM_GENIRQ=y

CONFIG_EXT2_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_TMPFS=y

CONFIG_CRAMFS=y

CONFIG_ROMFS_FS=y

CONFIG_NFS_FS=y

arch/microblaze/include/asm/irq.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#ifndef _ASM_MICROBLAZE_IRQ_H

#define _ASM_MICROBLAZE_IRQ_H



#define NR_IRQS		(32 + 1)

#include <asm-generic/irq.h>



struct pt_regs;

arch/microblaze/kernel/entry.S

+0 −5
Original line number Diff line number Diff line
@@ -738,14 +738,9 @@ no_intr_resched: 
	andi	r5, r5, _TIF_NEED_RESCHED;

	beqi	r5, restore /* if zero jump over */



preempt:

	/* interrupts are off that's why I am calling preempt_chedule_irq */

	bralid	r15, preempt_schedule_irq

	nop

	lwi	r11, CURRENT_TASK, TS_THREAD_INFO;	/* get thread info */

	lwi	r5, r11, TI_FLAGS;		/* get flags in thread info */

	andi	r5, r5, _TIF_NEED_RESCHED;

	bnei	r5, preempt /* if non zero jump to resched */

restore:

#endif

	VM_OFF /* MS: turn off MMU */

arch/microblaze/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ big_endian: 
_prepare_copy_fdt:

	or	r11, r0, r0 /* incremment */

	ori	r4, r0, TOPHYS(_fdt_start)

	ori	r3, r0, (0x8000 - 4)

	ori	r3, r0, (0x10000 - 4)

_copy_fdt:

	lw	r12, r7, r11 /* r12 = r7 + r11 */

	sw	r12, r4, r11 /* addr[r4 + r11] = r12 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE