diff options
| author | Nathan Lynch <nathanl@linux.ibm.com> | 2023-02-10 12:42:05 -0600 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2023-02-13 22:35:03 +1100 |
| commit | 69b9f5a5b2c04ce5993fe43da938f065571bdb25 (patch) | |
| tree | 1592f6931bba5c76dc5da52c260a9419093933ba /arch/powerpc/perf/hv-24x7.c | |
| parent | fff9846be00c467b4a277492af5be8487b6540e9 (diff) | |
powerpc/pseries/hv-24x7: convert to papr_sysparm API
The new papr_sysparm API handles the details of system parameter
retrieval. Use that instead of open-coding the RTAS call, work area
management, and retries.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20230125-b4-powerpc-rtas-queue-v3-17-26929c8cce78@linux.ibm.com
Diffstat (limited to 'arch/powerpc/perf/hv-24x7.c')
| -rw-r--r-- | arch/powerpc/perf/hv-24x7.c | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c index 5a8577447c9d..317175791d23 100644 --- a/arch/powerpc/perf/hv-24x7.c +++ b/arch/powerpc/perf/hv-24x7.c @@ -18,6 +18,7 @@ #include <asm/firmware.h> #include <asm/hvcall.h> #include <asm/io.h> +#include <asm/papr-sysparm.h> #include <linux/byteorder/generic.h> #include <asm/rtas.h> @@ -66,8 +67,6 @@ static bool is_physical_domain(unsigned int domain) * Refer PAPR+ document to get parameter token value as '43'. */ -#define PROCESSOR_MODULE_INFO 43 - static u32 phys_sockets; /* Physical sockets */ static u32 phys_chipspersocket; /* Physical chips per socket*/ static u32 phys_coresperchip; /* Physical cores per chip */ @@ -79,8 +78,7 @@ static u32 phys_coresperchip; /* Physical cores per chip */ */ void read_24x7_sys_info(void) { - const s32 token = rtas_token("ibm,get-system-parameter"); - int call_status; + struct papr_sysparm_buf *buf; /* * Making system parameter: chips and sockets and cores per chip @@ -90,27 +88,22 @@ void read_24x7_sys_info(void) phys_chipspersocket = 1; phys_coresperchip = 1; - do { - spin_lock(&rtas_data_buf_lock); - call_status = rtas_call(token, 3, 1, NULL, PROCESSOR_MODULE_INFO, - __pa(rtas_data_buf), RTAS_DATA_BUF_SIZE); - if (call_status == 0) { - int ntypes = be16_to_cpup((__be16 *)&rtas_data_buf[2]); - int len = be16_to_cpup((__be16 *)&rtas_data_buf[0]); - - if (len >= 8 && ntypes != 0) { - phys_sockets = be16_to_cpup((__be16 *)&rtas_data_buf[4]); - phys_chipspersocket = be16_to_cpup((__be16 *)&rtas_data_buf[6]); - phys_coresperchip = be16_to_cpup((__be16 *)&rtas_data_buf[8]); - } - } - spin_unlock(&rtas_data_buf_lock); - } while (rtas_busy_delay(call_status)); + buf = papr_sysparm_buf_alloc(); + if (!buf) + return; - if (call_status != 0) { - pr_err("Error calling get-system-parameter %d\n", - call_status); + if (!papr_sysparm_get(PAPR_SYSPARM_PROC_MODULE_INFO, buf)) { + int ntypes = be16_to_cpup((__be16 *)&buf->val[0]); + int len = be16_to_cpu(buf->len); + + if (len >= 8 && ntypes != 0) { + phys_sockets = be16_to_cpup((__be16 *)&buf->val[2]); + phys_chipspersocket = be16_to_cpup((__be16 *)&buf->val[4]); + phys_coresperchip = be16_to_cpup((__be16 *)&buf->val[6]); + } } + + papr_sysparm_buf_free(buf); } /* Domains for which more than one result element are returned for each event. */ |