Skip to content

L
linux
Commit bbeb3f4c authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files
Options

powerpc: clean up after powermac build merge 

Complete moving arch/ppc64/kernel/mpic.h,
        include/asm-ppc/reg.h, include/asm-ppc64/kdebug.h
	        and include/asm-ppc64/kprobes.h
Add arch/powerpc/platforms/Makefile and use it from
	arch/powerpc/Makefile
Introduce OLDARCH temporarily so we can point back to
	the originating architecture
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 51a0885e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 880 deletions
arch/powerpc/Makefile
View file @ bbeb3f4c
...@@ -18,6 +18,7 @@ KERNELLOAD := $(CONFIG_KERNEL_START) ...@@ -18,6 +18,7 @@ KERNELLOAD := $(CONFIG_KERNEL_START)
HAS_BIARCH := $(call cc-option-yn, -m32) HAS_BIARCH := $(call cc-option-yn, -m32)
ifeq ($(CONFIG_PPC64),y) ifeq ($(CONFIG_PPC64),y)
OLDARCH := ppc64
SZ := 64 SZ := 64
# Set default 32 bits cross compilers for vdso and boot wrapper # Set default 32 bits cross compilers for vdso and boot wrapper
...@@ -46,6 +47,7 @@ NM := $(NM) --synthetic ...@@ -46,6 +47,7 @@ NM := $(NM) --synthetic
endif endif
else else
OLDARCH := ppc
SZ := 32 SZ := 32
endif endif
...@@ -61,11 +63,9 @@ LDFLAGS_vmlinux := -Ttext $(KERNELLOAD) -Bstatic -e $(KERNELLOAD) ...@@ -61,11 +63,9 @@ LDFLAGS_vmlinux := -Ttext $(KERNELLOAD) -Bstatic -e $(KERNELLOAD)
CPPFLAGS += -Iarch/$(ARCH) -Iarch/$(ARCH)/include CPPFLAGS += -Iarch/$(ARCH) -Iarch/$(ARCH)/include
AFLAGS += -Iarch/$(ARCH) AFLAGS += -Iarch/$(ARCH)
CFLAGS += -Iarch/$(ARCH) -msoft-float -pipe CFLAGS += -Iarch/$(ARCH) -msoft-float -pipe
ifeq ($(CONFIG_PPC64),y) CFLAGS-$(CONFIG_PPC64) := -mminimal-toc -mtraceback=none -mcall-aixdesc
CFLAGS += -mminimal-toc -mtraceback=none -mcall-aixdesc CFLAGS-$(CONFIG_PPC32) := -ffixed-r2 -mmultiple
else CFLAGS += $(CFLAGS-y)
CFLAGS += -ffixed-r2 -mmultiple
endif
CPP = $(CC) -E $(CFLAGS) CPP = $(CC) -E $(CFLAGS)
# Temporary hack until we have migrated to asm-powerpc # Temporary hack until we have migrated to asm-powerpc
LINUXINCLUDE += -Iarch/$(ARCH)/include LINUXINCLUDE += -Iarch/$(ARCH)/include
...@@ -126,16 +126,12 @@ head-$(CONFIG_PPC_FPU) += arch/powerpc/kernel/fpu.o ...@@ -126,16 +126,12 @@ head-$(CONFIG_PPC_FPU) += arch/powerpc/kernel/fpu.o
endif endif
core-y += arch/powerpc/kernel/ \ core-y += arch/powerpc/kernel/ \
arch/$(OLDARCH)/kernel/ \
arch/powerpc/mm/ \ arch/powerpc/mm/ \
arch/powerpc/lib/ \ arch/powerpc/lib/ \
arch/powerpc/sysdev/ arch/powerpc/sysdev/ \
core-$(CONFIG_PPC32) += arch/ppc/kernel/ \ arch/powerpc/platforms/
arch/ppc/syslib/ core-$(CONFIG_PPC32) += arch/ppc/syslib/
core-$(CONFIG_PPC64) += arch/ppc64/kernel/
core-$(CONFIG_PPC_PMAC) += arch/powerpc/platforms/powermac/
core-$(CONFIG_4xx) += arch/ppc/platforms/4xx/
core-$(CONFIG_83xx) += arch/ppc/platforms/83xx/
core-$(CONFIG_85xx) += arch/ppc/platforms/85xx/
core-$(CONFIG_MATH_EMULATION) += arch/ppc/math-emu/ core-$(CONFIG_MATH_EMULATION) += arch/ppc/math-emu/
core-$(CONFIG_XMON) += arch/powerpc/xmon/ core-$(CONFIG_XMON) += arch/powerpc/xmon/
core-$(CONFIG_APUS) += arch/ppc/amiga/ core-$(CONFIG_APUS) += arch/ppc/amiga/
...@@ -182,17 +178,10 @@ archclean: ...@@ -182,17 +178,10 @@ archclean:
archprepare: checkbin archprepare: checkbin
# Temporary hack until we have migrated to asm-powerpc # Temporary hack until we have migrated to asm-powerpc
ifeq ($(CONFIG_PPC64),y)
include/asm: arch/$(ARCH)/include/asm include/asm: arch/$(ARCH)/include/asm
arch/$(ARCH)/include/asm: arch/$(ARCH)/include/asm:
$(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
$(Q)ln -fsn $(srctree)/include/asm-ppc64 arch/$(ARCH)/include/asm $(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm
else
include/asm: arch/$(ARCH)/include/asm
arch/$(ARCH)/include/asm:
$(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
$(Q)ln -fsn $(srctree)/include/asm-ppc arch/$(ARCH)/include/asm
endif
# Use the file '.tmp_gas_check' for binutils tests, as gas won't output # Use the file '.tmp_gas_check' for binutils tests, as gas won't output
# to stdout and these checks are run even on install targets. # to stdout and these checks are run even on install targets.
......
arch/powerpc/platforms/Makefile 0 → 100644
View file @ bbeb3f4c
obj-$(CONFIG_PPC_PMAC) += powermac/
obj-$(CONFIG_4xx) += 4xx/
obj-$(CONFIG_83xx) += 83xx/
obj-$(CONFIG_85xx) += 85xx/
arch/powerpc/platforms/embedded6xx/Kconfig
View file @ bbeb3f4c
...@@ -2,14 +2,6 @@ choice ...@@ -2,14 +2,6 @@ choice
prompt "Machine Type" prompt "Machine Type"
depends on EMBEDDED6xx depends on EMBEDDED6xx
config APUS
bool "Amiga-APUS"
depends on BROKEN
help
Select APUS if configuring for a PowerUP Amiga.
More information is available at:
<http://linux-apus.sourceforge.net/>.
config KATANA config KATANA
bool "Artesyn-Katana" bool "Artesyn-Katana"
help help
......
arch/ppc64/kernel/kprobes.c
View file @ bbeb3f4c
...@@ -395,7 +395,6 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, ...@@ -395,7 +395,6 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
if (post_kprobe_handler(args->regs)) if (post_kprobe_handler(args->regs))
ret = NOTIFY_STOP; ret = NOTIFY_STOP;
break; break;
case DIE_GPF:
case DIE_PAGE_FAULT: case DIE_PAGE_FAULT:
if (kprobe_running() && if (kprobe_running() &&
kprobe_fault_handler(args->regs, args->trapnr)) kprobe_fault_handler(args->regs, args->trapnr))
......
arch/ppc64/kernel/maple_setup.c
View file @ bbeb3f4c
...@@ -59,8 +59,7 @@ ...@@ -59,8 +59,7 @@
#include <asm/time.h> #include <asm/time.h>
#include <asm/of_device.h> #include <asm/of_device.h>
#include <asm/lmb.h> #include <asm/lmb.h>
#include <asm/mpic.h>
#include "mpic.h"
#ifdef DEBUG #ifdef DEBUG
#define DBG(fmt...) udbg_printf(fmt) #define DBG(fmt...) udbg_printf(fmt)
......
arch/ppc64/kernel/mpic.c
View file @ bbeb3f4c
...@@ -31,8 +31,7 @@ ...@@ -31,8 +31,7 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/mpic.h>
#include "mpic.h"
#ifdef DEBUG #ifdef DEBUG
#define DBG(fmt...) printk(fmt) #define DBG(fmt...) printk(fmt)
......
arch/ppc64/kernel/mpic.h deleted 100644 → 0
View file @ 51a0885e
#include <linux/irq.h>
/*
* Global registers
*/
#define MPIC_GREG_BASE 0x01000
#define MPIC_GREG_FEATURE_0 0x00000
#define MPIC_GREG_FEATURE_LAST_SRC_MASK 0x07ff0000
#define MPIC_GREG_FEATURE_LAST_SRC_SHIFT 16
#define MPIC_GREG_FEATURE_LAST_CPU_MASK 0x00001f00
#define MPIC_GREG_FEATURE_LAST_CPU_SHIFT 8
#define MPIC_GREG_FEATURE_VERSION_MASK 0xff
#define MPIC_GREG_FEATURE_1 0x00010
#define MPIC_GREG_GLOBAL_CONF_0 0x00020
#define MPIC_GREG_GCONF_RESET 0x80000000
#define MPIC_GREG_GCONF_8259_PTHROU_DIS 0x20000000
#define MPIC_GREG_GCONF_BASE_MASK 0x000fffff
#define MPIC_GREG_GLOBAL_CONF_1 0x00030
#define MPIC_GREG_VENDOR_0 0x00040
#define MPIC_GREG_VENDOR_1 0x00050
#define MPIC_GREG_VENDOR_2 0x00060
#define MPIC_GREG_VENDOR_3 0x00070
#define MPIC_GREG_VENDOR_ID 0x00080
#define MPIC_GREG_VENDOR_ID_STEPPING_MASK 0x00ff0000
#define MPIC_GREG_VENDOR_ID_STEPPING_SHIFT 16
#define MPIC_GREG_VENDOR_ID_DEVICE_ID_MASK 0x0000ff00
#define MPIC_GREG_VENDOR_ID_DEVICE_ID_SHIFT 8
#define MPIC_GREG_VENDOR_ID_VENDOR_ID_MASK 0x000000ff
#define MPIC_GREG_PROCESSOR_INIT 0x00090
#define MPIC_GREG_IPI_VECTOR_PRI_0 0x000a0
#define MPIC_GREG_IPI_VECTOR_PRI_1 0x000b0
#define MPIC_GREG_IPI_VECTOR_PRI_2 0x000c0
#define MPIC_GREG_IPI_VECTOR_PRI_3 0x000d0
#define MPIC_GREG_SPURIOUS 0x000e0
#define MPIC_GREG_TIMER_FREQ 0x000f0
/*
*
* Timer registers
*/
#define MPIC_TIMER_BASE 0x01100
#define MPIC_TIMER_STRIDE 0x40
#define MPIC_TIMER_CURRENT_CNT 0x00000
#define MPIC_TIMER_BASE_CNT 0x00010
#define MPIC_TIMER_VECTOR_PRI 0x00020
#define MPIC_TIMER_DESTINATION 0x00030
/*
* Per-Processor registers
*/
#define MPIC_CPU_THISBASE 0x00000
#define MPIC_CPU_BASE 0x20000
#define MPIC_CPU_STRIDE 0x01000
#define MPIC_CPU_IPI_DISPATCH_0 0x00040
#define MPIC_CPU_IPI_DISPATCH_1 0x00050
#define MPIC_CPU_IPI_DISPATCH_2 0x00060
#define MPIC_CPU_IPI_DISPATCH_3 0x00070
#define MPIC_CPU_CURRENT_TASK_PRI 0x00080
#define MPIC_CPU_TASKPRI_MASK 0x0000000f
#define MPIC_CPU_WHOAMI 0x00090
#define MPIC_CPU_WHOAMI_MASK 0x0000001f
#define MPIC_CPU_INTACK 0x000a0
#define MPIC_CPU_EOI 0x000b0
/*
* Per-source registers
*/
#define MPIC_IRQ_BASE 0x10000
#define MPIC_IRQ_STRIDE 0x00020
#define MPIC_IRQ_VECTOR_PRI 0x00000
#define MPIC_VECPRI_MASK 0x80000000
#define MPIC_VECPRI_ACTIVITY 0x40000000 /* Read Only */
#define MPIC_VECPRI_PRIORITY_MASK 0x000f0000
#define MPIC_VECPRI_PRIORITY_SHIFT 16
#define MPIC_VECPRI_VECTOR_MASK 0x000007ff
#define MPIC_VECPRI_POLARITY_POSITIVE 0x00800000
#define MPIC_VECPRI_POLARITY_NEGATIVE 0x00000000
#define MPIC_VECPRI_POLARITY_MASK 0x00800000
#define MPIC_VECPRI_SENSE_LEVEL 0x00400000
#define MPIC_VECPRI_SENSE_EDGE 0x00000000
#define MPIC_VECPRI_SENSE_MASK 0x00400000
#define MPIC_IRQ_DESTINATION 0x00010
#define MPIC_MAX_IRQ_SOURCES 2048
#define MPIC_MAX_CPUS 32
#define MPIC_MAX_ISU 32
/*
* Special vector numbers (internal use only)
*/
#define MPIC_VEC_SPURRIOUS 255
#define MPIC_VEC_IPI_3 254
#define MPIC_VEC_IPI_2 253
#define MPIC_VEC_IPI_1 252
#define MPIC_VEC_IPI_0 251
/* unused */
#define MPIC_VEC_TIMER_3 250
#define MPIC_VEC_TIMER_2 249
#define MPIC_VEC_TIMER_1 248
#define MPIC_VEC_TIMER_0 247
/* Type definition of the cascade handler */
typedef int (*mpic_cascade_t)(struct pt_regs *regs, void *data);
#ifdef CONFIG_MPIC_BROKEN_U3
/* Fixup table entry */
struct mpic_irq_fixup
{
u8 __iomem *base;
unsigned int irq;
};
#endif /* CONFIG_MPIC_BROKEN_U3 */
/* The instance data of a given MPIC */
struct mpic
{
/* The "linux" controller struct */
hw_irq_controller hc_irq;
#ifdef CONFIG_SMP
hw_irq_controller hc_ipi;
#endif
const char *name;
/* Flags */
unsigned int flags;
/* How many irq sources in a given ISU */
unsigned int isu_size;
unsigned int isu_shift;
unsigned int isu_mask;
/* Offset of irq vector numbers */
unsigned int irq_offset;
unsigned int irq_count;
/* Offset of ipi vector numbers */
unsigned int ipi_offset;
/* Number of sources */
unsigned int num_sources;
/* Number of CPUs */
unsigned int num_cpus;
/* cascade handler */
mpic_cascade_t cascade;
void *cascade_data;
unsigned int cascade_vec;
/* senses array */
unsigned char *senses;
unsigned int senses_count;
#ifdef CONFIG_MPIC_BROKEN_U3
/* The fixup table */
struct mpic_irq_fixup *fixups;
spinlock_t fixup_lock;
#endif
/* The various ioremap'ed bases */
volatile u32 __iomem *gregs;
volatile u32 __iomem *tmregs;
volatile u32 __iomem *cpuregs[MPIC_MAX_CPUS];
volatile u32 __iomem *isus[MPIC_MAX_ISU];
/* link */
struct mpic *next;
};
/* This is the primary controller, only that one has IPIs and
* has afinity control. A non-primary MPIC always uses CPU0
* registers only
*/
#define MPIC_PRIMARY 0x00000001
/* Set this for a big-endian MPIC */
#define MPIC_BIG_ENDIAN 0x00000002
/* Broken U3 MPIC */
#define MPIC_BROKEN_U3 0x00000004
/* Broken IPI registers (autodetected) */
#define MPIC_BROKEN_IPI 0x00000008
/* MPIC wants a reset */
#define MPIC_WANTS_RESET 0x00000010
/* Allocate the controller structure and setup the linux irq descs
* for the range if interrupts passed in. No HW initialization is
* actually performed.
*
* @phys_addr: physial base address of the MPIC
* @flags: flags, see constants above
* @isu_size: number of interrupts in an ISU. Use 0 to use a
* standard ISU-less setup (aka powermac)
* @irq_offset: first irq number to assign to this mpic
* @irq_count: number of irqs to use with this mpic IRQ sources. Pass 0
* to match the number of sources
* @ipi_offset: first irq number to assign to this mpic IPI sources,
* used only on primary mpic
* @senses: array of sense values
* @senses_num: number of entries in the array
*
* Note about the sense array. If none is passed, all interrupts are
* setup to be level negative unless MPIC_BROKEN_U3 is set in which
* case they are edge positive (and the array is ignored anyway).
* The values in the array start at the first source of the MPIC,
* that is senses[0] correspond to linux irq "irq_offset".
*/
extern struct mpic *mpic_alloc(unsigned long phys_addr,
unsigned int flags,
unsigned int isu_size,
unsigned int irq_offset,
unsigned int irq_count,
unsigned int ipi_offset,
unsigned char *senses,
unsigned int senses_num,
const char *name);
/* Assign ISUs, to call before mpic_init()
*
* @mpic: controller structure as returned by mpic_alloc()
* @isu_num: ISU number
* @phys_addr: physical address of the ISU
*/
extern void mpic_assign_isu(struct mpic *mpic, unsigned int isu_num,
unsigned long phys_addr);
/* Initialize the controller. After this has been called, none of the above
* should be called again for this mpic
*/
extern void mpic_init(struct mpic *mpic);
/* Setup a cascade. Currently, only one cascade is supported this
* way, though you can always do a normal request_irq() and add
* other cascades this way. You should call this _after_ having
* added all the ISUs
*
* @irq_no: "linux" irq number of the cascade (that is offset'ed vector)
* @handler: cascade handler function
*/
extern void mpic_setup_cascade(unsigned int irq_no, mpic_cascade_t hanlder,
void *data);
/*
* All of the following functions must only be used after the
* ISUs have been assigned and the controller fully initialized
* with mpic_init()
*/
/* Change/Read the priority of an interrupt. Default is 8 for irqs and
* 10 for IPIs. You can call this on both IPIs and IRQ numbers, but the
* IPI number is then the offset'ed (linux irq number mapped to the IPI)
*/
extern void mpic_irq_set_priority(unsigned int irq, unsigned int pri);
extern unsigned int mpic_irq_get_priority(unsigned int irq);
/* Setup a non-boot CPU */
extern void mpic_setup_this_cpu(void);
/* Clean up for kexec (or cpu offline or ...) */
extern void mpic_teardown_this_cpu(int secondary);
/* Request IPIs on primary mpic */
extern void mpic_request_ipis(void);
/* Send an IPI (non offseted number 0..3) */
extern void mpic_send_ipi(unsigned int ipi_no, unsigned int cpu_mask);
/* Fetch interrupt from a given mpic */
extern int mpic_get_one_irq(struct mpic *mpic, struct pt_regs *regs);
/* This one gets to the primary mpic */
extern int mpic_get_irq(struct pt_regs *regs);
/* global mpic for pSeries */
extern struct mpic *pSeries_mpic;
arch/ppc64/kernel/pSeries_setup.c
View file @ bbeb3f4c
...@@ -62,9 +62,9 @@ ...@@ -62,9 +62,9 @@
#include <asm/xics.h> #include <asm/xics.h>
#include <asm/firmware.h> #include <asm/firmware.h>
#include <asm/pmc.h> #include <asm/pmc.h>
#include <asm/mpic.h>
#include "i8259.h" #include "i8259.h"
#include "mpic.h"
#include "pci.h" #include "pci.h"
#ifdef DEBUG #ifdef DEBUG
......
arch/ppc64/kernel/pSeries_smp.c
View file @ bbeb3f4c
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
#include <asm/rtas.h> #include <asm/rtas.h>
#include <asm/plpar_wrappers.h> #include <asm/plpar_wrappers.h>
#include <asm/pSeries_reconfig.h> #include <asm/pSeries_reconfig.h>
#include <asm/mpic.h>
#include "mpic.h"
#include "bpa_iic.h" #include "bpa_iic.h"
#ifdef DEBUG #ifdef DEBUG
......
arch/ppc64/kernel/pmac_setup.c
View file @ bbeb3f4c
...@@ -72,9 +72,9 @@ ...@@ -72,9 +72,9 @@
#include <asm/lmb.h> #include <asm/lmb.h>
#include <asm/smu.h> #include <asm/smu.h>
#include <asm/pmc.h> #include <asm/pmc.h>
#include <asm/mpic.h>
#include "pmac.h" #include "pmac.h"
#include "mpic.h"
#ifdef DEBUG #ifdef DEBUG
#define DBG(fmt...) udbg_printf(fmt) #define DBG(fmt...) udbg_printf(fmt)
......
arch/ppc64/kernel/pmac_smp.c
View file @ bbeb3f4c
...@@ -51,8 +51,7 @@ ...@@ -51,8 +51,7 @@
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/keylargo.h> #include <asm/keylargo.h>
#include <asm/pmac_low_i2c.h> #include <asm/pmac_low_i2c.h>
#include <asm/mpic.h>
#include "mpic.h"
#ifdef DEBUG #ifdef DEBUG
#define DBG(fmt...) udbg_printf(fmt) #define DBG(fmt...) udbg_printf(fmt)
......
arch/ppc64/kernel/rtas_pci.c
View file @ bbeb3f4c
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
#include <asm/pci-bridge.h> #include <asm/pci-bridge.h>
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/rtas.h> #include <asm/rtas.h>
#include <asm/mpic.h>
#include "mpic.h"
#include "pci.h" #include "pci.h"
/* RTAS tokens */ /* RTAS tokens */
......
arch/ppc64/kernel/smp.c
View file @ bbeb3f4c
...@@ -45,8 +45,7 @@ ...@@ -45,8 +45,7 @@
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/abs_addr.h> #include <asm/abs_addr.h>
#include <asm/mpic.h>
#include "mpic.h"
#ifdef DEBUG #ifdef DEBUG
#define DBG(fmt...) udbg_printf(fmt) #define DBG(fmt...) udbg_printf(fmt)
......
arch/ppc64/kernel/traps.c
View file @ bbeb3f4c
...@@ -62,7 +62,7 @@ EXPORT_SYMBOL(__debugger_dabr_match); ...@@ -62,7 +62,7 @@ EXPORT_SYMBOL(__debugger_dabr_match);
EXPORT_SYMBOL(__debugger_fault_handler); EXPORT_SYMBOL(__debugger_fault_handler);
#endif #endif
struct notifier_block *ppc64_die_chain; struct notifier_block *powerpc_die_chain;
static DEFINE_SPINLOCK(die_notifier_lock); static DEFINE_SPINLOCK(die_notifier_lock);
int register_die_notifier(struct notifier_block *nb) int register_die_notifier(struct notifier_block *nb)
...@@ -71,7 +71,7 @@ int register_die_notifier(struct notifier_block *nb) ...@@ -71,7 +71,7 @@ int register_die_notifier(struct notifier_block *nb)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&die_notifier_lock, flags); spin_lock_irqsave(&die_notifier_lock, flags);
err = notifier_chain_register(&ppc64_die_chain, nb); err = notifier_chain_register(&powerpc_die_chain, nb);
spin_unlock_irqrestore(&die_notifier_lock, flags); spin_unlock_irqrestore(&die_notifier_lock, flags);
return err; return err;
} }
......
include/asm-powerpc/kdebug.h
View file @ bbeb3f4c
#ifndef _POWERPC_KDEBUG_H #ifndef _ASM_POWERPC_KDEBUG_H
#define _POWERPC_KDEBUG_H 1 #define _ASM_POWERPC_KDEBUG_H
/* nearly identical to x86_64/i386 code */ /* nearly identical to x86_64/i386 code */
...@@ -39,4 +39,4 @@ static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,lon ...@@ -39,4 +39,4 @@ static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,lon
return notifier_call_chain(&powerpc_die_chain, val, &args); return notifier_call_chain(&powerpc_die_chain, val, &args);
} }
#endif #endif /* _ASM_POWERPC_KDEBUG_H */
include/asm-powerpc/kprobes.h
View file @ bbeb3f4c
#ifndef _ASM_KPROBES_H #ifndef _ASM_POWERPC_KPROBES_H
#define _ASM_KPROBES_H #define _ASM_POWERPC_KPROBES_H
/* /*
* Kernel Probes (KProbes) * Kernel Probes (KProbes)
* include/asm-ppc64/kprobes.h
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -64,4 +63,4 @@ static inline int kprobe_exceptions_notify(struct notifier_block *self, ...@@ -64,4 +63,4 @@ static inline int kprobe_exceptions_notify(struct notifier_block *self,
return 0; return 0;
} }
#endif #endif
#endif /* _ASM_KPROBES_H */ #endif /* _ASM_POWERPC_KPROBES_H */
include/asm-powerpc/mpic.h
View file @ bbeb3f4c
#ifndef _ASM_POWERPC_MPIC_H
#define _ASM_POWERPC_MPIC_H
#include <linux/irq.h> #include <linux/irq.h>
/* /*
...@@ -277,3 +280,5 @@ extern int mpic_get_irq(struct pt_regs *regs); ...@@ -277,3 +280,5 @@ extern int mpic_get_irq(struct pt_regs *regs);
/* global mpic for pSeries */ /* global mpic for pSeries */
extern struct mpic *pSeries_mpic; extern struct mpic *pSeries_mpic;
#endif /* _ASM_POWERPC_MPIC_H */
include/asm-powerpc/reg.h
View file @ bbeb3f4c
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
* Implementations of the PowerPC Architecture (a.k.a. Green Book) here. * Implementations of the PowerPC Architecture (a.k.a. Green Book) here.
*/ */
#ifndef _ASM_POWERPC_REGS_H
#define _ASM_POWERPC_REGS_H
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifndef __ASM_PPC_REGS_H__
#define __ASM_PPC_REGS_H__
#include <linux/stringify.h> #include <linux/stringify.h>
...@@ -442,5 +442,5 @@ ...@@ -442,5 +442,5 @@
#define proc_trap() asm volatile("trap") #define proc_trap() asm volatile("trap")
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __ASM_PPC_REGS_H__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_REGS_H */
include/asm-powerpc/system.h
View file @ bbeb3f4c
/* /*
* Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu> * Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu>
*/ */
#ifndef __PPC_SYSTEM_H #ifndef _ASM_POWERPC_SYSTEM_H
#define __PPC_SYSTEM_H #define _ASM_POWERPC_SYSTEM_H
#include <linux/config.h> #include <linux/config.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -347,4 +347,4 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, ...@@ -347,4 +347,4 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new,
#define arch_align_stack(x) (x) #define arch_align_stack(x) (x)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __PPC_SYSTEM_H */ #endif /* _ASM_POWERPC_SYSTEM_H */
include/asm-ppc/reg.h deleted 100644 → 0
View file @ 51a0885e
This diff is collapsed.
include/asm-ppc64/kdebug.h deleted 100644 → 0
View file @ 51a0885e
#ifndef _PPC64_KDEBUG_H
#define _PPC64_KDEBUG_H 1
/* nearly identical to x86_64/i386 code */
#include <linux/notifier.h>
struct pt_regs;
struct die_args {
struct pt_regs *regs;
const char *str;
long err;
int trapnr;
int signr;
};
/*
Note - you should never unregister because that can race with NMIs.
If you really want to do it first unregister - then synchronize_sched -
then free.
*/
int register_die_notifier(struct notifier_block *nb);
extern struct notifier_block *ppc64_die_chain;
/* Grossly misnamed. */
enum die_val {
DIE_OOPS = 1,
DIE_IABR_MATCH,
DIE_DABR_MATCH,
DIE_BPT,
DIE_SSTEP,
DIE_GPF,
DIE_PAGE_FAULT,
};
static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig)
{
struct die_args args = { .regs=regs, .str=str, .err=err, .trapnr=trap,.signr=sig };
return notifier_call_chain(&ppc64_die_chain, val, &args);
}
#endif
include/asm-ppc64/kprobes.h deleted 100644 → 0
View file @ 51a0885e
#ifndef _ASM_KPROBES_H
#define _ASM_KPROBES_H
/*
* Kernel Probes (KProbes)
* include/asm-ppc64/kprobes.h
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* Copyright (C) IBM Corporation, 2002, 2004
*
* 2002-Oct Created by Vamsi Krishna S <vamsi_krishna@in.ibm.com> Kernel
* Probes initial implementation ( includes suggestions from
* Rusty Russell).
* 2004-Nov Modified for PPC64 by Ananth N Mavinakayanahalli
* <ananth@in.ibm.com>
*/
#include <linux/types.h>
#include <linux/ptrace.h>
struct pt_regs;
typedef unsigned int kprobe_opcode_t;
#define BREAKPOINT_INSTRUCTION 0x7fe00008 /* trap */
#define MAX_INSN_SIZE 1
#define IS_TW(instr) (((instr) & 0xfc0007fe) == 0x7c000008)
#define IS_TD(instr) (((instr) & 0xfc0007fe) == 0x7c000088)
#define IS_TDI(instr) (((instr) & 0xfc000000) == 0x08000000)
#define IS_TWI(instr) (((instr) & 0xfc000000) == 0x0c000000)
#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)((func_descr_t *)pentry)
#define is_trap(instr) (IS_TW(instr) || IS_TD(instr) || \
IS_TWI(instr) || IS_TDI(instr))
#define ARCH_SUPPORTS_KRETPROBES
void kretprobe_trampoline(void);
/* Architecture specific copy of original instruction */
struct arch_specific_insn {
/* copy of original instruction */
kprobe_opcode_t *insn;
};
#ifdef CONFIG_KPROBES
extern int kprobe_exceptions_notify(struct notifier_block *self,
unsigned long val, void *data);
#else /* !CONFIG_KPROBES */
static inline int kprobe_exceptions_notify(struct notifier_block *self,
unsigned long val, void *data)
{
return 0;
}
#endif
#endif /* _ASM_KPROBES_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7