Patch "firmware: smccc: Fix use of uninitialised results structure" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    firmware: smccc: Fix use of uninitialised results structure

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     firmware-smccc-fix-use-of-uninitialised-results-stru.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 29b02d734f48d1c65cfe0bcfa20f12892b8bff93
Author: Punit Agrawal <punit.agrawal@xxxxxxxxxxxxx>
Date:   Mon Jul 17 18:17:02 2023 +0100

    firmware: smccc: Fix use of uninitialised results structure
    
    [ Upstream commit d05799d7b4a39fa71c65aa277128ac7c843ffcdc ]
    
    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 <punit.agrawal@xxxxxxxxxxxxx>
    Cc: Sudeep Holla <sudeep.holla@xxxxxxx>
    Cc: Marc Zyngier <maz@xxxxxxxxxx>
    Cc: Vikram Sethi <vsethi@xxxxxxxxxx>
    Cc: Shanker Donthineni <sdonthineni@xxxxxxxxxx>
    Acked-by: Marc Zyngier <maz@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20230717171702.424253-1-punit.agrawal@xxxxxxxxxxxxx
    Signed-off-by: Sudeep Holla <sudeep.holla@xxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/firmware/smccc/soc_id.c b/drivers/firmware/smccc/soc_id.c
index 890eb454599a3..1990263fbba0e 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;
 	}