Skip to content
Snippets Groups Projects
Commit a8222fd5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents cad18da0 9fd1a1c9
No related branches found
No related tags found
No related merge requests found
Showing
with 34 additions and 103 deletions
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
generated-y += syscall_table.h generated-y += syscall_table.h
generic-y += barrier.h
generic-y += bitops.h generic-y += bitops.h
generic-y += bug.h generic-y += bug.h
generic-y += bugs.h generic-y += bugs.h
...@@ -13,6 +12,7 @@ generic-y += exec.h ...@@ -13,6 +12,7 @@ generic-y += exec.h
generic-y += extable.h generic-y += extable.h
generic-y += fb.h generic-y += fb.h
generic-y += hardirq.h generic-y += hardirq.h
generic-y += hw_irq.h
generic-y += irq_regs.h generic-y += irq_regs.h
generic-y += irq_work.h generic-y += irq_work.h
generic-y += kdebug.h generic-y += kdebug.h
...@@ -31,8 +31,10 @@ generic-y += preempt.h ...@@ -31,8 +31,10 @@ generic-y += preempt.h
generic-y += serial.h generic-y += serial.h
generic-y += shmparam.h generic-y += shmparam.h
generic-y += syscalls.h generic-y += syscalls.h
generic-y += tlb.h
generic-y += topology.h generic-y += topology.h
generic-y += trace_clock.h generic-y += trace_clock.h
generic-y += user.h
generic-y += vga.h generic-y += vga.h
generic-y += word-at-a-time.h generic-y += word-at-a-time.h
generic-y += xor.h generic-y += xor.h
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2015 - 2020 Xilinx, Inc. All rights reserved.
*/
#ifndef _ASM_MICROBLAZE_BARRIER_H
#define _ASM_MICROBLAZE_BARRIER_H
#define mb() __asm__ __volatile__ ("mbar 1" : : : "memory")
#include <asm-generic/barrier.h>
#endif /* _ASM_MICROBLAZE_BARRIER_H */
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Cache operations * Cache operations
* *
* Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu> * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu>
* Copyright (C) 2007-2009 PetaLogix * Copyright (C) 2007-2009 PetaLogix
* Copyright (C) 2003 John Williams <jwilliams@itee.uq.edu.au> * Copyright (C) 2003 John Williams <jwilliams@itee.uq.edu.au>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
* archive for more details.
*/ */
#ifndef _ASM_MICROBLAZE_CACHE_H #ifndef _ASM_MICROBLAZE_CACHE_H
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu> * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu>
* Copyright (C) 2007-2009 PetaLogix * Copyright (C) 2007-2009 PetaLogix
...@@ -5,11 +6,6 @@ ...@@ -5,11 +6,6 @@
* based on v850 version which was * based on v850 version which was
* Copyright (C) 2001,02,03 NEC Electronics Corporation * Copyright (C) 2001,02,03 NEC Electronics Corporation
* Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org> * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
* archive for more details.
*
*/ */
#ifndef _ASM_MICROBLAZE_CACHEFLUSH_H #ifndef _ASM_MICROBLAZE_CACHEFLUSH_H
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2008 Michal Simek <monstr@monstr.eu> * Copyright (C) 2008 Michal Simek <monstr@monstr.eu>
* Copyright (C) 2006 Atmark Techno, Inc. * Copyright (C) 2006 Atmark Techno, Inc.
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/ */
#ifndef _ASM_MICROBLAZE_CHECKSUM_H #ifndef _ASM_MICROBLAZE_CHECKSUM_H
......
...@@ -2,42 +2,8 @@ ...@@ -2,42 +2,8 @@
#ifndef _ASM_MICROBLAZE_CMPXCHG_H #ifndef _ASM_MICROBLAZE_CMPXCHG_H
#define _ASM_MICROBLAZE_CMPXCHG_H #define _ASM_MICROBLAZE_CMPXCHG_H
#include <linux/irqflags.h> #ifndef CONFIG_SMP
# include <asm-generic/cmpxchg.h>
void __bad_xchg(volatile void *ptr, int size); #endif
static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
int size)
{
unsigned long ret;
unsigned long flags;
switch (size) {
case 1:
local_irq_save(flags);
ret = *(volatile unsigned char *)ptr;
*(volatile unsigned char *)ptr = x;
local_irq_restore(flags);
break;
case 4:
local_irq_save(flags);
ret = *(volatile unsigned long *)ptr;
*(volatile unsigned long *)ptr = x;
local_irq_restore(flags);
break;
default:
__bad_xchg(ptr, size), ret = 0;
break;
}
return ret;
}
#define xchg(ptr, x) \
((__typeof__(*(ptr))) __xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))
#include <asm-generic/cmpxchg.h>
#include <asm-generic/cmpxchg-local.h>
#endif /* _ASM_MICROBLAZE_CMPXCHG_H */ #endif /* _ASM_MICROBLAZE_CMPXCHG_H */
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Generic support for queying CPU info * Generic support for queying CPU info
* *
* Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu> * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu>
* Copyright (C) 2007-2009 PetaLogix * Copyright (C) 2007-2009 PetaLogix
* Copyright (C) 2007 John Williams <jwilliams@itee.uq.edu.au> * Copyright (C) 2007 John Williams <jwilliams@itee.uq.edu.au>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
* archive for more details.
*/ */
#ifndef _ASM_MICROBLAZE_CPUINFO_H #ifndef _ASM_MICROBLAZE_CPUINFO_H
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu>
* Copyright (C) 2008-2009 PetaLogix * Copyright (C) 2008-2009 PetaLogix
* Copyright (C) 2006 Atmark Techno, Inc. * Copyright (C) 2006 Atmark Techno, Inc.
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/ */
#ifndef _ASM_MICROBLAZE_CURRENT_H #ifndef _ASM_MICROBLAZE_CURRENT_H
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* include/asm-microblaze/delay.h
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (C) 2008 Michal Simek * Copyright (C) 2008 Michal Simek
* Copyright (C) 2007 John Williams * Copyright (C) 2007 John Williams
* Copyright (C) 2006 Atmark Techno, Inc. * Copyright (C) 2006 Atmark Techno, Inc.
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2006 Atmark Techno, Inc. * Copyright (C) 2006 Atmark Techno, Inc.
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/ */
#ifndef _ASM_MICROBLAZE_DMA_H #ifndef _ASM_MICROBLAZE_DMA_H
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu>
* Copyright (C) 2008-2009 PetaLogix * Copyright (C) 2008-2009 PetaLogix
* Copyright (C) 2006 Atmark Techno, Inc. * Copyright (C) 2006 Atmark Techno, Inc.
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/ */
#ifndef _ASM_MICROBLAZE_ELF_H #ifndef _ASM_MICROBLAZE_ELF_H
#define _ASM_MICROBLAZE_ELF_H #define _ASM_MICROBLAZE_ELF_H
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Definitions used by low-level trap handlers * Definitions used by low-level trap handlers
* *
* Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu>
* Copyright (C) 2007-2009 PetaLogix * Copyright (C) 2007-2009 PetaLogix
* Copyright (C) 2007 John Williams <john.williams@petalogix.com> * Copyright (C) 2007 John Williams <john.williams@petalogix.com>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
* archive for more details.
*/ */
#ifndef _ASM_MICROBLAZE_ENTRY_H #ifndef _ASM_MICROBLAZE_ENTRY_H
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Preliminary support for HW exception handing for Microblaze * Preliminary support for HW exception handing for Microblaze
* *
* Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu> * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu>
* Copyright (C) 2008-2009 PetaLogix * Copyright (C) 2008-2009 PetaLogix
* Copyright (C) 2005 John Williams <jwilliams@itee.uq.edu.au> * Copyright (C) 2005 John Williams <jwilliams@itee.uq.edu.au>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
* archive for more details.
*/ */
#ifndef _ASM_MICROBLAZE_EXCEPTIONS_H #ifndef _ASM_MICROBLAZE_EXCEPTIONS_H
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* fixmap.h: compile-time virtual memory allocation * fixmap.h: compile-time virtual memory allocation
* *
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (C) 1998 Ingo Molnar * Copyright (C) 1998 Ingo Molnar
* *
* Copyright 2008 Freescale Semiconductor Inc. * Copyright 2008 Freescale Semiconductor Inc.
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* uClinux flat-format executables * uClinux flat-format executables
* *
* Copyright (C) 2005 John Williams <jwilliams@itee.uq.edu.au> * Copyright (C) 2005 John Williams <jwilliams@itee.uq.edu.au>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
* archive for more details.
*/ */
#ifndef _ASM_MICROBLAZE_FLAT_H #ifndef _ASM_MICROBLAZE_FLAT_H
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu> * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu>
* Copyright (C) 2007-2009 PetaLogix * Copyright (C) 2007-2009 PetaLogix
* Copyright (C) 2006 Atmark Techno, Inc. * Copyright (C) 2006 Atmark Techno, Inc.
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/ */
#ifndef _ASM_MICROBLAZE_IO_H #ifndef _ASM_MICROBLAZE_IO_H
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2006 Atmark Techno, Inc. * Copyright (C) 2006 Atmark Techno, Inc.
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/ */
#ifndef _ASM_MICROBLAZE_IRQ_H #ifndef _ASM_MICROBLAZE_IRQ_H
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2006 Atmark Techno, Inc. * Copyright (C) 2006 Atmark Techno, Inc.
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/ */
#ifndef _ASM_MICROBLAZE_IRQFLAGS_H #ifndef _ASM_MICROBLAZE_IRQFLAGS_H
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment