3 files changed, 32 insertions, 2 deletions

diff --git a/arch/powerpc/include/asm/lppaca.h b/arch/powerpc/include/asm/lppaca.h
index f78f65c38f05..14b592dfb4e8 100644
--- a/arch/powerpc/include/asm/lppaca.h
+++ b/arch/powerpc/include/asm/lppaca.h
@@ -100,7 +100,14 @@ struct lppaca {
         // Used to pass parms from the OS to PLIC for SetAsrAndRfid
         u64     saved_gpr3;             // Saved GPR3                   x20-x27
         u64     saved_gpr4;             // Saved GPR4                   x28-x2F
-        u64     saved_gpr5;             // Saved GPR5                   x30-x37
+        union {
+                u64     saved_gpr5;     /* Saved GPR5               x30-x37 */
+                struct {
+                        u8      cede_latency_hint;  /*                  x30 */
+                        u8      reserved[7];        /*              x31-x36 */
+                } fields;
+        } gpr5_dword;
+
 
         u8      dtl_enable_mask;        // Dispatch Trace Log mask      x38-x38
         u8      donate_dedicated_cpu;   // Donate dedicated CPU cycles  x39-x39
diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h
index a24a6b2333b2..0603c91538ae 100644
--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h
+++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h
@@ -9,11 +9,33 @@ static inline long poll_pending(void)
         return plpar_hcall_norets(H_POLL_PENDING);
 }
 
+static inline u8 get_cede_latency_hint(void)
+{
+        return get_lppaca()->gpr5_dword.fields.cede_latency_hint;
+}
+
+static inline void set_cede_latency_hint(u8 latency_hint)
+{
+        get_lppaca()->gpr5_dword.fields.cede_latency_hint = latency_hint;
+}
+
 static inline long cede_processor(void)
 {
         return plpar_hcall_norets(H_CEDE);
 }
 
+static inline long extended_cede_processor(unsigned long latency_hint)
+{
+        long rc;
+        u8 old_latency_hint = get_cede_latency_hint();
+
+        set_cede_latency_hint(latency_hint);
+        rc = cede_processor();
+        set_cede_latency_hint(old_latency_hint);
+
+        return rc;
+}
+
 static inline long vpa_call(unsigned long flags, unsigned long cpu,
                 unsigned long vpa)
 {
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index bdbe96c8a7e4..4e6152c13764 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -1641,7 +1641,8 @@ static void super_regs(void)
                                ptrLpPaca->saved_srr0, ptrLpPaca->saved_srr1);
                         printf("    Saved Gpr3=%.16lx  Saved Gpr4=%.16lx \n",
                                ptrLpPaca->saved_gpr3, ptrLpPaca->saved_gpr4);
-                        printf("    Saved Gpr5=%.16lx \n", ptrLpPaca->saved_gpr5);
+                        printf("    Saved Gpr5=%.16lx \n",
+                                ptrLpPaca->gpr5_dword.saved_gpr5);
                 }
 #endif