From patchwork Thu Apr 18 20:02:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 789854 Delivered-To: patch@linaro.org Received: by 2002:adf:e6ca:0:b0:346:15ad:a2a with SMTP id y10csp747172wrm; Thu, 18 Apr 2024 13:03:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV2GjX/03vdhpXwV92ZILVedupRXbB8WgeEJ6/x38Koz0uozLhlHXy+ncW5U8/YE0BAeTxrjHzbRgyBlCAFAYef X-Google-Smtp-Source: AGHT+IHvZEc+Li0WZuUXRRMJ4yNyNyzrvj9xF5egCCL3cLYeI2xrtrRF7+2XoaK9JganFF+MeWP+ X-Received: by 2002:a05:6359:7606:b0:186:c06f:4379 with SMTP id wg6-20020a056359760600b00186c06f4379mr353440rwc.14.1713470614252; Thu, 18 Apr 2024 13:03:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713470614; cv=none; d=google.com; s=arc-20160816; b=NenI6STaGSRy/XG60gquzsfz3I7TmXYKLXxUPRX1jBnSgu8lCBU+7O+5paYD+1AHRK PTk4BUpLNQ404B75CKjn6o6hFZfQli/TbQQrY4l+OXdhqHAsiU/ec3xTnJ+dyg0Ckx2f jiSEX2ep5HUsTQCvoUTCu8jRKBtofUonuKMbwPNTm4ekTc5IVFJz4RGOBTTUr407pSOM Y3r+Bk/xHNNHtaRiQrTX/v2gobyU3Npdg/WYTlcjkEQbhdUhG43zcLTwzluIU9IwNomI 2Hcf3eslCNlNrGVSHjZaUU6H1zXbBfJ5lFAomHZNLozwBtOtbL1FePR4gOl6rBCI683j EeEQ== 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; bh=7bD5miNBzNbL62vhRkya0W0rKMV0w2F9y8euYmSyX1A=; fh=duFCrbmW7QyIwJKOp0blY4kXHchuONJhRN0ZSjkPt6k=; b=NzsSV/6E3enHmyU/ekyam6/0/KFQ020wK8Cs5dqDpZkzxJiU7Oi5ueO3gWDAu+Kx4i DIXCRS73gf3fZXdNbYL+QMYh4HsuaHQJXZCJyKlIJyb0IRQMtYReGshrL1hmoMPuPSXG DsS3tg0stFR/FgAq+7zh5Fn+QyCZAYOSzjtG5YNmNo+rcNskV65f+naHABgAAIwdwR+7 gnVsITcOHWQ2OmRkK6A8OKadQPOpTA9tXyi/R2cg0UU57V0yG92UW9dgStqUdXf4kPZy GAcaCrbnJLAAyEkh49GPQr/dlsrn10YQGrwYuVuGwmBdV6/ehJQZBrgmW78pDE3wVjXF CTtQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id hy6-20020a67e7c6000000b0047913e536ccsi655472vsb.803.2024.04.18.13.03.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Apr 2024 13:03:34 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxXyO-0001cJ-8o; Thu, 18 Apr 2024 16:03:08 -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 1rxXy5-0001Yr-98; Thu, 18 Apr 2024 16:02:51 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rxXy2-0005II-JA; Thu, 18 Apr 2024 16:02:47 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id C647F5FE11; Thu, 18 Apr 2024 23:02:27 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 323A3B93F7; Thu, 18 Apr 2024 23:02:25 +0300 (MSK) Received: (nullmailer pid 952866 invoked by uid 1000); Thu, 18 Apr 2024 20:02:24 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Kevin Wolf , Michael Tokarev Subject: [Stable-7.2.11 50/59] hw/block/nand: Have blk_load() take unsigned offset and return boolean Date: Thu, 18 Apr 2024 23:02:10 +0300 Message-Id: <20240418200224.952785-9-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 From: Philippe Mathieu-Daudé 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> (cherry picked from commit 2e3e09b368001f7eaeeca7a9b49cb1f0c9092d85) Signed-off-by: Michael Tokarev diff --git a/hw/block/nand.c b/hw/block/nand.c index 4e3d7fb065..81b2bb804d 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)