From 5f6665e400569de479733677e77862542aebb6cc Mon Sep 17 00:00:00 2001

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

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

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

References: bsc#1181674 ltc#189159

Patch-mainline: v5.11-rc1

Git-commit: 5f6665e400569de479733677e77862542aebb6cc

rtas_ibm_suspend_me_unsafe() is now unused; remove it and

rtas_percpu_suspend_me() which becomes unused as a result.

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-17-nathanl@linux.ibm.com

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

---

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

 arch/powerpc/kernel/rtas.c      | 67 +--------------------------------

 2 files changed, 1 insertion(+), 67 deletions(-)

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

index 3b52d8574fcc..9a6107ffe378 100644

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

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

@@ -258,7 +258,6 @@ 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_unsafe(u64 handle);

 int rtas_ibm_suspend_me(int *fw_status);

 struct rtc_time;

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

@@ -923,73 +923,7 @@ int rtas_suspend_cpu(struct rtas_suspend

 {

 	return __rtas_suspend_cpu(data, 0);

 }

-

-static void rtas_percpu_suspend_me(void *info)

-{

-	__rtas_suspend_cpu((struct rtas_suspend_me_data *)info, 1);

-}

-

-int rtas_ibm_suspend_me_unsafe(u64 handle)

-{

-	long state;

-	long rc;

-	unsigned long retbuf[PLPAR_HCALL_BUFSIZE];

-	struct rtas_suspend_me_data data;

-	DECLARE_COMPLETION_ONSTACK(done);

-

-	if (!rtas_service_present("ibm,suspend-me"))

-		return -ENOSYS;

-

-	/* Make sure the state is valid */

-	rc = plpar_hcall(H_VASI_STATE, retbuf, handle);

-

-	state = retbuf[0];

-

-	if (rc) {

-		printk(KERN_ERR "rtas_ibm_suspend_me: vasi_state returned %ld\n",rc);

-		return rc;

-	} else if (state == H_VASI_ENABLED) {

-		return -EAGAIN;

-	} else if (state != H_VASI_SUSPENDING) {

-		printk(KERN_ERR "rtas_ibm_suspend_me: vasi_state returned state %ld\n",

-		       state);

-		return -EIO;

-	}

-

-	atomic_set(&data.working, 0);

-	atomic_set(&data.done, 0);

-	atomic_set(&data.error, 0);

-	data.token = rtas_token("ibm,suspend-me");

-	data.complete = &don;;

-

-	lock_device_hotplug();

-

-	cpu_hotplug_disable();

-

-	/* Call function on all CPUs.  One of us will make the

-	 * rtas call

-	 */

-	if (on_each_cpu(rtas_percpu_suspend_me, &data, 0))

-		atomic_set(&data.error, -EINVAL);

-

-	wait_for_completion(&done);

-

-	if (atomic_read(&data.error) != 0)

-		printk(KERN_ERR "Error doing global join\n");

-

-

-	cpu_hotplug_enable();

-

-	unlock_device_hotplug();

-

-	return atomic_read(&data.error);

-}

-#else /* CONFIG_PPC_PSERIES */

-int rtas_ibm_suspend_me_unsafe(u64 handle)

-{

-	return -ENOSYS;

-}

-#endif

+#endif /* CONFIG_PPC_PSERIES */

 /**

  * Find a specific pseries error log in an RTAS extended event log.

-- 

2.26.2