From nobody Tue Nov 26 22:21:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1704730201; cv=none; d=zohomail.com; s=zohoarc; b=SGn/4h7Jhv7dJFMLple3Yjd0ePvpd/CG7d6gVi4B6gPu6OtgKwlSXzNWXj/lVmMYhuwdZ/tf7h7D/b3O4Urp9Tp2rD79f0oyimHcgWcCqWPagD1oNq1nJtDnZ5KdL+fzR7ku1fKwM2x8zydVwtAjC8FErIw3uwuGMc3jMAnt8gw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704730201; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+UMeANDd14nL6Odyxug03PTmTfnYlzkXPTCXfG6UNpQ=; b=GkOH1FPZxEvD9qx+eOyYgvdWPYddYIteYQHOAI7fx/fZWQqRy7P3wlKsjNRZYzGLwMGylSE0TveicRdLICUrVHskC4E01Ct5CM5uQh2b4WgsfpzzcSY8n8u8j/0DVklTlBqUw9Lvwx/VGgOO70SCsi1NQfp2dJi41qFsWIxg9lU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1704730201600356.50647142224886; Mon, 8 Jan 2024 08:10:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMsBf-0006nj-EV; Mon, 08 Jan 2024 11:09:15 -0500 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 1rMsBc-0006mk-Ef for qemu-devel@nongnu.org; Mon, 08 Jan 2024 11:09:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMsBa-0000oZ-1Y for qemu-devel@nongnu.org; Mon, 08 Jan 2024 11:09:11 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-182-XAHmDmgONGONQOHLsiwQqw-1; Mon, 08 Jan 2024 11:09:03 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C28E8101A49F; Mon, 8 Jan 2024 16:09:02 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.194.130]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A1BD492BC7; Mon, 8 Jan 2024 16:09:02 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 37B8C18009BD; Mon, 8 Jan 2024 17:09:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704730146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+UMeANDd14nL6Odyxug03PTmTfnYlzkXPTCXfG6UNpQ=; b=WhHmASzPoo+1aaVQwHDG/tUSarVtrPgQiE4KmTUuLfU9YYkJx5KvObXEoNFn3HaGUcfzoc 176G5pN9rZx1v75MizLk8IvVel9t2uM0DsqrJZvzbHIC4aLj+2SKV+z192d92cy3WMDQS9 DuSoIbt4NZsnu4VmGIa8RWiy0o27qWs= X-MC-Unique: XAHmDmgONGONQOHLsiwQqw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Gerd Hoffmann Subject: [PATCH v2 2/3] hw/pflash: use ldn_{be,le}_p and stn_{be,le}_p Date: Mon, 8 Jan 2024 17:08:58 +0100 Message-ID: <20240108160900.104835-3-kraxel@redhat.com> In-Reply-To: <20240108160900.104835-1-kraxel@redhat.com> References: <20240108160900.104835-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1704730203214100003 Use the helper functions we have to read/write multi-byte values in correct byte order. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Gerd Hoffmann --- hw/block/pflash_cfi01.c | 63 ++++++----------------------------------- 1 file changed, 8 insertions(+), 55 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 67f1c9773ab3..8434a45cabb0 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -225,34 +225,10 @@ static uint32_t pflash_data_read(PFlashCFI01 *pfl, hw= addr offset, uint32_t ret; =20 p =3D pfl->storage; - switch (width) { - case 1: - ret =3D p[offset]; - break; - case 2: - if (be) { - ret =3D p[offset] << 8; - ret |=3D p[offset + 1]; - } else { - ret =3D p[offset]; - ret |=3D p[offset + 1] << 8; - } - break; - case 4: - if (be) { - ret =3D p[offset] << 24; - ret |=3D p[offset + 1] << 16; - ret |=3D p[offset + 2] << 8; - ret |=3D p[offset + 3]; - } else { - ret =3D p[offset]; - ret |=3D p[offset + 1] << 8; - ret |=3D p[offset + 2] << 16; - ret |=3D p[offset + 3] << 24; - } - break; - default: - abort(); + if (be) { + ret =3D ldn_be_p(p + offset, width); + } else { + ret =3D ldn_le_p(p + offset, width); } trace_pflash_data_read(pfl->name, offset, width, ret); return ret; @@ -408,34 +384,11 @@ static inline void pflash_data_write(PFlashCFI01 *pfl= , hwaddr offset, trace_pflash_data_write(pfl->name, offset, width, value, pfl->counter); p =3D pfl->storage + offset; =20 - switch (width) { - case 1: - p[0] =3D value; - break; - case 2: - if (be) { - p[0] =3D value >> 8; - p[1] =3D value; - } else { - p[0] =3D value; - p[1] =3D value >> 8; - } - break; - case 4: - if (be) { - p[0] =3D value >> 24; - p[1] =3D value >> 16; - p[2] =3D value >> 8; - p[3] =3D value; - } else { - p[0] =3D value; - p[1] =3D value >> 8; - p[2] =3D value >> 16; - p[3] =3D value >> 24; - } - break; + if (be) { + stn_be_p(p, width, value); + } else { + stn_le_p(p, width, value); } - } =20 static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, --=20 2.43.0