Skip to content

Commit

Permalink
powerpc: clean inclusions of asm/feature-fixups.h
Browse files Browse the repository at this point in the history 
files not using feature fixup don't need asm/feature-fixups.h
files using feature fixup need asm/feature-fixups.h

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Christophe Leroy authored and Michael Ellerman committed Jul 30, 2018
1 parent 5c35a02 commit 2c86cd1
Show file tree
Hide file tree
Showing 49 changed files with 45 additions and 4 deletions.
1 change: 0 additions & 1 deletion arch/powerpc/include/asm/cputable.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@


#include <linux/types.h>
#include <asm/feature-fixups.h>
#include <uapi/asm/cputable.h>
#include <asm/asm-const.h>

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/include/asm/dbell.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <linux/threads.h>

#include <asm/ppc-opcode.h>
#include <asm/feature-fixups.h>

#define PPC_DBELL_MSG_BRDCAST (0x04000000)
#define PPC_DBELL_TYPE(x) (((x) & 0xf) << (63-36))
Expand Down
1 change: 0 additions & 1 deletion arch/powerpc/include/asm/dt_cpu_ftrs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
*/

#include <linux/types.h>
#include <asm/feature-fixups.h>
#include <uapi/asm/cputable.h>

#ifdef CONFIG_PPC_DT_CPU_FTRS
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/include/asm/exception-64s.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
* implementations as possible.
*/
#include <asm/head-64.h>
#include <asm/feature-fixups.h>

/* PACA save area offsets (exgen, exmc, etc) */
#define EX_R9 0
Expand Down
1 change: 0 additions & 1 deletion arch/powerpc/include/asm/firmware.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

#ifdef __KERNEL__

#include <asm/feature-fixups.h>
#include <asm/asm-const.h>

/* firmware feature bitmask values */
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/include/asm/kvm_booke_hv_asm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#ifndef ASM_KVM_BOOKE_HV_ASM_H
#define ASM_KVM_BOOKE_HV_ASM_H

#include <asm/feature-fixups.h>

#ifdef __ASSEMBLY__

/*
Expand Down
1 change: 0 additions & 1 deletion arch/powerpc/include/asm/mmu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#include <linux/types.h>

#include <asm/feature-fixups.h>
#include <asm/asm-const.h>

/*
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/include/asm/ppc_asm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <asm/processor.h>
#include <asm/ppc-opcode.h>
#include <asm/firmware.h>
#include <asm/feature-fixups.h>

#ifdef __ASSEMBLY__

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/include/asm/reg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <linux/stringify.h>
#include <asm/cputable.h>
#include <asm/asm-const.h>
#include <asm/feature-fixups.h>

/* Pickup Book E specific registers. */
#if defined(CONFIG_BOOKE) || defined(CONFIG_40x)
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/cpu_setup_6xx.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <asm/asm-offsets.h>
#include <asm/cache.h>
#include <asm/mmu.h>
#include <asm/feature-fixups.h>

_GLOBAL(__setup_cpu_603)
mflr r5
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/entry_32.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <asm/ptrace.h>
#include <asm/export.h>
#include <asm/asm-405.h>
#include <asm/feature-fixups.h>

/*
* MSR_KERNEL is > 0x10000 on 4xx/Book-E since it include MSR_CE.
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/entry_64.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#else
#include <asm/exception-64e.h>
#endif
#include <asm/feature-fixups.h>

/*
* System calls.
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/exceptions-64e.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <asm/hw_irq.h>
#include <asm/kvm_asm.h>
#include <asm/kvm_booke_hv_asm.h>
#include <asm/feature-fixups.h>

/* XXX This will ultimately add space for a special exception save
* structure used to save things like SRR0/SRR1, SPRGs, MAS, etc...
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/exceptions-64s.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <asm/ptrace.h>
#include <asm/cpuidle.h>
#include <asm/head-64.h>
#include <asm/feature-fixups.h>

/*
* There are a few constraints to be concerned with.
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/fpu.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <asm/ptrace.h>
#include <asm/export.h>
#include <asm/asm-compat.h>
#include <asm/feature-fixups.h>

#ifdef CONFIG_VSX
#define __REST_32FPVSRS(n,c,base) \
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/head_32.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <asm/bug.h>
#include <asm/kvm_book3s_asm.h>
#include <asm/export.h>
#include <asm/feature-fixups.h>

/* 601 only have IBAT; cr0.eq is set on 601 when using this macro */
#define LOAD_BAT(n, reg, RA, RB) \
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/head_64.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#include <asm/cputhreads.h>
#include <asm/ppc-opcode.h>
#include <asm/export.h>
#include <asm/feature-fixups.h>

/* The physical memory is laid out such that the secondary processor
* spin code sits at 0x0000...0x00ff. On server, the vectors follow
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/head_fsl_booke.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include <asm/cache.h>
#include <asm/ptrace.h>
#include <asm/export.h>
#include <asm/feature-fixups.h>
#include "head_booke.h"

/* As with the other PowerPC ports, it is expected that when code
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/idle_6xx.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <asm/thread_info.h>
#include <asm/ppc_asm.h>
#include <asm/asm-offsets.h>
#include <asm/feature-fixups.h>

.text

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/idle_book3s.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <asm/book3s/64/mmu-hash.h>
#include <asm/mmu.h>
#include <asm/asm-compat.h>
#include <asm/feature-fixups.h>

#undef DEBUG

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/idle_e500.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <asm/thread_info.h>
#include <asm/ppc_asm.h>
#include <asm/asm-offsets.h>
#include <asm/feature-fixups.h>

.text

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/idle_power4.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <asm/asm-offsets.h>
#include <asm/irqflags.h>
#include <asm/hw_irq.h>
#include <asm/feature-fixups.h>

#undef DEBUG

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/l2cr_6xx.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include <asm/ppc_asm.h>
#include <asm/cache.h>
#include <asm/page.h>
#include <asm/feature-fixups.h>

/* Usage:
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/misc_32.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <asm/bug.h>
#include <asm/ptrace.h>
#include <asm/export.h>
#include <asm/feature-fixups.h>

.text

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/misc_64.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <asm/ptrace.h>
#include <asm/mmu.h>
#include <asm/export.h>
#include <asm/feature-fixups.h>

.text

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/setup_32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include <asm/cpu_has_feature.h>
#include <asm/asm-prototypes.h>
#include <asm/kdump.h>
#include <asm/feature-fixups.h>

#define DBG(fmt...)

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/setup_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
#include <asm/opal.h>
#include <asm/cputhreads.h>
#include <asm/hw_irq.h>
#include <asm/feature-fixups.h>

#include "setup.h"

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/swsusp_32.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <asm/ppc_asm.h>
#include <asm/asm-offsets.h>
#include <asm/mmu.h>
#include <asm/feature-fixups.h>

/*
* Structure for storing CPU registers on the save area.
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/swsusp_asm64.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <asm/thread_info.h>
#include <asm/ppc_asm.h>
#include <asm/asm-offsets.h>
#include <asm/feature-fixups.h>

/*
* Structure for storing CPU registers on the save area.
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kernel/tm.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <asm/reg.h>
#include <asm/bug.h>
#include <asm/export.h>
#include <asm/feature-fixups.h>

#ifdef CONFIG_VSX
/* See fpu.S, this is borrowed from there */
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kvm/book3s_64_slb.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/

#include <asm/asm-compat.h>
#include <asm/feature-fixups.h>

#define SHADOW_SLB_ENTRY_LEN 0x10
#define OFFSET_ESID(x) (SHADOW_SLB_ENTRY_LEN * x)
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kvm/book3s_hv_interrupts.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <asm/exception-64s.h>
#include <asm/ppc-opcode.h>
#include <asm/asm-compat.h>
#include <asm/feature-fixups.h>

/*****************************************************************************
* *
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kvm/book3s_hv_rmhandlers.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <asm/xive-regs.h>
#include <asm/thread_info.h>
#include <asm/asm-compat.h>
#include <asm/feature-fixups.h>

/* Sign-extend HDEC if not on POWER9 */
#define EXTEND_HDEC(reg) \
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kvm/book3s_segment.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
/* Real mode helpers */

#include <asm/asm-compat.h>
#include <asm/feature-fixups.h>

#if defined(CONFIG_PPC_BOOK3S_64)

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/lib/copypage_64.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <asm/ppc_asm.h>
#include <asm/asm-offsets.h>
#include <asm/export.h>
#include <asm/feature-fixups.h>

.section ".toc","aw"
PPC64_CACHES:
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/lib/copyuser_64.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <asm/ppc_asm.h>
#include <asm/export.h>
#include <asm/asm-compat.h>
#include <asm/feature-fixups.h>

#ifdef __BIG_ENDIAN__
#define sLd sld /* Shift towards low-numbered address. */
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/lib/hweight_64.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <asm/processor.h>
#include <asm/ppc_asm.h>
#include <asm/export.h>
#include <asm/feature-fixups.h>

/* Note: This code relies on -mminimal-toc */

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/lib/memcpy_64.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <asm/ppc_asm.h>
#include <asm/export.h>
#include <asm/asm-compat.h>
#include <asm/feature-fixups.h>

.align 7
_GLOBAL_TOC(memcpy)
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/mm/hash_low_32.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <asm/thread_info.h>
#include <asm/asm-offsets.h>
#include <asm/export.h>
#include <asm/feature-fixups.h>

#ifdef CONFIG_SMP
.section .bss
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/mm/hash_native_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <asm/udbg.h>
#include <asm/kexec.h>
#include <asm/ppc-opcode.h>
#include <asm/feature-fixups.h>

#include <misc/cxl-base.h>

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/mm/slb_low.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <asm/mmu.h>
#include <asm/pgtable.h>
#include <asm/firmware.h>
#include <asm/feature-fixups.h>

/*
* This macro generates asm code to compute the VSID scramble
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/mm/tlb_low_64e.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <asm/ppc-opcode.h>
#include <asm/kvm_asm.h>
#include <asm/kvm_booke_hv_asm.h>
#include <asm/feature-fixups.h>

#ifdef CONFIG_PPC_64K_PAGES
#define VPTE_PMD_SHIFT (PTE_INDEX_SIZE+1)
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/mm/tlb_nohash_low.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <asm/processor.h>
#include <asm/bug.h>
#include <asm/asm-compat.h>
#include <asm/feature-fixups.h>

#if defined(CONFIG_40x)

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/platforms/powermac/cache.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <asm/processor.h>
#include <asm/ppc_asm.h>
#include <asm/cputable.h>
#include <asm/feature-fixups.h>

/*
* Flush and disable all data caches (dL1, L2, L3). This is used
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/platforms/powermac/sleep.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <asm/thread_info.h>
#include <asm/asm-offsets.h>
#include <asm/mmu.h>
#include <asm/feature-fixups.h>

#define MAGIC 0x4c617273 /* 'Lars' */

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/platforms/powernv/opal-wrappers.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <asm/asm-offsets.h>
#include <asm/opal.h>
#include <asm/asm-compat.h>
#include <asm/feature-fixups.h>

.section ".text"

Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/platforms/pseries/hvCall.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <asm/ppc_asm.h>
#include <asm/asm-offsets.h>
#include <asm/ptrace.h>
#include <asm/feature-fixups.h>

.section ".text"

Expand Down
Empty file added tools/testing/selftests/powerpc/copyloops/asm/feature-fixups.h
View file
Empty file.
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/primitives/asm/feature-fixups.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../../../arch/powerpc/include/asm/feature-fixups.h

0 comments on commit 2c86cd1

Please sign in to comment.