Commit 99a2379c authored by Stephen Rothwell's avatar Stephen Rothwell

powerpc: move hvCall.s to powerpc/platforms/iseries

Rename it to hvcall.S and (so I can do that) rename hvcall.c
to hvlog.c - a more appropriate name.

Do some white space cleanups.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 2952bc7c
obj-y += hvcall.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o hvcall.o
/* /*
* arch/ppc64/kernel/hvCall.S
*
*
* This file contains the code to perform calls to the * This file contains the code to perform calls to the
* iSeries LPAR hypervisor * iSeries LPAR hypervisor
* *
...@@ -16,12 +13,12 @@ ...@@ -16,12 +13,12 @@
.text .text
/* /*
* Hypervisor call * Hypervisor call
* *
* Invoke the iSeries hypervisor via the System Call instruction * Invoke the iSeries hypervisor via the System Call instruction
* Parameters are passed to this routine in registers r3 - r10 * Parameters are passed to this routine in registers r3 - r10
* *
* r3 contains the HV function to be called * r3 contains the HV function to be called
* r4-r10 contain the operands to the hypervisor function * r4-r10 contain the operands to the hypervisor function
* *
...@@ -41,11 +38,11 @@ _GLOBAL(HvCall7) ...@@ -41,11 +38,11 @@ _GLOBAL(HvCall7)
mfcr r0 mfcr r0
std r0,-8(r1) std r0,-8(r1)
stdu r1,-(STACK_FRAME_OVERHEAD+16)(r1) stdu r1,-(STACK_FRAME_OVERHEAD+16)(r1)
/* r0 = 0xffffffffffffffff indicates a hypervisor call */ /* r0 = 0xffffffffffffffff indicates a hypervisor call */
li r0,-1 li r0,-1
/* Invoke the hypervisor */ /* Invoke the hypervisor */
sc sc
...@@ -55,7 +52,7 @@ _GLOBAL(HvCall7) ...@@ -55,7 +52,7 @@ _GLOBAL(HvCall7)
mtcrf 0xff,r0 mtcrf 0xff,r0
/* return to caller, return value in r3 */ /* return to caller, return value in r3 */
blr blr
_GLOBAL(HvCall0Ret16) _GLOBAL(HvCall0Ret16)
...@@ -92,7 +89,5 @@ _GLOBAL(HvCall7Ret16) ...@@ -92,7 +89,5 @@ _GLOBAL(HvCall7Ret16)
ld r0,-8(r1) ld r0,-8(r1)
mtcrf 0xff,r0 mtcrf 0xff,r0
ld r31,-16(r1) ld r31,-16(r1)
blr
blr
...@@ -22,8 +22,7 @@ pci-obj-$(CONFIG_PPC_MULTIPLATFORM) += pci_dn.o pci_direct_iommu.o ...@@ -22,8 +22,7 @@ pci-obj-$(CONFIG_PPC_MULTIPLATFORM) += pci_dn.o pci_direct_iommu.o
obj-$(CONFIG_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y) obj-$(CONFIG_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y)
obj-$(CONFIG_PPC_ISERIES) += hvCall.o \ obj-$(CONFIG_PPC_ISERIES) += HvLpEvent.o iSeries_proc.o iSeries_htab.o \
HvLpEvent.o iSeries_proc.o iSeries_htab.o \
iSeries_iommu.o iSeries_iommu.o
obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o
......
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