From nobody Mon Feb 9 09:01:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554757431401808.8471871893831; Mon, 8 Apr 2019 14:03:51 -0700 (PDT) Received: from localhost ([127.0.0.1]:58960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDbQk-0000QG-Ei for importer@patchew.org; Mon, 08 Apr 2019 17:03:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDbKW-00042B-47 for qemu-devel@nongnu.org; Mon, 08 Apr 2019 16:57:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDbKT-0007xt-Tx for qemu-devel@nongnu.org; Mon, 08 Apr 2019 16:57:24 -0400 Received: from mail-it1-x144.google.com ([2607:f8b0:4864:20::144]:40277) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDbKT-0007uh-Jk for qemu-devel@nongnu.org; Mon, 08 Apr 2019 16:57:21 -0400 Received: by mail-it1-x144.google.com with SMTP id k64so1429011itb.5 for ; Mon, 08 Apr 2019 13:57:18 -0700 (PDT) Received: from worksec.wireless.oberlin.edu (ip-70-93.wireless.oberlin.edu. [132.162.70.93]) by smtp.gmail.com with ESMTPSA id h133sm5969313itb.34.2019.04.08.13.57.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 13:57:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oberlin-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FI+c1gnaMYVDdjwo2QQ+OSPlpl5N2fagEdcijDjB1Wk=; b=f/AC4c7VL7tf54ZRPymRcuuqLo08R5No5mdzCydrRJFXsbzC62DuyfTHtAZjDejNXr B/GqSFzL+/8Spov5Ln5Wh57aCTovoDIoyr6Ts4PdWoTMn/kcdKNhXyuHQR/0hb1o2JpN OGGvd3P0to05n79ct/PsECfPG6lQotay3sK1zZ8jJPKrHwhT1ReXik+dg6jL9BQjdH9A 77lFzsJxrE8yEkWgIY61POoLPTTCQNuY0U4Tx5PNpuvet3FbIPGEEQ8BTZISAcIrQmOc qAHUzZFwp1KA3fEpv1Yy17tfw2phlDK1hUmBeynj8pYHw4ygOXnnqJ9mG35BOyeHvvXP srZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FI+c1gnaMYVDdjwo2QQ+OSPlpl5N2fagEdcijDjB1Wk=; b=KUVOgVJhmOsZIs8bbIDZ0/MXY06xDdsZjLgEo8bkVVDs3vpYqnnQvo4BuAL++rcG+M Unw0ysV5HT1+ZWoue/q2afRp4uOnhVjm14Mlu1ErbhVxh0cc6N5FYtZi1ACu+/u8Tkck FsIRjYL8oX4ad7QK/XW6vDlKFkgpQRaysk5ecwcP3ihl+8oEjhRS8WrEGHK2igZ8oypf JPFIf2PwYebSmR0PeoJPkAg/RTQtagGN+d5PNA02q5N5S1wQBJoKSnzI5LScmTCLMKd0 Jl1JY59sAwrsuu0iis3ROBTjGFeeMd4Jcz/ljdRURETNFeAHcY5fCBhAe2KRvyZwoHQd 4jTg== X-Gm-Message-State: APjAAAXskdD63Jwum1AY1nV+l0E28DlBAnjHlAUFyinDMnu9FyP8xENz EFTf9xsLtzQ48J5Z9mOrjyOwcbgIlmBZow== X-Google-Smtp-Source: APXvYqwC7WMrIHEv/HCXreRBOQlEnqtTgyW2iff1meINDvYD36YDPhqWwkVyTZJl7qBN8slIU8FK1g== X-Received: by 2002:a24:43d1:: with SMTP id s200mr23991351itb.155.1554757038306; Mon, 08 Apr 2019 13:57:18 -0700 (PDT) From: Stephen Checkoway To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 16:55:53 -0400 Message-Id: X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::144 Subject: [Qemu-devel] [PATCH 10/10] block/pflash_cfi02: Use the chip erase time specified in the CFI table X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Stephen Checkoway , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" When erasing the chip, use the typical time specified in the CFI table rather than arbitrarily selecting 5 seconds. Since the currently unconfigurable value set in the table is 12, this means a chip erase takes 4096 ms so this isn't a big change in behavior. Signed-off-by: Stephen Checkoway --- hw/block/pflash_cfi02.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index f8a7314dee..f256049375 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -637,9 +637,9 @@ static void pflash_write(void *opaque, hwaddr offset, u= int64_t value, pflash_update(pfl, 0, pfl->total_len); } set_dq7(pfl, 0x00); - /* Let's wait 5 seconds before chip erase is done */ + /* Wait the time specified at CFI address 0x22. */ timer_mod(&pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + - (NANOSECONDS_PER_SECOND * 5)); + (1ULL << pfl->cfi_table[0x22]) * SCALE_MS); break; case 0x30: /* Sector erase */ --=20 2.20.1 (Apple Git-117)