From nobody Mon Feb 9 10:53:00 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=1741516531; cv=none; d=zohomail.com; s=zohoarc; b=XphYY1i55NyTAMql7YCDQt/9rC4fntVF98SoYaCml8alfx21+68AX6LIpMZ6nu0U1iv4169jhTMA1ndvAUYEG9P64z7X3fpCJEUJ+8iZAoGXYJmKwHzWIQUUP4/FEo4i+gZQw4P/JOzWWrWu2nukUAfXCUkxriSuBCtdJxJrem4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741516531; 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=F9+Wxi/x9MmY8CxDvN4TGCD/sbZnRsQl3OJcT3nCjd8=; b=ZC+cOd1DjoTU0uasosINgXmw19CVWG0lPtLQpBdN5XLQNHTHpavgRSdJeEjbaxP45CC1nLTHYrHbSdJ9lUB+YHUfFgY7RAX6FUimdAmfgJugUMHb2eGjzoMkKNiR9kBBpKaYtkygA3I/2f1F6C+jCn1DGeu8U51RZljdHBw1VHs= 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 174151653198153.252678574579136; Sun, 9 Mar 2025 03:35:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trDxL-0000Nm-4q; Sun, 09 Mar 2025 06:32:27 -0400 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 1trDx6-0008Pg-Ue for qemu-devel@nongnu.org; Sun, 09 Mar 2025 06:32:13 -0400 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 1trDx4-00045C-9q for qemu-devel@nongnu.org; Sun, 09 Mar 2025 06:32:12 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-474-gfPkjX1xMVWBuKYSwk_l7w-1; Sun, 09 Mar 2025 06:32:07 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-39137e17c50so605007f8f.3 for ; Sun, 09 Mar 2025 03:32:07 -0700 (PDT) Received: from [192.168.10.48] ([176.206.122.167]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfba8b6sm11719579f8f.11.2025.03.09.03.32.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 03:32:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741516329; 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=F9+Wxi/x9MmY8CxDvN4TGCD/sbZnRsQl3OJcT3nCjd8=; b=XXfa0/VbwBc1FVUwuYYFCYZ5zyeV3x7jAwnnGlOIZLC3shTMUTsg2wLO+J5L4ZSyjd9goa VZejAebby0Ii8Yd4EnIgnA0dk7U1V/x4xaEyA+ORyybv6uh9IHP9cmg70cJExWuZCjmTRb kAMiR+jr6KC7tsqSqPTkQrF90jo/h+A= X-MC-Unique: gfPkjX1xMVWBuKYSwk_l7w-1 X-Mimecast-MFC-AGG-ID: gfPkjX1xMVWBuKYSwk_l7w_1741516326 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741516326; x=1742121126; 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=F9+Wxi/x9MmY8CxDvN4TGCD/sbZnRsQl3OJcT3nCjd8=; b=Kg7iNrRijkq0c7m0nlOcrG27sxyejfuPn3is8gETXabnQVgAFxVbnsW8FlKUoFYHmq yhKfeF5SmXnCOZe01JIb+Rte0FgzHdFlHKMbSKB+3dXwavWAdj5SGRwPDUp0YLw9rcZZ CztGNtCSNLI/Mla/SiSklwlqVXLSLnMiv5dZOh6spnX1buMATYJBDxoEQc1sM4aWPMft 7Jf6fG+g2QaChtmLP8KlzpVWvgepkDMnuHInau205NL1GzWozn3ssnho17zxhgedtbIT YEyBp2OlLUlW/Rgzj0a401dgCBEPwvg3lK1urVoeuSe7+QW+C1SoyoX/TS5riRa+LzhH INEg== X-Gm-Message-State: AOJu0Yzrtx3M73Q8ctASlJWS8EAP5gh6+XdGHcCDNRnw3LKe92ZjBlW8 TOPvKJY/cBd8t1e4VK20diWLzuyzNaCmjGYklD3/q0mcekN2hpcOb3x+4tG8ocbYkO4jROa7w0F UHl6XZe7DB7jzP7i1Wu9czARzHfQMovjn7Xylw0q85asleFMpglZl6hKJGWSs6D/ENLi/3HYGz+ /QIBhBtRSw3ycUesrpUT6Ed7h3raA77aBxp8Yhzas= X-Gm-Gg: ASbGncswivTsAASjf092pm2q9SKm1ayrXUTyamWjxVY9+9PH5YyodmmakkZylo/7BFn 82/2XlfXDPcZOQcPgSi4GR1Yuji0a8uixcNc+Xp/FrzlgaMEpa3vHikOnPaUpBxMabMSgr7nAXK sRDDByeP0YJKbhZcHlz0m0utRKJy77XnrZOvasEcAExqLlyq7Ffwg2IuqRvVr8AkAsA+TfIAqvQ LyCoU1A41lkry/O3v4SNGhIKr6BFhLGwiaDetL1UC/APGxwBirf4jsIhZU+DbduTUIIoc+VYI70 Oi0TU2g1tR2KOEH8q6n0CA== X-Received: by 2002:a05:6000:1867:b0:390:fbcf:56be with SMTP id ffacd0b85a97d-39132b63fb8mr6368084f8f.0.1741516325793; Sun, 09 Mar 2025 03:32:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpN1Ruxltms+1KzxliH3CaLjBWBxi39ybCTDvELTRt1q9o/aSDzhIxQGr3tZDGfScuNsbSzw== X-Received: by 2002:a05:6000:1867:b0:390:fbcf:56be with SMTP id ffacd0b85a97d-39132b63fb8mr6368067f8f.0.1741516325262; Sun, 09 Mar 2025 03:32:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 21/25] rust: hpet: decode HPET registers into enums Date: Sun, 9 Mar 2025 11:31:15 +0100 Message-ID: <20250309103120.1116448-22-pbonzini@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250309103120.1116448-1-pbonzini@redhat.com> References: <20250309103120.1116448-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.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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=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: 1741516535221019100 Content-Type: text/plain; charset="utf-8" Generalize timer_and_addr() to decode all registers into a single enum HPETRegister, and use the TryInto derive to separate valid and invalid values. The main advantage lies in checking that all registers are enumerated in the "match" statements. Signed-off-by: Paolo Bonzini --- rust/Cargo.toml | 2 + rust/hw/char/pl011/src/lib.rs | 2 - rust/hw/timer/hpet/src/hpet.rs | 222 +++++++++++++++++---------------- 3 files changed, 119 insertions(+), 107 deletions(-) diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 5041d6291fd..ab1185a8143 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -37,6 +37,8 @@ result_unit_err =3D "allow" should_implement_trait =3D "deny" # can be for a reason, e.g. in callbacks unused_self =3D "allow" +# common in device crates +upper_case_acronyms =3D "allow" =20 # default-allow lints as_ptr_cast_mut =3D "deny" diff --git a/rust/hw/char/pl011/src/lib.rs b/rust/hw/char/pl011/src/lib.rs index 45c13ba899e..dbae76991c9 100644 --- a/rust/hw/char/pl011/src/lib.rs +++ b/rust/hw/char/pl011/src/lib.rs @@ -12,8 +12,6 @@ //! See [`PL011State`](crate::device::PL011State) for the device model typ= e and //! the [`registers`] module for register types. =20 -#![allow(clippy::upper_case_acronyms)] - use qemu_api::c_str; =20 mod device; diff --git a/rust/hw/timer/hpet/src/hpet.rs b/rust/hw/timer/hpet/src/hpet.rs index d989360ede8..20e0afdfca8 100644 --- a/rust/hw/timer/hpet/src/hpet.rs +++ b/rust/hw/timer/hpet/src/hpet.rs @@ -48,8 +48,6 @@ const HPET_CLK_PERIOD: u64 =3D 10; // 10 ns const FS_PER_NS: u64 =3D 1000000; // 1000000 femtoseconds =3D=3D 1 ns =20 -/// General Capabilities and ID Register -const HPET_CAP_REG: u64 =3D 0x000; /// Revision ID (bits 0:7). Revision 1 is implemented (refer to v1.0a spec= ). const HPET_CAP_REV_ID_VALUE: u64 =3D 0x1; const HPET_CAP_REV_ID_SHIFT: usize =3D 0; @@ -65,8 +63,6 @@ /// Main Counter Tick Period (bits 32:63) const HPET_CAP_CNT_CLK_PERIOD_SHIFT: usize =3D 32; =20 -/// General Configuration Register -const HPET_CFG_REG: u64 =3D 0x010; /// Overall Enable (bit 0) const HPET_CFG_ENABLE_SHIFT: usize =3D 0; /// Legacy Replacement Route (bit 1) @@ -74,14 +70,6 @@ /// Other bits are reserved. const HPET_CFG_WRITE_MASK: u64 =3D 0x003; =20 -/// General Interrupt Status Register -const HPET_INT_STATUS_REG: u64 =3D 0x020; - -/// Main Counter Value Register -const HPET_COUNTER_REG: u64 =3D 0x0f0; - -/// Timer N Configuration and Capability Register (masked by 0x18) -const HPET_TN_CFG_REG: u64 =3D 0x000; /// bit 0, 7, and bits 16:31 are reserved. /// bit 4, 5, 15, and bits 32:64 are read-only. const HPET_TN_CFG_WRITE_MASK: u64 =3D 0x7f4e; @@ -109,11 +97,51 @@ /// Timer N Interrupt Routing Capability (bits 32:63) const HPET_TN_CFG_INT_ROUTE_CAP_SHIFT: usize =3D 32; =20 -/// Timer N Comparator Value Register (masked by 0x18) -const HPET_TN_CMP_REG: u64 =3D 0x008; +#[derive(qemu_api_macros::TryInto)] +#[repr(u64)] +#[allow(non_camel_case_types)] +/// Timer registers, masked by 0x18 +enum TimerRegister { + /// Timer N Configuration and Capability Register + CFG =3D 0, + /// Timer N Comparator Value Register + CMP =3D 8, + /// Timer N FSB Interrupt Route Register + ROUTE =3D 16, +} =20 -/// Timer N FSB Interrupt Route Register (masked by 0x18) -const HPET_TN_FSB_ROUTE_REG: u64 =3D 0x010; +#[derive(qemu_api_macros::TryInto)] +#[repr(u64)] +#[allow(non_camel_case_types)] +/// Global registers +enum GlobalRegister { + /// General Capabilities and ID Register + CAP =3D 0, + /// General Configuration Register + CFG =3D 0x10, + /// General Interrupt Status Register + INT_STATUS =3D 0x20, + /// Main Counter Value Register + COUNTER =3D 0xF0, +} + +enum HPETRegister<'a> { + /// Global register in the range from `0` to `0xff` + Global(GlobalRegister), + + /// Register in the timer block `0x100`...`0x3ff` + Timer(&'a BqlRefCell, TimerRegister), + + /// Invalid address + #[allow(dead_code)] + Unknown(hwaddr), +} + +struct HPETAddrDecode<'a> { + shift: u32, + len: u32, + reg: HPETRegister<'a>, +} =20 const fn hpet_next_wrap(cur_tick: u64) -> u64 { (cur_tick | 0xffffffff) + 1 @@ -471,33 +499,21 @@ fn callback(&mut self) { self.update_irq(true); } =20 - const fn read(&self, addr: hwaddr, _size: u32) -> u64 { - let shift: u64 =3D (addr & 4) * 8; - - match addr & !4 { - HPET_TN_CFG_REG =3D> self.config >> shift, // including interr= upt capabilities - HPET_TN_CMP_REG =3D> self.cmp >> shift, // comparator regis= ter - HPET_TN_FSB_ROUTE_REG =3D> self.fsb >> shift, - _ =3D> { - // TODO: Add trace point - trace_hpet_ram_read_invalid() - // Reserved. - 0 - } + const fn read(&self, reg: TimerRegister) -> u64 { + use TimerRegister::*; + match reg { + CFG =3D> self.config, // including interrupt capabilities + CMP =3D> self.cmp, // comparator register + ROUTE =3D> self.fsb, } } =20 - fn write(&mut self, addr: hwaddr, value: u64, size: u32) { - let shift =3D ((addr & 4) * 8) as u32; - let len =3D std::cmp::min(size * 8, 64 - shift); - - match addr & !4 { - HPET_TN_CFG_REG =3D> self.set_tn_cfg_reg(shift, len, value), - HPET_TN_CMP_REG =3D> self.set_tn_cmp_reg(shift, len, value), - HPET_TN_FSB_ROUTE_REG =3D> self.set_tn_fsb_route_reg(shift, le= n, value), - _ =3D> { - // TODO: Add trace point - trace_hpet_ram_write_invalid() - // Reserved. - } + fn write(&mut self, reg: TimerRegister, value: u64, shift: u32, len: u= 32) { + use TimerRegister::*; + match reg { + CFG =3D> self.set_tn_cfg_reg(shift, len, value), + CMP =3D> self.set_tn_cmp_reg(shift, len, value), + ROUTE =3D> self.set_tn_fsb_route_reg(shift, len, value), } } } @@ -749,77 +765,73 @@ fn reset_hold(&self, _type: ResetType) { self.rtc_irq_level.set(0); } =20 - fn timer_and_addr(&self, addr: hwaddr) -> Option<(&BqlRefCell, hwaddr)> { - let timer_id: usize =3D ((addr - 0x100) / 0x20) as usize; - - // TODO: Add trace point - trace_hpet_ram_[read|write]_timer_id(ti= mer_id) - if timer_id > self.num_timers.get() { - // TODO: Add trace point - trace_hpet_timer_id_out_of_range(t= imer_id) - None - } else { - // Keep the complete address so that HPETTimer's read and writ= e could - // detect the invalid access. - Some((&self.timers[timer_id], addr & 0x1F)) - } - } - - fn read(&self, addr: hwaddr, size: u32) -> u64 { - let shift: u64 =3D (addr & 4) * 8; - - // address range of all TN regs - // TODO: Add trace point - trace_hpet_ram_read(addr) - if (0x100..=3D0x3ff).contains(&addr) { - match self.timer_and_addr(addr) { - None =3D> 0, // Reserved, - Some((timer, tn_addr)) =3D> timer.borrow_mut().read(tn_add= r, size), - } - } else { - match addr & !4 { - HPET_CAP_REG =3D> self.capability.get() >> shift, /* inclu= ding HPET_PERIOD 0x004 */ - // (CNT_CLK_PERIOD field) - HPET_CFG_REG =3D> self.config.get() >> shift, - HPET_COUNTER_REG =3D> { - let cur_tick: u64 =3D if self.is_hpet_enabled() { - self.get_ticks() - } else { - self.counter.get() - }; - - // TODO: Add trace point - trace_hpet_ram_read_reading= _counter(addr & 4, - // cur_tick) - cur_tick >> shift - } - HPET_INT_STATUS_REG =3D> self.int_status.get() >> shift, - _ =3D> { - // TODO: Add trace point- trace_hpet_ram_read_invalid() - // Reserved. - 0 - } - } - } - } - - fn write(&self, addr: hwaddr, value: u64, size: u32) { + fn decode(&self, mut addr: hwaddr, size: u32) -> HPETAddrDecode { let shift =3D ((addr & 4) * 8) as u32; let len =3D std::cmp::min(size * 8, 64 - shift); =20 - // TODO: Add trace point - trace_hpet_ram_write(addr, value) - if (0x100..=3D0x3ff).contains(&addr) { - match self.timer_and_addr(addr) { - None =3D> (), // Reserved. - Some((timer, tn_addr)) =3D> timer.borrow_mut().write(tn_ad= dr, value, size), - } + addr &=3D !4; + let reg =3D if (0..=3D0xff).contains(&addr) { + GlobalRegister::try_from(addr).map(HPETRegister::Global) } else { - match addr & !0x4 { - HPET_CAP_REG =3D> {} // General Capabilities and ID Regist= er: Read Only - HPET_CFG_REG =3D> self.set_cfg_reg(shift, len, value), - HPET_INT_STATUS_REG =3D> self.set_int_status_reg(shift, le= n, value), - HPET_COUNTER_REG =3D> self.set_counter_reg(shift, len, val= ue), - _ =3D> { - // TODO: Add trace point - trace_hpet_ram_write_invali= d() - // Reserved. + let timer_id: usize =3D ((addr - 0x100) / 0x20) as usize; + if timer_id <=3D self.num_timers.get() { + // TODO: Add trace point - trace_hpet_ram_[read|write]_tim= er_id(timer_id) + TimerRegister::try_from(addr) + .map(|reg| HPETRegister::Timer(&self.timers[timer_id],= reg)) + } else { + // TODO: Add trace point - trace_hpet_timer_id_out_of_ran= ge(timer_id) + Err(addr) + } + }; + + // reg is now a Result + // convert the Err case into HPETRegister as well + let reg =3D reg.unwrap_or_else(HPETRegister::Unknown); + HPETAddrDecode { shift, len, reg } + } + + fn read(&self, addr: hwaddr, size: u32) -> u64 { + // TODO: Add trace point - trace_hpet_ram_read(addr) + let HPETAddrDecode { shift, reg, .. } =3D self.decode(addr, size); + + use GlobalRegister::*; + use HPETRegister::*; + (match reg { + Timer(timer, tn_reg) =3D> timer.borrow_mut().read(tn_reg), + Global(CAP) =3D> self.capability.get(), /* including HPET_PERI= OD 0x004 */ + Global(CFG) =3D> self.config.get(), + Global(INT_STATUS) =3D> self.int_status.get(), + Global(COUNTER) =3D> { + // TODO: Add trace point + // trace_hpet_ram_read_reading_counter(addr & 4, cur_tick) + if self.is_hpet_enabled() { + self.get_ticks() + } else { + self.counter.get() } } + Unknown(_) =3D> { + // TODO: Add trace point- trace_hpet_ram_read_invalid() + 0 + } + }) >> shift + } + + fn write(&self, addr: hwaddr, value: u64, size: u32) { + let HPETAddrDecode { shift, len, reg } =3D self.decode(addr, size); + + // TODO: Add trace point - trace_hpet_ram_write(addr, value) + use GlobalRegister::*; + use HPETRegister::*; + match reg { + Timer(timer, tn_reg) =3D> timer.borrow_mut().write(tn_reg, val= ue, shift, len), + Global(CAP) =3D> {} // General Capabilities and ID Register: R= ead Only + Global(CFG) =3D> self.set_cfg_reg(shift, len, value), + Global(INT_STATUS) =3D> self.set_int_status_reg(shift, len, va= lue), + Global(COUNTER) =3D> self.set_counter_reg(shift, len, value), + Unknown(_) =3D> { + // TODO: Add trace point - trace_hpet_ram_write_invalid() + } } } } --=20 2.48.1