aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPunit Agrawal <[email protected]>2023-07-17 18:17:02 +0100
committerSudeep Holla <[email protected]>2023-07-18 10:08:05 +0100
commitd05799d7b4a39fa71c65aa277128ac7c843ffcdc (patch)
tree434f557e69260cf0655718bf64af1c050645e4ab
parent06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 (diff)
firmware: smccc: Fix use of uninitialised results structure
Commit 35727af2b15d ("irqchip/gicv3: Workaround for NVIDIA erratum T241-FABRIC-4") moved the initialisation of the SoC version to arm_smccc_version_init() but forgot to update the results structure and it's usage. Fix the use of the uninitialised results structure and update the error strings. Fixes: 35727af2b15d ("irqchip/gicv3: Workaround for NVIDIA erratum T241-FABRIC-4") Signed-off-by: Punit Agrawal <[email protected]> Cc: Sudeep Holla <[email protected]> Cc: Marc Zyngier <[email protected]> Cc: Vikram Sethi <[email protected]> Cc: Shanker Donthineni <[email protected]> Acked-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sudeep Holla <[email protected]>
-rw-r--r--drivers/firmware/smccc/soc_id.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/firmware/smccc/soc_id.c b/drivers/firmware/smccc/soc_id.c
index 890eb454599a..1990263fbba0 100644
--- a/drivers/firmware/smccc/soc_id.c
+++ b/drivers/firmware/smccc/soc_id.c
@@ -34,7 +34,6 @@ static struct soc_device_attribute *soc_dev_attr;
static int __init smccc_soc_init(void)
{
- struct arm_smccc_res res;
int soc_id_rev, soc_id_version;
static char soc_id_str[20], soc_id_rev_str[12];
static char soc_id_jep106_id_str[12];
@@ -49,13 +48,13 @@ static int __init smccc_soc_init(void)
}
if (soc_id_version < 0) {
- pr_err("ARCH_SOC_ID(0) returned error: %lx\n", res.a0);
+ pr_err("Invalid SoC Version: %x\n", soc_id_version);
return -EINVAL;
}
soc_id_rev = arm_smccc_get_soc_id_revision();
if (soc_id_rev < 0) {
- pr_err("ARCH_SOC_ID(1) returned error: %lx\n", res.a0);
+ pr_err("Invalid SoC Revision: %x\n", soc_id_rev);
return -EINVAL;
}