PPC: Don't use hardcoded opcode for ePAPR hcall invocation

Signed-off-by: Liu Yu <yu.liu@freescale.com>
Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>

1 files changed, 18 insertions, 18 deletions

diff --git a/arch/powerpc/include/asm/fsl_hcalls.h b/arch/powerpc/include/asm/fsl_hcalls.h
index 922d9b5fe3d5..3abb58394da4 100644
--- a/arch/powerpc/include/asm/fsl_hcalls.h
+++ b/arch/powerpc/include/asm/fsl_hcalls.h
@@ -96,7 +96,7 @@ static inline unsigned int fh_send_nmi(unsigned int vcpu_mask)
         r11 = FH_HCALL_TOKEN(FH_SEND_NMI);
         r3 = vcpu_mask;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11), "+r" (r3)
                 : : EV_HCALL_CLOBBERS1
         );
@@ -151,7 +151,7 @@ static inline unsigned int fh_partition_get_dtprop(int handle,
         r9 = (uint32_t)propvalue_addr;
         r10 = *propvalue_len;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11),
                   "+r" (r3), "+r" (r4), "+r" (r5), "+r" (r6), "+r" (r7),
                   "+r" (r8), "+r" (r9), "+r" (r10)
@@ -205,7 +205,7 @@ static inline unsigned int fh_partition_set_dtprop(int handle,
         r9 = (uint32_t)propvalue_addr;
         r10 = propvalue_len;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11),
                   "+r" (r3), "+r" (r4), "+r" (r5), "+r" (r6), "+r" (r7),
                   "+r" (r8), "+r" (r9), "+r" (r10)
@@ -229,7 +229,7 @@ static inline unsigned int fh_partition_restart(unsigned int partition)
         r11 = FH_HCALL_TOKEN(FH_PARTITION_RESTART);
         r3 = partition;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11), "+r" (r3)
                 : : EV_HCALL_CLOBBERS1
         );
@@ -262,7 +262,7 @@ static inline unsigned int fh_partition_get_status(unsigned int partition,
         r11 = FH_HCALL_TOKEN(FH_PARTITION_GET_STATUS);
         r3 = partition;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11), "+r" (r3), "=r" (r4)
                 : : EV_HCALL_CLOBBERS2
         );
@@ -295,7 +295,7 @@ static inline unsigned int fh_partition_start(unsigned int partition,
         r4 = entry_point;
         r5 = load;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11), "+r" (r3), "+r" (r4), "+r" (r5)
                 : : EV_HCALL_CLOBBERS3
         );
@@ -317,7 +317,7 @@ static inline unsigned int fh_partition_stop(unsigned int partition)
         r11 = FH_HCALL_TOKEN(FH_PARTITION_STOP);
         r3 = partition;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11), "+r" (r3)
                 : : EV_HCALL_CLOBBERS1
         );
@@ -376,7 +376,7 @@ static inline unsigned int fh_partition_memcpy(unsigned int source,
 #endif
         r7 = count;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11),
                   "+r" (r3), "+r" (r4), "+r" (r5), "+r" (r6), "+r" (r7)
                 : : EV_HCALL_CLOBBERS5
@@ -399,7 +399,7 @@ static inline unsigned int fh_dma_enable(unsigned int liodn)
         r11 = FH_HCALL_TOKEN(FH_DMA_ENABLE);
         r3 = liodn;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11), "+r" (r3)
                 : : EV_HCALL_CLOBBERS1
         );
@@ -421,7 +421,7 @@ static inline unsigned int fh_dma_disable(unsigned int liodn)
         r11 = FH_HCALL_TOKEN(FH_DMA_DISABLE);
         r3 = liodn;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11), "+r" (r3)
                 : : EV_HCALL_CLOBBERS1
         );
@@ -447,7 +447,7 @@ static inline unsigned int fh_vmpic_get_msir(unsigned int interrupt,
         r11 = FH_HCALL_TOKEN(FH_VMPIC_GET_MSIR);
         r3 = interrupt;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11), "+r" (r3), "=r" (r4)
                 : : EV_HCALL_CLOBBERS2
         );
@@ -469,7 +469,7 @@ static inline unsigned int fh_system_reset(void)
 
         r11 = FH_HCALL_TOKEN(FH_SYSTEM_RESET);
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11), "=r" (r3)
                 : : EV_HCALL_CLOBBERS1
         );
@@ -506,7 +506,7 @@ static inline unsigned int fh_err_get_info(int queue, uint32_t *bufsize,
         r6 = addr_lo;
         r7 = peek;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11), "+r" (r3), "+r" (r4), "+r" (r5), "+r" (r6),
                   "+r" (r7)
                 : : EV_HCALL_CLOBBERS5
@@ -542,7 +542,7 @@ static inline unsigned int fh_get_core_state(unsigned int handle,
         r3 = handle;
         r4 = vcpu;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11), "+r" (r3), "+r" (r4)
                 : : EV_HCALL_CLOBBERS2
         );
@@ -572,7 +572,7 @@ static inline unsigned int fh_enter_nap(unsigned int handle, unsigned int vcpu)
         r3 = handle;
         r4 = vcpu;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11), "+r" (r3), "+r" (r4)
                 : : EV_HCALL_CLOBBERS2
         );
@@ -597,7 +597,7 @@ static inline unsigned int fh_exit_nap(unsigned int handle, unsigned int vcpu)
         r3 = handle;
         r4 = vcpu;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11), "+r" (r3), "+r" (r4)
                 : : EV_HCALL_CLOBBERS2
         );
@@ -618,7 +618,7 @@ static inline unsigned int fh_claim_device(unsigned int handle)
         r11 = FH_HCALL_TOKEN(FH_CLAIM_DEVICE);
         r3 = handle;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11), "+r" (r3)
                 : : EV_HCALL_CLOBBERS1
         );
@@ -645,7 +645,7 @@ static inline unsigned int fh_partition_stop_dma(unsigned int handle)
         r11 = FH_HCALL_TOKEN(FH_PARTITION_STOP_DMA);
         r3 = handle;
 
-        __asm__ __volatile__ ("sc 1"
+        asm volatile("bl        epapr_hypercall_start"
                 : "+r" (r11), "+r" (r3)
                 : : EV_HCALL_CLOBBERS1
         );