Add Rust bindings for device property child nodes and reference args
Subsystems (3)
cover Add Rust bindings for device property child nodes and reference args
This patch series was split-off from an earlier one. [1]
changes in v1 (compared to previous patch series):
* Fix resource leak of FwNodeReferenceArgs.
* Improve documentation of the type invariants of FwNodeReferenceArgs and how they are upheld at crate-internal use-sites.
* Remove derived implementation of Clone of FwNodeReferenceArgs. It would be unsafe according to the new type invariants.
* Add Debug implementation for FwNodeReferenceArgs.
* Add examples.
Best regards,
Remo
[1] https://lore.kernel.org/lkml/[email protected]/
Remo Senekowitsch (3):
rust: device: Add child accessor and iterator
rust: device: Add property_get_reference_args
samples: rust: platform: Add property child and reference args
examples
drivers/of/unittest-data/tests-platform.dtsi | 7 + rust/kernel/device/property.rs | 158 +++++++++++++++++++ samples/rust/rust_driver_platform.rs | 13 +- 3 files changed, 177 insertions(+), 1 deletion(-)
Signature · 1 line
2.49.0
PATCH 1/3 rust: device: Add child accessor and iterator
Allow Rust drivers to access children of a fwnode either by name or by iterating over all of them.
In C, there is the function fwnode_get_next_child_node for iteration and the macro fwnode_for_each_child_node that helps with handling the pointers. Instead of a macro, a native iterator is used in Rust such that regular for-loops can be used.
--- rust/kernel/device/property.rs | 56 ++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)
rust/kernel/device/property.rs +56 -0
@@ -190,6 +190,62 @@ pub fn property_read<'fwnode, 'name, T: Property>( name, } } + +/// Returns first matching named child node handle. +pub fn get_child_by_name (&self, name: &CStr ) ->Option <ARef <Self >> { +// SAFETY: `self` and `name` are valid by their type invariants. +let child = +unsafe { bindings::fwnode_get_named_child_node (self.as_raw (), name.as_char_ptr ()) }; +if child.is_null () { +return None ; + } +// SAFETY: +// - `fwnode_get_named_child_node` returns a pointer with its refcount +// incremented. +// - That increment is relinquished, i.e. the underlying object is not +// used anymore except via the newly created `ARef`. +Some (unsafe {Self ::from_raw (child) }) + } + +/// Returns an iterator over a node's children. +pub fn children <'a>(&'a self) ->impl Iterator <Item =ARef <FwNode >> + 'a { +let mut prev:Option <ARef <FwNode >> =None ; + + core::iter::from_fn (move || { +let prev_ptr =match prev.take () { +None => ptr::null_mut (), +Some (prev) => { +// We will pass `prev` to `fwnode_get_next_child_node`, +// which decrements its refcount, so we use +// `ARef::into_raw` to avoid decrementing the refcount +// twice. +let prev =ARef ::into_raw (prev); + prev.as_ptr ().cast () + } + }; +// SAFETY: +// - `self.as_raw()` is valid by its type invariant. +// - `prev_ptr` may be null, which is allowed and corresponds to +// getting the first child. Otherwise, `prev_ptr` is valid, as it +// is the stored return value from the previous invocation. +// - `prev_ptr` has its refount incremented. +// - The increment of `prev_ptr` is relinquished, i.e. the +// underlying object won't be used anymore. +let next =unsafe { bindings::fwnode_get_next_child_node (self.as_raw (), prev_ptr) }; +if next.is_null () { +return None ; + } +// SAFETY: +// - `next` is valid because `fwnode_get_next_child_node` returns a +// pointer with its refcount incremented. +// - That increment is relinquished, i.e. the underlying object +// won't be used anymore, except via the newly created +// `ARef<Self>`. +let next =unsafe {FwNode ::from_raw (next) }; + prev =Some (next.clone ()); +Some (next) + }) + } }// SAFETY: Instances of `FwNode` are always reference-counted.
Signature · 1 line
2.49.0
PATCH 2/3 rust: device: Add property_get_reference_args
In reply to Remo SenekowitschAllow Rust code to read reference args from device properties. The wrapper type FwNodeReferenceArgs allows callers to access the buffer of read args safely.
---
--- rust/kernel/device/property.rs | 102 +++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+)
rust/kernel/device/property.rs +102 -0
@@ -246,6 +246,99 @@ pub fn children<'a>(&'a self) -> impl Iterator<Item = ARef<FwNode>> + 'a {Some (next) }) } + +/// Finds a reference with arguments. +pub fn property_get_reference_args ( + &self, + prop: &CStr , + nargs:NArgs <'_>, + index:u32 , + ) ->Result <FwNodeReferenceArgs > { +let mut out_args =FwNodeReferenceArgs ::default (); + +let (nargs_prop, nargs) =match nargs { +NArgs ::Prop (nargs_prop) => (nargs_prop.as_char_ptr (),0 ), +NArgs ::N (nargs) => (ptr::null (), nargs), + }; + +// SAFETY: +// - `self.0.get()` is valid. +// - `prop.as_char_ptr()` is valid and zero-terminated. +// - `nargs_prop` is valid and zero-terminated if `nargs` +// is zero, otherwise it is allowed to be a null-pointer. +// - The function upholds the type invariants of `out_args`, +// namely: +// - It may fill the field `fwnode` with a valid pointer, +// in which case its refcount is incremented. +// - It may modify the field `nargs`, in which case it +// initializes at least as many elements in `args`. +let ret =unsafe { + bindings::fwnode_property_get_reference_args ( + self.0 .get (), + prop.as_char_ptr (), + nargs_prop, + nargs, + index, + &mut out_args.0 , + ) + }; +to_result (ret)?; + +Ok (out_args) + } +} + +/// The return value of [`FwNode::property_get_reference_args`]. +/// +/// This structure represents the Rust abstraction for a C +/// `struct fwnode_reference_args` which was initialized by the C side. +/// +/// # Invariants +/// +/// If the field `fwnode` is valid, it owns an increment of its refcount. +/// +/// The field `args` contains at least as many initialized elements as indicated +/// by the field `nargs`. +#[repr(transparent)] +#[derive( Default )] +pub struct FwNodeReferenceArgs (bindings::fwnode_reference_args ); + +impl Drop for FwNodeReferenceArgs { +fn drop (&mut self) { +if !self.0 .fwnode.is_null () { +// SAFETY: +// - By the type invariants of `FwNodeReferenceArgs`, its field +// `fwnode` owns an increment of its refcount. +// - That increment is relinquished. The underlying object won't be +// used anymore because we are dropping it. +let _ =unsafe {FwNode ::from_raw (self.0 .fwnode) }; + } + } +} + +impl FwNodeReferenceArgs { +/// Returns the slice of reference arguments. +pub fn as_slice (&self) -> &[u64 ] { +// SAFETY: As per the safety invariant of `FwNodeReferenceArgs`, `nargs` +// is the minimum number of elements in `args` that is valid. +unsafe { core::slice::from_raw_parts (self.0 .args.as_ptr (), self.0 .nargsas usize ) } + } + +/// Returns the number of reference arguments. +pub fn len (&self) ->usize { + self.0 .nargsas usize + } + +/// Returns `true` if there are no reference arguments. +pub fn is_empty (&self) ->bool { + self.0 .nargs ==0 + } +} + +impl core::fmt::Debug for FwNodeReferenceArgs { +fn fmt (&self, f: &mut core::fmt::Formatter <'_>) -> core::fmt::Result { +write! (f,"{:?}" , self.as_slice ()) + } }// SAFETY: Instances of `FwNode` are always reference-counted.
@@ -462,6 +555,15 @@ fn read_from_fwnode_property(fwnode: &FwNode, name: &CStr) -> Result<Self> { i64: fwnode_property_read_u64_array, } +/// The number of arguments of a reference. +pub enum NArgs <'a> { +/// The name of the property of the reference indicating the number of +/// arguments. +Prop (&'aCStr ), +/// The known number of arguments. +N (u32 ), +} +/// A helper for reading device properties. /// /// Use [`Self::required_by`] if a missing property is considered a bug and
Signature · 1 line
2.49.0
PATCH 3/3 samples: rust: platform: Add property child and reference args examples
In reply to Remo SenekowitschAdd some example usage of the device property methods for reading DT/ACPI/swnode child nodes and reference args.
--- drivers/of/unittest-data/tests-platform.dtsi | 7 +++++++ samples/rust/rust_driver_platform.rs | 13 ++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)
drivers/of/unittest-data/tests-platform.dtsi +7 -0
@@ -40,6 +40,13 @@ test-device@2 { test,u32-prop = <0xdeadbeef>; test,i16-array = /bits/ 16 <1 2 (-3) (-4)>; + + ref_child_0: child@0 { + test,ref-arg = <&ref_child_1 0x20 0x32>; + }; + ref_child_1: child@1 { + test,ref-arg = <&ref_child_0 0x10 0x64>; + }; }; };
samples/rust/rust_driver_platform.rs +12 -1
@@ -4,7 +4,11 @@use kernel::{ c_str, - device::{self,Core }, + device::{ + self, + property::{FwNodeReferenceArgs ,NArgs }, +Core , + }, of, platform, prelude::*, str::CString ,
@@ -91,6 +95,13 @@ fn properties_parse(dev: &device::Device) -> Result {let prop:KVec <i16 > = fwnode.property_read_array_vec (name,4 )?.required_by (dev)?;dev_info! (dev,"'{name}'='{prop:?}' (KVec)\n" ); +for childin fwnode.children () { +let name =c_str! ("test,ref-arg" ); +let nargs =NArgs ::N (2 ); +let prop:FwNodeReferenceArgs = child.property_get_reference_args (name, nargs,0 )?; +dev_info! (dev,"'{name}'='{prop:?}'\n" ); + } +Ok (()) } }
Signature · 1 line
2.49.0
Rob Herring
maintainerRe: [PATCH v1 3/3] samples: rust: platform: Add property child and reference args examples
Quoted 15 lines · Remo Senekowitsch
Add some example usage of the device property methods for reading DT/ACPI/swnode child nodes and reference args.
Signed-off-by Remo Senekowitsch <[email protected]>--- drivers/of/unittest-data/tests-platform.dtsi | 7 +++++++ samples/rust/rust_driver_platform.rs | 13 ++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)drivers/of/unittest-data/tests-platform.dtsi +0
-0
drivers/of/unittest-data/tests-platform.dtsi test-device@2 { · line 44
Quoted 5 lines
drivers/of/unittest-data/tests-platform.dtsi +2
-0@@ -40,6 +40,13 @@ test-device@2 { test,u32-prop = <0xdeadbeef>; test,i16-array = /bits/ 16 <1 2 (-3) (-4)>; + + ref_child_0: child@0 {
child-0 or you need to add 'reg' property if you keep the unit-address.
Quoted 26 lines
drivers/of/unittest-data/tests-platform.dtsi +5
-0+ test,ref-arg = <&ref_child_1 0x20 0x32>; + }; + ref_child_1: child@1 { + test,ref-arg = <&ref_child_0 0x10 0x64>; + }; }; };samples/rust/rust_driver_platform.rs +5
-1@@ -4,7 +4,11 @@use kernel::{ c_str, - device::{self,Core }, + device::{ + self, + property::{FwNodeReferenceArgs ,NArgs }, +Core , + }, of, platform, prelude::*, str::CString ,
samples/rust/rust_driver_platform.rs fn properties_parse(dev: &device::Device) -> Result { · line 101
Quoted 7 lines
samples/rust/rust_driver_platform.rs +4
-0@@ -91,6 +95,13 @@ fn properties_parse(dev: &device::Device) -> Result {let prop:KVec <i16 > = fwnode.property_read_array_vec (name,4 )?.required_by (dev)?;dev_info! (dev,"'{name}'='{prop:?}' (KVec)\n" ); +for childin fwnode.children () { +let name =c_str! ("test,ref-arg" ); +let nargs =NArgs ::N (2 ); +let prop:FwNodeReferenceArgs = child.property_get_reference_args (name, nargs,0 )?;
Is there some reason we can just pass 2 in rather than nargs? Seems overly verbose for my tastes.
Quoted 9 lines
samples/rust/rust_driver_platform.rs +3
-1+dev_info! (dev,"'{name}'='{prop:?}'\n" ); + } +Ok (()) } } --2.49.0
Danilo Krummrich
maintainerRe: [PATCH v1 3/3] samples: rust: platform: Add property child and reference args examples
Quoted 5 lines · Rob Herring
Quoted 4 lines · Remo Senekowitsch
samples/rust/rust_driver_platform.rs +0
-0@@ -91,6 +95,13 @@ fn properties_parse(dev: &device::Device) -> Result {let prop:KVec <i16 > = fwnode.property_read_array_vec (name,4 )?.required_by (dev)?;dev_info! (dev,"'{name}'='{prop:?}' (KVec)\n" );
Quoted 7 lines
samples/rust/rust_driver_platform.rs fn properties_parse(dev: &device::Device) -> Result { · line 101
Quoted 4 lines
samples/rust/rust_driver_platform.rs +4
-0+for childin fwnode.children () { +let name =c_str! ("test,ref-arg" ); +let nargs =NArgs ::N (2 ); +let prop:FwNodeReferenceArgs = child.property_get_reference_args (name, nargs,0 )?;Is there some reason we can just pass 2 in rather than nargs? Seems overly verbose for my tastes.
It's because you could also pass NArgs::Prop("foo-bar") to indicate the the name of the property telling the number of arguments.
NArgs is defined as
pub enum NArgs<'a> {
/// The name of the property of the reference indicating the number of
/// arguments.
Prop(&'a CStr),
/// The known number of arguments.
N(u32),
}and FwNode::property_get_reference_args() can match against the corresponding enum variant to cover both cases.
Quoted 9 lines
Quoted 9 lines
samples/rust/rust_driver_platform.rs +3
-1+dev_info! (dev,"'{name}'='{prop:?}'\n" ); + } +Ok (()) } } --2.49.0
Re: [PATCH v1 3/3] samples: rust: platform: Add property child and reference args examples
Quoted 27 lines · Danilo Krummrich
Quoted 5 lines · Rob Herring
Quoted 4 lines · Remo Senekowitsch
samples/rust/rust_driver_platform.rs +0
-0@@ -91,6 +95,13 @@ fn properties_parse(dev: &device::Device) -> Result {let prop:KVec <i16 > = fwnode.property_read_array_vec (name,4 )?.required_by (dev)?;dev_info! (dev,"'{name}'='{prop:?}' (KVec)\n" );Quoted 7 lines
samples/rust/rust_driver_platform.rs fn properties_parse(dev: &device::Device) -> Result { · line 101
Quoted 4 lines
samples/rust/rust_driver_platform.rs +4
-0+for childin fwnode.children () { +let name =c_str! ("test,ref-arg" ); +let nargs =NArgs ::N (2 ); +let prop:FwNodeReferenceArgs = child.property_get_reference_args (name, nargs,0 )?;Is there some reason we can just pass 2 in rather than nargs? Seems overly verbose for my tastes.
It's because you could also pass
NArgs::Prop("foo-bar")to indicate the the name of the property telling the number of arguments.NArgs is defined as
pub enum NArgs<'a> { /// The name of the property of the reference indicating the number of /// arguments. Prop(&'a CStr), /// The known number of arguments. N(u32), }
Quoted 2 lines
and
FwNode::property_get_reference_args()can match against the corresponding enum variant to cover both cases.
I guess we could make the function generic if that's deemed worth it? A trait and an implementation for u32 and &CStr each. Similar to how we made property_read generic.
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
samples/rust/rust_driver_platform.rs +3
-1+dev_info! (dev,"'{name}'='{prop:?}'\n" ); + } +Ok (()) } } --2.49.0
Rob Herring
maintainerRe: [PATCH v1 3/3] samples: rust: platform: Add property child and reference args examples
Quoted 28 lines · Remo Senekowitsch
Quoted 27 lines · Danilo Krummrich
Quoted 5 lines · Rob Herring
Quoted 4 lines · Remo Senekowitsch
samples/rust/rust_driver_platform.rs +0
-0@@ -91,6 +95,13 @@ fn properties_parse(dev: &device::Device) -> Result {let prop:KVec <i16 > = fwnode.property_read_array_vec (name,4 )?.required_by (dev)?;dev_info! (dev,"'{name}'='{prop:?}' (KVec)\n" );Quoted 7 lines
samples/rust/rust_driver_platform.rs fn properties_parse(dev: &device::Device) -> Result { · line 101
Quoted 4 lines
samples/rust/rust_driver_platform.rs +4
-0+for childin fwnode.children () { +let name =c_str! ("test,ref-arg" ); +let nargs =NArgs ::N (2 ); +let prop:FwNodeReferenceArgs = child.property_get_reference_args (name, nargs,0 )?;Is there some reason we can just pass 2 in rather than nargs? Seems overly verbose for my tastes.
It's because you could also pass
NArgs::Prop("foo-bar")to indicate the the name of the property telling the number of arguments.NArgs is defined as
pub enum NArgs<'a> { /// The name of the property of the reference indicating the number of /// arguments. Prop(&'a CStr), /// The known number of arguments. N(u32), }
Quoted 6 lines
Quoted 2 lines
and
FwNode::property_get_reference_args()can match against the corresponding enum variant to cover both cases.I guess we could make the function generic if that's deemed worth it? A trait and an implementation for
u32and&CStreach. Similar to how we madeproperty_readgeneric.
There is a case where the cells property is optional and we fallback to 0 cells if not found. #msi-cells is an example. I imagine NArgs could express that while a generic could not? In any case, I don't expect drivers to have to deal with that as it would be subsystem code handling it.
As-is is fine I think. This function isn't too widely used that it could be changed later if we change our minds.
Rob
Danilo Krummrich
maintainerRe: [PATCH v1 3/3] samples: rust: platform: Add property child and reference args examples
Quoted 29 lines · Rob Herring
Quoted 28 lines · Remo Senekowitsch
Quoted 27 lines · Danilo Krummrich
Quoted 5 lines · Rob Herring
Quoted 4 lines · Remo Senekowitsch
samples/rust/rust_driver_platform.rs +0
-0@@ -91,6 +95,13 @@ fn properties_parse(dev: &device::Device) -> Result {let prop:KVec <i16 > = fwnode.property_read_array_vec (name,4 )?.required_by (dev)?;dev_info! (dev,"'{name}'='{prop:?}' (KVec)\n" );Quoted 7 lines
samples/rust/rust_driver_platform.rs fn properties_parse(dev: &device::Device) -> Result { · line 101
Quoted 4 lines
samples/rust/rust_driver_platform.rs +4
-0+for childin fwnode.children () { +let name =c_str! ("test,ref-arg" ); +let nargs =NArgs ::N (2 ); +let prop:FwNodeReferenceArgs = child.property_get_reference_args (name, nargs,0 )?;Is there some reason we can just pass 2 in rather than nargs? Seems overly verbose for my tastes.
It's because you could also pass
NArgs::Prop("foo-bar")to indicate the the name of the property telling the number of arguments.NArgs is defined as
pub enum NArgs<'a> { /// The name of the property of the reference indicating the number of /// arguments. Prop(&'a CStr), /// The known number of arguments. N(u32), }
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
and
FwNode::property_get_reference_args()can match against the corresponding enum variant to cover both cases.I guess we could make the function generic if that's deemed worth it? A trait and an implementation for
u32and&CStreach. Similar to how we madeproperty_readgeneric.
I don't think that's worth it; I think the current version is fine as it is.
Quoted 8 lines
There is a case where the cells property is optional and we fallback to 0 cells if not found. #msi-cells is an example. I imagine NArgs could express that while a generic could not? In any case, I don't expect drivers to have to deal with that as it would be subsystem code handling it.
As-is is fine I think. This function isn't too widely used that it could be changed later if we change our minds.
Agreed.
Danilo Krummrich
maintainerRe: [PATCH v1 3/3] samples: rust: platform: Add property child and reference args examples
In reply to Rob HerringQuoted 17 lines · Rob Herring
Quoted 16 lines · Remo Senekowitsch
Add some example usage of the device property methods for reading DT/ACPI/swnode child nodes and reference args.
Signed-off-by Remo Senekowitsch <[email protected]>--- drivers/of/unittest-data/tests-platform.dtsi | 7 +++++++ samples/rust/rust_driver_platform.rs | 13 ++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)drivers/of/unittest-data/tests-platform.dtsi +0
-0@@ -40,6 +40,13 @@ test-device@2 {
Quoted 6 lines
drivers/of/unittest-data/tests-platform.dtsi test-device@2 { · line 44
Quoted 4 lines
drivers/of/unittest-data/tests-platform.dtsi +2
-0test,u32-prop = <0xdeadbeef>; test,i16-array = /bits/ 16 <1 2 (-3) (-4)>; + + ref_child_0: child@0 {child-0 or you need to add 'reg' property if you keep the unit-address.
Adding child nodes here creates the following dt-test failues.
[ 1.031239] ### dt-test ### FAIL of_unittest_platform_populate():1862 Could not create device for node 'child' [ 1.031647] ### dt-test ### FAIL of_unittest_platform_populate():1862 Could not create device for node 'child'
@Rob: What do you suggest?
Quoted 8 lines
Quoted 8 lines
drivers/of/unittest-data/tests-platform.dtsi +5
-0+ test,ref-arg = <&ref_child_1 0x20 0x32>; + }; + ref_child_1: child@1 { + test,ref-arg = <&ref_child_0 0x10 0x64>; + }; }; };
Rob Herring
maintainerRe: [PATCH v1 3/3] samples: rust: platform: Add property child and reference args examples
Quoted 25 lines · Danilo Krummrich
Quoted 17 lines · Rob Herring
Quoted 16 lines · Remo Senekowitsch
Add some example usage of the device property methods for reading DT/ACPI/swnode child nodes and reference args.
Signed-off-by Remo Senekowitsch <[email protected]>--- drivers/of/unittest-data/tests-platform.dtsi | 7 +++++++ samples/rust/rust_driver_platform.rs | 13 ++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)drivers/of/unittest-data/tests-platform.dtsi +0
-0@@ -40,6 +40,13 @@ test-device@2 {Quoted 6 lines
drivers/of/unittest-data/tests-platform.dtsi test-device@2 { · line 44
Quoted 4 lines
drivers/of/unittest-data/tests-platform.dtsi +2
-0test,u32-prop = <0xdeadbeef>; test,i16-array = /bits/ 16 <1 2 (-3) (-4)>; + + ref_child_0: child@0 {child-0 or you need to add 'reg' property if you keep the unit-address.
Quoted 6 lines
Adding child nodes here creates the following dt-test failues.
[ 1.031239] ### dt-test ### FAIL of_unittest_platform_populate():1862 Could not create device for node 'child' [ 1.031647] ### dt-test ### FAIL of_unittest_platform_populate():1862 Could not create device for node 'child'@Rob: What do you suggest?
This should fix it:
index eeb370e0f507..e3503ec20f6c 100644
drivers/of/unittest.c +2 -0
@@ -1856,6 +1856,8 @@ static void __init of_unittest_platform_populate(void)of_platform_populate (np, match,NULL , &test_bus->dev);for_each_child_of_node (np, child) {for_each_child_of_node (child, grandchild) { +if (!of_property_present (grandchild,"compatible" )) +continue ; pdev =of_find_device_by_node (grandchild); unittest(pdev, "Could not create device for node '%pOFn'\n",
Danilo Krummrich
maintainerRe: [PATCH v1 3/3] samples: rust: platform: Add property child and reference args examples
Quoted 40 lines · Rob Herring
Quoted 25 lines · Danilo Krummrich
Quoted 17 lines · Rob Herring
Quoted 16 lines · Remo Senekowitsch
Add some example usage of the device property methods for reading DT/ACPI/swnode child nodes and reference args.
Signed-off-by Remo Senekowitsch <[email protected]>--- drivers/of/unittest-data/tests-platform.dtsi | 7 +++++++ samples/rust/rust_driver_platform.rs | 13 ++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)drivers/of/unittest-data/tests-platform.dtsi +0
-0@@ -40,6 +40,13 @@ test-device@2 {Quoted 6 lines
drivers/of/unittest-data/tests-platform.dtsi test-device@2 { · line 44
Quoted 4 lines
drivers/of/unittest-data/tests-platform.dtsi +2
-0test,u32-prop = <0xdeadbeef>; test,i16-array = /bits/ 16 <1 2 (-3) (-4)>; + + ref_child_0: child@0 {child-0 or you need to add 'reg' property if you keep the unit-address.
Quoted 6 lines
Adding child nodes here creates the following dt-test failues.
[ 1.031239] ### dt-test ### FAIL of_unittest_platform_populate():1862 Could not create device for node 'child' [ 1.031647] ### dt-test ### FAIL of_unittest_platform_populate():1862 Could not create device for node 'child'@Rob: What do you suggest?
This should fix it:
index
eeb370e0f507..e3503ec20f6c100644
drivers/of/unittest.c static void __init of_unittest_platform_populate(void) · line 1863
Quoted 8 lines
drivers/of/unittest.c +2
-0@@ -1856,6 +1856,8 @@ static void __init of_unittest_platform_populate(void)of_platform_populate (np, match,NULL , &test_bus->dev);for_each_child_of_node (np, child) {for_each_child_of_node (child, grandchild) { +if (!of_property_present (grandchild,"compatible" )) +continue ; pdev =of_find_device_by_node (grandchild); unittest(pdev, "Could not create device for node '%pOFn'\n",
Do you want this to be a separate patch? Otherwise, I'd fine just adding it to this one.
Rob Herring
maintainerRe: [PATCH v1 3/3] samples: rust: platform: Add property child and reference args examples
Quoted 37 lines · Danilo Krummrich
Quoted 35 lines · Rob Herring
Quoted 25 lines · Danilo Krummrich
Quoted 17 lines · Rob Herring
Quoted 16 lines · Remo Senekowitsch
Add some example usage of the device property methods for reading DT/ACPI/swnode child nodes and reference args.
Signed-off-by Remo Senekowitsch <[email protected]>--- drivers/of/unittest-data/tests-platform.dtsi | 7 +++++++ samples/rust/rust_driver_platform.rs | 13 ++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)drivers/of/unittest-data/tests-platform.dtsi +0
-0@@ -40,6 +40,13 @@ test-device@2 {Quoted 6 lines
drivers/of/unittest-data/tests-platform.dtsi test-device@2 { · line 44
Quoted 4 lines
drivers/of/unittest-data/tests-platform.dtsi +2
-0test,u32-prop = <0xdeadbeef>; test,i16-array = /bits/ 16 <1 2 (-3) (-4)>; + + ref_child_0: child@0 {child-0 or you need to add 'reg' property if you keep the unit-address.
Quoted 6 lines
Adding child nodes here creates the following dt-test failues.
[ 1.031239] ### dt-test ### FAIL of_unittest_platform_populate():1862 Could not create device for node 'child' [ 1.031647] ### dt-test ### FAIL of_unittest_platform_populate():1862 Could not create device for node 'child'@Rob: What do you suggest?
This should fix it:
Quoted 16 lines
drivers/of/unittest.c static void __init of_unittest_platform_populate(void) · line 1863
Quoted 13 lines
index
eeb370e0f507..e3503ec20f6c100644drivers/of/unittest.c +2
-0@@ -1856,6 +1856,8 @@ static void __init of_unittest_platform_populate(void)of_platform_populate (np, match,NULL , &test_bus->dev);for_each_child_of_node (np, child) {for_each_child_of_node (child, grandchild) { +if (!of_property_present (grandchild,"compatible" )) +continue ; pdev =of_find_device_by_node (grandchild); unittest(pdev, "Could not create device for node '%pOFn'\n",Do you want this to be a separate patch? Otherwise, I'd fine just adding it to this one.
Adding it here is fine.
Rob
Danilo Krummrich
maintainerQuoted 3 lines · Remo Senekowitsch
This patch series was split-off from an earlier one. [1]
Applied to driver-core-testing, thanks!
Quoted 3 lines
Remo Senekowitsch (3):
rust: device: Add child accessor and iterator
rust: device: Addproperty_get_reference_args
[ Move up NArgs; refer to FwNodeReferenceArgs in NArgs doc-comment.
- Danilo ]
Quoted 2 lines
samples: rust: platform: Add property child and reference args
examples
[ Convert 'child@{0,1}' to 'child-{0,1}'; skip child nodes without
'compatible' property in of_unittest_platform_populate() as proposed by Rob Herring. - Danilo]