Skip to content

Commit 477093b

Browse files
committed
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
2 parents 6a0e20c + 22648c9 commit 477093b

File tree

6 files changed

+6
-8
lines changed

6 files changed

+6
-8
lines changed

arch/microblaze/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ config MICROBLAZE
4646
select VIRT_TO_BUS
4747
select CPU_NO_EFFICIENT_FFS
4848
select MMU_GATHER_NO_RANGE if MMU
49+
select SPARSE_IRQ
4950

5051
# Endianness selection
5152
choice

arch/microblaze/configs/mmu_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ CONFIG_INET=y
3333
# CONFIG_IPV6 is not set
3434
CONFIG_BRIDGE=m
3535
CONFIG_PCI=y
36+
CONFIG_DEVTMPFS=y
37+
CONFIG_DEVTMPFS_MOUNT=y
3638
CONFIG_MTD=y
3739
CONFIG_MTD_CFI=y
3840
CONFIG_MTD_CFI_INTELEXT=y
@@ -73,6 +75,7 @@ CONFIG_UIO_PDRV_GENIRQ=y
7375
CONFIG_UIO_DMEM_GENIRQ=y
7476
CONFIG_EXT2_FS=y
7577
# CONFIG_DNOTIFY is not set
78+
CONFIG_TMPFS=y
7679
CONFIG_CRAMFS=y
7780
CONFIG_ROMFS_FS=y
7881
CONFIG_NFS_FS=y

arch/microblaze/include/asm/irq.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#ifndef _ASM_MICROBLAZE_IRQ_H
1010
#define _ASM_MICROBLAZE_IRQ_H
1111

12-
#define NR_IRQS (32 + 1)
1312
#include <asm-generic/irq.h>
1413

1514
struct pt_regs;

arch/microblaze/kernel/entry.S

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -738,14 +738,9 @@ no_intr_resched:
738738
andi r5, r5, _TIF_NEED_RESCHED;
739739
beqi r5, restore /* if zero jump over */
740740

741-
preempt:
742741
/* interrupts are off that's why I am calling preempt_chedule_irq */
743742
bralid r15, preempt_schedule_irq
744743
nop
745-
lwi r11, CURRENT_TASK, TS_THREAD_INFO; /* get thread info */
746-
lwi r5, r11, TI_FLAGS; /* get flags in thread info */
747-
andi r5, r5, _TIF_NEED_RESCHED;
748-
bnei r5, preempt /* if non zero jump to resched */
749744
restore:
750745
#endif
751746
VM_OFF /* MS: turn off MMU */

arch/microblaze/kernel/head.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ big_endian:
9999
_prepare_copy_fdt:
100100
or r11, r0, r0 /* incremment */
101101
ori r4, r0, TOPHYS(_fdt_start)
102-
ori r3, r0, (0x8000 - 4)
102+
ori r3, r0, (0x10000 - 4)
103103
_copy_fdt:
104104
lw r12, r7, r11 /* r12 = r7 + r11 */
105105
sw r12, r4, r11 /* addr[r4 + r11] = r12 */

arch/microblaze/kernel/vmlinux.lds.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ SECTIONS {
4848
__fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET) {
4949
_fdt_start = . ; /* place for fdt blob */
5050
*(__fdt_blob) ; /* Any link-placed DTB */
51-
. = _fdt_start + 0x8000; /* Pad up to 32kbyte */
51+
. = _fdt_start + 0x10000; /* Pad up to 64kbyte */
5252
_fdt_end = . ;
5353
}
5454

0 commit comments

Comments
 (0)