From patchwork Wed Apr 10 09:13:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 787490 Delivered-To: patch@linaro.org Received: by 2002:adf:fdd2:0:b0:346:15ad:a2a with SMTP id i18csp597992wrs; Wed, 10 Apr 2024 02:15:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX3PDxB9kX0XDwuF8F86vckOPNmIpBci+TkYEaVasJp01Hj/0a1xrR89D4NGFj7ja470Idb5aizUXyO0gK44dAp X-Google-Smtp-Source: AGHT+IElVlylp9mtU5pELLcimDALpiqzL+xdxG94/UAOeEjcOEiLWt4PI74/mwKQQulQ7Abil+jv X-Received: by 2002:a05:622a:1444:b0:434:8aa2:9807 with SMTP id v4-20020a05622a144400b004348aa29807mr1829439qtx.23.1712740502144; Wed, 10 Apr 2024 02:15:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712740502; cv=none; d=google.com; s=arc-20160816; b=anwdv6nTyvnesBG2mZuxoZ00ejwnjJkITz7YnNGJiGqvD8N8V+8/7kqF/Vk4oY7AHr oqrMqGoBf8yZE0LDLxdlq+TQTdh9TtBg9M8cQYuG+QbhVlnO9kkPpv1lN/Rm1W4rL5+3 l/WBwZcvFtsps4zhcWmItM61uMUJ1CzfLDtxMLh8lAxpULcYjeEjjbkFeoMj1r3ozYHS c6kGMhMD4jSC92s7PovBgjGHXDhEVFNApqy1Mu2gHq65+vaN9z+NRbqdInKN1AjiKypq 9Bw7ibGw+0nXWU53PqyM1sD7VeFvqelydvPEQP1r2fqSHyKz9sNbxKdnOOIbIAeHwr8V CV/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Cl/8eM6HtaFKzS73NnToQu9iXIco13zqVdgURn6Eu4c=; fh=whFxegePTlxAiRk9a26JuFy5di3ZC0+Wr5/41MGEye4=; b=HWXnOcRk89vrLNpyiThjuHpvuS6n2Ewqwa80KA8Kgv2rId+GxT6D2i8i5TlUFqftJn KTi/c6PnB5H7e0Q//3EdkLyTE0AgyMva/2DOgQdP8n7670/g/uWf9aO7d5BiitVwvEeA NP4OB3E+TKlC3k9k6AGSncHIw5w2H/YmvCuK4ABaLGXkHEEIZDAnkG06WTA92C7lmNvS ISJiQ2nbCQ6q1KnEEdk31QoOsYdTCZ8qv7OiN1WvNtBtN5P1P9wNg6aLbQ3b9d5nbjuk rnHLa3mf+Xerq4uSyB08Njcj81LGI1Nby1JORZ4vDZwEevD+rZT+z2mmvlfaLTMsrnNp l7IQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="cFh/Isz4"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c19-20020ac87d93000000b004347d0a1d75si9027280qtd.101.2024.04.10.02.15.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Apr 2024 02:15:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="cFh/Isz4"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ruU1v-0005sU-S8; Wed, 10 Apr 2024 05:14:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ruU1u-0005s3-UB for qemu-devel@nongnu.org; Wed, 10 Apr 2024 05:14:06 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ruU1t-0005aa-6y for qemu-devel@nongnu.org; Wed, 10 Apr 2024 05:14:06 -0400 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-56e56ee8d5cso4716518a12.2 for ; Wed, 10 Apr 2024 02:14:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712740442; x=1713345242; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Cl/8eM6HtaFKzS73NnToQu9iXIco13zqVdgURn6Eu4c=; b=cFh/Isz4AkfWhxCGMn5IO6e3+UrN7sjAhPuhxidtXfcaqPjM3jJERof/JU6J1Z9Pnt Unf7kn83etLRdJl6YKgrhLyTElPBCY1AHDIGWt+K6+5aTGQPLyiLBbe+3O85KTa4XfzQ 0s+L6VY7MM/0RrRt0rDiKCtcrQcZvfB6Y0YSar3uv82HFJlWF69YcUjbJ1q5mve12rsV fYku9r2LfB3i2YgaMhWfEsrPxrDBjo7/BrZvVeK1Fe4NiP3tghYas/ZjPuDP/3UGgI7h OU7S4U4NHUw2HfDHDvhLYZAdlIDUTo02OLx+dOV10+BKP99n2f8HKFJFCfmjV6JPiXqh 6jOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712740442; x=1713345242; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Cl/8eM6HtaFKzS73NnToQu9iXIco13zqVdgURn6Eu4c=; b=Ib32eWSKtaVPUPWL7t5h2h4lF+sqwhoYRQIQ+kSgLHZMZiBp7R7IJzsgY+5VlaEqic ere7Q7eYz+umV9ynyrI53LPP2mk4v5MGHkcrI1AbNMzuIIonISqSmkBSNuf8/VUczo3X qRh1yI6oulU66nVU+N5aott2IFMkeQ0AgATj2JqPCT/t1vqXwp+mPO+jmr/KRnSFio86 Z5htPi+V69EGorxtZ7p2WTOaUJxjgS/98VjUlHiZ6Edu3pv8HxlFUxPu2zOWLRAr3Pp7 0QrcS+57Tfx8dmsi8wxCBk6HeifUmOYLjc6mPE3Lj65yHrH28ReRy9Uv8GOeD0Mi1bLI Nk+g== X-Gm-Message-State: AOJu0YzTzW2Qnb0Lpoaz3yYGM0cYZj9tb4qB8T+lgaDvWaaxlSjYIimd WSJIqvM1FRWqRMv/TPfcl62q0LquJ0LirHnaE2lf4bRjYhD830Xt6fBaOPXkFtryoy4lFdwOZnL X X-Received: by 2002:a17:906:3782:b0:a51:dc1f:a3b1 with SMTP id n2-20020a170906378200b00a51dc1fa3b1mr1435230ejc.39.1712740442464; Wed, 10 Apr 2024 02:14:02 -0700 (PDT) Received: from m1x-phil.lan (arl95-h02-176-184-34-173.dsl.sta.abo.bbox.fr. [176.184.34.173]) by smtp.gmail.com with ESMTPSA id bp5-20020a17090726c500b00a51db91186fsm3254243ejc.119.2024.04.10.02.14.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 10 Apr 2024 02:14:02 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org Subject: [PULL 07/16] hw/block/nand: Have blk_load() take unsigned offset and return boolean Date: Wed, 10 Apr 2024 11:13:06 +0200 Message-ID: <20240410091315.57241-8-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240410091315.57241-1-philmd@linaro.org> References: <20240410091315.57241-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=philmd@linaro.org; helo=mail-ed1-x532.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Negative offset is meaningless, use unsigned type. Return a boolean value indicating success. Reviewed-by: Richard Henderson Reviewed-by: Kevin Wolf Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20240409135944.24997-3-philmd@linaro.org> --- hw/block/nand.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/block/nand.c b/hw/block/nand.c index f33eb2d552..5a31d78b6b 100644 --- a/hw/block/nand.c +++ b/hw/block/nand.c @@ -84,7 +84,11 @@ struct NANDFlashState { void (*blk_write)(NANDFlashState *s); void (*blk_erase)(NANDFlashState *s); - void (*blk_load)(NANDFlashState *s, uint64_t addr, int offset); + /* + * Returns %true when block containing (@addr + @offset) is + * successfully loaded, otherwise %false. + */ + bool (*blk_load)(NANDFlashState *s, uint64_t addr, unsigned offset); uint32_t ioaddr_vmstate; }; @@ -772,11 +776,11 @@ static void glue(nand_blk_erase_, NAND_PAGE_SIZE)(NANDFlashState *s) } } -static void glue(nand_blk_load_, NAND_PAGE_SIZE)(NANDFlashState *s, - uint64_t addr, int offset) +static bool glue(nand_blk_load_, NAND_PAGE_SIZE)(NANDFlashState *s, + uint64_t addr, unsigned offset) { if (PAGE(addr) >= s->pages) { - return; + return false; } if (s->blk) { @@ -804,6 +808,8 @@ static void glue(nand_blk_load_, NAND_PAGE_SIZE)(NANDFlashState *s, offset, NAND_PAGE_SIZE + OOB_SIZE - offset); s->ioaddr = s->io; } + + return true; } static void glue(nand_init_, NAND_PAGE_SIZE)(NANDFlashState *s)