forked from mirrors/linux
Here is the big set of driver core updates for 6.15-rc1. Lots of stuff
happened this development cycle, including:
- kernfs scaling changes to make it even faster thanks to rcu
- bin_attribute constify work in many subsystems
- faux bus minor tweaks for the rust bindings
- rust binding updates for driver core, pci, and platform busses,
making more functionaliy available to rust drivers. These are all
due to people actually trying to use the bindings that were in 6.14.
- make Rafael and Danilo full co-maintainers of the driver core
codebase
- other minor fixes and updates.
This has been in linux-next for a while now, with the only reported
issue being some merge conflicts with the rust tree. Depending on which
tree you pull first, you will have conflicts in one of them. The merge
resolution has been in linux-next as an example of what to do, or can be
found here:
https://lore.kernel.org/r/CANiq72n3Xe8JcnEjirDhCwQgvWoE65dddWecXnfdnbrmuah-RQ@mail.gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-----BEGIN PGP SIGNATURE-----
iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCZ+mMrg8cZ3JlZ0Brcm9h
aC5jb20ACgkQMUfUDdst+ylRgwCdH58OE3BgL0uoFY5vFImStpmPtqUAoL5HpVWI
jtbJ+UuXGsnmO+JVNBEv
=gy6W
-----END PGP SIGNATURE-----
Merge tag 'driver-core-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updatesk from Greg KH:
"Here is the big set of driver core updates for 6.15-rc1. Lots of stuff
happened this development cycle, including:
- kernfs scaling changes to make it even faster thanks to rcu
- bin_attribute constify work in many subsystems
- faux bus minor tweaks for the rust bindings
- rust binding updates for driver core, pci, and platform busses,
making more functionaliy available to rust drivers. These are all
due to people actually trying to use the bindings that were in
6.14.
- make Rafael and Danilo full co-maintainers of the driver core
codebase
- other minor fixes and updates"
* tag 'driver-core-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (52 commits)
rust: platform: require Send for Driver trait implementers
rust: pci: require Send for Driver trait implementers
rust: platform: impl Send + Sync for platform::Device
rust: pci: impl Send + Sync for pci::Device
rust: platform: fix unrestricted &mut platform::Device
rust: pci: fix unrestricted &mut pci::Device
rust: device: implement device context marker
rust: pci: use to_result() in enable_device_mem()
MAINTAINERS: driver core: mark Rafael and Danilo as co-maintainers
rust/kernel/faux: mark Registration methods inline
driver core: faux: only create the device if probe() succeeds
rust/faux: Add missing parent argument to Registration::new()
rust/faux: Drop #[repr(transparent)] from faux::Registration
rust: io: fix devres test with new io accessor functions
rust: io: rename `io::Io` accessors
kernfs: Move dput() outside of the RCU section.
efi: rci2: mark bin_attribute as __ro_after_init
rapidio: constify 'struct bin_attribute'
firmware: qemu_fw_cfg: constify 'struct bin_attribute'
powerpc/perf/hv-24x7: Constify 'struct bin_attribute'
...
97 lines
2.4 KiB
Rust
97 lines
2.4 KiB
Rust
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
//! Rust DMA api test (based on QEMU's `pci-testdev`).
|
|
//!
|
|
//! To make this driver probe, QEMU must be run with `-device pci-testdev`.
|
|
|
|
use kernel::{bindings, device::Core, dma::CoherentAllocation, pci, prelude::*, types::ARef};
|
|
|
|
struct DmaSampleDriver {
|
|
pdev: ARef<pci::Device>,
|
|
ca: CoherentAllocation<MyStruct>,
|
|
}
|
|
|
|
const TEST_VALUES: [(u32, u32); 5] = [
|
|
(0xa, 0xb),
|
|
(0xc, 0xd),
|
|
(0xe, 0xf),
|
|
(0xab, 0xba),
|
|
(0xcd, 0xef),
|
|
];
|
|
|
|
struct MyStruct {
|
|
h: u32,
|
|
b: u32,
|
|
}
|
|
|
|
impl MyStruct {
|
|
fn new(h: u32, b: u32) -> Self {
|
|
Self { h, b }
|
|
}
|
|
}
|
|
// SAFETY: All bit patterns are acceptable values for `MyStruct`.
|
|
unsafe impl kernel::transmute::AsBytes for MyStruct {}
|
|
// SAFETY: Instances of `MyStruct` have no uninitialized portions.
|
|
unsafe impl kernel::transmute::FromBytes for MyStruct {}
|
|
|
|
kernel::pci_device_table!(
|
|
PCI_TABLE,
|
|
MODULE_PCI_TABLE,
|
|
<DmaSampleDriver as pci::Driver>::IdInfo,
|
|
[(
|
|
pci::DeviceId::from_id(bindings::PCI_VENDOR_ID_REDHAT, 0x5),
|
|
()
|
|
)]
|
|
);
|
|
|
|
impl pci::Driver for DmaSampleDriver {
|
|
type IdInfo = ();
|
|
const ID_TABLE: pci::IdTable<Self::IdInfo> = &PCI_TABLE;
|
|
|
|
fn probe(pdev: &pci::Device<Core>, _info: &Self::IdInfo) -> Result<Pin<KBox<Self>>> {
|
|
dev_info!(pdev.as_ref(), "Probe DMA test driver.\n");
|
|
|
|
let ca: CoherentAllocation<MyStruct> =
|
|
CoherentAllocation::alloc_coherent(pdev.as_ref(), TEST_VALUES.len(), GFP_KERNEL)?;
|
|
|
|
|| -> Result {
|
|
for (i, value) in TEST_VALUES.into_iter().enumerate() {
|
|
kernel::dma_write!(ca[i] = MyStruct::new(value.0, value.1));
|
|
}
|
|
|
|
Ok(())
|
|
}()?;
|
|
|
|
let drvdata = KBox::new(
|
|
Self {
|
|
pdev: pdev.into(),
|
|
ca,
|
|
},
|
|
GFP_KERNEL,
|
|
)?;
|
|
|
|
Ok(drvdata.into())
|
|
}
|
|
}
|
|
|
|
impl Drop for DmaSampleDriver {
|
|
fn drop(&mut self) {
|
|
dev_info!(self.pdev.as_ref(), "Unload DMA test driver.\n");
|
|
|
|
let _ = || -> Result {
|
|
for (i, value) in TEST_VALUES.into_iter().enumerate() {
|
|
assert_eq!(kernel::dma_read!(self.ca[i].h), value.0);
|
|
assert_eq!(kernel::dma_read!(self.ca[i].b), value.1);
|
|
}
|
|
Ok(())
|
|
}();
|
|
}
|
|
}
|
|
|
|
kernel::module_pci_driver! {
|
|
type: DmaSampleDriver,
|
|
name: "rust_dma",
|
|
authors: ["Abdiel Janulgue"],
|
|
description: "Rust DMA test",
|
|
license: "GPL v2",
|
|
}
|