aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/ppc64/kernel/asm-offsets.c1
-rw-r--r--arch/ppc64/kernel/iSeries_pci.c1
-rw-r--r--arch/ppc64/kernel/mf.c1
-rw-r--r--arch/ppc64/kernel/rtc.c1
-rw-r--r--include/asm-ppc64/iSeries/HvCall.h84
-rw-r--r--include/asm-ppc64/paca.h2
6 files changed, 3 insertions, 87 deletions
diff --git a/arch/ppc64/kernel/asm-offsets.c b/arch/ppc64/kernel/asm-offsets.c
index 0094ac79a18c..abb9e5b5da03 100644
--- a/arch/ppc64/kernel/asm-offsets.c
+++ b/arch/ppc64/kernel/asm-offsets.c
@@ -31,7 +31,6 @@
31 31
32#include <asm/paca.h> 32#include <asm/paca.h>
33#include <asm/lppaca.h> 33#include <asm/lppaca.h>
34#include <asm/iSeries/ItLpQueue.h>
35#include <asm/iSeries/HvLpEvent.h> 34#include <asm/iSeries/HvLpEvent.h>
36#include <asm/rtas.h> 35#include <asm/rtas.h>
37#include <asm/cputable.h> 36#include <asm/cputable.h>
diff --git a/arch/ppc64/kernel/iSeries_pci.c b/arch/ppc64/kernel/iSeries_pci.c
index 9829cd4666d8..1bff515bd298 100644
--- a/arch/ppc64/kernel/iSeries_pci.c
+++ b/arch/ppc64/kernel/iSeries_pci.c
@@ -38,7 +38,6 @@
38#include <asm/iommu.h> 38#include <asm/iommu.h>
39 39
40#include <asm/iSeries/HvCallPci.h> 40#include <asm/iSeries/HvCallPci.h>
41#include <asm/iSeries/HvCallSm.h>
42#include <asm/iSeries/HvCallXm.h> 41#include <asm/iSeries/HvCallXm.h>
43#include <asm/iSeries/iSeries_irq.h> 42#include <asm/iSeries/iSeries_irq.h>
44#include <asm/iSeries/iSeries_pci.h> 43#include <asm/iSeries/iSeries_pci.h>
diff --git a/arch/ppc64/kernel/mf.c b/arch/ppc64/kernel/mf.c
index 5aca7e8005a8..d98bebf7042f 100644
--- a/arch/ppc64/kernel/mf.c
+++ b/arch/ppc64/kernel/mf.c
@@ -40,7 +40,6 @@
40#include <asm/iSeries/vio.h> 40#include <asm/iSeries/vio.h>
41#include <asm/iSeries/mf.h> 41#include <asm/iSeries/mf.h>
42#include <asm/iSeries/HvLpConfig.h> 42#include <asm/iSeries/HvLpConfig.h>
43#include <asm/iSeries/ItSpCommArea.h>
44#include <asm/iSeries/ItLpQueue.h> 43#include <asm/iSeries/ItLpQueue.h>
45 44
46/* 45/*
diff --git a/arch/ppc64/kernel/rtc.c b/arch/ppc64/kernel/rtc.c
index 4cdafb4007b1..de02aedbe080 100644
--- a/arch/ppc64/kernel/rtc.c
+++ b/arch/ppc64/kernel/rtc.c
@@ -44,7 +44,6 @@
44 44
45#include <asm/iSeries/mf.h> 45#include <asm/iSeries/mf.h>
46#include <asm/machdep.h> 46#include <asm/machdep.h>
47#include <asm/iSeries/ItSpCommArea.h>
48 47
49extern int piranha_simulator; 48extern int piranha_simulator;
50 49
diff --git a/include/asm-ppc64/iSeries/HvCall.h b/include/asm-ppc64/iSeries/HvCall.h
index c903387e9128..c3f19475c0d9 100644
--- a/include/asm-ppc64/iSeries/HvCall.h
+++ b/include/asm-ppc64/iSeries/HvCall.h
@@ -27,48 +27,6 @@
27#include <asm/iSeries/HvTypes.h> 27#include <asm/iSeries/HvTypes.h>
28#include <asm/paca.h> 28#include <asm/paca.h>
29 29
30/*
31enum HvCall_ReturnCode
32{
33 HvCall_Good = 0,
34 HvCall_Partial = 1,
35 HvCall_NotOwned = 2,
36 HvCall_NotFreed = 3,
37 HvCall_UnspecifiedError = 4
38};
39
40enum HvCall_TypeOfSIT
41{
42 HvCall_ReduceOnly = 0,
43 HvCall_Unconditional = 1
44};
45
46enum HvCall_TypeOfYield
47{
48 HvCall_YieldTimed = 0, // Yield until specified time
49 HvCall_YieldToActive = 1, // Yield until all active procs have run
50 HvCall_YieldToProc = 2 // Yield until the specified processor has run
51};
52
53enum HvCall_InterruptMasks
54{
55 HvCall_MaskIPI = 0x00000001,
56 HvCall_MaskLpEvent = 0x00000002,
57 HvCall_MaskLpProd = 0x00000004,
58 HvCall_MaskTimeout = 0x00000008
59};
60
61enum HvCall_VaryOffChunkRc
62{
63 HvCall_VaryOffSucceeded = 0,
64 HvCall_VaryOffWithdrawn = 1,
65 HvCall_ChunkInLoadArea = 2,
66 HvCall_ChunkInHPT = 3,
67 HvCall_ChunkNotAccessible = 4,
68 HvCall_ChunkInUse = 5
69};
70*/
71
72/* Type of yield for HvCallBaseYieldProcessor */ 30/* Type of yield for HvCallBaseYieldProcessor */
73#define HvCall_YieldTimed 0 /* Yield until specified time (tb) */ 31#define HvCall_YieldTimed 0 /* Yield until specified time (tb) */
74#define HvCall_YieldToActive 1 /* Yield until all active procs have run */ 32#define HvCall_YieldToActive 1 /* Yield until all active procs have run */
@@ -139,35 +97,12 @@ static inline void HvCall_setEnabledInterrupts(u64 enabledInterrupts)
139 HvCall1(HvCallBaseSetEnabledInterrupts, enabledInterrupts); 97 HvCall1(HvCallBaseSetEnabledInterrupts, enabledInterrupts);
140} 98}
141 99
142static inline void HvCall_clearLogBuffer(HvLpIndex lpindex) 100static inline void HvCall_setLogBufferFormatAndCodepage(int format,
143{ 101 u32 codePage)
144 HvCall1(HvCallBaseClearLogBuffer, lpindex);
145}
146
147static inline u32 HvCall_getLogBufferCodePage(HvLpIndex lpindex)
148{
149 u32 retVal = HvCall1(HvCallBaseGetLogBufferCodePage, lpindex);
150 return retVal;
151}
152
153static inline int HvCall_getLogBufferFormat(HvLpIndex lpindex)
154{
155 int retVal = HvCall1(HvCallBaseGetLogBufferFormat, lpindex);
156 return retVal;
157}
158
159static inline u32 HvCall_getLogBufferLength(HvLpIndex lpindex)
160{
161 u32 retVal = HvCall1(HvCallBaseGetLogBufferLength, lpindex);
162 return retVal;
163}
164
165static inline void HvCall_setLogBufferFormatAndCodepage(int format, u32 codePage)
166{ 102{
167 HvCall2(HvCallBaseSetLogBufferFormatAndCodePage, format, codePage); 103 HvCall2(HvCallBaseSetLogBufferFormatAndCodePage, format, codePage);
168} 104}
169 105
170extern int HvCall_readLogBuffer(HvLpIndex lpindex, void *buffer, u64 bufLen);
171extern void HvCall_writeLogBuffer(const void *buffer, u64 bufLen); 106extern void HvCall_writeLogBuffer(const void *buffer, u64 bufLen);
172 107
173static inline void HvCall_sendIPI(struct paca_struct *targetPaca) 108static inline void HvCall_sendIPI(struct paca_struct *targetPaca)
@@ -175,19 +110,4 @@ static inline void HvCall_sendIPI(struct paca_struct *targetPaca)
175 HvCall1(HvCallBaseSendIPI, targetPaca->paca_index); 110 HvCall1(HvCallBaseSendIPI, targetPaca->paca_index);
176} 111}
177 112
178static inline void HvCall_terminateMachineSrc(void)
179{
180 HvCall0(HvCallBaseTerminateMachineSrc);
181}
182
183static inline void HvCall_setDABR(unsigned long val)
184{
185 HvCall1(HvCallCcSetDABR, val);
186}
187
188static inline void HvCall_setDebugBus(unsigned long val)
189{
190 HvCall1(HvCallBaseSetDebugBus, val);
191}
192
193#endif /* _HVCALL_H */ 113#endif /* _HVCALL_H */
diff --git a/include/asm-ppc64/paca.h b/include/asm-ppc64/paca.h
index 1a0223b5f3b8..ae76cae1483f 100644
--- a/include/asm-ppc64/paca.h
+++ b/include/asm-ppc64/paca.h
@@ -20,13 +20,13 @@
20#include <asm/types.h> 20#include <asm/types.h>
21#include <asm/lppaca.h> 21#include <asm/lppaca.h>
22#include <asm/iSeries/ItLpRegSave.h> 22#include <asm/iSeries/ItLpRegSave.h>
23#include <asm/iSeries/ItLpQueue.h>
23#include <asm/mmu.h> 24#include <asm/mmu.h>
24 25
25register struct paca_struct *local_paca asm("r13"); 26register struct paca_struct *local_paca asm("r13");
26#define get_paca() local_paca 27#define get_paca() local_paca
27 28
28struct task_struct; 29struct task_struct;
29struct ItLpQueue;
30 30
31/* 31/*
32 * Defines the layout of the paca. 32 * Defines the layout of the paca.