[Skiboot] [PATCH] slw: Move add_cpu_idle_state_properties() to add_opal_node()

Shilpasri G Bhat shilpa.bhat at linux.vnet.ibm.com
Tue Oct 20 16:36:45 AEDT 2015


05f52a8dd7c7e402896e049fd24f83d56b70aff4 core: Setup the OPAL DT node
before platform probe
add_cpu_idle_state_properties() was made local to slw.c in the above
commit which caused p7 systems to not populate the nap idle state in
DT. So moving add_cpu_idle_state_properties() to add_opal_node to fix
this bug.

Reported-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Signed-off-by: Shilpasri G Bhat <shilpa.bhat at linux.vnet.ibm.com>
---
Fixes BZ 131718	
 core/opal.c       | 1 +
 hw/slw.c          | 4 +---
 include/skiboot.h | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/opal.c b/core/opal.c
index c2c4d8d..b5a422a 100644
--- a/core/opal.c
+++ b/core/opal.c
@@ -160,6 +160,7 @@ void add_opal_node(void)
 	add_opal_firmware_node();
 	add_associativity_ref_point();
 	memcons_add_properties();
+	add_cpu_idle_state_properties();
 }
 
 static struct lock evt_lock = LOCK_UNLOCKED;
diff --git a/hw/slw.c b/hw/slw.c
index a009090..710d16b 100644
--- a/hw/slw.c
+++ b/hw/slw.c
@@ -507,7 +507,7 @@ static struct cpu_idle_states power8_cpu_idle_states[] = {
 };
 
 /* Add device tree properties to describe idle states */
-static void add_cpu_idle_state_properties(void)
+void add_cpu_idle_state_properties(void)
 {
 	struct dt_node *power_mgt;
 	struct cpu_idle_states *states;
@@ -1234,7 +1234,5 @@ void slw_init(void)
 	for_each_chip(chip)
 		slw_init_chip(chip);
 
-	add_cpu_idle_state_properties();
-
 	slw_init_timer();
 }
diff --git a/include/skiboot.h b/include/skiboot.h
index 4b58597..5f3a077 100644
--- a/include/skiboot.h
+++ b/include/skiboot.h
@@ -205,6 +205,7 @@ extern void uart_init(bool enable_interrupt);
 extern void homer_init(void);
 extern void occ_pstates_init(void);
 extern void slw_init(void);
+extern void add_cpu_idle_state_properties(void);
 extern void occ_fsp_init(void);
 extern void lpc_rtc_init(void);
 
-- 
1.9.3



More information about the Skiboot mailing list