[Skiboot] [PATCH v5 05/10] direct-ctl: Use the EC primary for special wakeups

[Vaidyanathan Srinivasan]

From: Benjamin Herrenschmidt <benh at kernel.crashing.org>

Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Michael Neuling <mikey at neuling.org>
---
 core/direct-controls.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/direct-controls.c b/core/direct-controls.c
index 793ef29c..e1c04fda 100644
--- a/core/direct-controls.c
+++ b/core/direct-controls.c
@@ -519,7 +519,7 @@ static int p9_sreset_thread(struct cpu_thread *cpu)
 
 int dctl_set_special_wakeup(struct cpu_thread *t)
 {
-	struct cpu_thread *c = t->primary;
+	struct cpu_thread *c = t->ec_primary;
 	int rc = OPAL_SUCCESS;
 
 	if (proc_gen == proc_gen_unknown)
@@ -541,7 +541,7 @@ int dctl_set_special_wakeup(struct cpu_thread *t)
 
 int dctl_clear_special_wakeup(struct cpu_thread *t)
 {
-	struct cpu_thread *c = t->primary;
+	struct cpu_thread *c = t->ec_primary;
 	int rc = OPAL_SUCCESS;
 
 	if (proc_gen == proc_gen_unknown)
@@ -566,7 +566,7 @@ out:
 
 int dctl_core_is_gated(struct cpu_thread *t)
 {
-	struct cpu_thread *c = t->primary;
+	struct cpu_thread *c = t->ec_primary;
 	uint32_t chip_id = pir_to_chip_id(c->pir);
 	uint32_t core_id = pir_to_core_id(c->pir);
 	uint32_t sshhyp_addr;
@@ -589,7 +589,7 @@ int dctl_core_is_gated(struct cpu_thread *t)
 
 static int dctl_stop(struct cpu_thread *t)
 {
-	struct cpu_thread *c = t->primary;
+	struct cpu_thread *c = t->ec_primary;
 	int rc;
 
 	lock(&c->dctl_lock);
@@ -610,7 +610,7 @@ static int dctl_stop(struct cpu_thread *t)
 
 static int dctl_cont(struct cpu_thread *t)
 {
-	struct cpu_thread *c = t->primary;
+	struct cpu_thread *c = t->ec_primary;
 	int rc;
 
 	if (proc_gen != proc_gen_p9)
@@ -637,7 +637,7 @@ static int dctl_cont(struct cpu_thread *t)
  */
 static int dctl_sreset(struct cpu_thread *t)
 {
-	struct cpu_thread *c = t->primary;
+	struct cpu_thread *c = t->ec_primary;
 	int rc;
 
 	lock(&c->dctl_lock);
-- 
2.26.1