From a10a5a17f4ac4f84fcc26162d43b53e2a4e1009a Mon Sep 17 00:00:00 2001

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

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

Subject: [PATCH] powerpc/pseries/hibernation: pass stream id via function

 arguments

References: bsc#1181674 ltc#189159

Patch-mainline: v5.11-rc1

Git-commit: a10a5a17f4ac4f84fcc26162d43b53e2a4e1009a

There is no need for the stream id to be a file-global variable; pass

it from hibernate_store() to pseries_suspend_begin() for the

H_VASI_STATE call.

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

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

---

 arch/powerpc/platforms/pseries/suspend.c | 8 +++-----

 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c

index 3eaa9d59dc7a..232621f33510 100644

--- a/arch/powerpc/platforms/pseries/suspend.c

+++ b/arch/powerpc/platforms/pseries/suspend.c

@@ -15,7 +15,6 @@

 #include <asm/topology.h>

 #include "../../kernel/cacheinfo.h"

-static u64 stream_id;

 static struct device suspend_dev;

 static DECLARE_COMPLETION(suspend_work);

 static struct rtas_suspend_me_data suspend_data;

@@ -29,7 +28,7 @@ static atomic_t suspending;

  * Return value:

  * 	0 on success / other on failure

  **/

-static int pseries_suspend_begin(suspend_state_t state)

+static int pseries_suspend_begin(u64 stream_id)

 {

 	long vasi_state, rc;

 	unsigned long retbuf[PLPAR_HCALL_BUFSIZE];

@@ -132,6 +131,7 @@ static ssize_t store_hibernate(struct device *dev,

 			       struct device_attribute *attr,

 			       const char *buf, size_t count)

 {

+	u64 stream_id;

 	int rc;

 	if (!capable(CAP_SYS_ADMIN))

@@ -140,7 +140,7 @@ static ssize_t store_hibernate(struct device *dev,

 	stream_id = simple_strtoul(buf, NULL, 16);

 	do {

-		rc = pseries_suspend_begin(PM_SUSPEND_MEM);

+		rc = pseries_suspend_begin(stream_id);

 		if (rc == -EAGAIN)

 			ssleep(1);

 	} while (rc == -EAGAIN);

@@ -148,8 +148,6 @@ static ssize_t store_hibernate(struct device *dev,

 	if (!rc)

 		rc = pm_suspend(PM_SUSPEND_MEM);

-	stream_id = 0;

-

 	if (!rc)

 		rc = count;

-- 

2.26.2