rust, nova-core: PCI Class, Vendor support
Subsystems (8)
v5 cover rust, nova-core: PCI Class, Vendor support
Changes since v4:
* Applied changes from Danilo's and Alex's review (thanks!):
* Reorganized the patches so that the Nova changes consume the results of Class and Vendor upgrades, all in one shot.
* Made Class and Vendor types get constructed infallibly.
* This was all somewhat disruptive, and also required one more patch in order to properly separate the various steps. But I think it is all correct now. And CLIPPY=1 builds cleanly too.
* Elle Rhumsaa provided a Reviewed-by for v4 (thanks!), but due to the churn in v5 here, I thought it best to not add that tag to v5 yet. Instead, I have directly Cc'd Elle on the patches for now.
Changes since v3:
* Applied changes from Danilo's review (thanks!):
* Moved Class and Vendor to a new pci/id.rs file.
* Added ClassMask, to constrain callers to use only the two valid masks.
* Removed pci_class_code_raw()
* Changed Class and Vendor .as_u32() to .as_raw(), because after Danilo's comment I looked around rust/kernel and learned that .as_raw() is the overwhelmingly used convention.
* Changed vendor_id() to return a Vendor instance directly.
* Also, validated Vendor during construction, just as is done with Class. Both of these items are expected to match known values, even for new devices, so that's a reasonable move.
Changes since v2:
* Applied changes from Danilo's and Alex's review (thanks!):
* Moved everything possible out of the new define_all_pci_classes!() and define_all_pci_vendors!() macros.
* Used "impl TryFrom<u32> for Class/Vendor", instead of .from_u32().
* Made the new DeviceId methods infallible.
* Upgraded DeviceId::from_id() to accept a Vendor struct.
* Changed the names to be a little clearer:
* class_code_raw() --> pci_class_code_raw()
* class_enum() --> pci_class()
* Added doctests for the items that are not yet used in real drivers.
v2 is here:
https://lore.kernel.org/[email protected]
Changes since v1:
1) Use the pci_device_table for filtering, instead of open-coding filters in the .probe() callback.
2) Add PCI Class (class, subclass, implementation) and PCI Vendor to Rust for Linux.
3) Rebased onto the latest nova-next branch, which is here:
https://gitlab.freedesktop.org/drm/nova.git
v1 is here:
https://lore.kernel.org/[email protected]
John Hubbard (4):
rust: pci: provide access to PCI Class and Class-related items
rust: pci: provide access to PCI Vendor values
gpu: nova-core: avoid probing non-display/compute PCI functions
rust: pci: use pci::Vendor instead of bindings::PCI_VENDOR_ID_*
drivers/gpu/nova-core/driver.rs | 33 +- rust/kernel/pci.rs | 46 +- rust/kernel/pci/id.rs | 591 ++++++++++++++++++++++++++ samples/rust/rust_dma.rs | 6 +- samples/rust/rust_driver_auxiliary.rs | 12 +- samples/rust/rust_driver_pci.rs | 9 +- 6 files changed, 669 insertions(+), 28 deletions(-) create mode 100644 rust/kernel/pci/id.rs
base-commit: 0dfc23ac2c5b3a62ab27fb9b6ee582b4bb5ce33c
Signature · 1 line
2.50.1
PATCH v5 1/4 rust: pci: provide access to PCI Class and Class-related items
Allow callers to write Class::STORAGE_SCSI instead of bindings::PCI_CLASS_STORAGE_SCSI, for example.
New APIs:
Class::STORAGE_SCSI, Class::NETWORK_ETHERNET, etc. Class::as_raw()
Class: From<u32> for Class
ClassMask: Full, ClassSubclass Device::pci_class()
--- rust/kernel/pci.rs | 10 ++ rust/kernel/pci/id.rs | 239 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 249 insertions(+) create mode 100644 rust/kernel/pci/id.rs
rust/kernel/pci.rs +10 -0
@@ -23,6 +23,10 @@ };use kernel::prelude::*; +mod id; + +pub use self::id::{Class ,ClassMask }; +/// An adapter for the registration of PCI drivers. pub struct Adapter <T :Driver >(T );
@@ -410,6 +414,12 @@ pub fn resource_len(&self, bar: u32) -> Result<bindings::resource_size_t> {// - by its type invariant `self.as_raw` is always a valid pointer to a `struct pci_dev`. Ok (unsafe { bindings::pci_resource_len (self.as_raw (), bar.try_into ()?) }) } + +/// Returns the PCI class as a `Class` struct. +pub fn pci_class (&self) ->Class { +// SAFETY: `self.as_raw` is a valid pointer to a `struct pci_dev`. +Class ::new (unsafe { (*self.as_raw ()).class }) + } }impl Device <device::Bound > {
rust/kernel/pci/id.rs new file +239 -0
239 lines not on this page · raw message
Signature · 1 line
2.50.1
Danilo Krummrich
maintainerRe: [PATCH v5 1/4] rust: pci: provide access to PCI Class and Class-related items
Quoted 10 lines · John Hubbard
Allow callers to write
Class::STORAGE_SCSIinstead ofbindings::PCI_CLASS_STORAGE_SCSI, for example.New APIs:
Class::STORAGE_SCSI,Class::NETWORK_ETHERNET, etc.Class::as_raw()
Class: From<u32> for Class
ClassMask: Full, ClassSubclassDevice::pci_class()
Quoted 7 lines
Cc Danilo Krummrich <[email protected]>Cc Alexandre Courbot <[email protected]>Cc Elle Rhumsaa <[email protected]>Signed-off-by John Hubbard <[email protected]>--- rust/kernel/pci.rs | 10 ++ rust/kernel/pci/id.rs | 239 ++++++++++++++++++++++++++++++++++++++++++
Please add rust/kernel/pci/ to the maintainers entry.
(Would have done on apply, but I have another comment on patch 3.)
Quoted 2 lines
2 files changed, 249 insertions(+) create mode 100644 rust/kernel/pci/id.rs
Re: [PATCH v5 1/4] rust: pci: provide access to PCI Class and Class-related items
Quoted 19 lines · Danilo Krummrich
Quoted 10 lines · John Hubbard
Allow callers to write
Class::STORAGE_SCSIinstead ofbindings::PCI_CLASS_STORAGE_SCSI, for example.New APIs:
Class::STORAGE_SCSI,Class::NETWORK_ETHERNET, etc.Class::as_raw()
Class: From<u32> for Class
ClassMask: Full, ClassSubclassDevice::pci_class()Quoted 7 lines
Cc Danilo Krummrich <[email protected]>Cc Alexandre Courbot <[email protected]>Cc Elle Rhumsaa <[email protected]>Signed-off-by John Hubbard <[email protected]>--- rust/kernel/pci.rs | 10 ++ rust/kernel/pci/id.rs | 239 ++++++++++++++++++++++++++++++++++++++++++
Quoted 1 line
Please add
rust/kernel/pci/to the maintainers entry.
OK.
Quoted 5 lines
(Would have done on apply, but I have another comment on patch 3.)
Quoted 2 lines
2 files changed, 249 insertions(+)create mode 100644
rust/kernel/pci/id.rs
thanks,
Signature · 1 line
John Hubbard
PATCH v5 2/4 rust: pci: provide access to PCI Vendor values
In reply to John HubbardThis allows callers to write Vendor::SOME_COMPANY instead of bindings::PCI_VENDOR_ID_SOME_COMPANY.
New APIs:
Vendor::SOME_COMPANY Vendor::as_raw()
Vendor: From<u32> for Vendor
--- rust/kernel/pci.rs | 2 +- rust/kernel/pci/id.rs | 355 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 355 insertions(+), 2 deletions(-)
rust/kernel/pci.rs +1 -1
@@ -25,7 +25,7 @@mod id; -pub use self::id::{Class ,ClassMask }; +pub use self::id::{Class ,ClassMask ,Vendor };/// An adapter for the registration of PCI drivers. pub struct Adapter <T :Driver >(T );
rust/kernel/pci/id.rs +354 -1
370 lines not on this page · raw message
Signature · 1 line
2.50.1
Re: [PATCH v5 2/4] rust: pci: provide access to PCI Vendor values
Quoted 92 lines · John Hubbard
This allows callers to write
Vendor::SOME_COMPANYinstead ofbindings::PCI_VENDOR_ID_SOME_COMPANY.New APIs:
Vendor::SOME_COMPANYVendor::as_raw()
Vendor: From<u32> for VendorCc Danilo Krummrich <[email protected]>Cc Alexandre Courbot <[email protected]>Cc Elle Rhumsaa <[email protected]>Signed-off-by John Hubbard <[email protected]>--- rust/kernel/pci.rs | 2 +- rust/kernel/pci/id.rs | 355 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 355 insertions(+), 2 deletions(-)rust/kernel/pci.rs +1
-1@@ -25,7 +25,7 @@mod id; -pub use self::id::{Class ,ClassMask }; +pub use self::id::{Class ,ClassMask ,Vendor };/// An adapter for the registration of PCI drivers. pub struct Adapter <T :Driver >(T );rust/kernel/pci/id.rs +46
-1@@ -2,7 +2,7 @@//! PCI device identifiers and related types. //! -//! This module contains PCI class codes and supporting types. +//! This module contains PCI class codes, Vendor IDs, and supporting types. use crate ::{bindings, error::code::EINVAL , error::Error , prelude::*};use core::fmt;@@ -115,6 +115,74 @@ fn try_from(value: u32) -> Result<Self, Self::Error> { } } +/// PCI vendor IDs. +/// +/// Each entry contains the 16-bit PCI vendor ID as assigned by the PCI SIG. +/// +/// # Examples +/// +/// ``` +/// # use kernel::{device::Core, pci::{self, Vendor}, prelude::*}; +/// fn log_device_info(pdev: &pci::Device<Core>) -> Result<()> { +/// // Get the raw PCI vendor ID and convert to Vendor +/// let vendor_id = pdev.vendor_id(); +/// let vendor = Vendor::new(vendor_id.into()); +/// dev_info!( +/// pdev.as_ref(), +/// "Device: Vendor={}, Device=0x{:x}\n", +/// vendor, +/// pdev.device_id() +/// ); +/// Ok(()) +/// } +/// ``` +#[derive( Debug , Clone , Copy , PartialEq , Eq )] +#[repr(transparent)] +pub struct Vendor (u32 ); + +macro_rules! define_all_pci_vendors { + ( + $($variant:ident = $binding:expr,)+ + ) => { + +impl Vendor { + $( +#[allow(missing_docs)] +pub const $variant:Self =Self ($bindingas u32 ); + )+ + } + +/// Convert a raw 16-bit vendor ID to a `Vendor`. +impl From <u32 >for Vendor { +fn from(value:u32 ) ->Self { +match value { + $(xif x ==Self ::$variant.0 =>Self ::$variant,)+ + _ =>Self ::UNKNOWN , + } + }
rust/kernel/pci/id.rs fn try_from(value: u32) -> Result<Self, Self::Error> { · line 172
Quoted 10 lines
rust/kernel/pci/id.rs +10
-0+ } + }; +} + +/// Once constructed, a `Vendor` contains a valid PCI Vendor ID. +impl Vendor { +/// Create a new Vendor from a raw 16-bit vendor ID. +pub fn new (vendor_id:u32 ) ->Self { +Self ::from (vendor_id) + }
Reversing this implementation would allow for a signature:
```rust
pub const fn new(vendor_id: u32) -> Self {
...
}
```Which would allow use in const contexts. Until we get a stable const-trait impl, this is kind of the best workaround.
Then, the From<u32> implementation can call Self::new.
Not really applicable here, but you can also provide a Default implementation for Self::new with no parameters.
Quoted 307 lines
rust/kernel/pci/id.rs +298
-0+ +/// Get the raw 16-bit vendor ID value. +pub const fn as_raw (self) ->u32 { + self.0 + } +} + +impl fmt::Display for Vendor { +fn fmt (&self, f: &mut fmt::Formatter <'_>) -> fmt::Result { +write! (f,"0x{:04x}" , self.0 ) + } +} +define_all_pci_classes! {NOT_DEFINED = bindings::PCI_CLASS_NOT_DEFINED ,// 0x000000 NOT_DEFINED_VGA = bindings::PCI_CLASS_NOT_DEFINED_VGA ,// 0x000100 @@ -237,3 +305,288 @@ fn try_from(value: u32) -> Result<Self, Self::Error> { OTHERS = bindings::PCI_CLASS_OTHERS, // 0xff0000 UNKNOWN = 0xffffff, } + +define_all_pci_vendors! { +PCI_SIG = bindings::PCI_VENDOR_ID_PCI_SIG ,// 0x0001 +LOONGSON = bindings::PCI_VENDOR_ID_LOONGSON ,// 0x0014 +SOLIDIGM = bindings::PCI_VENDOR_ID_SOLIDIGM ,// 0x025e +TTTECH = bindings::PCI_VENDOR_ID_TTTECH ,// 0x0357 +DYNALINK = bindings::PCI_VENDOR_ID_DYNALINK ,// 0x0675 +UBIQUITI = bindings::PCI_VENDOR_ID_UBIQUITI ,// 0x0777 +BERKOM = bindings::PCI_VENDOR_ID_BERKOM ,// 0x0871 +ITTIM = bindings::PCI_VENDOR_ID_ITTIM ,// 0x0b48 +COMPAQ = bindings::PCI_VENDOR_ID_COMPAQ ,// 0x0e11 +LSI_LOGIC = bindings::PCI_VENDOR_ID_LSI_LOGIC ,// 0x1000 +ATI = bindings::PCI_VENDOR_ID_ATI ,// 0x1002 +VLSI = bindings::PCI_VENDOR_ID_VLSI ,// 0x1004 +ADL = bindings::PCI_VENDOR_ID_ADL ,// 0x1005 +NS = bindings::PCI_VENDOR_ID_NS ,// 0x100b +TSENG = bindings::PCI_VENDOR_ID_TSENG ,// 0x100c +WEITEK = bindings::PCI_VENDOR_ID_WEITEK ,// 0x100e +DEC = bindings::PCI_VENDOR_ID_DEC ,// 0x1011 +CIRRUS = bindings::PCI_VENDOR_ID_CIRRUS ,// 0x1013 +IBM = bindings::PCI_VENDOR_ID_IBM ,// 0x1014 +UNISYS = bindings::PCI_VENDOR_ID_UNISYS ,// 0x1018 +COMPEX2 = bindings::PCI_VENDOR_ID_COMPEX2 ,// 0x101a +WD = bindings::PCI_VENDOR_ID_WD ,// 0x101c +AMI = bindings::PCI_VENDOR_ID_AMI ,// 0x101e +AMD = bindings::PCI_VENDOR_ID_AMD ,// 0x1022 +TRIDENT = bindings::PCI_VENDOR_ID_TRIDENT ,// 0x1023 +AI = bindings::PCI_VENDOR_ID_AI ,// 0x1025 +DELL = bindings::PCI_VENDOR_ID_DELL ,// 0x1028 +MATROX = bindings::PCI_VENDOR_ID_MATROX ,// 0x102B +MOBILITY_ELECTRONICS = bindings::PCI_VENDOR_ID_MOBILITY_ELECTRONICS ,// 0x14f2 +CT = bindings::PCI_VENDOR_ID_CT ,// 0x102c +MIRO = bindings::PCI_VENDOR_ID_MIRO ,// 0x1031 +NEC = bindings::PCI_VENDOR_ID_NEC ,// 0x1033 +FD = bindings::PCI_VENDOR_ID_FD ,// 0x1036 +SI = bindings::PCI_VENDOR_ID_SI ,// 0x1039 +HP = bindings::PCI_VENDOR_ID_HP ,// 0x103c +HP_3PAR = bindings::PCI_VENDOR_ID_HP_3PAR ,// 0x1590 +PCTECH = bindings::PCI_VENDOR_ID_PCTECH ,// 0x1042 +ASUSTEK = bindings::PCI_VENDOR_ID_ASUSTEK ,// 0x1043 +DPT = bindings::PCI_VENDOR_ID_DPT ,// 0x1044 +OPTI = bindings::PCI_VENDOR_ID_OPTI ,// 0x1045 +ELSA = bindings::PCI_VENDOR_ID_ELSA ,// 0x1048 +STMICRO = bindings::PCI_VENDOR_ID_STMICRO ,// 0x104A +BUSLOGIC = bindings::PCI_VENDOR_ID_BUSLOGIC ,// 0x104B +TI = bindings::PCI_VENDOR_ID_TI ,// 0x104c +SONY = bindings::PCI_VENDOR_ID_SONY ,// 0x104d +WINBOND2 = bindings::PCI_VENDOR_ID_WINBOND2 ,// 0x1050 +ANIGMA = bindings::PCI_VENDOR_ID_ANIGMA ,// 0x1051 +EFAR = bindings::PCI_VENDOR_ID_EFAR ,// 0x1055 +MOTOROLA = bindings::PCI_VENDOR_ID_MOTOROLA ,// 0x1057 +PROMISE = bindings::PCI_VENDOR_ID_PROMISE ,// 0x105a +FOXCONN = bindings::PCI_VENDOR_ID_FOXCONN ,// 0x105b +UMC = bindings::PCI_VENDOR_ID_UMC ,// 0x1060 +PICOPOWER = bindings::PCI_VENDOR_ID_PICOPOWER ,// 0x1066 +MYLEX = bindings::PCI_VENDOR_ID_MYLEX ,// 0x1069 +APPLE = bindings::PCI_VENDOR_ID_APPLE ,// 0x106b +YAMAHA = bindings::PCI_VENDOR_ID_YAMAHA ,// 0x1073 +QLOGIC = bindings::PCI_VENDOR_ID_QLOGIC ,// 0x1077 +CYRIX = bindings::PCI_VENDOR_ID_CYRIX ,// 0x1078 +CONTAQ = bindings::PCI_VENDOR_ID_CONTAQ ,// 0x1080 +OLICOM = bindings::PCI_VENDOR_ID_OLICOM ,// 0x108d +SUN = bindings::PCI_VENDOR_ID_SUN ,// 0x108e +NI = bindings::PCI_VENDOR_ID_NI ,// 0x1093 +CMD = bindings::PCI_VENDOR_ID_CMD ,// 0x1095 +BROOKTREE = bindings::PCI_VENDOR_ID_BROOKTREE ,// 0x109e +SGI = bindings::PCI_VENDOR_ID_SGI ,// 0x10a9 +WINBOND = bindings::PCI_VENDOR_ID_WINBOND ,// 0x10ad +PLX = bindings::PCI_VENDOR_ID_PLX ,// 0x10b5 +MADGE = bindings::PCI_VENDOR_ID_MADGE ,// 0x10b6 +THREECOM = bindings::PCI_VENDOR_ID_3COM ,// 0x10b7 +AL = bindings::PCI_VENDOR_ID_AL ,// 0x10b9 +NEOMAGIC = bindings::PCI_VENDOR_ID_NEOMAGIC ,// 0x10c8 +TCONRAD = bindings::PCI_VENDOR_ID_TCONRAD ,// 0x10da +ROHM = bindings::PCI_VENDOR_ID_ROHM ,// 0x10db +NVIDIA = bindings::PCI_VENDOR_ID_NVIDIA ,// 0x10de +IMS = bindings::PCI_VENDOR_ID_IMS ,// 0x10e0 +AMCC = bindings::PCI_VENDOR_ID_AMCC ,// 0x10e8 +AMPERE = bindings::PCI_VENDOR_ID_AMPERE ,// 0x1def +INTERG = bindings::PCI_VENDOR_ID_INTERG ,// 0x10ea +REALTEK = bindings::PCI_VENDOR_ID_REALTEK ,// 0x10ec +XILINX = bindings::PCI_VENDOR_ID_XILINX ,// 0x10ee +INIT = bindings::PCI_VENDOR_ID_INIT ,// 0x1101 +CREATIVE = bindings::PCI_VENDOR_ID_CREATIVE ,// 0x1102 +TTI = bindings::PCI_VENDOR_ID_TTI ,// 0x1103 +SIGMA = bindings::PCI_VENDOR_ID_SIGMA ,// 0x1105 +VIA = bindings::PCI_VENDOR_ID_VIA ,// 0x1106 +SIEMENS = bindings::PCI_VENDOR_ID_SIEMENS ,// 0x110A +VORTEX = bindings::PCI_VENDOR_ID_VORTEX ,// 0x1119 +EF = bindings::PCI_VENDOR_ID_EF ,// 0x111a +IDT = bindings::PCI_VENDOR_ID_IDT ,// 0x111d +FORE = bindings::PCI_VENDOR_ID_FORE ,// 0x1127 +PHILIPS = bindings::PCI_VENDOR_ID_PHILIPS ,// 0x1131 +EICON = bindings::PCI_VENDOR_ID_EICON ,// 0x1133 +CISCO = bindings::PCI_VENDOR_ID_CISCO ,// 0x1137 +ZIATECH = bindings::PCI_VENDOR_ID_ZIATECH ,// 0x1138 +SYSKONNECT = bindings::PCI_VENDOR_ID_SYSKONNECT ,// 0x1148 +DIGI = bindings::PCI_VENDOR_ID_DIGI ,// 0x114f +XIRCOM = bindings::PCI_VENDOR_ID_XIRCOM ,// 0x115d +SERVERWORKS = bindings::PCI_VENDOR_ID_SERVERWORKS ,// 0x1166 +ALTERA = bindings::PCI_VENDOR_ID_ALTERA ,// 0x1172 +SBE = bindings::PCI_VENDOR_ID_SBE ,// 0x1176 +TOSHIBA = bindings::PCI_VENDOR_ID_TOSHIBA ,// 0x1179 +TOSHIBA_2 = bindings::PCI_VENDOR_ID_TOSHIBA_2 ,// 0x102f +ATTO = bindings::PCI_VENDOR_ID_ATTO ,// 0x117c +RICOH = bindings::PCI_VENDOR_ID_RICOH ,// 0x1180 +DLINK = bindings::PCI_VENDOR_ID_DLINK ,// 0x1186 +ARTOP = bindings::PCI_VENDOR_ID_ARTOP ,// 0x1191 +ZEITNET = bindings::PCI_VENDOR_ID_ZEITNET ,// 0x1193 +FUJITSU_ME = bindings::PCI_VENDOR_ID_FUJITSU_ME ,// 0x119e +MARVELL = bindings::PCI_VENDOR_ID_MARVELL ,// 0x11ab +MARVELL_EXT = bindings::PCI_VENDOR_ID_MARVELL_EXT ,// 0x1b4b +V3 = bindings::PCI_VENDOR_ID_V3 ,// 0x11b0 +ATT = bindings::PCI_VENDOR_ID_ATT ,// 0x11c1 +SPECIALIX = bindings::PCI_VENDOR_ID_SPECIALIX ,// 0x11cb +ANALOG_DEVICES = bindings::PCI_VENDOR_ID_ANALOG_DEVICES ,// 0x11d4 +ZORAN = bindings::PCI_VENDOR_ID_ZORAN ,// 0x11de +COMPEX = bindings::PCI_VENDOR_ID_COMPEX ,// 0x11f6 +MICROSEMI = bindings::PCI_VENDOR_ID_MICROSEMI ,// 0x11f8 +RP = bindings::PCI_VENDOR_ID_RP ,// 0x11fe +CYCLADES = bindings::PCI_VENDOR_ID_CYCLADES ,// 0x120e +ESSENTIAL = bindings::PCI_VENDOR_ID_ESSENTIAL ,// 0x120f +O2 = bindings::PCI_VENDOR_ID_O2 ,// 0x1217 +THREEDX = bindings::PCI_VENDOR_ID_3DFX ,// 0x121a +AVM = bindings::PCI_VENDOR_ID_AVM ,// 0x1244 +STALLION = bindings::PCI_VENDOR_ID_STALLION ,// 0x124d +AT = bindings::PCI_VENDOR_ID_AT ,// 0x1259 +ASIX = bindings::PCI_VENDOR_ID_ASIX ,// 0x125b +ESS = bindings::PCI_VENDOR_ID_ESS ,// 0x125d +SATSAGEM = bindings::PCI_VENDOR_ID_SATSAGEM ,// 0x1267 +ENSONIQ = bindings::PCI_VENDOR_ID_ENSONIQ ,// 0x1274 +TRANSMETA = bindings::PCI_VENDOR_ID_TRANSMETA ,// 0x1279 +ROCKWELL = bindings::PCI_VENDOR_ID_ROCKWELL ,// 0x127A +ITE = bindings::PCI_VENDOR_ID_ITE ,// 0x1283 +ALTEON = bindings::PCI_VENDOR_ID_ALTEON ,// 0x12ae +NVIDIA_SGS = bindings::PCI_VENDOR_ID_NVIDIA_SGS ,// 0x12d2 +PERICOM = bindings::PCI_VENDOR_ID_PERICOM ,// 0x12D8 +AUREAL = bindings::PCI_VENDOR_ID_AUREAL ,// 0x12eb +ELECTRONICDESIGNGMBH = bindings::PCI_VENDOR_ID_ELECTRONICDESIGNGMBH ,// 0x12f8 +ESDGMBH = bindings::PCI_VENDOR_ID_ESDGMBH ,// 0x12fe +CB = bindings::PCI_VENDOR_ID_CB ,// 0x1307 +SIIG = bindings::PCI_VENDOR_ID_SIIG ,// 0x131f +RADISYS = bindings::PCI_VENDOR_ID_RADISYS ,// 0x1331 +MICRO_MEMORY = bindings::PCI_VENDOR_ID_MICRO_MEMORY ,// 0x1332 +DOMEX = bindings::PCI_VENDOR_ID_DOMEX ,// 0x134a +INTASHIELD = bindings::PCI_VENDOR_ID_INTASHIELD ,// 0x135a +QUATECH = bindings::PCI_VENDOR_ID_QUATECH ,// 0x135C +SEALEVEL = bindings::PCI_VENDOR_ID_SEALEVEL ,// 0x135e +HYPERCOPE = bindings::PCI_VENDOR_ID_HYPERCOPE ,// 0x1365 +DIGIGRAM = bindings::PCI_VENDOR_ID_DIGIGRAM ,// 0x1369 +KAWASAKI = bindings::PCI_VENDOR_ID_KAWASAKI ,// 0x136b +CNET = bindings::PCI_VENDOR_ID_CNET ,// 0x1371 +LMC = bindings::PCI_VENDOR_ID_LMC ,// 0x1376 +NETGEAR = bindings::PCI_VENDOR_ID_NETGEAR ,// 0x1385 +APPLICOM = bindings::PCI_VENDOR_ID_APPLICOM ,// 0x1389 +MOXA = bindings::PCI_VENDOR_ID_MOXA ,// 0x1393 +CCD = bindings::PCI_VENDOR_ID_CCD ,// 0x1397 +EXAR = bindings::PCI_VENDOR_ID_EXAR ,// 0x13a8 +MICROGATE = bindings::PCI_VENDOR_ID_MICROGATE ,// 0x13c0 +THREEWARE = bindings::PCI_VENDOR_ID_3WARE ,// 0x13C1 +IOMEGA = bindings::PCI_VENDOR_ID_IOMEGA ,// 0x13ca +ABOCOM = bindings::PCI_VENDOR_ID_ABOCOM ,// 0x13D1 +SUNDANCE = bindings::PCI_VENDOR_ID_SUNDANCE ,// 0x13f0 +CMEDIA = bindings::PCI_VENDOR_ID_CMEDIA ,// 0x13f6 +ADVANTECH = bindings::PCI_VENDOR_ID_ADVANTECH ,// 0x13fe +MEILHAUS = bindings::PCI_VENDOR_ID_MEILHAUS ,// 0x1402 +LAVA = bindings::PCI_VENDOR_ID_LAVA ,// 0x1407 +TIMEDIA = bindings::PCI_VENDOR_ID_TIMEDIA ,// 0x1409 +ICE = bindings::PCI_VENDOR_ID_ICE ,// 0x1412 +MICROSOFT = bindings::PCI_VENDOR_ID_MICROSOFT ,// 0x1414 +OXSEMI = bindings::PCI_VENDOR_ID_OXSEMI ,// 0x1415 +CHELSIO = bindings::PCI_VENDOR_ID_CHELSIO ,// 0x1425 +EDIMAX = bindings::PCI_VENDOR_ID_EDIMAX ,// 0x1432 +ADLINK = bindings::PCI_VENDOR_ID_ADLINK ,// 0x144a +SAMSUNG = bindings::PCI_VENDOR_ID_SAMSUNG ,// 0x144d +GIGABYTE = bindings::PCI_VENDOR_ID_GIGABYTE ,// 0x1458 +AMBIT = bindings::PCI_VENDOR_ID_AMBIT ,// 0x1468 +MYRICOM = bindings::PCI_VENDOR_ID_MYRICOM ,// 0x14c1 +MEDIATEK = bindings::PCI_VENDOR_ID_MEDIATEK ,// 0x14c3 +TITAN = bindings::PCI_VENDOR_ID_TITAN ,// 0x14D2 +PANACOM = bindings::PCI_VENDOR_ID_PANACOM ,// 0x14d4 +SIPACKETS = bindings::PCI_VENDOR_ID_SIPACKETS ,// 0x14d9 +AFAVLAB = bindings::PCI_VENDOR_ID_AFAVLAB ,// 0x14db +AMPLICON = bindings::PCI_VENDOR_ID_AMPLICON ,// 0x14dc +BCM_GVC = bindings::PCI_VENDOR_ID_BCM_GVC ,// 0x14a4 +BROADCOM = bindings::PCI_VENDOR_ID_BROADCOM ,// 0x14e4 +TOPIC = bindings::PCI_VENDOR_ID_TOPIC ,// 0x151f +MAINPINE = bindings::PCI_VENDOR_ID_MAINPINE ,// 0x1522 +ENE = bindings::PCI_VENDOR_ID_ENE ,// 0x1524 +SYBA = bindings::PCI_VENDOR_ID_SYBA ,// 0x1592 +MORETON = bindings::PCI_VENDOR_ID_MORETON ,// 0x15aa +VMWARE = bindings::PCI_VENDOR_ID_VMWARE ,// 0x15ad +ZOLTRIX = bindings::PCI_VENDOR_ID_ZOLTRIX ,// 0x15b0 +MELLANOX = bindings::PCI_VENDOR_ID_MELLANOX ,// 0x15b3 +DFI = bindings::PCI_VENDOR_ID_DFI ,// 0x15bd +QUICKNET = bindings::PCI_VENDOR_ID_QUICKNET ,// 0x15e2 +ADDIDATA = bindings::PCI_VENDOR_ID_ADDIDATA ,// 0x15B8 +PDC = bindings::PCI_VENDOR_ID_PDC ,// 0x15e9 +FARSITE = bindings::PCI_VENDOR_ID_FARSITE ,// 0x1619 +ARIMA = bindings::PCI_VENDOR_ID_ARIMA ,// 0x161f +BROCADE = bindings::PCI_VENDOR_ID_BROCADE ,// 0x1657 +SIBYTE = bindings::PCI_VENDOR_ID_SIBYTE ,// 0x166d +ATHEROS = bindings::PCI_VENDOR_ID_ATHEROS ,// 0x168c +NETCELL = bindings::PCI_VENDOR_ID_NETCELL ,// 0x169c +CENATEK = bindings::PCI_VENDOR_ID_CENATEK ,// 0x16CA +SYNOPSYS = bindings::PCI_VENDOR_ID_SYNOPSYS ,// 0x16c3 +USR = bindings::PCI_VENDOR_ID_USR ,// 0x16ec +VITESSE = bindings::PCI_VENDOR_ID_VITESSE ,// 0x1725 +LINKSYS = bindings::PCI_VENDOR_ID_LINKSYS ,// 0x1737 +ALTIMA = bindings::PCI_VENDOR_ID_ALTIMA ,// 0x173b +CAVIUM = bindings::PCI_VENDOR_ID_CAVIUM ,// 0x177d +TECHWELL = bindings::PCI_VENDOR_ID_TECHWELL ,// 0x1797 +BELKIN = bindings::PCI_VENDOR_ID_BELKIN ,// 0x1799 +RDC = bindings::PCI_VENDOR_ID_RDC ,// 0x17f3 +GLI = bindings::PCI_VENDOR_ID_GLI ,// 0x17a0 +LENOVO = bindings::PCI_VENDOR_ID_LENOVO ,// 0x17aa +QCOM = bindings::PCI_VENDOR_ID_QCOM ,// 0x17cb +CDNS = bindings::PCI_VENDOR_ID_CDNS ,// 0x17cd +ARECA = bindings::PCI_VENDOR_ID_ARECA ,// 0x17d3 +S2IO = bindings::PCI_VENDOR_ID_S2IO ,// 0x17d5 +SITECOM = bindings::PCI_VENDOR_ID_SITECOM ,// 0x182d +TOPSPIN = bindings::PCI_VENDOR_ID_TOPSPIN ,// 0x1867 +COMMTECH = bindings::PCI_VENDOR_ID_COMMTECH ,// 0x18f7 +SILAN = bindings::PCI_VENDOR_ID_SILAN ,// 0x1904 +RENESAS = bindings::PCI_VENDOR_ID_RENESAS ,// 0x1912 +SOLARFLARE = bindings::PCI_VENDOR_ID_SOLARFLARE ,// 0x1924 +TDI = bindings::PCI_VENDOR_ID_TDI ,// 0x192E +NXP = bindings::PCI_VENDOR_ID_NXP ,// 0x1957 +PASEMI = bindings::PCI_VENDOR_ID_PASEMI ,// 0x1959 +ATTANSIC = bindings::PCI_VENDOR_ID_ATTANSIC ,// 0x1969 +JMICRON = bindings::PCI_VENDOR_ID_JMICRON ,// 0x197B +KORENIX = bindings::PCI_VENDOR_ID_KORENIX ,// 0x1982 +HUAWEI = bindings::PCI_VENDOR_ID_HUAWEI ,// 0x19e5 +NETRONOME = bindings::PCI_VENDOR_ID_NETRONOME ,// 0x19ee +QMI = bindings::PCI_VENDOR_ID_QMI ,// 0x1a32 +AZWAVE = bindings::PCI_VENDOR_ID_AZWAVE ,// 0x1a3b +REDHAT_QUMRANET = bindings::PCI_VENDOR_ID_REDHAT_QUMRANET ,// 0x1af4 +ASMEDIA = bindings::PCI_VENDOR_ID_ASMEDIA ,// 0x1b21 +REDHAT = bindings::PCI_VENDOR_ID_REDHAT ,// 0x1b36 +WCHIC = bindings::PCI_VENDOR_ID_WCHIC ,// 0x1c00 +SILICOM_DENMARK = bindings::PCI_VENDOR_ID_SILICOM_DENMARK ,// 0x1c2c +AMAZON_ANNAPURNA_LABS = bindings::PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS ,// 0x1c36 +CIRCUITCO = bindings::PCI_VENDOR_ID_CIRCUITCO ,// 0x1cc8 +AMAZON = bindings::PCI_VENDOR_ID_AMAZON ,// 0x1d0f +ZHAOXIN = bindings::PCI_VENDOR_ID_ZHAOXIN ,// 0x1d17 +ROCKCHIP = bindings::PCI_VENDOR_ID_ROCKCHIP ,// 0x1d87 +HYGON = bindings::PCI_VENDOR_ID_HYGON ,// 0x1d94 +META = bindings::PCI_VENDOR_ID_META ,// 0x1d9b +FUNGIBLE = bindings::PCI_VENDOR_ID_FUNGIBLE ,// 0x1dad +HXT = bindings::PCI_VENDOR_ID_HXT ,// 0x1dbf +TEKRAM = bindings::PCI_VENDOR_ID_TEKRAM ,// 0x1de1 +RPI = bindings::PCI_VENDOR_ID_RPI ,// 0x1de4 +ALIBABA = bindings::PCI_VENDOR_ID_ALIBABA ,// 0x1ded +CXL = bindings::PCI_VENDOR_ID_CXL ,// 0x1e98 +TEHUTI = bindings::PCI_VENDOR_ID_TEHUTI ,// 0x1fc9 +SUNIX = bindings::PCI_VENDOR_ID_SUNIX ,// 0x1fd4 +HINT = bindings::PCI_VENDOR_ID_HINT ,// 0x3388 +THREEDLABS = bindings::PCI_VENDOR_ID_3DLABS ,// 0x3d3d +NETXEN = bindings::PCI_VENDOR_ID_NETXEN ,// 0x4040 +AKS = bindings::PCI_VENDOR_ID_AKS ,// 0x416c +WCHCN = bindings::PCI_VENDOR_ID_WCHCN ,// 0x4348 +ACCESSIO = bindings::PCI_VENDOR_ID_ACCESSIO ,// 0x494f +S3 = bindings::PCI_VENDOR_ID_S3 ,// 0x5333 +DUNORD = bindings::PCI_VENDOR_ID_DUNORD ,// 0x5544 +DCI = bindings::PCI_VENDOR_ID_DCI ,// 0x6666 +GLENFLY = bindings::PCI_VENDOR_ID_GLENFLY ,// 0x6766 +INTEL = bindings::PCI_VENDOR_ID_INTEL ,// 0x8086 +WANGXUN = bindings::PCI_VENDOR_ID_WANGXUN ,// 0x8088 +SCALEMP = bindings::PCI_VENDOR_ID_SCALEMP ,// 0x8686 +COMPUTONE = bindings::PCI_VENDOR_ID_COMPUTONE ,// 0x8e0e +KTI = bindings::PCI_VENDOR_ID_KTI ,// 0x8e2e +ADAPTEC = bindings::PCI_VENDOR_ID_ADAPTEC ,// 0x9004 +ADAPTEC2 = bindings::PCI_VENDOR_ID_ADAPTEC2 ,// 0x9005 +HOLTEK = bindings::PCI_VENDOR_ID_HOLTEK ,// 0x9412 +NETMOS = bindings::PCI_VENDOR_ID_NETMOS ,// 0x9710 +THREECOM_2 = bindings::PCI_VENDOR_ID_3COM_2 ,// 0xa727 +SOLIDRUN = bindings::PCI_VENDOR_ID_SOLIDRUN ,// 0xd063 +DIGIUM = bindings::PCI_VENDOR_ID_DIGIUM ,// 0xd161 +TIGERJET = bindings::PCI_VENDOR_ID_TIGERJET ,// 0xe159 +XILINX_RME = bindings::PCI_VENDOR_ID_XILINX_RME ,// 0xea60 +XEN = bindings::PCI_VENDOR_ID_XEN ,// 0x5853 +OCZ = bindings::PCI_VENDOR_ID_OCZ ,// 0x1b85 +NCUBE = bindings::PCI_VENDOR_ID_NCUBE ,// 0x10ff +UNKNOWN =0xffff , +}Signature · 1 line
2.50.1
Re: [PATCH v5 2/4] rust: pci: provide access to PCI Vendor values
Quoted 112 lines · Elle Rhumsaa
Quoted 92 lines · John Hubbard
This allows callers to write
Vendor::SOME_COMPANYinstead ofbindings::PCI_VENDOR_ID_SOME_COMPANY.New APIs:
Vendor::SOME_COMPANYVendor::as_raw()
Vendor: From<u32> for VendorCc Danilo Krummrich <[email protected]>Cc Alexandre Courbot <[email protected]>Cc Elle Rhumsaa <[email protected]>Signed-off-by John Hubbard <[email protected]>--- rust/kernel/pci.rs | 2 +- rust/kernel/pci/id.rs | 355 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 355 insertions(+), 2 deletions(-)rust/kernel/pci.rs +1
-1@@ -25,7 +25,7 @@mod id; -pub use self::id::{Class ,ClassMask }; +pub use self::id::{Class ,ClassMask ,Vendor };/// An adapter for the registration of PCI drivers. pub struct Adapter <T :Driver >(T );rust/kernel/pci/id.rs +46
-1@@ -2,7 +2,7 @@//! PCI device identifiers and related types. //! -//! This module contains PCI class codes and supporting types. +//! This module contains PCI class codes, Vendor IDs, and supporting types. use crate ::{bindings, error::code::EINVAL , error::Error , prelude::*};use core::fmt;@@ -115,6 +115,74 @@ fn try_from(value: u32) -> Result<Self, Self::Error> { } } +/// PCI vendor IDs. +/// +/// Each entry contains the 16-bit PCI vendor ID as assigned by the PCI SIG. +/// +/// # Examples +/// +/// ``` +/// # use kernel::{device::Core, pci::{self, Vendor}, prelude::*}; +/// fn log_device_info(pdev: &pci::Device<Core>) -> Result<()> { +/// // Get the raw PCI vendor ID and convert to Vendor +/// let vendor_id = pdev.vendor_id(); +/// let vendor = Vendor::new(vendor_id.into()); +/// dev_info!( +/// pdev.as_ref(), +/// "Device: Vendor={}, Device=0x{:x}\n", +/// vendor, +/// pdev.device_id() +/// ); +/// Ok(()) +/// } +/// ``` +#[derive( Debug , Clone , Copy , PartialEq , Eq )] +#[repr(transparent)] +pub struct Vendor (u32 ); + +macro_rules! define_all_pci_vendors { + ( + $($variant:ident = $binding:expr,)+ + ) => { + +impl Vendor { + $( +#[allow(missing_docs)] +pub const $variant:Self =Self ($bindingas u32 ); + )+ + } + +/// Convert a raw 16-bit vendor ID to a `Vendor`. +impl From <u32 >for Vendor { +fn from(value:u32 ) ->Self { +match value { + $(xif x ==Self ::$variant.0 =>Self ::$variant,)+ + _ =>Self ::UNKNOWN , + } + }rust/kernel/pci/id.rs fn try_from(value: u32) -> Result<Self, Self::Error> { · line 172
Quoted 10 lines
rust/kernel/pci/id.rs +10
-0+ } + }; +} + +/// Once constructed, a `Vendor` contains a valid PCI Vendor ID. +impl Vendor { +/// Create a new Vendor from a raw 16-bit vendor ID. +pub fn new (vendor_id:u32 ) ->Self { +Self ::from (vendor_id) + }Reversing this implementation would allow for a signature:
```rust pub const fn new(vendor_id: u32) -> Self { ... } ```
Quoted 8 lines
Which would allow use in
constcontexts. Until we get a stableconst-traitimpl, this is kind of the best workaround.Then, the
From<u32>implementation can callSelf::new.Not really applicable here, but you can also provide a
Defaultimplementation forSelf::newwith no parameters.
I'm going to post a new version, v7, later today, that will change this area around quite a bit.
thanks,
Signature · 1 line
John Hubbard
PATCH v5 3/4 gpu: nova-core: avoid probing non-display/compute PCI functions
In reply to John HubbardNovaCore has so far been too imprecise about figuring out if .probe() has found a supported PCI PF (Physical Function). By that I mean:
.probe() sets up BAR0 (which involves a lot of very careful devres and Device<Bound> details behind the scenes). And then if it is dealing with a non-supported device such as the .1 audio PF on many GPUs, it fails out due to an unexpected BAR0 size. We have been fortunate that the BAR0 sizes are different.
Really, we should be filtering on PCI class ID instead. These days I think we can confidently pick out Nova's supported PF's via PCI class ID. And if not, then we'll revisit.
The approach here is to filter on "Display VGA" or "Display 3D", which is how PCI class IDs express "this is a modern GPU's PF".
--- drivers/gpu/nova-core/driver.rs | 33 ++++++++++++++++++++++++++++----- rust/kernel/pci.rs | 21 +++++++++++++++++++++ 2 files changed, 49 insertions(+), 5 deletions(-)
drivers/gpu/nova-core/driver.rs +28 -5
@@ -1,6 +1,14 @@// SPDX-License-Identifier: GPL-2.0 -use kernel::{auxiliary, bindings, c_str, device::Core , pci, prelude::*, sizes::SZ_16M , sync::Arc }; +use kernel::{ + auxiliary, c_str, + device::Core , + pci, + pci::{Class ,ClassMask ,Vendor }, + prelude::*, + sizes::SZ_16M , + sync::Arc , +};use crate ::gpu::Gpu ;
@@ -18,10 +26,25 @@ pub(crate) struct NovaCore { PCI_TABLE, MODULE_PCI_TABLE, <NovaCore as pci::Driver>::IdInfo, - [( - pci::DeviceId ::from_id (bindings::PCI_VENDOR_ID_NVIDIA , bindings::PCI_ANY_ID as u32 ), - () - )] + [ +// 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 {
rust/kernel/pci.rs +21 -0
@@ -161,6 +161,27 @@ pub const fn from_class(class: u32, class_mask: u32) -> Self { override_only: 0, }) } + +/// Create a new `pci::DeviceId` from a class number, mask, and specific vendor. +/// +/// This is more targeted than [`DeviceId::from_class`]: in addition to matching by Vendor, it +/// also matches the PCI Class (up to the entire 24 bits, depending on the mask). +pub const fn from_class_and_vendor ( + class:Class , + class_mask:ClassMask , + vendor:Vendor , + ) ->Self { +Self (bindings::pci_device_id { + vendor: vendor.as_raw (), + device:DeviceId ::PCI_ANY_ID , + subvendor:DeviceId ::PCI_ANY_ID , + subdevice:DeviceId ::PCI_ANY_ID , + class: class.as_raw (), + class_mask: class_mask.as_raw (), + driver_data:0 , + override_only:0 , + }) + } }// SAFETY: `DeviceId` is a `#[repr(transparent)]` wrapper of `pci_device_id` and does not add
Signature · 1 line
2.50.1
Danilo Krummrich
maintainerRe: [PATCH v5 3/4] gpu: nova-core: avoid probing non-display/compute PCI functions
Quoted 15 lines · John Hubbard
NovaCore has so far been too imprecise about figuring out if .probe() has found a supported PCI PF (Physical Function). By that I mean:
.probe() sets up BAR0 (which involves a lot of very careful devres and Device<Bound> details behind the scenes). And then if it is dealing with a non-supported device such as the .1 audio PF on many GPUs, it fails out due to an unexpected BAR0 size. We have been fortunate that the BAR0 sizes are different.Really, we should be filtering on PCI class ID instead. These days I think we can confidently pick out Nova's supported PF's via PCI class ID. And if not, then we'll revisit.
The approach here is to filter on "Display VGA" or "Display 3D", which is how PCI class IDs express "this is a modern GPU's PF".
Quoted 7 lines
Cc Danilo Krummrich <[email protected]>Cc Alexandre Courbot <[email protected]>Cc Elle Rhumsaa <[email protected]>Signed-off-by John Hubbard <[email protected]>--- drivers/gpu/nova-core/driver.rs | 33 ++++++++++++++++++++++++++++----- rust/kernel/pci.rs | 21 +++++++++++++++++++++
Can you please split this one up in two patches?
Quoted 1 line
2 files changed, 49 insertions(+), 5 deletions(-)
Re: [PATCH v5 3/4] gpu: nova-core: avoid probing non-display/compute PCI functions
Quoted 24 lines · Danilo Krummrich
Quoted 15 lines · John Hubbard
NovaCore has so far been too imprecise about figuring out if .probe() has found a supported PCI PF (Physical Function). By that I mean:
.probe() sets up BAR0 (which involves a lot of very careful devres and Device<Bound> details behind the scenes). And then if it is dealing with a non-supported device such as the .1 audio PF on many GPUs, it fails out due to an unexpected BAR0 size. We have been fortunate that the BAR0 sizes are different.Really, we should be filtering on PCI class ID instead. These days I think we can confidently pick out Nova's supported PF's via PCI class ID. And if not, then we'll revisit.
The approach here is to filter on "Display VGA" or "Display 3D", which is how PCI class IDs express "this is a modern GPU's PF".
Quoted 7 lines
Cc Danilo Krummrich <[email protected]>Cc Alexandre Courbot <[email protected]>Cc Elle Rhumsaa <[email protected]>Signed-off-by John Hubbard <[email protected]>--- drivers/gpu/nova-core/driver.rs | 33 ++++++++++++++++++++++++++++----- rust/kernel/pci.rs | 21 +++++++++++++++++++++
Quoted 1 line
Can you please split this one up in two patches?
Sure.
Quoted 2 lines
Quoted 2 lines
2 files changed, 49 insertions(+), 5 deletions(-)
thanks,
Signature · 1 line
John Hubbard
PATCH v5 4/4 rust: pci: use pci::Vendor instead of bindings::PCI_VENDOR_ID_*
In reply to John HubbardChange Device::vendor_id() to return a Vendor type, and change DeviceId::from_id() to accept a Vendor type.
Use the new pci::Vendor in the various Rust for Linux callers who were previously using bindings::PCI_VENDOR_ID_*.
Doing so also allows removing "use kernel::bindings" entirely from most of the affected files here.
--- rust/kernel/pci.rs | 15 ++++++++------- rust/kernel/pci/id.rs | 5 ++--- samples/rust/rust_dma.rs | 6 +----- samples/rust/rust_driver_auxiliary.rs | 12 +++++------- samples/rust/rust_driver_pci.rs | 9 +++++---- 5 files changed, 21 insertions(+), 26 deletions(-)
rust/kernel/pci.rs +8 -7
@@ -132,10 +132,10 @@ impl DeviceId {/// Equivalent to C's `PCI_DEVICE` macro. /// -/// Create a new `pci::DeviceId` from a vendor and device ID number. -pub const fn from_id (vendor:u32 , device:u32 ) ->Self { +/// Create a new `pci::DeviceId` from a vendor and device ID. +pub const fn from_id (vendor:Vendor , device:u32 ) ->Self {Self (bindings::pci_device_id { - vendor, + vendor: vendor.as_raw (), device, subvendor:DeviceId ::PCI_ANY_ID , subdevice:DeviceId ::PCI_ANY_ID ,
@@ -231,7 +231,7 @@ macro_rules! pci_device_table {/// <MyDriver as pci::Driver>::IdInfo, /// [ /// ( -/// pci::DeviceId::from_id(bindings::PCI_VENDOR_ID_REDHAT, bindings::PCI_ANY_ID as u32), +/// pci::DeviceId::from_id(pci::Vendor::REDHAT, bindings::PCI_ANY_ID as u32), /// (), /// ) /// ]
@@ -412,10 +412,11 @@ fn as_raw(&self) -> *mut bindings::pci_dev { }impl Device { -/// Returns the PCI vendor ID. -pub fn vendor_id (&self) ->u16 { +/// Returns the PCI vendor ID as a validated Vendor. +pub fn vendor_id (&self) ->Vendor {// SAFETY: `self.as_raw` is a valid pointer to a `struct pci_dev`. -unsafe { (*self.as_raw ()).vendor } +let vendor_id =unsafe { (*self.as_raw ()).vendor }; +Vendor ::new (u32::from (vendor_id)) }/// Returns the PCI device ID.
rust/kernel/pci/id.rs +2 -3
@@ -124,9 +124,8 @@ fn try_from(value: u32) -> Result<Self, Self::Error> {/// ``` /// # use kernel::{device::Core, pci::{self, Vendor}, prelude::*}; /// fn log_device_info(pdev: &pci::Device<Core>) -> Result<()> { -/// // Get the raw PCI vendor ID and convert to Vendor -/// let vendor_id = pdev.vendor_id(); -/// let vendor = Vendor::new(vendor_id.into()); +/// // Get the validated PCI vendor ID +/// let vendor = pdev.vendor_id(); /// dev_info!( /// pdev.as_ref(), /// "Device: Vendor={}, Device=0x{:x}\n",
samples/rust/rust_dma.rs +1 -5
@@ -5,7 +5,6 @@//! To make this driver probe, QEMU must be run with `-device pci-testdev`. use kernel::{ - bindings, device::Core , dma::{CoherentAllocation ,Device ,DmaMask }, pci,
@@ -45,10 +44,7 @@ unsafe impl kernel::transmute::FromBytes for MyStruct {} PCI_TABLE, MODULE_PCI_TABLE, <DmaSampleDriver as pci::Driver>::IdInfo, - [( - pci::DeviceId ::from_id (bindings::PCI_VENDOR_ID_REDHAT ,0x5 ), - () - )] + [(pci::DeviceId ::from_id (pci::Vendor ::REDHAT ,0x5 ), ())] );impl pci::Driver for DmaSampleDriver {
samples/rust/rust_driver_auxiliary.rs +5 -7
@@ -5,7 +5,7 @@//! To make this driver probe, QEMU must be run with `-device pci-testdev`. use kernel::{ - auxiliary, bindings, c_str, device::Core , driver, error::Error , pci, prelude::*,InPlaceModule , + auxiliary, c_str, device::Core , driver, error::Error , pci, prelude::*,InPlaceModule , };use pin_init::PinInit ;
@@ -50,10 +50,7 @@ struct ParentDriver { PCI_TABLE, MODULE_PCI_TABLE, <ParentDriver as pci::Driver>::IdInfo, - [( - pci::DeviceId ::from_id (bindings::PCI_VENDOR_ID_REDHAT ,0x5 ), - () - )] + [(pci::DeviceId ::from_id (pci::Vendor ::REDHAT ,0x5 ), ())] );impl pci::Driver for ParentDriver {
@@ -81,11 +78,12 @@ fn connect(adev: &auxiliary::Device) -> Result<()> {let parent = adev.parent ().ok_or (EINVAL )?;let pdev: &pci::Device = parent.try_into ()?; +let vendor = pdev.vendor_id ();dev_info! ( adev.as_ref (), -"Connect auxiliary {} with parent: VendorID={:#x}, DeviceID={:#x}\n" , +"Connect auxiliary {} with parent: VendorID={}, DeviceID={:#x}\n" , adev.id (), - pdev.vendor_id (), + vendor, pdev.device_id () );
samples/rust/rust_driver_pci.rs +5 -4
@@ -4,7 +4,7 @@//! //! 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 }; +use kernel::{c_str, device::Core , devres::Devres , pci, prelude::*, types::ARef };struct Regs ;
@@ -38,7 +38,7 @@ struct SampleDriver { MODULE_PCI_TABLE, <SampleDriver as pci::Driver>::IdInfo, [( - pci::DeviceId ::from_id (bindings::PCI_VENDOR_ID_REDHAT ,0x5 ), + pci::DeviceId ::from_id (pci::Vendor ::REDHAT ,0x5 ),TestIndex ::NO_EVENTFD )] );
@@ -66,10 +66,11 @@ impl pci::Driver for SampleDriver {const ID_TABLE : pci::IdTable <Self ::IdInfo > = &PCI_TABLE ;fn probe (pdev: &pci::Device <Core >, info: &Self ::IdInfo ) ->Result <Pin <KBox <Self >>> { +let vendor = pdev.vendor_id ();dev_dbg! ( pdev.as_ref (), -"Probe Rust PCI driver sample (PCI ID: 0x{:x}, 0x{:x}).\n" , - pdev.vendor_id (), +"Probe Rust PCI driver sample (PCI ID: {}, 0x{:x}).\n" , + vendor, pdev.device_id () );
Signature · 1 line
2.50.1