From nobody Mon Feb 9 19:37:34 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=1737712350; cv=none; d=zohomail.com; s=zohoarc; b=KeRb6wLIYkSyHC/12SGkvV4mS3z2iInS7QbgfaJ9tl+CJWOEftl+WMhHtx6wOZV962QRRpyVpQXUiDAtwpgMrfqjosVMu7ca/9F0bg39yplw5IP+IJ+vEuZf24X4qU5LABunrOUAlKTjsd0fISRVNQPn11kNILNNeHPsuRDcGAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737712350; h=Content-Transfer-Encoding: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:Cc; bh=LnYPmmzbHtO9VYxLsF7WeRrLBt7TIDcweZucQbIAULs=; b=RCaJf95YyD6Vf8BjroQQ7+G/hIlvmHDUFJ06TE9M/G3xiE4gCnEa5D43igEnKR4RdN9jTHBbQhFA5/G/vrruwHaYjMR5cMWP32GzTkV84kgPuD7QyzwVx4raSjsfvZCL3+8OVJW5K3TOaahtEg1qFBapV89mKkba9T45I/rXN/E= 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 1737712350990187.3198150330561; Fri, 24 Jan 2025 01:52:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tbGHv-0003ii-GS; Fri, 24 Jan 2025 04:47:43 -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 1tbGGT-0007rL-6G for qemu-devel@nongnu.org; Fri, 24 Jan 2025 04:46:22 -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 1tbGGQ-0003zZ-Fs for qemu-devel@nongnu.org; Fri, 24 Jan 2025 04:46:12 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-593-aQMRFyNBPOWxMDhjRNLCnA-1; Fri, 24 Jan 2025 04:46:08 -0500 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-436225d4389so14625265e9.1 for ; Fri, 24 Jan 2025 01:46:07 -0800 (PST) Received: from [192.168.10.48] ([151.95.59.125]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438bd4b9990sm20855065e9.29.2025.01.24.01.46.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 01:46:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737711969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LnYPmmzbHtO9VYxLsF7WeRrLBt7TIDcweZucQbIAULs=; b=bcpQ9EBOhXBq7pT0Nn4/Di/gdwxx/QAZmUGOvDRxBpHL0QEUxTgoUVgDL0n1+17r8dIpik e84PubB7gxwxMQbWKIXjOkibVxnroFUNFlIiBum6z+iLxSo5JuvVyIlFeXZvBMMT+AU4z6 OcQZmPoypXIMY8z1WqzcR9779PMmhG4= X-MC-Unique: aQMRFyNBPOWxMDhjRNLCnA-1 X-Mimecast-MFC-AGG-ID: aQMRFyNBPOWxMDhjRNLCnA X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737711966; x=1738316766; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LnYPmmzbHtO9VYxLsF7WeRrLBt7TIDcweZucQbIAULs=; b=Xy83KKrg2K+fvQh+swHWx6lyVtOMsBzFd4LgPE1dYvebFSoY8r23bjlxLnLeP5kPd9 RJM0xDcSAKyHoKwxMF/f9heumD2USeuXCoiz/gpd2XBl6rSoxNunhJX/HXnKL4x2Gwq2 X+CHrnqXGd8w4A/ze4LimJQ4hkq8z3c0DHCgCHQj3b5AMCQnnTkqbm8vcSOSzCPDG0UZ POgEscQIq1DyzmsRZHLmjxnmjpDOHKEsPJkGWElRXDl2SGDsGyQbtm6jj9w83RqFp5vR M2Ej1HpQch8fZC4ci+/evmBRjHYpJQZPFbMUjnvkfW0oj+pf8Bv0ZCqF3sMGHJvFUJFv qEpw== X-Gm-Message-State: AOJu0Yw7IYz1CyghzM0y2H+ZJeEy14bNOW9u7jy4DQ4WNUy4UZZlBInq jYP5GGMOwRNBcAiQjzpfxAPzYalLC4odMQ3FGHZr+aEZJUPk76LUtoiseH/bSgg59QX34IM79rs 70a/cB1g0uW03F7ZMWdiUo8VoJtD6BQ60fXtfeQNRJDkHvWHUSNYrIA8mFl8Rd1nIX/cmE2l9zB BqOkGEpYaLnWorzV5+k+y0nYBlkCZEgcMde+Wd4x4= X-Gm-Gg: ASbGncs8f9EoRWpil+uX4iVVsNq5IhWkklt0gjQA/V5oWMB/aWb4jeB+HEUwacf2Ugk YrXQI+kgIV47NaIxyClVsAfjNSpSSlu3d57vDXG/XEwx6E1O4Ns5t2GrE95EsV5RA2pH3RBOT+Q 6kDB7lPU6ZK2tEkXgpRm89/vACg36gluQgUq8nUtceg0WsnUZjPjFhu19V8rPGIlcNi9imeugLE XKS2ezqtrcGy9pwC9cao9MUa4rBW6TL0Uhm5au7hsn/7fw+MileL26m0FaD4Sy5uGOH8EOXyg== X-Received: by 2002:a05:600c:58c9:b0:436:e3ea:64dd with SMTP id 5b1f17b1804b1-438bd0a88dbmr22948015e9.11.1737711966482; Fri, 24 Jan 2025 01:46:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IHXene5jhJddv0rJmibbIevqjM3Q7qVX6fnc4nuI5ZR4uq6NX3kd8xFBwOws2RK1dhn7pKf5Q== X-Received: by 2002:a05:600c:58c9:b0:436:e3ea:64dd with SMTP id 5b1f17b1804b1-438bd0a88dbmr22947645e9.11.1737711965962; Fri, 24 Jan 2025 01:46:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 42/48] rust: pl011: wrap registers with BqlRefCell Date: Fri, 24 Jan 2025 10:44:36 +0100 Message-ID: <20250124094442.13207-43-pbonzini@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250124094442.13207-1-pbonzini@redhat.com> References: <20250124094442.13207-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: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.996, 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=ham 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: 1737712352955019000 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. Reviewed-by: Zhao Liu Signed-off-by: Paolo Bonzini --- rust/hw/char/pl011/src/device.rs | 40 ++++++++++++++------------ rust/hw/char/pl011/src/device_class.rs | 8 +++--- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/rust/hw/char/pl011/src/device.rs b/rust/hw/char/pl011/src/devi= ce.rs index f1319d1a8bd..4fd9bdc8584 100644 --- a/rust/hw/char/pl011/src/device.rs +++ b/rust/hw/char/pl011/src/device.rs @@ -109,14 +109,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 @@ -538,6 +538,7 @@ fn post_init(&self) { } } =20 + #[allow(clippy::needless_pass_by_ref_mut)] pub fn read(&mut self, offset: hwaddr, _size: u32) -> ControlFlow { let mut update_irq =3D false; let result =3D match RegisterOffset::try_from(offset) { @@ -549,7 +550,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 self.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> { update_irq =3D true; @@ -566,7 +567,10 @@ pub fn read(&mut self, offset: hwaddr, _size: u32) -> = ControlFlow { pub fn write(&mut self, offset: hwaddr, value: u64) { let mut update_irq =3D false; if let Ok(field) =3D RegisterOffset::try_from(offset) { - update_irq =3D self.regs.write(field, value as u32, &mut self.= char_backend); + update_irq =3D self + .regs + .borrow_mut() + .write(field, value as u32, &mut self.char_backend); } else { eprintln!("write bad offset {offset} value {value}"); } @@ -577,21 +581,21 @@ 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(); let update_irq =3D !regs.loopback_enabled() && regs.put_fifo(ch); if update_irq { self.update(); } } =20 - pub fn event(&mut self, event: QEMUChrEvent) { + pub fn event(&self, event: QEMUChrEvent) { let mut update_irq =3D false; - let regs =3D &mut self.regs; + let mut regs =3D self.regs.borrow_mut(); if event =3D=3D QEMUChrEvent::CHR_EVENT_BREAK && !regs.loopback_en= abled() { update_irq =3D regs.put_fifo(registers::Data::BREAK.into()); } @@ -618,19 +622,19 @@ pub fn realize(&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 @@ -667,11 +671,11 @@ pub fn post_load(&mut self, _version_id: u32) -> Resu= lt<(), ()> { /// /// The buffer and size arguments must also be valid. pub unsafe extern "C" fn pl011_receive(opaque: *mut c_void, buf: *const u8= , size: c_int) { - let mut state =3D NonNull::new(opaque).unwrap().cast::(); + let state =3D NonNull::new(opaque).unwrap().cast::(); unsafe { 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())); } } } @@ -682,8 +686,8 @@ pub fn post_load(&mut self, _version_id: u32) -> Result= <(), ()> { /// the same size as [`PL011State`]. We also expect the device is /// readable/writeable from one thread at any time. pub unsafe extern "C" fn pl011_event(opaque: *mut c_void, event: QEMUChrEv= ent) { - let mut state =3D NonNull::new(opaque).unwrap().cast::(); - unsafe { state.as_mut().event(event) } + let state =3D NonNull::new(opaque).unwrap().cast::(); + unsafe { state.as_ref().event(event) } } =20 /// # Safety @@ -708,7 +712,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 d94b98de7bb..8a157a663fb 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 @@ -31,8 +31,8 @@ extern "C" fn pl011_clock_needed(opaque: *mut c_void) -> = bool { }; =20 extern "C" fn pl011_post_load(opaque: *mut c_void, version_id: c_int) -> c= _int { - let mut state =3D NonNull::new(opaque).unwrap().cast::(); - let result =3D unsafe { state.as_mut().post_load(version_id as u32) }; + let state =3D NonNull::new(opaque).unwrap().cast::(); + let result =3D unsafe { state.as_ref().post_load(version_id as u32) }; if result.is_err() { -1 } else { @@ -71,7 +71,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 --=20 2.48.1