From 395b2c090907975c627902ba8fda0bdb04c7cad3 Mon Sep 17 00:00:00 2001

From: Nathan Lynch <nathanl@linux.ibm.com>

Date: Mon, 7 Dec 2020 15:51:53 -0600

Subject: [PATCH] powerpc/rtas: remove rtas_suspend_cpu()

References: bsc#1181674 ltc#189159

Patch-mainline: v5.11-rc1

Git-commit: 395b2c090907975c627902ba8fda0bdb04c7cad3

rtas_suspend_cpu() no longer has users; remove it and

__rtas_suspend_cpu() which now becomes unused as well.

Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

Link: https://lore.kernel.org/r/20201207215200.1785968-22-nathanl@linux.ibm.com

Acked-by: Michal Suchanek <msuchanek@suse.de>

---

 arch/powerpc/include/asm/rtas.h |  1 -

 arch/powerpc/kernel/rtas.c      | 52 ---------------------------------

 2 files changed, 53 deletions(-)

diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h

index 9a6107ffe378..97ccb40fb09f 100644

--- a/arch/powerpc/include/asm/rtas.h

+++ b/arch/powerpc/include/asm/rtas.h

@@ -256,7 +256,6 @@ extern bool rtas_indicator_present(int token, int *maxindex);

 extern int rtas_set_indicator(int indicator, int index, int new_value);

 extern int rtas_set_indicator_fast(int indicator, int index, int new_value);

 extern void rtas_progress(char *s, unsigned short hex);

-extern int rtas_suspend_cpu(struct rtas_suspend_me_data *data);

 extern int rtas_suspend_last_cpu(struct rtas_suspend_me_data *data);

 int rtas_ibm_suspend_me(int *fw_status);

diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c

--- a/arch/powerpc/kernel/rtas.c

+++ b/arch/powerpc/kernel/rtas.c

@@ -873,57 +873,6 @@ int rtas_suspend_last_cpu(struct rtas_suspend_me_data *data)

 	return __rtas_suspend_last_cpu(data, 0);

 }

-static int __rtas_suspend_cpu(struct rtas_suspend_me_data *data, int wake_when_done)

-{

-	long rc = H_SUCCESS;

-	unsigned long msr_save;

-	int cpu;

-

-	atomic_inc(&data->working);

-

-	/* really need to ensure MSR.EE is off for H_JOIN */

-	msr_save = mfmsr();

-	mtmsr(msr_save & ~(MSR_EE));

-

-	while (rc == H_SUCCESS && !atomic_read(&data->done) && !atomic_read(&data->error))

-		rc = plpar_hcall_norets(H_JOIN);

-

-	mtmsr(msr_save);

-

-	if (rc == H_SUCCESS) {

-		/* This cpu was prodded and the suspend is complete. */

-		goto out;

-	} else if (rc == H_CONTINUE) {

-		/* All other cpus are in H_JOIN, this cpu does

-		 * the suspend.

-		 */

-		return __rtas_suspend_last_cpu(data, wake_when_done);

-	} else {

-		printk(KERN_ERR "H_JOIN on cpu %i failed with rc = %ld\n",

-		       smp_processor_id(), rc);

-		atomic_set(&data->error, rc);

-	}

-

-	if (wake_when_done) {

-		atomic_set(&data->done, 1);

-

-		/* This cpu did the suspend or got an error; in either case,

-		 * we need to prod all other other cpus out of join state.

-		 * Extra prods are harmless.

-		 */

-		for_each_online_cpu(cpu)

-			plpar_hcall_norets(H_PROD, get_hard_smp_processor_id(cpu));

-	}

-out:

-	if (atomic_dec_return(&data->working) == 0)

-		complete(data->complete);

-	return rc;

-}

-

-int rtas_suspend_cpu(struct rtas_suspend_me_data *data)

-{

-	return __rtas_suspend_cpu(data, 0);

-}

 #endif /* CONFIG_PPC_PSERIES */

 /**

-- 

2.26.2