powerpc/pseries: Add failure related checks for h_get_mpp and h_get_ppp

[ Upstream commit 6d4341638516bf97b9a34947e0bd95035a8230a5 ]

Couple of Minor fixes:

- hcall return values are long. Fix that for h_get_mpp, h_get_ppp and
parse_ppp_data

- If hcall fails, values set should be at-least zero. It shouldn't be
uninitialized values. Fix that for h_get_mpp and h_get_ppp

Signed-off-by: Shrikanth Hegde <sshegde@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240412092047.455483-3-sshegde@linux.ibm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h
index 00c8cda1c9c3179e41ae91691fced33f58b9ac70..1a60188f74ad88b47748c0491f348fa221d55e0f 100644 (file)
--- a/arch/powerpc/include/asm/hvcall.h
+++ b/arch/powerpc/include/asm/hvcall.h
@@ -494,7 +494,7 @@ struct hvcall_mpp_data {
        unsigned long backing_mem;
 };
 
-int h_get_mpp(struct hvcall_mpp_data *);
+long h_get_mpp(struct hvcall_mpp_data *mpp_data);
 
 struct hvcall_mpp_x_data {
        unsigned long coalesced_bytes;

diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 4a3425fb19398bbc9c2f9002d0b8445a998c82fd..aed67f1a1bc5688286b90a8bf9f0c144b4f98f61 100644 (file)
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -1883,10 +1883,10 @@ out:
  * h_get_mpp
  * H_GET_MPP hcall returns info in 7 parms
  */
-int h_get_mpp(struct hvcall_mpp_data *mpp_data)
+long h_get_mpp(struct hvcall_mpp_data *mpp_data)
 {
-       int rc;
-       unsigned long retbuf[PLPAR_HCALL9_BUFSIZE];
+       unsigned long retbuf[PLPAR_HCALL9_BUFSIZE] = {0};
+       long rc;
 
        rc = plpar_hcall9(H_GET_MPP, retbuf);
 

diff --git a/arch/powerpc/platforms/pseries/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c
index a7d4e25ae82a1756e6d47eca8c9b0c2115108bb2..e0c5fc9ab242e8676df7b2d447559c2940d7b1ac 100644 (file)
--- a/arch/powerpc/platforms/pseries/lparcfg.c
+++ b/arch/powerpc/platforms/pseries/lparcfg.c
@@ -112,8 +112,8 @@ struct hvcall_ppp_data {
  */
 static unsigned int h_get_ppp(struct hvcall_ppp_data *ppp_data)
 {
-       unsigned long rc;
-       unsigned long retbuf[PLPAR_HCALL9_BUFSIZE];
+       unsigned long retbuf[PLPAR_HCALL9_BUFSIZE] = {0};
+       long rc;
 
        rc = plpar_hcall9(H_GET_PPP, retbuf);
 
@@ -192,7 +192,7 @@ static void parse_ppp_data(struct seq_file *m)
        struct hvcall_ppp_data ppp_data;
        struct device_node *root;
        const __be32 *perf_level;
-       int rc;
+       long rc;
 
        rc = h_get_ppp(&ppp_data);
        if (rc)