iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2019-11-27 11:30:55 -08:00
parent 6a0e20cd8c 22648c989c
commit 477093b3e1
6 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/microblaze/Kconfig
View File

@ -46,6 +46,7 @@ config MICROBLAZE
select VIRT_TO_BUS select VIRT_TO_BUS
select CPU_NO_EFFICIENT_FFS select CPU_NO_EFFICIENT_FFS
select MMU_GATHER_NO_RANGE if MMU select MMU_GATHER_NO_RANGE if MMU
select SPARSE_IRQ
# Endianness selection # Endianness selection
choice choice

3
arch/microblaze/configs/mmu_defconfig
View File

@ -33,6 +33,8 @@ CONFIG_INET=y
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
CONFIG_BRIDGE=m CONFIG_BRIDGE=m
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_MTD=y CONFIG_MTD=y
CONFIG_MTD_CFI=y CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_INTELEXT=y
@ -73,6 +75,7 @@ CONFIG_UIO_PDRV_GENIRQ=y
CONFIG_UIO_DMEM_GENIRQ=y CONFIG_UIO_DMEM_GENIRQ=y
CONFIG_EXT2_FS=y CONFIG_EXT2_FS=y
# CONFIG_DNOTIFY is not set # CONFIG_DNOTIFY is not set
CONFIG_TMPFS=y
CONFIG_CRAMFS=y CONFIG_CRAMFS=y
CONFIG_ROMFS_FS=y CONFIG_ROMFS_FS=y
CONFIG_NFS_FS=y CONFIG_NFS_FS=y

1
arch/microblaze/include/asm/irq.h
View File

@ -9,7 +9,6 @@
#ifndef _ASM_MICROBLAZE_IRQ_H #ifndef _ASM_MICROBLAZE_IRQ_H
#define _ASM_MICROBLAZE_IRQ_H #define _ASM_MICROBLAZE_IRQ_H
#define NR_IRQS (32 + 1)
#include <asm-generic/irq.h> #include <asm-generic/irq.h>
struct pt_regs; struct pt_regs;

5
arch/microblaze/kernel/entry.S
View File

@ -738,14 +738,9 @@ no_intr_resched:
andi r5, r5, _TIF_NEED_RESCHED; andi r5, r5, _TIF_NEED_RESCHED;
beqi r5, restore /* if zero jump over */ beqi r5, restore /* if zero jump over */
preempt:
/* interrupts are off that's why I am calling preempt_chedule_irq */ /* interrupts are off that's why I am calling preempt_chedule_irq */
bralid r15, preempt_schedule_irq bralid r15, preempt_schedule_irq
nop 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: restore:
#endif #endif
VM_OFF /* MS: turn off MMU */ VM_OFF /* MS: turn off MMU */

2
arch/microblaze/kernel/head.S
View File

@ -99,7 +99,7 @@ big_endian:
_prepare_copy_fdt: _prepare_copy_fdt:
or r11, r0, r0 /* incremment */ or r11, r0, r0 /* incremment */
ori r4, r0, TOPHYS(_fdt_start) ori r4, r0, TOPHYS(_fdt_start)
ori r3, r0, (0x8000 - 4) ori r3, r0, (0x10000 - 4)
_copy_fdt: _copy_fdt:
lw r12, r7, r11 /* r12 = r7 + r11 */ lw r12, r7, r11 /* r12 = r7 + r11 */
sw r12, r4, r11 /* addr[r4 + r11] = r12 */ sw r12, r4, r11 /* addr[r4 + r11] = r12 */

2
arch/microblaze/kernel/vmlinux.lds.S
View File

@ -48,7 +48,7 @@ SECTIONS {
__fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET) { __fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET) {
_fdt_start = . ; /* place for fdt blob */ _fdt_start = . ; /* place for fdt blob */
*(__fdt_blob) ; /* Any link-placed DTB */ *(__fdt_blob) ; /* Any link-placed DTB */
. = _fdt_start + 0x8000; /* Pad up to 32kbyte */ . = _fdt_start + 0x10000; /* Pad up to 64kbyte */
_fdt_end = . ; _fdt_end = . ;
} }