powerpc64: Break asm/percpu.h vs spinlock_types.h dependency (d6bdceb6) · Commits · 戴 / test

arch/powerpc/include/asm/dtl.h

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		#ifndef _ASM_POWERPC_DTL_H
		#define _ASM_POWERPC_DTL_H

		#include <asm/lppaca.h>
		#include <linux/spinlock_types.h>

		/*
		* Layout of entries in the hypervisor's dispatch trace log buffer.
		*/
		struct dtl_entry {
		u8 dispatch_reason;
		u8 preempt_reason;
		__be16 processor_id;
		__be32 enqueue_to_dispatch_time;
		__be32 ready_to_enqueue_time;
		__be32 waiting_to_ready_time;
		__be64 timebase;
		__be64 fault_addr;
		__be64 srr0;
		__be64 srr1;
		};

		#define DISPATCH_LOG_BYTES 4096 /* bytes per cpu */
		#define N_DISPATCH_LOG (DISPATCH_LOG_BYTES / sizeof(struct dtl_entry))

		/*
		* Dispatch trace log event enable mask:
		* 0x1: voluntary virtual processor waits
		* 0x2: time-slice preempts
		* 0x4: virtual partition memory page faults
		*/
		#define DTL_LOG_CEDE 0x1
		#define DTL_LOG_PREEMPT 0x2
		#define DTL_LOG_FAULT 0x4
		#define DTL_LOG_ALL (DTL_LOG_CEDE \| DTL_LOG_PREEMPT \| DTL_LOG_FAULT)

		extern struct kmem_cache *dtl_cache;
		extern rwlock_t dtl_access_lock;

		/*
		* When CONFIG_VIRT_CPU_ACCOUNTING_NATIVE = y, the cpu accounting code controls
		* reading from the dispatch trace log. If other code wants to consume
		* DTL entries, it can set this pointer to a function that will get
		* called once for each DTL entry that gets processed.
		*/
		extern void (dtl_consumer)(struct dtl_entry entry, u64 index);

		extern void register_dtl_buffer(int cpu);
		extern void alloc_dtl_buffers(unsigned long *time_limit);
		extern long hcall_vphn(unsigned long cpu, u64 flags, __be32 *associativity);

		#endif /* _ASM_POWERPC_DTL_H */

arch/powerpc/include/asm/lppaca.h

+0 −44

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@
		*/
		#include <linux/cache.h>
		#include <linux/threads.h>
		#include <linux/spinlock_types.h>
		#include <asm/types.h>
		#include <asm/mmu.h>
		#include <asm/firmware.h>
		@@ -146,49 +145,6 @@ struct slb_shadow {
		} save_area[SLB_NUM_BOLTED];
		} ____cacheline_aligned;

		/*
		* Layout of entries in the hypervisor's dispatch trace log buffer.
		*/
		struct dtl_entry {
		u8 dispatch_reason;
		u8 preempt_reason;
		__be16 processor_id;
		__be32 enqueue_to_dispatch_time;
		__be32 ready_to_enqueue_time;
		__be32 waiting_to_ready_time;
		__be64 timebase;
		__be64 fault_addr;
		__be64 srr0;
		__be64 srr1;
		};

		#define DISPATCH_LOG_BYTES 4096 /* bytes per cpu */
		#define N_DISPATCH_LOG (DISPATCH_LOG_BYTES / sizeof(struct dtl_entry))

		/*
		* Dispatch trace log event enable mask:
		* 0x1: voluntary virtual processor waits
		* 0x2: time-slice preempts
		* 0x4: virtual partition memory page faults
		*/
		#define DTL_LOG_CEDE 0x1
		#define DTL_LOG_PREEMPT 0x2
		#define DTL_LOG_FAULT 0x4
		#define DTL_LOG_ALL (DTL_LOG_CEDE \| DTL_LOG_PREEMPT \| DTL_LOG_FAULT)

		extern struct kmem_cache *dtl_cache;
		extern rwlock_t dtl_access_lock;

		/*
		* When CONFIG_VIRT_CPU_ACCOUNTING_NATIVE = y, the cpu accounting code controls
		* reading from the dispatch trace log. If other code wants to consume
		* DTL entries, it can set this pointer to a function that will get
		* called once for each DTL entry that gets processed.
		*/
		extern void (dtl_consumer)(struct dtl_entry entry, u64 index);

		extern void register_dtl_buffer(int cpu);
		extern void alloc_dtl_buffers(unsigned long *time_limit);
		extern long hcall_vphn(unsigned long cpu, u64 flags, __be32 *associativity);

		#endif /* CONFIG_PPC_BOOK3S */

arch/powerpc/include/asm/paca.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@
		#include <asm/hmi.h>
		#include <asm/cpuidle.h>
		#include <asm/atomic.h>
		#include <asm/rtas-types.h>

		#include <asm-generic/mmiowb_types.h>

		@@ -53,6 +52,7 @@ extern unsigned int debug_smp_processor_id(void); /* from linux/smp.h */
		#define get_slb_shadow() (get_paca()->slb_shadow_ptr)

		struct task_struct;
		struct rtas_args;

		/*
		* Defines the layout of the paca.

arch/powerpc/kernel/time.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -183,6 +183,8 @@ static inline unsigned long read_spurr(unsigned long tb)

		#ifdef CONFIG_PPC_SPLPAR

		#include <asm/dtl.h>

		/*
		* Scan the dispatch trace log and count up the stolen time.
		* Should be called with interrupts disabled.

arch/powerpc/kvm/book3s_hv.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@
		#include <asm/hw_breakpoint.h>
		#include <asm/kvm_book3s_uvmem.h>
		#include <asm/ultravisor.h>
		#include <asm/dtl.h>

		#include "book3s.h"

Admin message