hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

powerpc: move ASM_CONST and stringify_in_c() into asm-const.h 

This patch moves ASM_CONST() and stringify_in_c() into
dedicated asm-const.h, then cleans all related inclusions.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
[mpe: asm-compat.h should include asm-const.h]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Christophe Leroy 2018-07-05 16:24:57 +00:00 committed by Michael Ellerman
parent 36a7eeaff7
commit ec0c464cdb
57 changed files with 73 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/crypto/md5-asm.S
View File

@ -11,6 +11,7 @@
*/
#include <asm/ppc_asm.h>
#include <asm/asm-offsets.h>
#include <asm/asm-compat.h>
#define rHP r3
#define rWP r4

1
arch/powerpc/crypto/sha1-powerpc-asm.S
View File

@ -7,6 +7,7 @@
#include <asm/ppc_asm.h>
#include <asm/asm-offsets.h>
#include <asm/asm-compat.h>
#ifdef __BIG_ENDIAN__
#define LWZ(rt, d, ra) \

13
arch/powerpc/include/asm/asm-compat.h
View File

@ -1,21 +1,10 @@
#ifndef _ASM_POWERPC_ASM_COMPAT_H
#define _ASM_POWERPC_ASM_COMPAT_H
#include <asm/asm-const.h>
#include <asm/types.h>
#include <asm/ppc-opcode.h>
#ifdef __ASSEMBLY__
# define stringify_in_c(...) __VA_ARGS__
# define ASM_CONST(x) x
#else
/* This version of stringify will deal with commas... */
# define __stringify_in_c(...) #__VA_ARGS__
# define stringify_in_c(...) __stringify_in_c(__VA_ARGS__) " "
# define __ASM_CONST(x) x##UL
# define ASM_CONST(x) __ASM_CONST(x)
#endif
#ifdef __powerpc64__
/* operations for longs and pointers */

14
arch/powerpc/include/asm/asm-const.h Normal file
View File

@ -0,0 +1,14 @@
#ifndef _ASM_POWERPC_ASM_CONST_H
#define _ASM_POWERPC_ASM_CONST_H
#ifdef __ASSEMBLY__
# define stringify_in_c(...) __VA_ARGS__
# define ASM_CONST(x) x
#else
/* This version of stringify will deal with commas... */
# define __stringify_in_c(...) #__VA_ARGS__
# define stringify_in_c(...) __stringify_in_c(__VA_ARGS__) " "
# define __ASM_CONST(x) x##UL
# define ASM_CONST(x) __ASM_CONST(x)
#endif
#endif /* _ASM_POWERPC_ASM_CONST_H */

2
arch/powerpc/include/asm/barrier.h
View File

@ -5,6 +5,8 @@
#ifndef _ASM_POWERPC_BARRIER_H
#define _ASM_POWERPC_BARRIER_H
#include <asm/asm-const.h>
/*
* Memory barrier.
* The sync instruction guarantees that all memory accesses initiated

2
arch/powerpc/include/asm/book3s/64/hash.h
View File

@ -3,6 +3,8 @@
#define _ASM_POWERPC_BOOK3S_64_HASH_H
#ifdef __KERNEL__
#include <asm/asm-const.h>
/*
* Common bits between 4K and 64K pages in a linux-style PTE.
* Additional bits may be defined in pgtable-hash64-*.h

2
arch/powerpc/include/asm/book3s/64/mmu-hash.h
View File

@ -12,9 +12,9 @@
* 2 of the License, or (at your option) any later version.
*/
#include <asm/asm-compat.h>
#include <asm/page.h>
#include <asm/bug.h>
#include <asm/asm-const.h>
/*
* This is necessary to get the definition of PGTABLE_RANGE which we

2
arch/powerpc/include/asm/book3s/64/radix.h
View File

@ -2,6 +2,8 @@
#ifndef _ASM_POWERPC_PGTABLE_RADIX_H
#define _ASM_POWERPC_PGTABLE_RADIX_H
#include <asm/asm-const.h>
#ifndef __ASSEMBLY__
#include <asm/cmpxchg.h>
#endif

1
arch/powerpc/include/asm/cmpxchg.h
View File

@ -5,7 +5,6 @@
#ifdef __KERNEL__
#include <linux/compiler.h>
#include <asm/synch.h>
#include <asm/asm-compat.h>
#include <linux/bug.h>
#include <asm/asm-405.h>

1
arch/powerpc/include/asm/code-patching.h
View File

@ -14,6 +14,7 @@
#include <asm/ppc-opcode.h>
#include <linux/string.h>
#include <linux/kallsyms.h>
#include <asm/asm-compat.h>
/* Flags for create_branch:
* "b" == create_branch(addr, target, 0);

2
arch/powerpc/include/asm/cputable.h
View File

@ -4,9 +4,9 @@
#include <linux/types.h>
#include <asm/asm-compat.h>
#include <asm/feature-fixups.h>
#include <uapi/asm/cputable.h>
#include <asm/asm-const.h>
#ifndef __ASSEMBLY__

1
arch/powerpc/include/asm/dt_cpu_ftrs.h
View File

@ -10,7 +10,6 @@
*/
#include <linux/types.h>
#include <asm/asm-compat.h>
#include <asm/feature-fixups.h>
#include <uapi/asm/cputable.h>

2
arch/powerpc/include/asm/feature-fixups.h
View File

@ -1,6 +1,8 @@
#ifndef __ASM_POWERPC_FEATURE_FIXUPS_H
#define __ASM_POWERPC_FEATURE_FIXUPS_H
#include <asm/asm-const.h>
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

2
arch/powerpc/include/asm/firmware.h
View File

@ -14,8 +14,8 @@
#ifdef __KERNEL__
#include <asm/asm-compat.h>
#include <asm/feature-fixups.h>
#include <asm/asm-const.h>
/* firmware feature bitmask values */

1
arch/powerpc/include/asm/futex.h
View File

@ -8,7 +8,6 @@
#include <linux/uaccess.h>
#include <asm/errno.h>
#include <asm/synch.h>
#include <asm/asm-compat.h>
#include <asm/asm-405.h>
#define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \

1
arch/powerpc/include/asm/iommu.h
View File

@ -30,6 +30,7 @@
#include <asm/machdep.h>
#include <asm/types.h>
#include <asm/pci-bridge.h>
#include <asm/asm-const.h>
#define IOMMU_PAGE_SHIFT_4K 12
#define IOMMU_PAGE_SIZE_4K (ASM_CONST(1) << IOMMU_PAGE_SHIFT_4K)

2
arch/powerpc/include/asm/jump_label.h
View File

@ -14,7 +14,7 @@
#include <linux/types.h>
#include <asm/feature-fixups.h>
#include <asm/asm-compat.h>
#include <asm/asm-const.h>
#define JUMP_ENTRY_TYPE stringify_in_c(FTR_ENTRY_LONG)
#define JUMP_LABEL_NOP_SIZE 4

1
arch/powerpc/include/asm/mmu-44x.h
View File

@ -6,6 +6,7 @@
*/
#include <asm/page.h>
#include <asm/asm-const.h>
#define PPC44x_MMUCR_TID 0x000000ff
#define PPC44x_MMUCR_STS 0x00010000

2
arch/powerpc/include/asm/mmu.h
View File

@ -5,8 +5,8 @@
#include <linux/types.h>
#include <asm/asm-compat.h>
#include <asm/feature-fixups.h>
#include <asm/asm-const.h>
/*
* MMU features bit definitions

1
arch/powerpc/include/asm/nohash/64/pgtable.h
View File

@ -8,6 +8,7 @@
#include <asm/nohash/64/pgtable-4k.h>
#include <asm/barrier.h>
#include <asm/asm-const.h>
#ifdef CONFIG_PPC_64K_PAGES
#error "Page size not supported"

2
arch/powerpc/include/asm/page.h
View File

@ -16,7 +16,7 @@
#else
#include <asm/types.h>
#endif
#include <asm/asm-compat.h>
#include <asm/asm-const.h>
/*
* On regular PPC32 page size is 4K (but we support 4K/16K/64K/256K pages

2
arch/powerpc/include/asm/page_64.h
View File

@ -10,6 +10,8 @@
* 2 of the License, or (at your option) any later version.
*/
#include <asm/asm-const.h>
/*
* We always define HW_PAGE_SHIFT to 12 as use of 64K pages remains Linux
* specific, every notion of page number shared with the firmware, TCEs,

2
arch/powerpc/include/asm/ppc-opcode.h
View File

@ -13,7 +13,7 @@
#define _ASM_POWERPC_PPC_OPCODE_H
#include <linux/stringify.h>
#include <asm/asm-compat.h>
#include <asm/asm-const.h>
#define __REG_R0 0
#define __REG_R1 1

1
arch/powerpc/include/asm/ptrace.h
View File

@ -24,6 +24,7 @@
#define _ASM_POWERPC_PTRACE_H
#include <uapi/asm/ptrace.h>
#include <asm/asm-const.h>
#ifdef __powerpc64__

1
arch/powerpc/include/asm/reg.h
View File

@ -13,6 +13,7 @@
#include <linux/stringify.h>
#include <asm/cputable.h>
#include <asm/asm-const.h>
/* Pickup Book E specific registers. */
#if defined(CONFIG_BOOKE) || defined(CONFIG_40x)

2
arch/powerpc/include/asm/reg_a2.h
View File

@ -12,6 +12,8 @@
#ifndef __ASM_POWERPC_REG_A2_H__
#define __ASM_POWERPC_REG_A2_H__
#include <asm/asm-const.h>
#define SPRN_TENSR 0x1b5
#define SPRN_TENS 0x1b6 /* Thread ENable Set */
#define SPRN_TENC 0x1b7 /* Thread ENable Clear */

1
arch/powerpc/include/asm/spinlock.h
View File

@ -24,7 +24,6 @@
#include <asm/paca.h>
#include <asm/hvcall.h>
#endif
#include <asm/asm-compat.h>
#include <asm/synch.h>
#include <asm/ppc-opcode.h>
#include <asm/asm-405.h>

1
arch/powerpc/include/asm/synch.h
View File

@ -5,6 +5,7 @@
#include <linux/stringify.h>
#include <asm/feature-fixups.h>
#include <asm/asm-const.h>
#ifndef __ASSEMBLY__
extern unsigned int __start___lwsync_fixup, __stop___lwsync_fixup;

2
arch/powerpc/include/asm/thread_info.h
View File

@ -9,6 +9,8 @@
#ifndef _ASM_POWERPC_THREAD_INFO_H
#define _ASM_POWERPC_THREAD_INFO_H
#include <asm/asm-const.h>
#ifdef __KERNEL__
#define THREAD_SHIFT CONFIG_THREAD_SHIFT

1
arch/powerpc/include/asm/uaccess.h
View File

@ -2,7 +2,6 @@
#ifndef _ARCH_POWERPC_UACCESS_H
#define _ARCH_POWERPC_UACCESS_H
#include <asm/asm-compat.h>
#include <asm/ppc_asm.h>
#include <asm/processor.h>
#include <asm/page.h>

1
arch/powerpc/kernel/entry_64.S
View File

@ -38,6 +38,7 @@
#include <asm/ppc-opcode.h>
#include <asm/barrier.h>
#include <asm/export.h>
#include <asm/asm-compat.h>
#ifdef CONFIG_PPC_BOOK3S
#include <asm/exception-64s.h>
#else

1
arch/powerpc/kernel/fpu.S
View File

@ -25,6 +25,7 @@
#include <asm/asm-offsets.h>
#include <asm/ptrace.h>
#include <asm/export.h>
#include <asm/asm-compat.h>
#ifdef CONFIG_VSX
#define __REST_32FPVSRS(n,c,base) \

1
arch/powerpc/kernel/idle_book3s.S
View File

@ -23,6 +23,7 @@
#include <asm/exception-64s.h>
#include <asm/book3s/64/mmu-hash.h>
#include <asm/mmu.h>
#include <asm/asm-compat.h>
#undef DEBUG

1
arch/powerpc/kernel/kvm_emul.S
View File

@ -23,6 +23,7 @@
#include <asm/reg.h>
#include <asm/page.h>
#include <asm/asm-offsets.h>
#include <asm/asm-compat.h>
#define KVM_MAGIC_PAGE (-4096)

1
arch/powerpc/kernel/ppc_save_regs.S
View File

@ -12,6 +12,7 @@
#include <asm/ppc_asm.h>
#include <asm/asm-offsets.h>
#include <asm/ptrace.h>
#include <asm/asm-compat.h>
/*
* Grab the register values as they are now.

1
arch/powerpc/kernel/vector.S
View File

@ -8,6 +8,7 @@
#include <asm/page.h>
#include <asm/ptrace.h>
#include <asm/export.h>
#include <asm/asm-compat.h>
/*
* Load state from memory into VMX registers including VSCR.

2
arch/powerpc/kvm/book3s_64_slb.S
View File

@ -17,6 +17,8 @@
* Authors: Alexander Graf <agraf@suse.de>
*/
#include <asm/asm-compat.h>
#define SHADOW_SLB_ENTRY_LEN 0x10
#define OFFSET_ESID(x) (SHADOW_SLB_ENTRY_LEN * x)
#define OFFSET_VSID(x) ((SHADOW_SLB_ENTRY_LEN * x) + 8)

1
arch/powerpc/kvm/book3s_hv_interrupts.S
View File

@ -27,6 +27,7 @@
#include <asm/asm-offsets.h>
#include <asm/exception-64s.h>
#include <asm/ppc-opcode.h>
#include <asm/asm-compat.h>
/*****************************************************************************
* *

1
arch/powerpc/kvm/book3s_hv_rmhandlers.S
View File

@ -32,6 +32,7 @@
#include <asm/opal.h>
#include <asm/xive-regs.h>
#include <asm/thread_info.h>
#include <asm/asm-compat.h>
/* Sign-extend HDEC if not on POWER9 */
#define EXTEND_HDEC(reg) \

1
arch/powerpc/kvm/book3s_interrupts.S
View File

@ -23,6 +23,7 @@
#include <asm/page.h>
#include <asm/asm-offsets.h>
#include <asm/exception-64s.h>
#include <asm/asm-compat.h>
#if defined(CONFIG_PPC_BOOK3S_64)
#ifdef PPC64_ELF_ABI_v2

1
arch/powerpc/kvm/book3s_rmhandlers.S
View File

@ -23,6 +23,7 @@
#include <asm/mmu.h>
#include <asm/page.h>
#include <asm/asm-offsets.h>
#include <asm/asm-compat.h>
#ifdef CONFIG_PPC_BOOK3S_64
#include <asm/exception-64s.h>

2
arch/powerpc/kvm/book3s_segment.S
View File

@ -19,6 +19,8 @@
/* Real mode helpers */
#include <asm/asm-compat.h>
#if defined(CONFIG_PPC_BOOK3S_64)
#define GET_SHADOW_VCPU(reg) \

1
arch/powerpc/lib/copyuser_64.S
View File

@ -9,6 +9,7 @@
#include <asm/processor.h>
#include <asm/ppc_asm.h>
#include <asm/export.h>
#include <asm/asm-compat.h>
#ifdef __BIG_ENDIAN__
#define sLd sld /* Shift towards low-numbered address. */

1
arch/powerpc/lib/feature-fixups-test.S
View File

@ -11,6 +11,7 @@
#include <asm/feature-fixups.h>
#include <asm/ppc_asm.h>
#include <asm/synch.h>
#include <asm/asm-compat.h>
.text

1
arch/powerpc/lib/ldstfp.S
View File

@ -15,6 +15,7 @@
#include <asm/ppc-opcode.h>
#include <asm/reg.h>
#include <asm/asm-offsets.h>
#include <asm/asm-compat.h>
#include <linux/errno.h>
#ifdef CONFIG_PPC_FPU

1
arch/powerpc/lib/memcpy_64.S
View File

@ -9,6 +9,7 @@
#include <asm/processor.h>
#include <asm/ppc_asm.h>
#include <asm/export.h>
#include <asm/asm-compat.h>
.align 7
_GLOBAL_TOC(memcpy)

1
arch/powerpc/mm/tlb_nohash_low.S
View File

@ -34,6 +34,7 @@
#include <asm/asm-offsets.h>
#include <asm/processor.h>
#include <asm/bug.h>
#include <asm/asm-compat.h>
#if defined(CONFIG_40x)

1
arch/powerpc/net/bpf_jit32.h
View File

@ -13,6 +13,7 @@
#ifndef _BPF_JIT32_H
#define _BPF_JIT32_H
#include <asm/asm-compat.h>
#include "bpf_jit.h"
#ifdef CONFIG_PPC64

1
arch/powerpc/net/bpf_jit_asm.S
View File

@ -10,6 +10,7 @@
*/
#include <asm/ppc_asm.h>
#include <asm/asm-compat.h>
#include "bpf_jit32.h"
/*

1
arch/powerpc/net/bpf_jit_comp.c
View File

@ -12,6 +12,7 @@
*/
#include <linux/moduleloader.h>
#include <asm/cacheflush.h>
#include <asm/asm-compat.h>
#include <linux/netdevice.h>
#include <linux/filter.h>
#include <linux/if_vlan.h>

1
arch/powerpc/net/bpf_jit_comp64.c
View File

@ -13,6 +13,7 @@
*/
#include <linux/moduleloader.h>
#include <asm/cacheflush.h>
#include <asm/asm-compat.h>
#include <linux/netdevice.h>
#include <linux/filter.h>
#include <linux/if_vlan.h>

1
arch/powerpc/platforms/powernv/opal-wrappers.S
View File

@ -14,6 +14,7 @@
#include <asm/hvcall.h>
#include <asm/asm-offsets.h>
#include <asm/opal.h>
#include <asm/asm-compat.h>
.section ".text"

1
arch/powerpc/platforms/pseries/setup.c
View File

@ -69,6 +69,7 @@
#include <asm/kexec.h>
#include <asm/isa-bridge.h>
#include <asm/security_features.h>
#include <asm/asm-const.h>
#include "pseries.h"

10
arch/powerpc/purgatory/trampoline.S
View File

@ -12,15 +12,7 @@
* Software Foundation (version 2 of the License).
*/
#if defined(__LITTLE_ENDIAN__)
#define STWX_BE stwbrx
#define LWZX_BE lwbrx
#elif defined(__BIG_ENDIAN__)
#define STWX_BE stwx
#define LWZX_BE lwzx
#else
#error no endianness defined!
#endif
#include <asm/asm-compat.h>
.machine ppc64
.balign 256

1
arch/powerpc/xmon/spr_access.S
View File

@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
#include <asm/ppc_asm.h>
#include <asm/asm-compat.h>
/* unsigned long xmon_mfspr(sprn, default_value) */
_GLOBAL(xmon_mfspr)

0
tools/testing/selftests/powerpc/copyloops/asm/asm-compat.h Normal file
View File

1
tools/testing/selftests/powerpc/primitives/asm/asm-const.h Symbolic link
View File

@ -0,0 +1 @@
../../../../../../arch/powerpc/include/asm/asm-const.h