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

MIPS: Move definitions for 32/64-bit agonstic inline assembler to new file.

Browse Source 
Inspired by Markos Chandras' patch.  I just didn't want do pull bitsops.h
into pgtable.h.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
References: https://patchwork.linux-mips.org/patch/11052/
This commit is contained in:
Ralf Baechle 2016-04-15 10:25:33 +02:00
parent 92e9953c58
commit 05490626d5
3 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/mips/include/asm/bitops.h
View File

@ -19,25 +19,10 @@
#include <asm/byteorder.h> /* sigh ... */ #include <asm/byteorder.h> /* sigh ... */
#include <asm/compiler.h> #include <asm/compiler.h>
#include <asm/cpu-features.h> #include <asm/cpu-features.h>
#include <asm/llsc.h>
#include <asm/sgidefs.h> #include <asm/sgidefs.h>
#include <asm/war.h> #include <asm/war.h>
#if _MIPS_SZLONG == 32
#define SZLONG_LOG 5
#define SZLONG_MASK 31UL
#define __LL "ll "
#define __SC "sc "
#define __INS "ins "
#define __EXT "ext "
#elif _MIPS_SZLONG == 64
#define SZLONG_LOG 6
#define SZLONG_MASK 63UL
#define __LL "lld "
#define __SC "scd "
#define __INS "dins "
#define __EXT "dext "
#endif
/* /*
* These are the "slower" versions of the functions and are in bitops.c. * These are the "slower" versions of the functions and are in bitops.c.
* These functions call raw_local_irq_{save,restore}(). * These functions call raw_local_irq_{save,restore}().

28
arch/mips/include/asm/llsc.h Normal file
View File

@ -0,0 +1,28 @@
/*
* 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.
*
* Macros for 32/64-bit neutral inline assembler
*/
#ifndef __ASM_LLSC_H
#define __ASM_LLSC_H
#if _MIPS_SZLONG == 32
#define SZLONG_LOG 5
#define SZLONG_MASK 31UL
#define __LL "ll "
#define __SC "sc "
#define __INS "ins "
#define __EXT "ext "
#elif _MIPS_SZLONG == 64
#define SZLONG_LOG 6
#define SZLONG_MASK 63UL
#define __LL "lld "
#define __SC "scd "
#define __INS "dins "
#define __EXT "dext "
#endif
#endif /* __ASM_LLSC_H */

11
arch/mips/include/asm/pgtable.h
View File

@ -187,23 +187,16 @@ static inline void set_pte(pte_t *ptep, pte_t pteval)
* For SMP, multiple CPUs can race, so we need to do * For SMP, multiple CPUs can race, so we need to do
* this atomically. * this atomically.
*/ */
#ifdef CONFIG_64BIT
#define LL_INSN "lld"
#define SC_INSN "scd"
#else /* CONFIG_32BIT */
#define LL_INSN "ll"
#define SC_INSN "sc"
#endif
unsigned long page_global = _PAGE_GLOBAL; unsigned long page_global = _PAGE_GLOBAL;
unsigned long tmp; unsigned long tmp;
__asm__ __volatile__ ( __asm__ __volatile__ (
" .set push\n" " .set push\n"
" .set noreorder\n" " .set noreorder\n"
"1: " LL_INSN " %[tmp], %[buddy]\n" "1: " __LL " %[tmp], %[buddy]\n"
" bnez %[tmp], 2f\n" " bnez %[tmp], 2f\n"
" or %[tmp], %[tmp], %[global]\n" " or %[tmp], %[tmp], %[global]\n"
" " SC_INSN " %[tmp], %[buddy]\n" " " __SC " %[tmp], %[buddy]\n"
" beqz %[tmp], 1b\n" " beqz %[tmp], 1b\n"
" nop\n" " nop\n"
"2:\n" "2:\n"