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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9D075C6FD1D for ; Mon, 20 Mar 2023 16:39:12 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AB03B85B2A; Mon, 20 Mar 2023 17:39:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=metanate.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=metanate.com header.i=@metanate.com header.b="yYnRb4Zy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0DA3285B23; Mon, 20 Mar 2023 17:39:01 +0100 (CET) Received: from metanate.com (unknown [IPv6:2001:8b0:1628:5005::111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6ACED85AEC for ; Mon, 20 Mar 2023 17:38:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=metanate.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=john@metanate.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=metanate.com; s=stronger; h=Content-Transfer-Encoding:Message-Id:Date: Subject:Cc:To:From:Content-Type:Reply-To:Content-ID:Content-Description: In-Reply-To:References; bh=u+zI8t0h/HGib2kff4mRH0Me7rnOu3D+leua2spn4p0=; b=yY nRb4ZyPaTBDio/YkKVhRokFOIdvTbjef+ha16GZyHo9ac5bsUwtBJWJ3t7gZHeYsjeezbt+nUo3Eu vdGSL/x70s8X/OF0MlxNJ2c/YipHxhlsbofseRYp4fArhsVMDAlBdjnQze/u+i/2TmwPa9faRJ7lV dkazMB+YRlECNSeQUC4TEF1VxWpg7qmU2PRNUJklQu9n58/VNVsX3mvVOwhZPsBLTkaY+2kZXvEZX rOUvEVJ+9ECb14sJTM8S2B+G4kfaqbm+/E/CGjjdlcasg1rsccdoYtd8ApaUDj/Bw4wuEtgMsCx1Z UiFgaLKyOuYHo1HCRxTaeh5UzntrthgQ==; Received: from [81.174.171.191] (helo=donbot.metanate.com) by email.metanate.com with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1peIX5-0002Y7-8c; Mon, 20 Mar 2023 16:38:52 +0000 From: John Keeping To: u-boot@lists.denx.de Cc: John Keeping , Simon Glass , Philipp Tomsich , Kever Yang Subject: [PATCH] rockchip: efuse: fix misc_read() return values Date: Mon, 20 Mar 2023 16:38:46 +0000 Message-Id: <20230320163846.1572323-1-john@metanate.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authenticated: YES X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The documentation for misc_read() says: Return: number of bytes read if OK (may be 0 if EOF), -ve on error The Rockchip efuse driver implements this so it should return the number of bytes read rather than zero on success. Fix this so that the driver follows the usual contract for read operations. Signed-off-by: John Keeping --- drivers/misc/rockchip-efuse.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c index 60931a5131..d021a20b1d 100644 --- a/drivers/misc/rockchip-efuse.c +++ b/drivers/misc/rockchip-efuse.c @@ -73,7 +73,7 @@ static int dump_efuse(struct cmd_tbl *cmdtp, int flag, for (i = 0; true; i += sizeof(data)) { ret = misc_read(dev, i, &data, sizeof(data)); - if (ret < 0) + if (ret <= 0) return 0; print_buffer(i, data, 1, sizeof(data), sizeof(data)); @@ -99,7 +99,7 @@ static int rockchip_rk3036_efuse_read(struct udevice *dev, int offset, writel(EFUSE_LOAD, efuse->base + EFUSE_CTRL); udelay(2); - while (size--) { + for (int i = 0; i < size; i++) { clrsetbits_le32(efuse->base + EFUSE_CTRL, RK3036_A_MASK, RK3036_ADDR(offset++)); udelay(2); @@ -113,7 +113,7 @@ static int rockchip_rk3036_efuse_read(struct udevice *dev, int offset, /* Switch to inactive mode */ writel(0x0, efuse->base + EFUSE_CTRL); - return 0; + return size; } static int rockchip_rk3128_efuse_read(struct udevice *dev, int offset, @@ -126,7 +126,7 @@ static int rockchip_rk3128_efuse_read(struct udevice *dev, int offset, writel(EFUSE_LOAD, efuse->base + EFUSE_CTRL); udelay(2); - while (size--) { + for (int i = 0; i < size; i++) { clrsetbits_le32(efuse->base + EFUSE_CTRL, RK3128_A_MASK, RK3128_ADDR(offset++)); udelay(2); @@ -140,7 +140,7 @@ static int rockchip_rk3128_efuse_read(struct udevice *dev, int offset, /* Switch to inactive mode */ writel(0x0, efuse->base + EFUSE_CTRL); - return 0; + return size; } static int rockchip_rk3288_efuse_read(struct udevice *dev, int offset, @@ -154,7 +154,7 @@ static int rockchip_rk3288_efuse_read(struct udevice *dev, int offset, writel(EFUSE_LOAD | EFUSE_PGENB, efuse->base + EFUSE_CTRL); udelay(2); - while (size--) { + for (int i = 0; i < size; i++) { clrsetbits_le32(efuse->base + EFUSE_CTRL, RK3288_A_MASK, RK3288_ADDR(offset++)); udelay(2); @@ -168,7 +168,7 @@ static int rockchip_rk3288_efuse_read(struct udevice *dev, int offset, /* Switch to standby mode */ writel(EFUSE_CSB | EFUSE_PGENB, efuse->base + EFUSE_CTRL); - return 0; + return size; } static int rockchip_rk3328_efuse_read(struct udevice *dev, int offset, @@ -178,7 +178,7 @@ static int rockchip_rk3328_efuse_read(struct udevice *dev, int offset, u32 status, *buffer = buf; int ret; - while (size--) { + for (int i = 0; i < size; i++) { writel(RK3328_AUTO_RD | RK3328_AUTO_ENB | RK3399_ADDR(offset++), efuse->base + RK3328_AUTO_CTRL); udelay(1); @@ -192,7 +192,7 @@ static int rockchip_rk3328_efuse_read(struct udevice *dev, int offset, writel(RK3328_INT_FINISH, efuse->base + RK3328_INT_STATUS); } - return 0; + return size; } static int rockchip_rk3399_efuse_read(struct udevice *dev, int offset, @@ -206,7 +206,7 @@ static int rockchip_rk3399_efuse_read(struct udevice *dev, int offset, efuse->base + EFUSE_CTRL); udelay(1); - while (size--) { + for (int i = 0; i < size; i++) { setbits_le32(efuse->base + EFUSE_CTRL, EFUSE_STROBE | RK3399_ADDR(offset++)); udelay(1); @@ -218,7 +218,7 @@ static int rockchip_rk3399_efuse_read(struct udevice *dev, int offset, /* Switch to power-down mode */ writel(RK3399_PD | EFUSE_CSB, efuse->base + EFUSE_CTRL); - return 0; + return size; } static int rockchip_efuse_read(struct udevice *dev, int offset, @@ -251,7 +251,7 @@ static int rockchip_efuse_read(struct udevice *dev, int offset, return -ENOMEM; ret = data->read(dev, block_start, buffer, blocks); - if (!ret) + if (ret > 0) memcpy(buf, buffer + block_offset, size); free(buffer); -- 2.40.0