From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8106C433EF for ; Mon, 18 Oct 2021 11:26:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7F2F8610A5 for ; Mon, 18 Oct 2021 11:26:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7F2F8610A5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:47312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcQn1-0006Hi-Jq for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 07:26:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcQij-0000cX-1U; Mon, 18 Oct 2021 07:22:21 -0400 Received: from mail-lj1-x22c.google.com ([2a00:1450:4864:20::22c]:34529) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcQif-0008O4-Q1; Mon, 18 Oct 2021 07:22:20 -0400 Received: by mail-lj1-x22c.google.com with SMTP id 145so8363873ljj.1; Mon, 18 Oct 2021 04:22:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=qUlcCqen1IZe73bGFd/HmIsGdFed/EX5BIwY/7EJN+E=; b=ZVtgM27zAWvmbDvYdZY37xGdyavkq93CvD27KMKzrEXWr0d6xCcBE9uM6rLsNrRJAe TuKNowd4Q8glHnrTAAdU6L0aFDVXiqzDEoz4jnRIGbNSrviojPCfDlT4i8/cD+g/1hLO CL5o2k1vkmztqmkw5gyt8G5O5hpLxUf9ymtNRlzEje7tldrlW4VJz8T5JN45gskV2Jkg kdV9reoPsXHIDLI62C0HRmcgHkreFqWMOhd7N5R+JYDm7Mwi/U/Zwfd9GkXYGiLX1+I6 agorhYIg9ZsVOsUmi3iXb19NA9iCiS+6YRIGUwYukL6XN6vaFN0CPHMGtWyWw7POUhhT CJLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=qUlcCqen1IZe73bGFd/HmIsGdFed/EX5BIwY/7EJN+E=; b=mJxAsQmHtoanFhGpj7S2UcUebSbJQ+6enoInjHTzGkB61LDyCV9hivdmIXv3rOdRLF DS0Jxr63sS/rYjCCOjv99WcdcSilVTQdvjID1AD8czzkOCfIH16vEDq+OnDzzumLWm6L x17nKaPGJ2xj9ISF2k/LD4k/XIonYdcXfhngNQdl3cbwNHFC3dQwDcDffRU2Y0Bln9R1 5WQ76Bx9iaR9dFlfaasnhJL0FB6ekBvzhdkwdYuzfe2EaGBtzQirwn7i5wSiT08zqTDz SRR/RjnzydqcBDOc9z28T0XZfflMJupjBJDt9T/BXnQFIKC13HuH6cXzmKq0PpWtOukQ flAQ== X-Gm-Message-State: AOAM533WjIC+gdYOnzbcNIFYGmpA82it2i/hxigOvcz1Rnm/4Kwl8tmk WM3ZLskqIzOsI9eZJxklOvE= X-Google-Smtp-Source: ABdhPJyq9CAdUVJRlekj5ZRGah7Adf9SBFddseFVm1xPPjBVfqvprQxCHx4SD+qi/Xrt99xI4efUTw== X-Received: by 2002:a2e:b618:: with SMTP id r24mr32408680ljn.414.1634556135790; Mon, 18 Oct 2021 04:22:15 -0700 (PDT) Received: from fralle-msi (31-208-27-151.cust.bredband2.com. [31.208.27.151]) by smtp.gmail.com with ESMTPSA id f4sm1378935lfr.43.2021.10.18.04.22.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 04:22:15 -0700 (PDT) Date: Mon, 18 Oct 2021 13:22:13 +0200 From: Francisco Iglesias To: Tong Ho Subject: Re: [PATCH 3/3] hw/nvram: Fix Memory Leak in Xilinx ZynqMP eFuse device Message-ID: <20211018112213.GE23846@fralle-msi> References: <20211015203532.2463705-1-tong.ho@xilinx.com> <20211015203532.2463705-4-tong.ho@xilinx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211015203532.2463705-4-tong.ho@xilinx.com> User-Agent: Mutt/1.10.1 (2018-07-13) Received-SPF: pass client-ip=2a00:1450:4864:20::22c; envelope-from=frasse.iglesias@gmail.com; helo=mail-lj1-x22c.google.com X-Spam_score_int: -1020 X-Spam_score: -102.1 X-Spam_bar: --------------------------------------------------- X-Spam_report: (-102.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_WELCOMELIST=-0.01, USER_IN_WHITELIST=-100 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: edgar.iglesias@gmail.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org, alistair@alistair23.me, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On [2021 Oct 15] Fri 13:35:32, Tong Ho wrote: > Signed-off-by: Tong Ho Reviewed-by: Francisco Iglesias > --- > 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 > >