From nobody Tue Feb 10 02:00:52 2026 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=1734024242; cv=none; d=zohomail.com; s=zohoarc; b=S8yPoMISzTRN3V1j5dQ0eL3BIlKZsTIqUOke2xqUHW1SoXqM1Pl7VUXGrU4oNCW3EkE9T2T45KX9ItE8Df4q4IecCK8sVoFAz9wJnMpMjUzoKN3uC60iDibBu3RZ08XFs3xE1QYmAV5eCJHLpKFFxl/f7AGkxUlV3N3aSLzkkbI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1734024242; h=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=QK+lsN9N8GKnH3zKNE8BJxFeo8zX1mw/5X/o/AQc7oc=; b=OugovwRQULdrQplMehSc2SsKwYEATpq4B3Yx8AUd4DwBd4XYl9IZ5v5CZcR7qGKQWqlwZ+B4n3cn/8zWV5usroFobybW7e9iXeYCHsBrplqaAzHA65TqhJS2ElQoKPpyKJnr/8HnKGVKVrTf5ls66/EvA0luuF1/u+888uCDuBc= 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 1734024242731211.1379892448474; Thu, 12 Dec 2024 09:24:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLmtV-0006oe-BR; Thu, 12 Dec 2024 12:22:33 -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 1tLmtT-0006nY-Cm for qemu-devel@nongnu.org; Thu, 12 Dec 2024 12:22:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tLmtP-0006nj-EQ for qemu-devel@nongnu.org; Thu, 12 Dec 2024 12:22:29 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-453-EeNdB360PNWx2advWsDeVg-1; Thu, 12 Dec 2024 12:22:24 -0500 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-436228ebc5eso5427615e9.3 for ; Thu, 12 Dec 2024 09:22:24 -0800 (PST) Received: from [192.168.10.47] ([151.81.118.45]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4361ec88993sm27906505e9.2.2024.12.12.09.22.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Dec 2024 09:22:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734024145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QK+lsN9N8GKnH3zKNE8BJxFeo8zX1mw/5X/o/AQc7oc=; b=ITykdqR+wQXU+/WCOYxrKz8bvObcVYXU4yw9qzfYV7aegXiKtKc89Tlsf3RLNQoJCGE6Fg j8+Pyt7jZVSInux/3UwTVotRUArFaT8+atM0Z1SqWCOVjZYdMWl9cjYTYnN548Idz+9PTm pgb+gS0p8VmwKLqH5XLTn2+6F1sNPyk= X-MC-Unique: EeNdB360PNWx2advWsDeVg-1 X-Mimecast-MFC-AGG-ID: EeNdB360PNWx2advWsDeVg X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734024142; x=1734628942; 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=QK+lsN9N8GKnH3zKNE8BJxFeo8zX1mw/5X/o/AQc7oc=; b=qU1FGsXdPdHkTaM9hvImaVh+niXOQoxm/YUe2yvD96An0mBy6AteO63C3Va+vFdvOB EXbkLR4iUynswQ4eJvsHq6PMJXMvJA6vdZJFGGZxHH1KoOmLEPW7h3xP0uv1OV4dLv5C aE/9zC7QZKqAiByv0+DyduFqt4vJ7K55CszyaeVThU/r2rYqEX/hBqn8bMGmyMAYOymm md5u4Fh9m5AdrwOHGnjfzl1/McKs5tn684fovaHrc6EVNQ71C8FZGI+qkFItu4sm8yND OJARnVq5dWhDUu1aU/GfuHBnD3/snBSw2Qev6H9Jk7ZrZp/nwNx1xeH6+4B0On9LyNSM K7kw== X-Gm-Message-State: AOJu0YzNIBcG4nuCUrT6WViMfgP17o1b59v4Ym0euDGL8sNeSGrWaq5f MQNB3w4kjScleU07SAATY9+Th3CZ/FP20ysIq2pLbc0sMYC5pPFo9N6I9HG6em626cvF3yHrTSH 1P9C6SjuIKt67QOOxkrZzWbZvMiCmwEsjeiSp4eozYSu/CsF774BLVYCEiZFsIIHEgZivIF4osV lPxbf439TNx55WnLIKzRICnOiTww4M7f5klJGW X-Gm-Gg: ASbGnctn6PmsDCBXd2gHpLoqoa3WNnfU4SCHh2w4CQMQ7kKWs3QJ5vNby1epCgzy/8M 5fQs7jM5cA0o77hwFGvnoSeK4bG+mkbe/AbQXvaG68uqofIgRGfAYS5WYbfthLtPuyX/5IltjJ9 2/kzjJMfAshdrQ395dpvEap5d3675ynb083HlLtFD8lPB/Ps36JO72yOc6kvcnNR5PyGoNh4D24 XeSemWxHuuAb9NhHhZdKq89MvUuPxtqiNVe4mSZfuMiZomFdp7i/T9jH4P5 X-Received: by 2002:a05:600c:4f86:b0:434:9e46:5bc with SMTP id 5b1f17b1804b1-4361c35cf0amr77607425e9.10.1734024140836; Thu, 12 Dec 2024 09:22:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IGOALJOSWPkWDyRLWHIqDFZoBkOeAohS1YxP/+7qkyhP9o/3cIaJKip1GqeHKcue6wF83J6kg== X-Received: by 2002:a05:600c:4f86:b0:434:9e46:5bc with SMTP id 5b1f17b1804b1-4361c35cf0amr77605895e9.10.1734024138930; Thu, 12 Dec 2024 09:22:18 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org, qemu-rust@nongnu.org Subject: [PATCH 3/7] rust: pl011: always use reset() method on registers Date: Thu, 12 Dec 2024 18:22:00 +0100 Message-ID: <20241212172209.533779-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212172209.533779-1-pbonzini@redhat.com> References: <20241212172209.533779-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.496, 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_H2=-0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1734024244741116600 Content-Type: text/plain; charset="utf-8" For CR, the ugly-ish "0.into()" idiom is already hidden within the Default trait. Do not repeat it. For FR, standardize on reset() being equivalent to "*self =3D Self::default= ()" and let reset_fifo toggle only the bits that are related to FIFOs. This commit also reproduces C commit 02b1f7f6192 ("hw/char/pl011: Split RX/TX path of pl011_reset_fifo()", 2024-09-13). Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Zhao Liu --- rust/hw/char/pl011/src/device.rs | 23 ++++++++++++++++------- rust/hw/char/pl011/src/lib.rs | 13 +++++-------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/rust/hw/char/pl011/src/device.rs b/rust/hw/char/pl011/src/devi= ce.rs index c6a8dbe1af4..eb15e9d5788 100644 --- a/rust/hw/char/pl011/src/device.rs +++ b/rust/hw/char/pl011/src/device.rs @@ -267,7 +267,7 @@ pub fn write(&mut self, offset: hwaddr, value: u64) { self.update(); } Ok(RSR) =3D> { - self.receive_status_error_clear =3D 0.into(); + self.receive_status_error_clear.reset(); } Ok(FR) =3D> { // flag writes are ignored @@ -288,7 +288,8 @@ pub fn write(&mut self, offset: hwaddr, value: u64) { if bool::from(self.line_control.fifos_enabled()) ^ bool::from(new_val.fifos_enabled()) { - self.reset_fifo(); + self.reset_rx_fifo(); + self.reset_tx_fifo(); } if self.line_control.send_break() ^ new_val.send_break() { let mut break_enable: c_int =3D new_val.send_break().i= nto(); @@ -447,16 +448,24 @@ pub fn reset(&mut self) { self.read_trigger =3D 1; self.ifl =3D 0x12; self.control.reset(); - self.flags =3D 0.into(); - self.reset_fifo(); + self.flags.reset(); + self.reset_rx_fifo(); + self.reset_tx_fifo(); } =20 - pub fn reset_fifo(&mut self) { + pub fn reset_rx_fifo(&mut self) { self.read_count =3D 0; self.read_pos =3D 0; =20 - /* Reset FIFO flags */ - self.flags.reset(); + // Reset FIFO flags + self.flags.set_receive_fifo_full(false); + self.flags.set_receive_fifo_empty(true); + } + + pub fn reset_tx_fifo(&mut self) { + // Reset FIFO flags + self.flags.set_transmit_fifo_full(false); + self.flags.set_transmit_fifo_empty(true); } =20 pub fn can_receive(&self) -> bool { diff --git a/rust/hw/char/pl011/src/lib.rs b/rust/hw/char/pl011/src/lib.rs index d5089f78854..e3eacb0e6b9 100644 --- a/rust/hw/char/pl011/src/lib.rs +++ b/rust/hw/char/pl011/src/lib.rs @@ -230,7 +230,7 @@ pub struct ReceiveStatusErrorClear { impl ReceiveStatusErrorClear { pub fn reset(&mut self) { // All the bits are cleared to 0 on reset. - *self =3D 0.into(); + *self =3D Self::default(); } } =20 @@ -297,19 +297,16 @@ pub struct Flags { =20 impl Flags { pub fn reset(&mut self) { - // After reset TXFF, RXFF, and BUSY are 0, and TXFE and RXFE a= re 1 - self.set_receive_fifo_full(false); - self.set_transmit_fifo_full(false); - self.set_busy(false); - self.set_receive_fifo_empty(true); - self.set_transmit_fifo_empty(true); + *self =3D Self::default(); } } =20 impl Default for Flags { fn default() -> Self { let mut ret: Self =3D 0.into(); - ret.reset(); + // After reset TXFF, RXFF, and BUSY are 0, and TXFE and RXFE a= re 1 + ret.set_receive_fifo_empty(true); + ret.set_transmit_fifo_empty(true); ret } } --=20 2.47.1