mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2025-04-19 20:58:31 +09:00

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' ...
111 lines
2.6 KiB
Rust
111 lines
2.6 KiB
Rust
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
//! Rust PCI driver sample (based on QEMU's `pci-testdev`).
|
|
//!
|
|
//! To make this driver probe, QEMU must be run with `-device pci-testdev`.
|
|
|
|
use kernel::{bindings, c_str, device::Core, devres::Devres, pci, prelude::*, types::ARef};
|
|
|
|
struct Regs;
|
|
|
|
impl Regs {
|
|
const TEST: usize = 0x0;
|
|
const OFFSET: usize = 0x4;
|
|
const DATA: usize = 0x8;
|
|
const COUNT: usize = 0xC;
|
|
const END: usize = 0x10;
|
|
}
|
|
|
|
type Bar0 = pci::Bar<{ Regs::END }>;
|
|
|
|
#[derive(Debug)]
|
|
struct TestIndex(u8);
|
|
|
|
impl TestIndex {
|
|
const NO_EVENTFD: Self = Self(0);
|
|
}
|
|
|
|
struct SampleDriver {
|
|
pdev: ARef<pci::Device>,
|
|
bar: Devres<Bar0>,
|
|
}
|
|
|
|
kernel::pci_device_table!(
|
|
PCI_TABLE,
|
|
MODULE_PCI_TABLE,
|
|
<SampleDriver as pci::Driver>::IdInfo,
|
|
[(
|
|
pci::DeviceId::from_id(bindings::PCI_VENDOR_ID_REDHAT, 0x5),
|
|
TestIndex::NO_EVENTFD
|
|
)]
|
|
);
|
|
|
|
impl SampleDriver {
|
|
fn testdev(index: &TestIndex, bar: &Bar0) -> Result<u32> {
|
|
// Select the test.
|
|
bar.write8(index.0, Regs::TEST);
|
|
|
|
let offset = u32::from_le(bar.read32(Regs::OFFSET)) as usize;
|
|
let data = bar.read8(Regs::DATA);
|
|
|
|
// Write `data` to `offset` to increase `count` by one.
|
|
//
|
|
// Note that we need `try_write8`, since `offset` can't be checked at compile-time.
|
|
bar.try_write8(data, offset)?;
|
|
|
|
Ok(bar.read32(Regs::COUNT))
|
|
}
|
|
}
|
|
|
|
impl pci::Driver for SampleDriver {
|
|
type IdInfo = TestIndex;
|
|
|
|
const ID_TABLE: pci::IdTable<Self::IdInfo> = &PCI_TABLE;
|
|
|
|
fn probe(pdev: &pci::Device<Core>, info: &Self::IdInfo) -> Result<Pin<KBox<Self>>> {
|
|
dev_dbg!(
|
|
pdev.as_ref(),
|
|
"Probe Rust PCI driver sample (PCI ID: 0x{:x}, 0x{:x}).\n",
|
|
pdev.vendor_id(),
|
|
pdev.device_id()
|
|
);
|
|
|
|
pdev.enable_device_mem()?;
|
|
pdev.set_master();
|
|
|
|
let bar = pdev.iomap_region_sized::<{ Regs::END }>(0, c_str!("rust_driver_pci"))?;
|
|
|
|
let drvdata = KBox::new(
|
|
Self {
|
|
pdev: pdev.into(),
|
|
bar,
|
|
},
|
|
GFP_KERNEL,
|
|
)?;
|
|
|
|
let bar = drvdata.bar.try_access().ok_or(ENXIO)?;
|
|
|
|
dev_info!(
|
|
pdev.as_ref(),
|
|
"pci-testdev data-match count: {}\n",
|
|
Self::testdev(info, &bar)?
|
|
);
|
|
|
|
Ok(drvdata.into())
|
|
}
|
|
}
|
|
|
|
impl Drop for SampleDriver {
|
|
fn drop(&mut self) {
|
|
dev_dbg!(self.pdev.as_ref(), "Remove Rust PCI driver sample.\n");
|
|
}
|
|
}
|
|
|
|
kernel::module_pci_driver! {
|
|
type: SampleDriver,
|
|
name: "rust_driver_pci",
|
|
authors: ["Danilo Krummrich"],
|
|
description: "Rust PCI driver",
|
|
license: "GPL v2",
|
|
}
|