From 1835303e5690cbeef2c07a9a5416045475ddaa13 Mon Sep 17 00:00:00 2001

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

Date: Fri, 12 Jun 2020 00:12:31 -0500

Subject: [PATCH] powerpc/numa: remove start/stop_topology_update()

References: bsc#1181674 ltc#189159

Patch-mainline: v5.9-rc1

Git-commit: 1835303e5690cbeef2c07a9a5416045475ddaa13

These APIs have become no-ops, so remove them and all call sites.

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

Reviewed-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>

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

Link: https://lore.kernel.org/r/20200612051238.1007764-12-nathanl@linux.ibm.com

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

---

 arch/powerpc/include/asm/topology.h       | 10 ----------

 arch/powerpc/mm/numa.c                    | 20 --------------------

 arch/powerpc/platforms/pseries/mobility.c |  4 ----

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

 4 files changed, 1 insertion(+), 38 deletions(-)

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

index 379e2cc3789f..537c638582eb 100644

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

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

@@ -93,19 +93,9 @@ static inline int cpu_distance(__be32 *cpu1_assoc, __be32 *cpu2_assoc)

 #endif /* CONFIG_NUMA */

 #if defined(CONFIG_NUMA) && defined(CONFIG_PPC_SPLPAR)

-extern int start_topology_update(void);

-extern int stop_topology_update(void);

 extern int prrn_is_enabled(void);

 extern int find_and_online_cpu_nid(int cpu);

 #else

-static inline int start_topology_update(void)

-{

-	return 0;

-}

-static inline int stop_topology_update(void)

-{

-	return 0;

-}

 static inline int prrn_is_enabled(void)

 {

 	return 0;

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c

--- a/arch/powerpc/mm/numa.c

+++ b/arch/powerpc/mm/numa.c

@@ -1140,13 +1140,11 @@ static long vphn_get_associativity(unsig

 	case H_FUNCTION:

 		printk_once(KERN_INFO

 			"VPHN is not supported. Disabling polling...\n");

-		stop_topology_update();

 		break;

 	case H_HARDWARE:

 		printk(KERN_ERR

 			"hcall_vphn() experienced a hardware fault "

 			"preventing VPHN. Disabling polling...\n");

-		stop_topology_update();

 		break;

 	case H_SUCCESS:

 		dbg("VPHN hcall succeeded. Reset polling...\n");

@@ -1205,22 +1203,6 @@ int arch_update_cpu_topology(void)

 	return numa_update_cpu_topology(true);

 }

-/*

- * Start polling for associativity changes.

- */

-int start_topology_update(void)

-{

-	return 0;

-}

-

-/*

- * Disable polling for VPHN associativity changes.

- */

-int stop_topology_update(void)

-{

-	return 0;

-}

-

 int prrn_is_enabled(void)

 {

 	return 0;

@@ -1228,8 +1210,6 @@ int prrn_is_enabled(void)

 static int topology_update_init(void)

 {

-	start_topology_update();

-

 	topology_inited = 1;

 	return 0;

 }

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

index 10d982997736..c0b09f6f0ae3 100644

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

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

@@ -388,8 +388,6 @@ static ssize_t migration_store(struct class *class,

 	if (rc)

 		return rc;

-	stop_topology_update();

-

 	do {

 		rc = rtas_ibm_suspend_me(streamid);

 		if (rc == -EAGAIN)

@@ -401,8 +399,6 @@ static ssize_t migration_store(struct class *class,

 	post_mobility_fixup();

-	start_topology_update();

-

 	return count;

 }

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

index f789693f61f4..81e0ac58d620 100644

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

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

@@ -145,11 +145,8 @@ static ssize_t store_hibernate(struct device *dev,

 			ssleep(1);

 	} while (rc == -EAGAIN);

-	if (!rc) {

-		stop_topology_update();

+	if (!rc)

 		rc = pm_suspend(PM_SUSPEND_MEM);

-		start_topology_update();

-	}

 	stream_id = 0;

-- 

2.26.2