merge filename and modify references to iseries/hv_call.h
authorKelly Daly <kelly@au.ibm.com>
Tue, 1 Nov 2005 05:59:20 +0000 (16:59 +1100)
committerKelly Daly <kelly@au.ibm.com>
Tue, 1 Nov 2005 05:59:20 +0000 (16:59 +1100)
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
arch/powerpc/lib/locks.c
arch/powerpc/platforms/iseries/hvlog.c
arch/powerpc/platforms/iseries/smp.c
drivers/char/viocons.c
include/asm-powerpc/iseries/hv_call.h [new file with mode: 0644]
include/asm-powerpc/time.h
include/asm-ppc64/iSeries/HvCall.h [deleted file]
include/asm-ppc64/spinlock.h

index 3794715b2972b1e69a03cf33cd5a95ab634e5ebe..2a912f411eb4af13500c97271e71e2b32d650daf 100644 (file)
@@ -22,7 +22,7 @@
 /* waiting for a spinlock... */
 #if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES)
 #include <asm/hvcall.h>
-#include <asm/iSeries/HvCall.h>
+#include <asm/iseries/hv_call.h>
 
 void __spin_yield(raw_spinlock_t *lock)
 {
index f61e2e9ac9ec4d08a61db69a8de93f724b2b869b..5a89b481f9788cf815a9cf33e32c25d04264c4d4 100644 (file)
@@ -9,7 +9,7 @@
 
 #include <asm/page.h>
 #include <asm/abs_addr.h>
-#include <asm/iSeries/HvCall.h>
+#include <asm/iseries/hv_call.h>
 #include <asm/iSeries/HvCallSc.h>
 #include <asm/iSeries/HvTypes.h>
 
index f720916682f6a70f090e3b18944322525a34c99e..3336bad67724e0f6cb30ea775d9e3a6c00e1903b 100644 (file)
@@ -38,7 +38,7 @@
 #include <asm/io.h>
 #include <asm/smp.h>
 #include <asm/paca.h>
-#include <asm/iSeries/HvCall.h>
+#include <asm/iseries/hv_call.h>
 #include <asm/time.h>
 #include <asm/ppcdebug.h>
 #include <asm/machdep.h>
index 44f5fb4a46efaec16a59ae47b673e0362bb18d2e..180507ae590f21809b803ce4144c43e16df5029f 100644 (file)
@@ -49,7 +49,7 @@
 #include <asm/iSeries/HvLpEvent.h>
 #include <asm/iSeries/HvCallEvent.h>
 #include <asm/iSeries/HvLpConfig.h>
-#include <asm/iSeries/HvCall.h>
+#include <asm/iseries/hv_call.h>
 
 #ifdef CONFIG_VT
 #error You must turn off CONFIG_VT to use CONFIG_VIOCONS
diff --git a/include/asm-powerpc/iseries/hv_call.h b/include/asm-powerpc/iseries/hv_call.h
new file mode 100644 (file)
index 0000000..c3f1947
--- /dev/null
@@ -0,0 +1,113 @@
+/*
+ * HvCall.h
+ * Copyright (C) 2001  Mike Corrigan IBM Corporation
+ *
+ * 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
+ */
+/*
+ * This file contains the "hypervisor call" interface which is used to
+ * drive the hypervisor from the OS.
+ */
+#ifndef _HVCALL_H
+#define _HVCALL_H
+
+#include <asm/iSeries/HvCallSc.h>
+#include <asm/iSeries/HvTypes.h>
+#include <asm/paca.h>
+
+/* Type of yield for HvCallBaseYieldProcessor */
+#define HvCall_YieldTimed      0       /* Yield until specified time (tb) */
+#define HvCall_YieldToActive   1       /* Yield until all active procs have run */
+#define HvCall_YieldToProc     2       /* Yield until the specified processor has run */
+
+/* interrupt masks for setEnabledInterrupts */
+#define HvCall_MaskIPI         0x00000001
+#define HvCall_MaskLpEvent     0x00000002
+#define HvCall_MaskLpProd      0x00000004
+#define HvCall_MaskTimeout     0x00000008
+
+/* Log buffer formats */
+#define HvCall_LogBuffer_ASCII          0
+#define HvCall_LogBuffer_EBCDIC         1
+
+#define HvCallBaseAckDeferredInts                      HvCallBase +  0
+#define HvCallBaseCpmPowerOff                          HvCallBase +  1
+#define HvCallBaseGetHwPatch                           HvCallBase +  2
+#define HvCallBaseReIplSpAttn                          HvCallBase +  3
+#define HvCallBaseSetASR                               HvCallBase +  4
+#define HvCallBaseSetASRAndRfi                         HvCallBase +  5
+#define HvCallBaseSetIMR                               HvCallBase +  6
+#define HvCallBaseSendIPI                              HvCallBase +  7
+#define HvCallBaseTerminateMachine                     HvCallBase +  8
+#define HvCallBaseTerminateMachineSrc                  HvCallBase +  9
+#define HvCallBaseProcessPlicInterrupts                        HvCallBase + 10
+#define HvCallBaseIsPrimaryCpmOrMsdIpl                 HvCallBase + 11
+#define HvCallBaseSetVirtualSIT                                HvCallBase + 12
+#define HvCallBaseVaryOffThisProcessor                 HvCallBase + 13
+#define HvCallBaseVaryOffMemoryChunk                   HvCallBase + 14
+#define HvCallBaseVaryOffInteractivePercentage         HvCallBase + 15
+#define HvCallBaseSendLpProd                           HvCallBase + 16
+#define HvCallBaseSetEnabledInterrupts                 HvCallBase + 17
+#define HvCallBaseYieldProcessor                       HvCallBase + 18
+#define HvCallBaseVaryOffSharedProcUnits               HvCallBase + 19
+#define HvCallBaseSetVirtualDecr                       HvCallBase + 20
+#define HvCallBaseClearLogBuffer                       HvCallBase + 21
+#define HvCallBaseGetLogBufferCodePage                 HvCallBase + 22
+#define HvCallBaseGetLogBufferFormat                   HvCallBase + 23
+#define HvCallBaseGetLogBufferLength                   HvCallBase + 24
+#define HvCallBaseReadLogBuffer                                HvCallBase + 25
+#define HvCallBaseSetLogBufferFormatAndCodePage                HvCallBase + 26
+#define HvCallBaseWriteLogBuffer                       HvCallBase + 27
+#define HvCallBaseRouter28                             HvCallBase + 28
+#define HvCallBaseRouter29                             HvCallBase + 29
+#define HvCallBaseRouter30                             HvCallBase + 30
+#define HvCallBaseSetDebugBus                          HvCallBase + 31
+
+#define HvCallCcSetDABR                                        HvCallCc + 7
+
+static inline void HvCall_setVirtualDecr(void)
+{
+       /*
+        * Ignore any error return codes - most likely means that the
+        * target value for the LP has been increased and this vary off
+        * would bring us below the new target.
+        */
+       HvCall0(HvCallBaseSetVirtualDecr);
+}
+
+static inline void HvCall_yieldProcessor(unsigned typeOfYield, u64 yieldParm)
+{
+       HvCall2(HvCallBaseYieldProcessor, typeOfYield, yieldParm);
+}
+
+static inline void HvCall_setEnabledInterrupts(u64 enabledInterrupts)
+{
+       HvCall1(HvCallBaseSetEnabledInterrupts, enabledInterrupts);
+}
+
+static inline void HvCall_setLogBufferFormatAndCodepage(int format,
+               u32 codePage)
+{
+       HvCall2(HvCallBaseSetLogBufferFormatAndCodePage, format, codePage);
+}
+
+extern void HvCall_writeLogBuffer(const void *buffer, u64 bufLen);
+
+static inline void HvCall_sendIPI(struct paca_struct *targetPaca)
+{
+       HvCall1(HvCallBaseSendIPI, targetPaca->paca_index);
+}
+
+#endif /* _HVCALL_H */
index 410e795f7d4392bab43b386129eaf2b54e34f5d8..d9b86a17271ba95ed500061b3a83e7d98d0104f5 100644 (file)
@@ -21,7 +21,7 @@
 #include <asm/processor.h>
 #ifdef CONFIG_PPC64
 #include <asm/paca.h>
-#include <asm/iSeries/HvCall.h>
+#include <asm/iseries/hv_call.h>
 #endif
 
 /* time.c */
diff --git a/include/asm-ppc64/iSeries/HvCall.h b/include/asm-ppc64/iSeries/HvCall.h
deleted file mode 100644 (file)
index c3f1947..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * HvCall.h
- * Copyright (C) 2001  Mike Corrigan IBM Corporation
- *
- * 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
- */
-/*
- * This file contains the "hypervisor call" interface which is used to
- * drive the hypervisor from the OS.
- */
-#ifndef _HVCALL_H
-#define _HVCALL_H
-
-#include <asm/iSeries/HvCallSc.h>
-#include <asm/iSeries/HvTypes.h>
-#include <asm/paca.h>
-
-/* Type of yield for HvCallBaseYieldProcessor */
-#define HvCall_YieldTimed      0       /* Yield until specified time (tb) */
-#define HvCall_YieldToActive   1       /* Yield until all active procs have run */
-#define HvCall_YieldToProc     2       /* Yield until the specified processor has run */
-
-/* interrupt masks for setEnabledInterrupts */
-#define HvCall_MaskIPI         0x00000001
-#define HvCall_MaskLpEvent     0x00000002
-#define HvCall_MaskLpProd      0x00000004
-#define HvCall_MaskTimeout     0x00000008
-
-/* Log buffer formats */
-#define HvCall_LogBuffer_ASCII          0
-#define HvCall_LogBuffer_EBCDIC         1
-
-#define HvCallBaseAckDeferredInts                      HvCallBase +  0
-#define HvCallBaseCpmPowerOff                          HvCallBase +  1
-#define HvCallBaseGetHwPatch                           HvCallBase +  2
-#define HvCallBaseReIplSpAttn                          HvCallBase +  3
-#define HvCallBaseSetASR                               HvCallBase +  4
-#define HvCallBaseSetASRAndRfi                         HvCallBase +  5
-#define HvCallBaseSetIMR                               HvCallBase +  6
-#define HvCallBaseSendIPI                              HvCallBase +  7
-#define HvCallBaseTerminateMachine                     HvCallBase +  8
-#define HvCallBaseTerminateMachineSrc                  HvCallBase +  9
-#define HvCallBaseProcessPlicInterrupts                        HvCallBase + 10
-#define HvCallBaseIsPrimaryCpmOrMsdIpl                 HvCallBase + 11
-#define HvCallBaseSetVirtualSIT                                HvCallBase + 12
-#define HvCallBaseVaryOffThisProcessor                 HvCallBase + 13
-#define HvCallBaseVaryOffMemoryChunk                   HvCallBase + 14
-#define HvCallBaseVaryOffInteractivePercentage         HvCallBase + 15
-#define HvCallBaseSendLpProd                           HvCallBase + 16
-#define HvCallBaseSetEnabledInterrupts                 HvCallBase + 17
-#define HvCallBaseYieldProcessor                       HvCallBase + 18
-#define HvCallBaseVaryOffSharedProcUnits               HvCallBase + 19
-#define HvCallBaseSetVirtualDecr                       HvCallBase + 20
-#define HvCallBaseClearLogBuffer                       HvCallBase + 21
-#define HvCallBaseGetLogBufferCodePage                 HvCallBase + 22
-#define HvCallBaseGetLogBufferFormat                   HvCallBase + 23
-#define HvCallBaseGetLogBufferLength                   HvCallBase + 24
-#define HvCallBaseReadLogBuffer                                HvCallBase + 25
-#define HvCallBaseSetLogBufferFormatAndCodePage                HvCallBase + 26
-#define HvCallBaseWriteLogBuffer                       HvCallBase + 27
-#define HvCallBaseRouter28                             HvCallBase + 28
-#define HvCallBaseRouter29                             HvCallBase + 29
-#define HvCallBaseRouter30                             HvCallBase + 30
-#define HvCallBaseSetDebugBus                          HvCallBase + 31
-
-#define HvCallCcSetDABR                                        HvCallCc + 7
-
-static inline void HvCall_setVirtualDecr(void)
-{
-       /*
-        * Ignore any error return codes - most likely means that the
-        * target value for the LP has been increased and this vary off
-        * would bring us below the new target.
-        */
-       HvCall0(HvCallBaseSetVirtualDecr);
-}
-
-static inline void HvCall_yieldProcessor(unsigned typeOfYield, u64 yieldParm)
-{
-       HvCall2(HvCallBaseYieldProcessor, typeOfYield, yieldParm);
-}
-
-static inline void HvCall_setEnabledInterrupts(u64 enabledInterrupts)
-{
-       HvCall1(HvCallBaseSetEnabledInterrupts, enabledInterrupts);
-}
-
-static inline void HvCall_setLogBufferFormatAndCodepage(int format,
-               u32 codePage)
-{
-       HvCall2(HvCallBaseSetLogBufferFormatAndCodePage, format, codePage);
-}
-
-extern void HvCall_writeLogBuffer(const void *buffer, u64 bufLen);
-
-static inline void HvCall_sendIPI(struct paca_struct *targetPaca)
-{
-       HvCall1(HvCallBaseSendIPI, targetPaca->paca_index);
-}
-
-#endif /* _HVCALL_H */
index 14cb895bb607245477e4dc466e7dd6a227491956..7d84fb5e39f1103d78852c7a9a3a2828f6406513 100644 (file)
@@ -21,7 +21,7 @@
 #include <linux/config.h>
 #include <asm/paca.h>
 #include <asm/hvcall.h>
-#include <asm/iSeries/HvCall.h>
+#include <asm/iseries/hv_call.h>
 
 #define __raw_spin_is_locked(x)                ((x)->slock != 0)