Hi folks,
This is Rust HPET normal patch series, and you can find the previous RFC
at [1].
This series is based on Paolo's rust-next branch at the commit
43c0ef3bfb3b ("rust: vmstate: remove redundant link targets") along with
another 2 more seperate patches:
*
https://lore.kernel.org/qemu-devel/20241205203721.347233-1-pbonz...@redhat.com/
* https://lore.kernel.org/qemu-devel/20250121140121.84550-1-zhao1....@intel.com/
Overall, HPET in Rust maintains the same logic as the original C
version, adhering to the Intel IA PC-HPET spec v1.0a [2]. While keeping
the logic unchanged, it attempts to keep up with the current development
progress of Rust for QEMU, leveraging the latest and ongoing Rust binding
updates as much as possible, such as BqlCell / BqlRefCell, qom & qdev
enhancements, irq binding, and more.
Additionally, it introduces new bindings, including gpio_{in|out},
memattrs, and timer.
Welcome your comments and feedback!
TODOs
=====
* Add more documentations for new bindings and HPET.
* Live migration support for HPET.
* address-spaces binding (for address_space_memory, address_space_stl_le).
Introduction
============
.
│
...
└── timer
├── hpet
│ ├── Cargo.toml
│ ├── meson.build
│ └── src
│ ├── fw_cfg.rs
│ ├── hpet.rs
│ ├── lib.rs
├── Kconfig
└── meson.build
HPET emulation contains 2 parts:
* HPET device emulation:
- hpet.rs:
It includes basic operations for the HPET timer and HPET state
(which actually represents the HPET timer block).
Here, similar to the C implementation, it directly defines the
registers and bit shifts as const variables, without a complete
register space structure.
And, it implements various QEMU qdev/qom required traits for the
HPETState.
* Global HPET firmwrie configuration:
- fw_cfg.rs
In the C code, there is a variable hpet_fw_cfg (old name: hpet_cfg)
used to configure the number of HPET timer blocks and the basic
HPET firmware configuration. It is defined in .c file and is
referenced as extern in the .h file.
For the Rust HPET, fw_cfg.rs also implementes hpet_fw_cfg so that
the .h file can still reference it.
Change Log
==========
Main changes since Patch v1:
* Reimplement InterruptSource::slice_as_ptr() by dereferring `slice[0]`.
* Ensure the callback parameter of input GPIO/timer is not none.
* Use Timer/TimerListGroup in Rust code instead of QEMUTimer/
QEMUTimerListGroup.
* Add MS/US/NS wrappers.
* Enable workspace's lint configurations in hpet's Cargo.toml.
* Add rust_version in Cargo.toml.
* Fix complaints from cargo (+nightly) doc/clippy/fmt (v1.84.0).
* Do `addr & !4` in timer's register read and write.
* Mask the timer N's register address with 0x1F (timer_and_addr()).
* Drop HPETClass.
* Fix a memory leak issue by not destroying the timer instance in
HPETTimer::del_timer().
[1]:
https://lore.kernel.org/qemu-devel/20250125125137.1223277-1-zhao1....@intel.com/
[2]:
https://www.intel.com/content/dam/www/public/us/en/documents/technical-specifications/software-developers-hpet-spec-1-0a.pdf
Thanks and Best Rgards,
Zhao
---
Zhao Liu (10):
i386/fw_cfg: move hpet_cfg definition to hpet.c
rust/qdev: add the macro to define bit property
rust/irq: Add a helper to convert [InterruptSource] to pointer
rust: add bindings for gpio_{in|out} initialization
rust: add bindings for memattrs
rust: add bindings for timer
rust/timer/hpet: define hpet_fw_cfg
rust/timer/hpet: add basic HPET timer and HPETState
rust/timer/hpet: add qom and qdev APIs support
i386: enable rust hpet for pc when rust is enabled
configs/devices/i386-softmmu/default.mak | 1 +
hw/i386/fw_cfg.c | 6 +-
hw/i386/pc.c | 2 +-
hw/timer/Kconfig | 6 +-
hw/timer/hpet.c | 14 +-
include/hw/timer/hpet.h | 2 +-
meson.build | 7 +
rust/Cargo.lock | 8 +
rust/Cargo.toml | 1 +
rust/hw/Kconfig | 1 +
rust/hw/meson.build | 1 +
rust/hw/timer/Kconfig | 2 +
rust/hw/timer/hpet/Cargo.toml | 18 +
rust/hw/timer/hpet/meson.build | 18 +
rust/hw/timer/hpet/src/fw_cfg.rs | 78 ++
rust/hw/timer/hpet/src/hpet.rs | 890 +++++++++++++++++++++++
rust/hw/timer/hpet/src/lib.rs | 18 +
rust/hw/timer/meson.build | 1 +
rust/qemu-api/meson.build | 1 +
rust/qemu-api/src/irq.rs | 5 +
rust/qemu-api/src/lib.rs | 1 +
rust/qemu-api/src/memory.rs | 16 +-
rust/qemu-api/src/qdev.rs | 59 +-
rust/qemu-api/src/timer.rs | 98 +++
rust/qemu-api/src/zeroable.rs | 7 +-
rust/wrapper.h | 3 +
tests/qtest/meson.build | 3 +-
27 files changed, 1245 insertions(+), 22 deletions(-)
create mode 100644 rust/hw/timer/Kconfig
create mode 100644 rust/hw/timer/hpet/Cargo.toml
create mode 100644 rust/hw/timer/hpet/meson.build
create mode 100644 rust/hw/timer/hpet/src/fw_cfg.rs
create mode 100644 rust/hw/timer/hpet/src/hpet.rs
create mode 100644 rust/hw/timer/hpet/src/lib.rs
create mode 100644 rust/hw/timer/meson.build
create mode 100644 rust/qemu-api/src/timer.rs
--
2.34.1
