From nobody Tue Feb 10 14:32:23 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=1737106130; cv=none; d=zohomail.com; s=zohoarc; b=Jc/WFZcElyzIARfVJR1LJTA+dTxYz+oKnx/P/ShOAzinDZK/LSJHCEO1fOysql2pWtyOdQ0jVuhE/8ayMIuVh4utqcUn7LWRkggE5DYoxvqzBoio2bepi3boLX48SyhOjaV4+DJaEoHJMBEBY87EPCrI10VMdRGNXqEKIywUmn8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737106130; 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=BITrw44P4w2bvCQ1NpWsRn31RrbjunDLRRexWgq3HHQ=; b=bYHF9nPAXKrOA1yvnP/LItnxxKdgIL2edwwtXBM8nc+vIqV88QIjIZQTVlsOuPCZgNxBGP+Syb90YFgdgGwTD8usKZSlx+hhShV+XIJvooR7LvZ4gzdyNMV6XfbERRgcFurJRpA3nNMwtKmaSqMnf2iQLDQd19RLv9ju7ANrxtM= 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 1737106130714237.95563019754172; Fri, 17 Jan 2025 01:28:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYidY-0002dq-SF; Fri, 17 Jan 2025 04:27:32 -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 1tYidT-0002cC-GH for qemu-devel@nongnu.org; Fri, 17 Jan 2025 04:27:29 -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 1tYidN-0003Rc-Gi for qemu-devel@nongnu.org; Fri, 17 Jan 2025 04:27:26 -0500 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-695-lQqNfVpwOPifA77sfM9dFg-1; Fri, 17 Jan 2025 04:27:17 -0500 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-5d3d2cccbe4so1808033a12.3 for ; Fri, 17 Jan 2025 01:27:17 -0800 (PST) Received: from [192.168.10.3] ([176.206.124.70]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab384f2242bsm137373666b.118.2025.01.17.01.27.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 01:27:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737106039; 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=BITrw44P4w2bvCQ1NpWsRn31RrbjunDLRRexWgq3HHQ=; b=cBEpa6tTSr9OZLep4eBvBFSl7361A3XexiPUi8MBXAn00QaDHC/Li+Ot7Pcj1E6mfbi4YF I6RsFQFTRU5jekEEY8gbNMr7BhR2FHdokEoBQcA4dWtXgzlYSxu4Ge/E6AXDRg7//5v4TR uQFC+QkfRgkm/ucu+aq9jXuWkK/4jik= X-MC-Unique: lQqNfVpwOPifA77sfM9dFg-1 X-Mimecast-MFC-AGG-ID: lQqNfVpwOPifA77sfM9dFg X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737106035; x=1737710835; 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=BITrw44P4w2bvCQ1NpWsRn31RrbjunDLRRexWgq3HHQ=; b=PetL3lx+XdrSfYjFq3vSF9tYM/2F2DwNSR8/UvuCVLqlXkB2zZgAy8rNhqoMN9baUv JuSalQIuTB0Rw4QbaLRzOU3P9nspY6M0clhs9UC9l8KzfPEOJLaMxjLWewmmV1FRIeL4 S7E8Q9g1JiRiMS7gEUuwuB78Dg/D2loQRvgiMS/EwkAE13tYLTENduycLwJjw7H6nYVh xivLR8KECXpBmdJb6aNvU785DxeQaiHSnji6dWx8sQcRwipBNxWAj8SXcwweYW9mCHyc TL0cA+SjSfx4mlog4MMAVaDnk1YN9Ia7cQ8SKoaAdF0fERBWFsvOQHYaJciG5Sa4K2oM Sotg== X-Gm-Message-State: AOJu0YwrME5kjd9Z0rFfmJI/6paN+LDruNcPK+Pt11sGn5hcGiWVvHB9 O/9XfWObzqKW6UT9WngAa1mOJ1YEQoKHhcZ+3rJes5CziBeXB8CUilIShfnDfd8iIPky/k5MQX2 HF9Cbs3AvWrutR4APbaXgAc+V4P2arwWY/Q9mNqNZcwz9DMLNwT7ICZFoL5fd3Dv4OAjj/vUIJW 6SkRpO/z4xOBVoEsNM2s32ddUz3XWxoy/VzAfn9oo= X-Gm-Gg: ASbGncvKOWIJ9Tm7uKZV/HnC1zxrdoaQV3k4dHWePDYtPVMdNCY6fToH8V8POmA452y iSA1ekWlATsQfa5EJykuXgg0oepsR+BiVO0tUQJEC0c7zWJhEOcsQh4BnE0T8p4Q8j4fipReJ0V 5rLWeEnXN03aMkA3p/GunLP48nZvB3xds3p2Lkb5MM9oB6ADOhfq1lL654imRSA5LDZxIvA1W5p dHW8fBZdRVqzM5pdEe4hO/zeWwW9Az/vgZEFZAvbiDqCoLzIymWxA70pQce X-Received: by 2002:a17:907:d87:b0:aab:d4f0:c598 with SMTP id a640c23a62f3a-ab38b163e88mr182766466b.27.1737106035526; Fri, 17 Jan 2025 01:27:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IHM3xBiLlu1RrP/TGFxrKCGnXWRBJYhH422XRXl47H2MI/ZbKF33AxiB9YjlvutaayNsAPfgA== X-Received: by 2002:a17:907:d87:b0:aab:d4f0:c598 with SMTP id a640c23a62f3a-ab38b163e88mr182764766b.27.1737106035051; Fri, 17 Jan 2025 01:27:15 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org Subject: [PATCH 07/10] rust: pl011: wrap registers with BqlRefCell Date: Fri, 17 Jan 2025 10:26:54 +0100 Message-ID: <20250117092657.1051233-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250117092657.1051233-1-pbonzini@redhat.com> References: <20250117092657.1051233-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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.093, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 1737106132595019000 Content-Type: text/plain; charset="utf-8" This is a step towards making memory ops use a shared reference to the device type; it's not yet possible due to the calls to character device functions. Signed-off-by: Paolo Bonzini Reviewed-by: Zhao Liu --- rust/hw/char/pl011/src/device.rs | 38 +++++++++++++------------- rust/hw/char/pl011/src/device_class.rs | 8 +++--- rust/hw/char/pl011/src/memory_ops.rs | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/rust/hw/char/pl011/src/device.rs b/rust/hw/char/pl011/src/devi= ce.rs index 476abe765a9..1d3da59e481 100644 --- a/rust/hw/char/pl011/src/device.rs +++ b/rust/hw/char/pl011/src/device.rs @@ -102,14 +102,14 @@ pub struct PL011Registers { } =20 #[repr(C)] -#[derive(Debug, qemu_api_macros::Object, qemu_api_macros::offsets)] +#[derive(qemu_api_macros::Object, qemu_api_macros::offsets)] /// PL011 Device Model in QEMU pub struct PL011State { pub parent_obj: ParentField, pub iomem: MemoryRegion, #[doc(alias =3D "chr")] pub char_backend: CharBackend, - pub regs: PL011Registers, + pub regs: BqlRefCell, /// QEMU interrupts /// /// ```text @@ -530,8 +530,8 @@ fn post_init(&self) { } } =20 + #[allow(clippy::needless_pass_by_ref_mut)] pub fn read(&mut self, offset: hwaddr, _size: u32) -> ControlFlow { - let regs =3D &mut self.regs; match RegisterOffset::try_from(offset) { Err(v) if (0x3f8..0x400).contains(&(v >> 2)) =3D> { let device_id =3D self.get_class().device_id; @@ -541,7 +541,7 @@ pub fn read(&mut self, offset: hwaddr, _size: u32) -> C= ontrolFlow { // qemu_log_mask(LOG_GUEST_ERROR, "pl011_read: Bad offset = 0x%x\n", (int)offset); ControlFlow::Break(0) } - Ok(field) =3D> match regs.read(field) { + Ok(field) =3D> match self.regs.borrow_mut().read(field) { ControlFlow::Break(value) =3D> ControlFlow::Break(value.in= to()), ControlFlow::Continue(value) =3D> { self.update(); @@ -552,7 +552,7 @@ pub fn read(&mut self, offset: hwaddr, _size: u32) -> C= ontrolFlow { } =20 pub fn write(&mut self, offset: hwaddr, value: u64) { - let regs =3D &mut self.regs; + let mut regs =3D self.regs.borrow_mut(); if let Ok(field) =3D RegisterOffset::try_from(offset) { if regs.write(field, value as u32, &mut self.char_backend) { self.update(); @@ -564,19 +564,19 @@ pub fn write(&mut self, offset: hwaddr, value: u64) { =20 pub fn can_receive(&self) -> bool { // trace_pl011_can_receive(s->lcr, s->read_count, r); - let regs =3D &self.regs; + let regs =3D self.regs.borrow(); regs.read_count < regs.fifo_depth() } =20 - pub fn receive(&mut self, ch: u32) { - let regs =3D &mut self.regs; + pub fn receive(&self, ch: u32) { + let mut regs =3D self.regs.borrow_mut(); if !regs.loopback_enabled() && regs.put_fifo(ch) { self.update(); } } =20 - pub fn event(&mut self, event: QEMUChrEvent) { - let regs =3D &mut self.regs; + pub fn event(&self, event: QEMUChrEvent) { + let mut regs =3D self.regs.borrow_mut(); if event =3D=3D bindings::QEMUChrEvent::CHR_EVENT_BREAK && !regs.l= oopback_enabled() { let update =3D regs.put_fifo(registers::Data::BREAK.into()); if update { @@ -603,19 +603,19 @@ pub fn realize(&mut self) { } =20 pub fn reset(&mut self) { - self.regs.reset(); + self.regs.borrow_mut().reset(); } =20 pub fn update(&self) { - let regs =3D &self.regs; + let regs =3D self.regs.borrow(); let flags =3D regs.int_level & regs.int_enabled; for (irq, i) in self.interrupts.iter().zip(IRQMASK) { irq.set(flags & i !=3D 0); } } =20 - pub fn post_load(&mut self, _version_id: u32) -> Result<(), ()> { - self.regs.post_load() + pub fn post_load(&self, _version_id: u32) -> Result<(), ()> { + self.regs.borrow_mut().post_load() } } =20 @@ -657,10 +657,10 @@ pub fn post_load(&mut self, _version_id: u32) -> Resu= lt<(), ()> { pub unsafe extern "C" fn pl011_receive(opaque: *mut c_void, buf: *const u8= , size: c_int) { unsafe { debug_assert!(!opaque.is_null()); - let mut state =3D NonNull::new_unchecked(opaque.cast::= ()); + let state =3D NonNull::new_unchecked(opaque.cast::()); if size > 0 { debug_assert!(!buf.is_null()); - state.as_mut().receive(u32::from(buf.read_volatile())); + state.as_ref().receive(u32::from(buf.read_volatile())); } } } @@ -673,8 +673,8 @@ pub fn post_load(&mut self, _version_id: u32) -> Result= <(), ()> { pub unsafe extern "C" fn pl011_event(opaque: *mut c_void, event: QEMUChrEv= ent) { unsafe { debug_assert!(!opaque.is_null()); - let mut state =3D NonNull::new_unchecked(opaque.cast::= ()); - state.as_mut().event(event) + let state =3D NonNull::new_unchecked(opaque.cast::()); + state.as_ref().event(event) } } =20 @@ -700,7 +700,7 @@ pub fn post_load(&mut self, _version_id: u32) -> Result= <(), ()> { } =20 #[repr(C)] -#[derive(Debug, qemu_api_macros::Object)] +#[derive(qemu_api_macros::Object)] /// PL011 Luminary device model. pub struct PL011Luminary { parent_obj: ParentField, diff --git a/rust/hw/char/pl011/src/device_class.rs b/rust/hw/char/pl011/sr= c/device_class.rs index e25645ceb0d..06178778a8e 100644 --- a/rust/hw/char/pl011/src/device_class.rs +++ b/rust/hw/char/pl011/src/device_class.rs @@ -6,7 +6,7 @@ use std::os::raw::{c_int, c_void}; =20 use qemu_api::{ - bindings::*, c_str, vmstate_clock, vmstate_fields, vmstate_of, vmstate= _struct, + bindings::*, c_str, prelude::*, vmstate_clock, vmstate_fields, vmstate= _of, vmstate_struct, vmstate_subsections, vmstate_unused, zeroable::Zeroable, }; =20 @@ -35,8 +35,8 @@ extern "C" fn pl011_clock_needed(opaque: *mut c_void) -> = bool { extern "C" fn pl011_post_load(opaque: *mut c_void, version_id: c_int) -> c= _int { unsafe { debug_assert!(!opaque.is_null()); - let mut state =3D NonNull::new_unchecked(opaque.cast::= ()); - let result =3D state.as_mut().post_load(version_id as u32); + let state =3D NonNull::new_unchecked(opaque.cast::()); + let result =3D state.as_ref().post_load(version_id as u32); if result.is_err() { -1 } else { @@ -76,7 +76,7 @@ extern "C" fn pl011_post_load(opaque: *mut c_void, versio= n_id: c_int) -> c_int { post_load: Some(pl011_post_load), fields: vmstate_fields! { vmstate_unused!(core::mem::size_of::()), - vmstate_struct!(PL011State, regs, &VMSTATE_PL011_REGS, PL011Regist= ers), + vmstate_struct!(PL011State, regs, &VMSTATE_PL011_REGS, BqlRefCell<= PL011Registers>), }, subsections: vmstate_subsections! { VMSTATE_PL011_CLOCK diff --git a/rust/hw/char/pl011/src/memory_ops.rs b/rust/hw/char/pl011/src/= memory_ops.rs index c4e8599ba43..8f66c8d492c 100644 --- a/rust/hw/char/pl011/src/memory_ops.rs +++ b/rust/hw/char/pl011/src/memory_ops.rs @@ -26,7 +26,7 @@ unsafe extern "C" fn pl011_read(opaque: *mut c_void, addr: hwaddr, size: c= _uint) -> u64 { assert!(!opaque.is_null()); let mut state =3D unsafe { NonNull::new_unchecked(opaque.cast::()) }; - let val =3D unsafe { state.as_mut().read(addr, size) }; + let val =3D unsafe { state.as_mut() }.read(addr, size); match val { std::ops::ControlFlow::Break(val) =3D> val, std::ops::ControlFlow::Continue(val) =3D> { --=20 2.47.1