Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Pull microblaze updates from Michal Simek:

- convert license headers to SPDX

- cleanup header handling and use asm-generic one

- get rid of earlyprintk residues

- define barriers and use it in the code

- get rid of setup_irq() for timer

- various small addons and fixes

* tag 'microblaze-v5.7-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Replace setup_irq() by request_irq()
microblaze: Stop printing the virtual memory layout
microblaze: Use asm generic cmpxchg.h for !SMP case
microblaze: Define percpu sestion in linker file
microblaze: Remove unused boot_cpuid variable
microblaze: Add missing irqflags.h header
microblaze: Add sync to tlb operations
microblaze: Define microblaze barrier
microblaze: Remove empty headers
microblaze: Remove early printk setup
microblaze: Remove architecture tlb.h and use generic one
microblaze: Convert headers to SPDX license
microblaze: Fix _reset() function
microblaze: Kernel parameters should be parsed earlier

+67 -236
+3 -1
arch/microblaze/include/asm/Kbuild
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 generated-y += syscall_table.h 3 - generic-y += barrier.h 4 3 generic-y += bitops.h 5 4 generic-y += bug.h 6 5 generic-y += bugs.h ··· 12 13 generic-y += extable.h 13 14 generic-y += fb.h 14 15 generic-y += hardirq.h 16 + generic-y += hw_irq.h 15 17 generic-y += irq_regs.h 16 18 generic-y += irq_work.h 17 19 generic-y += kdebug.h ··· 31 31 generic-y += serial.h 32 32 generic-y += shmparam.h 33 33 generic-y += syscalls.h 34 + generic-y += tlb.h 34 35 generic-y += topology.h 35 36 generic-y += trace_clock.h 37 + generic-y += user.h 36 38 generic-y += vga.h 37 39 generic-y += word-at-a-time.h 38 40 generic-y += xor.h
+13
arch/microblaze/include/asm/barrier.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 + /* 3 + * Copyright (c) 2015 - 2020 Xilinx, Inc. All rights reserved. 4 + */ 5 + 6 + #ifndef _ASM_MICROBLAZE_BARRIER_H 7 + #define _ASM_MICROBLAZE_BARRIER_H 8 + 9 + #define mb() __asm__ __volatile__ ("mbar 1" : : : "memory") 10 + 11 + #include <asm-generic/barrier.h> 12 + 13 + #endif /* _ASM_MICROBLAZE_BARRIER_H */
+1 -4
arch/microblaze/include/asm/cache.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Cache operations 3 4 * 4 5 * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu> 5 6 * Copyright (C) 2007-2009 PetaLogix 6 7 * Copyright (C) 2003 John Williams <jwilliams@itee.uq.edu.au> 7 - * 8 - * This file is subject to the terms and conditions of the GNU General 9 - * Public License. See the file COPYING in the main directory of this 10 - * archive for more details. 11 8 */ 12 9 13 10 #ifndef _ASM_MICROBLAZE_CACHE_H
+1 -5
arch/microblaze/include/asm/cacheflush.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2007-2009 PetaLogix ··· 6 5 * based on v850 version which was 7 6 * Copyright (C) 2001,02,03 NEC Electronics Corporation 8 7 * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org> 9 - * 10 - * This file is subject to the terms and conditions of the GNU General 11 - * Public License. See the file COPYING in the main directory of this 12 - * archive for more details. 13 - * 14 8 */ 15 9 16 10 #ifndef _ASM_MICROBLAZE_CACHEFLUSH_H
+1 -4
arch/microblaze/include/asm/checksum.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2008 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2006 Atmark Techno, Inc. 4 - * 5 - * This file is subject to the terms and conditions of the GNU General Public 6 - * License. See the file "COPYING" in the main directory of this archive 7 - * for more details. 8 5 */ 9 6 10 7 #ifndef _ASM_MICROBLAZE_CHECKSUM_H
+3 -37
arch/microblaze/include/asm/cmpxchg.h
··· 2 2 #ifndef _ASM_MICROBLAZE_CMPXCHG_H 3 3 #define _ASM_MICROBLAZE_CMPXCHG_H 4 4 5 - #include <linux/irqflags.h> 6 - 7 - void __bad_xchg(volatile void *ptr, int size); 8 - 9 - static inline unsigned long __xchg(unsigned long x, volatile void *ptr, 10 - int size) 11 - { 12 - unsigned long ret; 13 - unsigned long flags; 14 - 15 - switch (size) { 16 - case 1: 17 - local_irq_save(flags); 18 - ret = *(volatile unsigned char *)ptr; 19 - *(volatile unsigned char *)ptr = x; 20 - local_irq_restore(flags); 21 - break; 22 - 23 - case 4: 24 - local_irq_save(flags); 25 - ret = *(volatile unsigned long *)ptr; 26 - *(volatile unsigned long *)ptr = x; 27 - local_irq_restore(flags); 28 - break; 29 - default: 30 - __bad_xchg(ptr, size), ret = 0; 31 - break; 32 - } 33 - 34 - return ret; 35 - } 36 - 37 - #define xchg(ptr, x) \ 38 - ((__typeof__(*(ptr))) __xchg((unsigned long)(x), (ptr), sizeof(*(ptr)))) 39 - 40 - #include <asm-generic/cmpxchg.h> 41 - #include <asm-generic/cmpxchg-local.h> 5 + #ifndef CONFIG_SMP 6 + # include <asm-generic/cmpxchg.h> 7 + #endif 42 8 43 9 #endif /* _ASM_MICROBLAZE_CMPXCHG_H */
+1 -4
arch/microblaze/include/asm/cpuinfo.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Generic support for queying CPU info 3 4 * 4 5 * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu> 5 6 * Copyright (C) 2007-2009 PetaLogix 6 7 * Copyright (C) 2007 John Williams <jwilliams@itee.uq.edu.au> 7 - * 8 - * This file is subject to the terms and conditions of the GNU General 9 - * Public License. See the file COPYING in the main directory of this 10 - * archive for more details. 11 8 */ 12 9 13 10 #ifndef _ASM_MICROBLAZE_CPUINFO_H
-1
arch/microblaze/include/asm/cputable.h
··· 1 -
+1 -4
arch/microblaze/include/asm/current.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2008-2009 PetaLogix 4 5 * Copyright (C) 2006 Atmark Techno, Inc. 5 - * 6 - * This file is subject to the terms and conditions of the GNU General Public 7 - * License. See the file "COPYING" in the main directory of this archive 8 - * for more details. 9 6 */ 10 7 11 8 #ifndef _ASM_MICROBLAZE_CURRENT_H
+1 -6
arch/microblaze/include/asm/delay.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 - * include/asm-microblaze/delay.h 3 - * 4 - * This file is subject to the terms and conditions of the GNU General Public 5 - * License. See the file "COPYING" in the main directory of this archive 6 - * for more details. 7 - * 8 3 * Copyright (C) 2008 Michal Simek 9 4 * Copyright (C) 2007 John Williams 10 5 * Copyright (C) 2006 Atmark Techno, Inc.
+1 -4
arch/microblaze/include/asm/dma.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2006 Atmark Techno, Inc. 3 - * 4 - * This file is subject to the terms and conditions of the GNU General Public 5 - * License. See the file "COPYING" in the main directory of this archive 6 - * for more details. 7 4 */ 8 5 9 6 #ifndef _ASM_MICROBLAZE_DMA_H
+1 -4
arch/microblaze/include/asm/elf.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2008-2009 PetaLogix 4 5 * Copyright (C) 2006 Atmark Techno, Inc. 5 - * 6 - * This file is subject to the terms and conditions of the GNU General Public 7 - * License. See the file "COPYING" in the main directory of this archive 8 - * for more details. 9 6 */ 10 7 #ifndef _ASM_MICROBLAZE_ELF_H 11 8 #define _ASM_MICROBLAZE_ELF_H
+1 -4
arch/microblaze/include/asm/entry.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Definitions used by low-level trap handlers 3 4 * 4 5 * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> 5 6 * Copyright (C) 2007-2009 PetaLogix 6 7 * Copyright (C) 2007 John Williams <john.williams@petalogix.com> 7 - * 8 - * This file is subject to the terms and conditions of the GNU General 9 - * Public License. See the file COPYING in the main directory of this 10 - * archive for more details. 11 8 */ 12 9 13 10 #ifndef _ASM_MICROBLAZE_ENTRY_H
+1 -4
arch/microblaze/include/asm/exceptions.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Preliminary support for HW exception handing for Microblaze 3 4 * 4 5 * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> 5 6 * Copyright (C) 2008-2009 PetaLogix 6 7 * Copyright (C) 2005 John Williams <jwilliams@itee.uq.edu.au> 7 - * 8 - * This file is subject to the terms and conditions of the GNU General 9 - * Public License. See the file COPYING in the main directory of this 10 - * archive for more details. 11 8 */ 12 9 13 10 #ifndef _ASM_MICROBLAZE_EXCEPTIONS_H
+1 -4
arch/microblaze/include/asm/fixmap.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * fixmap.h: compile-time virtual memory allocation 3 - * 4 - * This file is subject to the terms and conditions of the GNU General Public 5 - * License. See the file "COPYING" in the main directory of this archive 6 - * for more details. 7 4 * 8 5 * Copyright (C) 1998 Ingo Molnar 9 6 *
+1 -4
arch/microblaze/include/asm/flat.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * uClinux flat-format executables 3 4 * 4 5 * Copyright (C) 2005 John Williams <jwilliams@itee.uq.edu.au> 5 - * 6 - * This file is subject to the terms and conditions of the GNU General 7 - * Public License. See the file COPYING in the main directory of this 8 - * archive for more details. 9 6 */ 10 7 11 8 #ifndef _ASM_MICROBLAZE_FLAT_H
-1
arch/microblaze/include/asm/hw_irq.h
··· 1 -
+1 -4
arch/microblaze/include/asm/io.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2007-2009 PetaLogix 4 5 * Copyright (C) 2006 Atmark Techno, Inc. 5 - * 6 - * This file is subject to the terms and conditions of the GNU General Public 7 - * License. See the file "COPYING" in the main directory of this archive 8 - * for more details. 9 6 */ 10 7 11 8 #ifndef _ASM_MICROBLAZE_IO_H
+1 -4
arch/microblaze/include/asm/irq.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2006 Atmark Techno, Inc. 3 - * 4 - * This file is subject to the terms and conditions of the GNU General Public 5 - * License. See the file "COPYING" in the main directory of this archive 6 - * for more details. 7 4 */ 8 5 9 6 #ifndef _ASM_MICROBLAZE_IRQ_H
+1 -4
arch/microblaze/include/asm/irqflags.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2006 Atmark Techno, Inc. 3 - * 4 - * This file is subject to the terms and conditions of the GNU General Public 5 - * License. See the file "COPYING" in the main directory of this archive 6 - * for more details. 7 4 */ 8 5 9 6 #ifndef _ASM_MICROBLAZE_IRQFLAGS_H
+1 -4
arch/microblaze/include/asm/mmu.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2008-2009 PetaLogix 4 5 * Copyright (C) 2006 Atmark Techno, Inc. 5 - * 6 - * This file is subject to the terms and conditions of the GNU General Public 7 - * License. See the file "COPYING" in the main directory of this archive 8 - * for more details. 9 6 */ 10 7 11 8 #ifndef _ASM_MICROBLAZE_MMU_H
+1 -4
arch/microblaze/include/asm/mmu_context_mm.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2008-2009 PetaLogix 4 5 * Copyright (C) 2006 Atmark Techno, Inc. 5 - * 6 - * This file is subject to the terms and conditions of the GNU General Public 7 - * License. See the file "COPYING" in the main directory of this archive 8 - * for more details. 9 6 */ 10 7 11 8 #ifndef _ASM_MICROBLAZE_MMU_CONTEXT_H
+1 -4
arch/microblaze/include/asm/module.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2006 Atmark Techno, Inc. 3 - * 4 - * This file is subject to the terms and conditions of the GNU General Public 5 - * License. See the file "COPYING" in the main directory of this archive 6 - * for more details. 7 4 */ 8 5 9 6 #ifndef _ASM_MICROBLAZE_MODULE_H
+1 -4
arch/microblaze/include/asm/page.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * VM ops 3 4 * ··· 7 6 * Copyright (C) 2006 Atmark Techno, Inc. 8 7 * Changes for MMU support: 9 8 * Copyright (C) 2007 Xilinx, Inc. All rights reserved. 10 - * 11 - * This file is subject to the terms and conditions of the GNU General Public 12 - * License. See the file "COPYING" in the main directory of this archive 13 - * for more details. 14 9 */ 15 10 16 11 #ifndef _ASM_MICROBLAZE_PAGE_H
+1 -4
arch/microblaze/include/asm/pgalloc.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2008-2009 PetaLogix 4 5 * Copyright (C) 2006 Atmark Techno, Inc. 5 - * 6 - * This file is subject to the terms and conditions of the GNU General Public 7 - * License. See the file "COPYING" in the main directory of this archive 8 - * for more details. 9 6 */ 10 7 11 8 #ifndef _ASM_MICROBLAZE_PGALLOC_H
+1 -4
arch/microblaze/include/asm/pgtable.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2008-2009 PetaLogix 4 5 * Copyright (C) 2006 Atmark Techno, Inc. 5 - * 6 - * This file is subject to the terms and conditions of the GNU General Public 7 - * License. See the file "COPYING" in the main directory of this archive 8 - * for more details. 9 6 */ 10 7 11 8 #ifndef _ASM_MICROBLAZE_PGTABLE_H
+1 -4
arch/microblaze/include/asm/processor.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2008-2009 PetaLogix 4 5 * Copyright (C) 2006 Atmark Techno, Inc. 5 - * 6 - * This file is subject to the terms and conditions of the GNU General Public 7 - * License. See the file "COPYING" in the main directory of this archive 8 - * for more details. 9 6 */ 10 7 11 8 #ifndef _ASM_MICROBLAZE_PROCESSOR_H
+1 -4
arch/microblaze/include/asm/ptrace.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2006 Atmark Techno, Inc. 3 - * 4 - * This file is subject to the terms and conditions of the GNU General Public 5 - * License. See the file "COPYING" in the main directory of this archive 6 - * for more details. 7 4 */ 8 5 #ifndef _ASM_MICROBLAZE_PTRACE_H 9 6 #define _ASM_MICROBLAZE_PTRACE_H
+1 -4
arch/microblaze/include/asm/pvr.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Support for the MicroBlaze PVR (Processor Version Register) 3 4 * 4 5 * Copyright (C) 2009 - 2011 Michal Simek <monstr@monstr.eu> 5 6 * Copyright (C) 2007 John Williams <john.williams@petalogix.com> 6 7 * Copyright (C) 2007 - 2011 PetaLogix 7 - * 8 - * This file is subject to the terms and conditions of the GNU General 9 - * Public License. See the file COPYING in the main directory of this 10 - * archive for more details. 11 8 */ 12 9 13 10 #ifndef _ASM_MICROBLAZE_PVR_H
+1 -4
arch/microblaze/include/asm/registers.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2008-2009 PetaLogix 4 5 * Copyright (C) 2006 Atmark Techno, Inc. 5 - * 6 - * This file is subject to the terms and conditions of the GNU General Public 7 - * License. See the file "COPYING" in the main directory of this archive 8 - * for more details. 9 6 */ 10 7 11 8 #ifndef _ASM_MICROBLAZE_REGISTERS_H
+1 -4
arch/microblaze/include/asm/sections.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2008-2009 PetaLogix 4 5 * Copyright (C) 2006 Atmark Techno, Inc. 5 - * 6 - * This file is subject to the terms and conditions of the GNU General Public 7 - * License. See the file "COPYING" in the main directory of this archive 8 - * for more details. 9 6 */ 10 7 11 8 #ifndef _ASM_MICROBLAZE_SECTIONS_H
+1 -6
arch/microblaze/include/asm/setup.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2007-2009 PetaLogix 4 5 * Copyright (C) 2006 Atmark Techno, Inc. 5 - * 6 - * This file is subject to the terms and conditions of the GNU General Public 7 - * License. See the file "COPYING" in the main directory of this archive 8 - * for more details. 9 6 */ 10 7 #ifndef _ASM_MICROBLAZE_SETUP_H 11 8 #define _ASM_MICROBLAZE_SETUP_H ··· 10 13 #include <uapi/asm/setup.h> 11 14 12 15 # ifndef __ASSEMBLY__ 13 - extern unsigned int boot_cpuid; /* move to smp.h */ 14 - 15 16 extern char cmd_line[COMMAND_LINE_SIZE]; 16 17 17 18 extern char *klimit;
+1 -4
arch/microblaze/include/asm/string.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2006 Atmark Techno, Inc. 3 - * 4 - * This file is subject to the terms and conditions of the GNU General Public 5 - * License. See the file "COPYING" in the main directory of this archive 6 - * for more details. 7 4 */ 8 5 9 6 #ifndef _ASM_MICROBLAZE_STRING_H
+1 -4
arch/microblaze/include/asm/switch_to.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2006 Atmark Techno, Inc. 3 - * 4 - * This file is subject to the terms and conditions of the GNU General Public 5 - * License. See the file "COPYING" in the main directory of this archive 6 - * for more details. 7 4 */ 8 5 9 6 #ifndef _ASM_MICROBLAZE_SWITCH_TO_H
+1 -4
arch/microblaze/include/asm/thread_info.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2006 Atmark Techno, Inc. 3 - * 4 - * This file is subject to the terms and conditions of the GNU General Public 5 - * License. See the file "COPYING" in the main directory of this archive 6 - * for more details. 7 4 */ 8 5 9 6 #ifndef _ASM_MICROBLAZE_THREAD_INFO_H
+1 -4
arch/microblaze/include/asm/timex.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2006 Atmark Techno, Inc. 3 - * 4 - * This file is subject to the terms and conditions of the GNU General Public 5 - * License. See the file "COPYING" in the main directory of this archive 6 - * for more details. 7 4 */ 8 5 9 6 #ifndef _ASM_MICROBLAZE_TIMEX_H
-17
arch/microblaze/include/asm/tlb.h
··· 1 - /* 2 - * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> 3 - * Copyright (C) 2008-2009 PetaLogix 4 - * Copyright (C) 2006 Atmark Techno, Inc. 5 - * 6 - * This file is subject to the terms and conditions of the GNU General Public 7 - * License. See the file "COPYING" in the main directory of this archive 8 - * for more details. 9 - */ 10 - 11 - #ifndef _ASM_MICROBLAZE_TLB_H 12 - #define _ASM_MICROBLAZE_TLB_H 13 - 14 - #include <linux/pagemap.h> 15 - #include <asm-generic/tlb.h> 16 - 17 - #endif /* _ASM_MICROBLAZE_TLB_H */
+1 -4
arch/microblaze/include/asm/tlbflush.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2008-2009 PetaLogix 4 5 * Copyright (C) 2006 Atmark Techno, Inc. 5 - * 6 - * This file is subject to the terms and conditions of the GNU General Public 7 - * License. See the file "COPYING" in the main directory of this archive 8 - * for more details. 9 6 */ 10 7 11 8 #ifndef _ASM_MICROBLAZE_TLBFLUSH_H
+1 -4
arch/microblaze/include/asm/uaccess.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2008-2009 PetaLogix 4 5 * Copyright (C) 2006 Atmark Techno, Inc. 5 - * 6 - * This file is subject to the terms and conditions of the GNU General Public 7 - * License. See the file "COPYING" in the main directory of this archive 8 - * for more details. 9 6 */ 10 7 11 8 #ifndef _ASM_MICROBLAZE_UACCESS_H
+1 -4
arch/microblaze/include/asm/unaligned.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2008 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2006 Atmark Techno, Inc. 4 - * 5 - * This file is subject to the terms and conditions of the GNU General Public 6 - * License. See the file "COPYING" in the main directory of this archive 7 - * for more details. 8 5 */ 9 6 10 7 #ifndef _ASM_MICROBLAZE_UNALIGNED_H
+1 -4
arch/microblaze/include/asm/unistd.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2007-2008 Michal Simek <monstr@monstr.eu> 3 4 * Copyright (C) 2006 Atmark Techno, Inc. 4 - * 5 - * This file is subject to the terms and conditions of the GNU General Public 6 - * License. See the file "COPYING" in the main directory of this archive 7 - * for more details. 8 5 */ 9 6 #ifndef _ASM_MICROBLAZE_UNISTD_H 10 7 #define _ASM_MICROBLAZE_UNISTD_H
+1 -4
arch/microblaze/include/asm/unwind.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Backtrace support for Microblaze 3 4 * 4 5 * Copyright (C) 2010 Digital Design Corporation 5 - * 6 - * This file is subject to the terms and conditions of the GNU General Public 7 - * License. See the file "COPYING" in the main directory of this archive 8 - * for more details. 9 6 */ 10 7 11 8 #ifndef __MICROBLAZE_UNWIND_H
-1
arch/microblaze/include/asm/user.h
··· 1 -
+1 -6
arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
··· 22 22 23 23 #define CI(c, p) { ci->c = PVR_##p(pvr); } 24 24 25 - #if defined(CONFIG_EARLY_PRINTK) && defined(CONFIG_SERIAL_UARTLITE_CONSOLE) 26 25 #define err_printk(x) \ 27 - early_printk("ERROR: Microblaze " x "-different for PVR and DTS\n"); 28 - #else 29 - #define err_printk(x) \ 30 - pr_info("ERROR: Microblaze " x "-different for PVR and DTS\n"); 31 - #endif 26 + pr_err("ERROR: Microblaze " x "-different for PVR and DTS\n"); 32 27 33 28 void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu) 34 29 {
+1
arch/microblaze/kernel/cpu/pvr.c
··· 14 14 #include <linux/compiler.h> 15 15 #include <asm/exceptions.h> 16 16 #include <asm/pvr.h> 17 + #include <linux/irqflags.h> 17 18 18 19 /* 19 20 * Until we get an assembler that knows about the pvr registers,
+1
arch/microblaze/kernel/entry.S
··· 958 958 nop 959 959 960 960 ENTRY(_reset) 961 + VM_OFF 961 962 brai 0; /* Jump to reset vector */ 962 963 963 964 /* These are compiled and loaded into high memory, then
+2 -1
arch/microblaze/kernel/misc.S
··· 39 39 rsubi r11, r12, MICROBLAZE_TLB_SIZE - 1 40 40 bneid r11, _tlbia_1 /* loop for all entries */ 41 41 addik r12, r12, 1 42 - /* sync */ 42 + mbar 1 /* sync */ 43 43 rtsd r15, 8 44 44 nop 45 45 .size _tlbia, . - _tlbia ··· 58 58 blti r12, _tlbie_1 /* Check if found */ 59 59 mts rtlbhi, r0 /* flush: ensure V is clear */ 60 60 nop 61 + mbar 1 /* sync */ 61 62 _tlbie_1: 62 63 rtsd r15, 8 63 64 nop
-2
arch/microblaze/kernel/setup.c
··· 41 41 DEFINE_PER_CPU(unsigned int, R11_SAVE); /* Temp variable for entry */ 42 42 DEFINE_PER_CPU(unsigned int, CURRENT_SAVE); /* Saved current pointer */ 43 43 44 - unsigned int boot_cpuid; 45 44 /* 46 45 * Placed cmd_line to .data section because can be initialized from 47 46 * ASM code. Default position is BSS section which is cleared ··· 53 54 *cmdline_p = boot_command_line; 54 55 55 56 setup_memory(); 56 - parse_early_param(); 57 57 58 58 console_verbose(); 59 59
+2 -8
arch/microblaze/kernel/timer.c
··· 161 161 return IRQ_HANDLED; 162 162 } 163 163 164 - static struct irqaction timer_irqaction = { 165 - .handler = timer_interrupt, 166 - .flags = IRQF_TIMER, 167 - .name = "timer", 168 - .dev_id = &clockevent_xilinx_timer, 169 - }; 170 - 171 164 static __init int xilinx_clockevent_init(void) 172 165 { 173 166 clockevent_xilinx_timer.mult = ··· 302 309 303 310 freq_div_hz = timer_clock_freq / HZ; 304 311 305 - ret = setup_irq(irq, &timer_irqaction); 312 + ret = request_irq(irq, timer_interrupt, IRQF_TIMER, "timer", 313 + &clockevent_xilinx_timer); 306 314 if (ret) { 307 315 pr_err("Failed to setup IRQ"); 308 316 return ret;
+3
arch/microblaze/kernel/vmlinux.lds.S
··· 13 13 14 14 #define RO_EXCEPTION_TABLE_ALIGN 16 15 15 16 + #include <asm/cache.h> 16 17 #include <asm/page.h> 17 18 #include <asm-generic/vmlinux.lds.h> 18 19 #include <asm/thread_info.h> ··· 89 88 _ssro_size = _essro - _ssro ; 90 89 _KERNEL_SDA_BASE_ = _ssro + (_ssro_size / 2) ; 91 90 } 91 + 92 + PERCPU_SECTION(L1_CACHE_BYTES) 92 93 93 94 . = ALIGN(PAGE_SIZE); 94 95 __init_begin = .;
+2 -12
arch/microblaze/mm/init.c
··· 201 201 #endif 202 202 203 203 mem_init_print_info(NULL); 204 - #ifdef CONFIG_MMU 205 - pr_info("Kernel virtual memory layout:\n"); 206 - pr_info(" * 0x%08lx..0x%08lx : fixmap\n", FIXADDR_START, FIXADDR_TOP); 207 - #ifdef CONFIG_HIGHMEM 208 - pr_info(" * 0x%08lx..0x%08lx : highmem PTEs\n", 209 - PKMAP_BASE, PKMAP_ADDR(LAST_PKMAP)); 210 - #endif /* CONFIG_HIGHMEM */ 211 - pr_info(" * 0x%08lx..0x%08lx : early ioremap\n", 212 - ioremap_bot, ioremap_base); 213 - pr_info(" * 0x%08lx..0x%08lx : vmalloc & ioremap\n", 214 - (unsigned long)VMALLOC_START, VMALLOC_END); 215 - #endif 216 204 mem_init_done = 1; 217 205 } 218 206 ··· 334 346 /* This will also cause that unflatten device tree will be allocated 335 347 * inside 768MB limit */ 336 348 memblock_set_current_limit(memory_start + lowmem_size - 1); 349 + 350 + parse_early_param(); 337 351 338 352 /* CMA initialization */ 339 353 dma_contiguous_reserve(memory_start + lowmem_size - 1);