TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/pseries/lpar: add missing RTAS retry status handling

Browse Source 
[ Upstream commit daa8ab5904 ]

The ibm,get-system-parameter RTAS function may return -2 or 990x,
which indicate that the caller should try again.

pseries_lpar_read_hblkrm_characteristics() ignores this, making it
possible to incorrectly detect TLB block invalidation characteristics
at boot.

Move the RTAS call into a coventional rtas_busy_delay()-based loop.

Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Fixes: 1211ee61b4 ("powerpc/pseries: Read TLB Block Invalidate Characteristics")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20230125-b4-powerpc-rtas-queue-v3-3-26929c8cce78@linux.ibm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Nathan Lynch
2023-02-10 12:41:51 -06:00
committed by Greg Kroah-Hartman
parent 9626f83a6e
commit df995aef64
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/powerpc/platforms/pseries/lpar.c
+10 -10
View File
@@ -1433,22 +1433,22 @@ static inline void __init check_lp_set_hblkrm(unsigned int lp,
void __init pseries_lpar_read_hblkrm_characteristics(void) void __init pseries_lpar_read_hblkrm_characteristics(void)
{ {
const s32 token = rtas_token("ibm,get-system-parameter");
unsigned char local_buffer[SPLPAR_TLB_BIC_MAXLENGTH]; unsigned char local_buffer[SPLPAR_TLB_BIC_MAXLENGTH];
int call_status, len, idx, bpsize; int call_status, len, idx, bpsize;
if (!firmware_has_feature(FW_FEATURE_BLOCK_REMOVE)) if (!firmware_has_feature(FW_FEATURE_BLOCK_REMOVE))
return; return;
spin_lock(&rtas_data_buf_lock); do {
memset(rtas_data_buf, 0, RTAS_DATA_BUF_SIZE); spin_lock(&rtas_data_buf_lock);
call_status = rtas_call(rtas_token("ibm,get-system-parameter"), 3, 1, memset(rtas_data_buf, 0, RTAS_DATA_BUF_SIZE);
NULL, call_status = rtas_call(token, 3, 1, NULL, SPLPAR_TLB_BIC_TOKEN,
SPLPAR_TLB_BIC_TOKEN, __pa(rtas_data_buf), RTAS_DATA_BUF_SIZE);
__pa(rtas_data_buf), memcpy(local_buffer, rtas_data_buf, SPLPAR_TLB_BIC_MAXLENGTH);
RTAS_DATA_BUF_SIZE); local_buffer[SPLPAR_TLB_BIC_MAXLENGTH - 1] = '\0';
memcpy(local_buffer, rtas_data_buf, SPLPAR_TLB_BIC_MAXLENGTH); spin_unlock(&rtas_data_buf_lock);
local_buffer[SPLPAR_TLB_BIC_MAXLENGTH - 1] = '\0'; } while (rtas_busy_delay(call_status));
spin_unlock(&rtas_data_buf_lock);
if (call_status != 0) { if (call_status != 0) {
pr_warn("%s %s Error calling get-system-parameter (0x%x)\n", pr_warn("%s %s Error calling get-system-parameter (0x%x)\n",