mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
Pull driver core updates from Danilo Krummrich:
"Arch Topology:
- Move parse_acpi_topology() from arm64 to common code for reuse in
RISC-V
CPU:
- Expose housekeeping CPUs through /sys/devices/system/cpu/housekeeping
- Print a newline (or 0x0A) instead of '(null)' reading
/sys/devices/system/cpu/nohz_full when nohz_full= is not set
debugfs
- Remove (broken) 'no-mount' mode
- Remove redundant access mode checks in debugfs_get_tree() and
debugfs_create_*() functions
Devres:
- Remove unused devm_free_percpu() helper
- Move devm_alloc_percpu() from device.h to devres.h
Firmware Loader:
- Replace simple_strtol() with kstrtoint()
- Do not call cancel_store() when no upload is in progress
kernfs:
- Increase struct super_block::maxbytes to MAX_LFS_FILESIZE
- Fix a missing unwind path in __kernfs_new_node()
Misc:
- Increase the name size in struct auxiliary_device_id to 40
characters
- Replace system_unbound_wq with system_dfl_wq and add WQ_PERCPU to
alloc_workqueue()
Platform:
- Replace ERR_PTR() with IOMEM_ERR_PTR() in platform ioremap
functions
Rust:
- Auxiliary:
- Unregister auxiliary device on parent device unbind
- Move parent() to impl Device; implement device context aware
parent() for Device<Bound>
- Illustrate how to safely obtain a driver's device private data
when calling from an auxiliary driver into the parant device
driver
- DebugFs:
- Implement support for binary large objects
- Device:
- Let probe() return the driver's device private data as pinned
initializer, i.e. impl PinInit<Self, Error>
- Implement safe accessor for a driver's device private data for
Device<Bound> (returned reference can't out-live driver binding
and guarantees the correct private data type)
- Implement AsBusDevice trait, to be used by class device
abstractions to derive the bus device type of the parent device
- DMA:
- Store raw pointer of allocation as NonNull
- Use start_ptr() and start_ptr_mut() to inherit correct
mutability of self
- FS:
- Add file::Offset type alias
- I2C:
- Add abstractions for I2C device / driver infrastructure
- Implement abstractions for manual I2C device registrations
- I/O:
- Use "kernel vertical" style for imports
- Define ResourceSize as resource_size_t
- Move ResourceSize to top-level I/O module
- Add type alias for phys_addr_t
- Implement Rust version of read_poll_timeout_atomic()
- PCI:
- Use "kernel vertical" style for imports
- Move I/O and IRQ infrastructure to separate files
- Add support for PCI interrupt vectors
- Implement TryInto<IrqRequest<'a>> for IrqVector<'a> to convert
an IrqVector bound to specific pci::Device into an IrqRequest
bound to the same pci::Device's parent Device
- Leverage pin_init_scope() to get rid of redundant Result in IRQ
methods
- PinInit:
- Add {pin_}init_scope() to execute code before creating an
initializer
- Platform:
- Leverage pin_init_scope() to get rid of redundant Result in IRQ
methods
- Timekeeping:
- Implement abstraction of udelay()
- Uaccess:
- Implement read_slice_partial() and read_slice_file() for
UserSliceReader
- Implement write_slice_partial() and write_slice_file() for
UserSliceWriter
sysfs:
- Prepare the constification of struct attribute"
* tag 'driver-core-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core: (75 commits)
rust: pci: fix build failure when CONFIG_PCI_MSI is disabled
debugfs: Fix default access mode config check
debugfs: Remove broken no-mount mode
debugfs: Remove redundant access mode checks
driver core: Check drivers_autoprobe for all added devices
driver core: WQ_PERCPU added to alloc_workqueue users
driver core: replace use of system_unbound_wq with system_dfl_wq
tick/nohz: Expose housekeeping CPUs in sysfs
tick/nohz: avoid showing '(null)' if nohz_full= not set
sysfs/cpu: Use DEVICE_ATTR_RO for nohz_full attribute
kernfs: fix memory leak of kernfs_iattrs in __kernfs_new_node
fs/kernfs: raise sb->maxbytes to MAX_LFS_FILESIZE
mod_devicetable: Bump auxiliary_device_id name size
sysfs: simplify attribute definition macros
samples/kobject: constify 'struct foo_attribute'
samples/kobject: add is_visible() callback to attribute group
sysfs: attribute_group: enable const variants of is_visible()
sysfs: introduce __SYSFS_FUNCTION_ALTERNATIVE()
sysfs: transparently handle const pointers in ATTRIBUTE_GROUPS()
sysfs: attribute_group: allow registration of const attribute
...
105 lines
2.9 KiB
Rust
105 lines
2.9 KiB
Rust
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
use kernel::{
|
|
auxiliary,
|
|
c_str,
|
|
device::Core,
|
|
devres::Devres,
|
|
dma::Device,
|
|
dma::DmaMask,
|
|
pci,
|
|
pci::{
|
|
Class,
|
|
ClassMask,
|
|
Vendor, //
|
|
},
|
|
prelude::*,
|
|
sizes::SZ_16M,
|
|
sync::Arc, //
|
|
};
|
|
|
|
use crate::gpu::Gpu;
|
|
|
|
#[pin_data]
|
|
pub(crate) struct NovaCore {
|
|
#[pin]
|
|
pub(crate) gpu: Gpu,
|
|
#[pin]
|
|
_reg: Devres<auxiliary::Registration>,
|
|
}
|
|
|
|
const BAR0_SIZE: usize = SZ_16M;
|
|
|
|
// For now we only support Ampere which can use up to 47-bit DMA addresses.
|
|
//
|
|
// TODO: Add an abstraction for this to support newer GPUs which may support
|
|
// larger DMA addresses. Limiting these GPUs to smaller address widths won't
|
|
// have any adverse affects, unless installed on systems which require larger
|
|
// DMA addresses. These systems should be quite rare.
|
|
const GPU_DMA_BITS: u32 = 47;
|
|
|
|
pub(crate) type Bar0 = pci::Bar<BAR0_SIZE>;
|
|
|
|
kernel::pci_device_table!(
|
|
PCI_TABLE,
|
|
MODULE_PCI_TABLE,
|
|
<NovaCore as pci::Driver>::IdInfo,
|
|
[
|
|
// Modern NVIDIA GPUs will show up as either VGA or 3D controllers.
|
|
(
|
|
pci::DeviceId::from_class_and_vendor(
|
|
Class::DISPLAY_VGA,
|
|
ClassMask::ClassSubclass,
|
|
Vendor::NVIDIA
|
|
),
|
|
()
|
|
),
|
|
(
|
|
pci::DeviceId::from_class_and_vendor(
|
|
Class::DISPLAY_3D,
|
|
ClassMask::ClassSubclass,
|
|
Vendor::NVIDIA
|
|
),
|
|
()
|
|
),
|
|
]
|
|
);
|
|
|
|
impl pci::Driver for NovaCore {
|
|
type IdInfo = ();
|
|
const ID_TABLE: pci::IdTable<Self::IdInfo> = &PCI_TABLE;
|
|
|
|
fn probe(pdev: &pci::Device<Core>, _info: &Self::IdInfo) -> impl PinInit<Self, Error> {
|
|
pin_init::pin_init_scope(move || {
|
|
dev_dbg!(pdev.as_ref(), "Probe Nova Core GPU driver.\n");
|
|
|
|
pdev.enable_device_mem()?;
|
|
pdev.set_master();
|
|
|
|
// SAFETY: No concurrent DMA allocations or mappings can be made because
|
|
// the device is still being probed and therefore isn't being used by
|
|
// other threads of execution.
|
|
unsafe { pdev.dma_set_mask_and_coherent(DmaMask::new::<GPU_DMA_BITS>())? };
|
|
|
|
let bar = Arc::pin_init(
|
|
pdev.iomap_region_sized::<BAR0_SIZE>(0, c_str!("nova-core/bar0")),
|
|
GFP_KERNEL,
|
|
)?;
|
|
|
|
Ok(try_pin_init!(Self {
|
|
gpu <- Gpu::new(pdev, bar.clone(), bar.access(pdev.as_ref())?),
|
|
_reg <- auxiliary::Registration::new(
|
|
pdev.as_ref(),
|
|
c_str!("nova-drm"),
|
|
0, // TODO[XARR]: Once it lands, use XArray; for now we don't use the ID.
|
|
crate::MODULE_NAME
|
|
),
|
|
}))
|
|
})
|
|
}
|
|
|
|
fn unbind(pdev: &pci::Device<Core>, this: Pin<&Self>) {
|
|
this.gpu.unbind(pdev.as_ref());
|
|
}
|
|
}
|