From nobody Mon Feb 9 09:33:49 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562037608; cv=none; d=zoho.com; s=zohoarc; b=h9pOSyYl5GeZCup1hJ6Mgj79FPSYXjiYiMXfIDpTZssr366Uv+BkScLYp83Qq9Wyh6s4w8ufpYrwS+MJu+x53RTYGgO4AtfznhCKv7777D0QenBjTx0jF5/NsA/Lc0lW7O2Ng5lhav1T755AZZGZIoiPg99GO/RAuB1Xgm3KTpw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562037608; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=fHLupvWibkvv59AYvsxJovAGx0USimsqxysithofj4Y=; b=nJLS+Mn2kOMRrb+AuUjsug0W/lhVZZLSysnOpUmXQ5bdo8jnEPOWlDHWOrj2QihqRgUsjQkCK2ycyd/lMsE7xIEt125lVontYWeNcp3bPstNPJbLhh6pTpPskxcHLJdZgi3lwBG0UCHrhXxgV3mP/UfbPR9ZX6RuL4SVWK2Q+N8= ARC-Authentication-Results: i=1; mx.zoho.com; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562037608397157.41935018881748; Mon, 1 Jul 2019 20:20:08 -0700 (PDT) Received: from localhost ([::1]:47926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hi9Kr-0002CV-86 for importer@patchew.org; Mon, 01 Jul 2019 23:20:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34779) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hi7B3-00036o-15 for qemu-devel@nongnu.org; Mon, 01 Jul 2019 21:01:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hi7AR-0001z6-Dg for qemu-devel@nongnu.org; Mon, 01 Jul 2019 21:01:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42372) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hi79U-0001K9-Uo; Mon, 01 Jul 2019 21:00:13 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D5BD23001817; Tue, 2 Jul 2019 00:59:59 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-21.brq.redhat.com [10.40.204.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 01DFC1001B33; Tue, 2 Jul 2019 00:59:55 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 1 Jul 2019 21:58:53 -0300 Message-Id: <20190702005912.15905-9-philmd@redhat.com> In-Reply-To: <20190702005912.15905-1-philmd@redhat.com> References: <20190702005912.15905-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 02 Jul 2019 00:59:59 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 08/27] hw/block/pflash_cfi02: Use the ldst API in pflash_write() 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: Kevin Wolf , Laurent Vivier , Thomas Huth , Stephen Checkoway , qemu-block@nongnu.org, Max Reitz , Alistair Francis , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The load/store API eases code review. Signed-off-by: Stephen Checkoway Message-Id: <20190426162624.55977-3-stephen.checkoway@oberlin.edu> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 [PMD: Extracted from bigger patch] Reviewed-by: Alistair Francis Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/pflash_cfi02.c | 38 ++++++++------------------------------ 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 9e8c28af8f..ae38ed0bae 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -365,38 +365,16 @@ static void pflash_write(PFlashCFI02 *pfl, hwaddr off= set, goto check_unlock0; case 0xA0: trace_pflash_data_write(offset, width << 1, value, 0); - p =3D pfl->storage; if (!pfl->ro) { - switch (width) { - case 1: - p[offset] &=3D value; - pflash_update(pfl, offset, 1); - break; - case 2: - if (be) { - p[offset] &=3D value >> 8; - p[offset + 1] &=3D value; - } else { - p[offset] &=3D value; - p[offset + 1] &=3D value >> 8; - } - pflash_update(pfl, offset, 2); - break; - case 4: - if (be) { - p[offset] &=3D value >> 24; - p[offset + 1] &=3D value >> 16; - p[offset + 2] &=3D value >> 8; - p[offset + 3] &=3D value; - } else { - p[offset] &=3D value; - p[offset + 1] &=3D value >> 8; - p[offset + 2] &=3D value >> 16; - p[offset + 3] &=3D value >> 24; - } - pflash_update(pfl, offset, 4); - break; + p =3D (uint8_t *)pfl->storage + offset; + if (pfl->be) { + uint64_t current =3D ldn_be_p(p, width); + stn_be_p(p, width, current & value); + } else { + uint64_t current =3D ldn_le_p(p, width); + stn_le_p(p, width, current & value); } + pflash_update(pfl, offset, width); } /* * While programming, status bit DQ7 should hold the opposite --=20 2.20.1