aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasant Hegde <hegdevasant@linux.vnet.ibm.com>2020-10-19 17:14:08 +0530
committerVasant Hegde <hegdevasant@linux.vnet.ibm.com>2020-10-22 16:29:58 +0530
commit88a6dc9ecc15d13d56d59da6b0d300dc03075912 (patch)
tree6fd7a6a5ddd6355379a06d42e618691e61edf50f
parenta171f21e4d7805d1e04b9987de841402b70cd8c4 (diff)
downloadskiboot-88a6dc9ecc15d13d56d59da6b0d300dc03075912.zip
skiboot-88a6dc9ecc15d13d56d59da6b0d300dc03075912.tar.gz
skiboot-88a6dc9ecc15d13d56d59da6b0d300dc03075912.tar.bz2
FSP/NVRAM: Do not assert in vNVRAM statistics call
[ Upstream commit 9ca8bf1bde56330075634bd3cb601d0f6ee90514 ] `msg` is valid pointer here. I don't recall why I added assert here :-( This is not correct. We shouldn't call assert here. Also we are not using `msg`. Hence convert it to `__unused`. Fixes: 19d4f98e ('FSP/NVRAM: Handle "get vNVRAM statistics" command') Cc: skiboot-stable@lists.ozlabs.org # v5.4.x + Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> Reviewed-by: Mahesh Salgaonkar <mahesh@linux.ibm.com> Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
-rw-r--r--hw/fsp/fsp-nvram.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/fsp/fsp-nvram.c b/hw/fsp/fsp-nvram.c
index 80c8424..aa17cb5 100644
--- a/hw/fsp/fsp-nvram.c
+++ b/hw/fsp/fsp-nvram.c
@@ -305,12 +305,11 @@ static struct fsp_client fsp_nvram_client_rr = {
.message = fsp_nvram_msg_rr,
};
-static bool fsp_vnvram_msg(u32 cmd_sub_mod, struct fsp_msg *msg)
+static bool fsp_vnvram_msg(u32 cmd_sub_mod, struct fsp_msg *msg __unused)
{
u32 cmd;
struct fsp_msg *resp;
- assert(msg == NULL);
switch (cmd_sub_mod) {
case FSP_CMD_GET_VNV_STATS:
prlog(PR_DEBUG,