From: Tong Ho <tong.ho@xilinx.com>
To: <qemu-arm@nongnu.org>
Cc: edgar.iglesias@gmail.com, alistair@alistair23.me,
tong.ho@xilinx.com, qemu-devel@nongnu.org,
peter.maydell@linaro.org
Subject: [PATCH 3/3] hw/nvram: Fix Memory Leak in Xilinx ZynqMP eFuse device
Date: Fri, 15 Oct 2021 13:35:32 -0700 [thread overview]
Message-ID: <20211015203532.2463705-4-tong.ho@xilinx.com> (raw)
In-Reply-To: <20211015203532.2463705-1-tong.ho@xilinx.com>
Signed-off-by: Tong Ho <tong.ho@xilinx.com>
---
hw/nvram/xlnx-zynqmp-efuse.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/hw/nvram/xlnx-zynqmp-efuse.c b/hw/nvram/xlnx-zynqmp-efuse.c
index 1f87dbf988..228ba0bbfa 100644
--- a/hw/nvram/xlnx-zynqmp-efuse.c
+++ b/hw/nvram/xlnx-zynqmp-efuse.c
@@ -434,11 +434,12 @@ static void zynqmp_efuse_pgm_addr_postw(RegisterInfo *reg, uint64_t val64)
if (!errmsg) {
ARRAY_FIELD_DP32(s->regs, EFUSE_ISR, PGM_ERROR, 0);
} else {
+ g_autofree char *path = object_get_canonical_path(OBJECT(s));
+
ARRAY_FIELD_DP32(s->regs, EFUSE_ISR, PGM_ERROR, 1);
qemu_log_mask(LOG_GUEST_ERROR,
"%s - eFuse write error: %s; addr=0x%x\n",
- object_get_canonical_path(OBJECT(s)),
- errmsg, (unsigned)val64);
+ path, errmsg, (unsigned)val64);
}
ARRAY_FIELD_DP32(s->regs, EFUSE_ISR, PGM_DONE, 1);
@@ -448,6 +449,7 @@ static void zynqmp_efuse_pgm_addr_postw(RegisterInfo *reg, uint64_t val64)
static void zynqmp_efuse_rd_addr_postw(RegisterInfo *reg, uint64_t val64)
{
XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(reg->opaque);
+ g_autofree char *path = NULL;
/*
* Grant reads only to allowed bits; reference sources:
@@ -538,10 +540,10 @@ static void zynqmp_efuse_rd_addr_postw(RegisterInfo *reg, uint64_t val64)
return;
denied:
+ path = object_get_canonical_path(OBJECT(s));
qemu_log_mask(LOG_GUEST_ERROR,
"%s: Denied efuse read from array %u, row %u\n",
- object_get_canonical_path(OBJECT(s)),
- efuse_ary, efuse_row);
+ path, efuse_ary, efuse_row);
s->regs[R_EFUSE_RD_DATA] = 0;
@@ -731,9 +733,11 @@ static void zynqmp_efuse_reg_write(void *opaque, hwaddr addr,
s = XLNX_ZYNQMP_EFUSE(dev);
if (addr != A_WR_LOCK && s->regs[R_WR_LOCK]) {
+ g_autofree char *path = object_get_canonical_path(OBJECT(s));
+
qemu_log_mask(LOG_GUEST_ERROR,
"%s[reg_0x%02lx]: Attempt to write locked register.\n",
- object_get_canonical_path(OBJECT(s)), (long)addr);
+ path, (long)addr);
} else {
register_write_memory(opaque, addr, data, size);
}
@@ -784,8 +788,10 @@ static void zynqmp_efuse_realize(DeviceState *dev, Error **errp)
XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(dev);
if (!s->efuse) {
+ g_autofree char *path = object_get_canonical_path(OBJECT(s));
+
error_setg(errp, "%s.efuse: link property not connected to XLNX-EFUSE",
- object_get_canonical_path(OBJECT(dev)));
+ path);
return;
}
--
2.25.1
next prev parent reply other threads:[~2021-10-15 20:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 20:35 [PATCH 0/3] hw/nvram: Fix Memory Leaks in Xilinx eFUSE Tong Ho
2021-10-15 20:35 ` [PATCH 1/3] hw/nvram: Fix Memory Leak in Xilinx eFuse QOM Tong Ho
2021-10-18 11:21 ` Francisco Iglesias
2021-10-15 20:35 ` [PATCH 2/3] hw/nvram: Fix Memory Leak in Xilinx Versal eFuse device Tong Ho
2021-10-18 11:21 ` Francisco Iglesias
2021-10-15 20:35 ` Tong Ho [this message]
2021-10-18 11:22 ` [PATCH 3/3] hw/nvram: Fix Memory Leak in Xilinx ZynqMP " Francisco Iglesias
2021-10-18 10:31 ` [PATCH 0/3] hw/nvram: Fix Memory Leaks in Xilinx eFUSE Philippe Mathieu-Daudé
2021-10-18 16:20 ` Edgar E. Iglesias
2021-10-19 7:53 ` Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211015203532.2463705-4-tong.ho@xilinx.com \
--to=tong.ho@xilinx.com \
--cc=alistair@alistair23.me \
--cc=edgar.iglesias@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.