MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-13 04:39:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

powerpc/pseries: make max polling consistent for longer H_CALLs

Browse Source 
[ Upstream commit 784354349d ]

Currently, plpks_confirm_object_flushed() function polls for 5msec in
total instead of 5sec.

Keep max polling time consistent for all the H_CALLs, which take longer
than expected, to be 5sec. Also, make use of fsleep() everywhere to
insert delay.

Reported-by: Nageswara R Sastry <rnsastry@linux.ibm.com>
Fixes: 2454a7af0f ("powerpc/pseries: define driver for Platform KeyStore")
Signed-off-by: Nayna Jain <nayna@linux.ibm.com>
Tested-by: Nageswara R Sastry <rnsastry@linux.ibm.com>
Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240418031230.170954-1-nayna@linux.ibm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Nayna Jain 2024-04-17 23:12:30 -04:00 committed by Greg Kroah-Hartman
parent 0b82eb134d
commit 3b59a75943
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/include/asm/plpks.h
View File

@ -44,9 +44,8 @@
#define PLPKS_MAX_DATA_SIZE 4000 #define PLPKS_MAX_DATA_SIZE 4000
// Timeouts for PLPKS operations // Timeouts for PLPKS operations
#define PLPKS_MAX_TIMEOUT 5000 // msec #define PLPKS_MAX_TIMEOUT (5 * USEC_PER_SEC)
#define PLPKS_FLUSH_SLEEP 10 // msec #define PLPKS_FLUSH_SLEEP 10000 // usec
#define PLPKS_FLUSH_SLEEP_RANGE 400
struct plpks_var { struct plpks_var {
char *component; char *component;

10
arch/powerpc/platforms/pseries/plpks.c
View File

@ -415,8 +415,7 @@ static int plpks_confirm_object_flushed(struct label *label,
break; break;
} }
usleep_range(PLPKS_FLUSH_SLEEP, fsleep(PLPKS_FLUSH_SLEEP);
PLPKS_FLUSH_SLEEP + PLPKS_FLUSH_SLEEP_RANGE);
timeout = timeout + PLPKS_FLUSH_SLEEP; timeout = timeout + PLPKS_FLUSH_SLEEP;
} while (timeout < PLPKS_MAX_TIMEOUT); } while (timeout < PLPKS_MAX_TIMEOUT);
@ -464,9 +463,10 @@ int plpks_signed_update_var(struct plpks_var *var, u64 flags)
continuetoken = retbuf[0]; continuetoken = retbuf[0];
if (pseries_status_to_err(rc) == -EBUSY) { if (pseries_status_to_err(rc) == -EBUSY) {
int delay_ms = get_longbusy_msecs(rc); int delay_us = get_longbusy_msecs(rc) * 1000;
mdelay(delay_ms);
timeout += delay_ms; fsleep(delay_us);
timeout += delay_us;
} }
rc = pseries_status_to_err(rc); rc = pseries_status_to_err(rc);
} while (rc == -EBUSY && timeout < PLPKS_MAX_TIMEOUT); } while (rc == -EBUSY && timeout < PLPKS_MAX_TIMEOUT);