[Skiboot] [PATCH 20/34] interrupts: Rename icp_prep_for_rvwinkle to icp_prep_for_pm

Benjamin Herrenschmidt benh at kernel.crashing.org
Sun Jul 24 09:27:14 AEST 2016


Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
---
 core/interrupts.c    | 6 +++---
 hw/slw.c             | 2 +-
 include/interrupts.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/interrupts.c b/core/interrupts.c
index f93ce7b..3b919fa 100644
--- a/core/interrupts.c
+++ b/core/interrupts.c
@@ -267,10 +267,10 @@ void icp_send_eoi(uint32_t interrupt)
 	out_be32(icp + ICP_XIRR, interrupt & 0xffffff);
 }
 
-/* This is called before winkle, we clear pending IPIs and set our priority
- * to 1 to mask all but the IPI
+/* This is called before winkle or nap, we clear pending IPIs and
+ * set our priority to 1 to mask all but the IPI.
  */
-void icp_prep_for_rvwinkle(void)
+void icp_prep_for_pm(void)
 {
 	void *icp = this_cpu()->icp_regs;
 
diff --git a/hw/slw.c b/hw/slw.c
index aeb4ff1..e3ee9e7 100644
--- a/hw/slw.c
+++ b/hw/slw.c
@@ -74,7 +74,7 @@ static void slw_do_rvwinkle(void *data)
 	struct proc_chip *chip;
 
 	/* Setup our ICP to receive IPIs */
-	icp_prep_for_rvwinkle();
+	icp_prep_for_pm();
 
 	/* Setup LPCR to wakeup on external interrupts only */
 	mtspr(SPR_LPCR, ((lpcr & ~SPR_LPCR_P8_PECE) | SPR_LPCR_P8_PECE2));
diff --git a/include/interrupts.h b/include/interrupts.h
index 3fba9d9..f269900 100644
--- a/include/interrupts.h
+++ b/include/interrupts.h
@@ -300,7 +300,7 @@ struct cpu_thread;
 
 extern void reset_cpu_icp(void);
 extern void icp_send_eoi(uint32_t interrupt);
-extern void icp_prep_for_rvwinkle(void);
+extern void icp_prep_for_pm(void);
 extern void icp_kick_cpu(struct cpu_thread *cpu);
 
 extern void init_interrupts(void);
-- 
2.7.4



More information about the Skiboot mailing list