software node: implement reference properties
PATCH 1/3 software node: implement reference properties
It is possible to store references to software nodes in the same fashion as other static properties, so that users do not need to define separate structures:
const struct software_node gpio_bank_b_node = {
.name = "B",
};const struct property_entry simone_key_enter_props[] __initconst = {
PROPERTY_ENTRY_U32("linux,code", KEY_ENTER),
PROPERTY_ENTRY_STRING("label", "enter"),
PROPERTY_ENTRY_REF("gpios", &gpio_bank_b_node, 123, GPIO_ACTIVE_LOW),
{ }
};--- drivers/base/swnode.c | 34 +++++++++++++++++++------ include/linux/property.h | 54 +++++++++++++++++++++++++++++----------- 2 files changed, 65 insertions(+), 23 deletions(-)
drivers/base/swnode.c +26 -8
@@ -568,21 +568,39 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode, {struct swnode *swnode =to_swnode (fwnode);const struct software_node_reference *ref; +const struct software_node_ref_args *ref_args;const struct property_entry *prop;struct fwnode_handle *refnode;int i; -if (!swnode || !swnode->node->references) +if (!swnode)return -ENOENT ; -for (ref = swnode->node->references; ref->name; ref++) -if (!strcmp (ref->name, propname)) -break ; + prop =property_entry_get (swnode->node->properties, propname); +if (prop) { +if (prop->type !=DEV_PROP_REF ) +return -EINVAL ; -if (!ref->name || index > (ref->nrefs -1 )) -return -ENOENT ; +if (index *sizeof (*ref_args) >= prop->length) +return -ENOENT ; + + ref_args = prop->is_array ? + &prop->pointer.ref[index] : &prop->value.ref; + }else { +if (!swnode->node->references) +return -ENOENT ; + +for (ref = swnode->node->references; ref->name; ref++) +if (!strcmp (ref->name, propname)) +break ; + +if (!ref->name || index > (ref->nrefs -1 )) +return -ENOENT ; + + ref_args = &ref->refs[index]; + } - refnode =software_node_fwnode (ref->refs[index].node); + refnode =software_node_fwnode (ref_args->node);if (!refnode)return -ENOENT ;
@@ -601,7 +619,7 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode, args->nargs = nargs;for (i =0 ; i < nargs; i++) - args->args[i] = ref->refs[index].args[i]; + args->args[i] = ref_args->args[i];return 0 ; }
include/linux/property.h +39 -15
96 lines not on this page · raw message
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
PATCH 2/3 platform/x86: intel_cht_int33fe: use inline reference properties
Now that static device properties allow defining reference properties together with all other types of properties, instead of managing them separately, let's adjust the driver.
---
Heikki, I do not have this hardware, so if you could try this out it would be really great.
drivers/platform/x86/intel_cht_int33fe.c | 46 ++++++++++++------------ 1 file changed, 22 insertions(+), 24 deletions(-)
drivers/platform/x86/intel_cht_int33fe.c +22 -24
@@ -50,28 +50,8 @@ struct cht_int33fe_data {static const struct software_node nodes[]; -static const struct software_node_ref_args pi3usb30532_ref = { - &nodes[INT33FE_NODE_PI3USB30532 ] -}; - -static const struct software_node_ref_args dp_ref = { - &nodes[INT33FE_NODE_DISPLAYPORT ] -}; -static struct software_node_ref_args mux_ref; -static const struct software_node_reference usb_connector_refs[] = { - {"orientation-switch" ,1 , &pi3usb30532_ref}, - {"mode-switch" ,1 , &pi3usb30532_ref}, - {"displayport" ,1 , &dp_ref}, - { } -}; - -static const struct software_node_reference fusb302_refs[] = { - {"usb-role-switch" ,1 , &mux_ref}, - { } -}; -/* * Grrr I severly dislike buggy BIOS-es. At least one BIOS enumerates * the max17047 both through the INT33FE ACPI device (it is right there
@@ -107,7 +87,13 @@ static const struct property_entry max17047_props[] = { { } }; -static const struct property_entry fusb302_props[] = { +/* Not const because we need to update "usb-role-switch" property. */ +static struct property_entry fusb302_props[] = { +/* +* usb-role-switch property must be first as we rely on fixed +* position to adjust it once we know the real node. +*/ +PROPERTY_ENTRY_REF ("usb-role-switch" ,NULL ),PROPERTY_ENTRY_STRING ("linux,extcon-name" ,"cht_wcove_pwrsrc" ), { } };
@@ -131,16 +117,22 @@ static const struct property_entry usb_connector_props[] = {PROPERTY_ENTRY_U32_ARRAY ("source-pdos" , src_pdo),PROPERTY_ENTRY_U32_ARRAY ("sink-pdos" , snk_pdo),PROPERTY_ENTRY_U32 ("op-sink-microwatt" ,2500000 ), +PROPERTY_ENTRY_REF ("orientation-switch" , + &nodes[INT33FE_NODE_PI3USB30532 ]), +PROPERTY_ENTRY_REF ("mode-switch" , + &nodes[INT33FE_NODE_PI3USB30532 ]), +PROPERTY_ENTRY_REF ("displayport" , + &nodes[INT33FE_NODE_DISPLAYPORT]), { } };static const struct software_node nodes[] = { - {"fusb302" ,NULL , fusb302_props, fusb302_refs }, + {"fusb302" ,NULL , fusb302_props }, {"max17047" ,NULL , max17047_props }, {"pi3usb30532" }, {"displayport" }, {"usb-role-switch" }, - {"connector" , &nodes[0 ], usb_connector_props, usb_connector_refs }, + {"connector" , &nodes[0 ], usb_connector_props }, { } };
@@ -174,7 +166,13 @@ static int cht_int33fe_setup_mux(struct cht_int33fe_data *data) data->mux =fwnode_handle_get (dev->fwnode);put_device (dev); - mux_ref.node =to_software_node (data->mux); + +/* +* Update "usb-role-switch" property with real node. Note that we +* rely on software_node_register_nodes() to use the original +* instance of properties instead of copying them. +*/ + fusb302_props[0 ].value.ref.node =to_software_node (data->mux);return 0 ; }
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
Heikki Krogerus
reviewerRe: [PATCH 2/3] platform/x86: intel_cht_int33fe: use inline reference properties
Hi,
Quoted 18 lines · Dmitry Torokhov
Now that static device properties allow defining reference properties together with all other types of properties, instead of managing them separately, let's adjust the driver.
Signed-off-by Dmitry Torokhov <[email protected]>---
Heikki, I do not have this hardware, so if you could try this out it would be really great.
drivers/platform/x86/intel_cht_int33fe.c | 46 ++++++++++++------------ 1 file changed, 22 insertions(+), 24 deletions(-)drivers/platform/x86/intel_cht_int33fe.c +0
-0
drivers/platform/x86/intel_cht_int33fe.c struct cht_int33fe_data { · line 51
Quoted 2 lines
drivers/platform/x86/intel_cht_int33fe.c +0
-0@@ -50,28 +50,8 @@ struct cht_int33fe_data {static const struct software_node nodes[];
I think you can remove that.
drivers/platform/x86/intel_cht_int33fe.c struct cht_int33fe_data { · line 53
Quoted 9 lines
drivers/platform/x86/intel_cht_int33fe.c +0
-8-static const struct software_node_ref_args pi3usb30532_ref = { - &nodes[INT33FE_NODE_PI3USB30532 ] -}; - -static const struct software_node_ref_args dp_ref = { - &nodes[INT33FE_NODE_DISPLAYPORT ] -}; -static struct software_node_ref_args mux_ref;
I'm pretty sure you should now drop that one.
Quoted 57 lines
drivers/platform/x86/intel_cht_int33fe.c +15
-15-static const struct software_node_reference usb_connector_refs[] = { - {"orientation-switch" ,1 , &pi3usb30532_ref}, - {"mode-switch" ,1 , &pi3usb30532_ref}, - {"displayport" ,1 , &dp_ref}, - { } -}; - -static const struct software_node_reference fusb302_refs[] = { - {"usb-role-switch" ,1 , &mux_ref}, - { } -}; -/* * Grrr I severly dislike buggy BIOS-es. At least one BIOS enumerates * the max17047 both through the INT33FE ACPI device (it is right there @@ -107,7 +87,13 @@ static const struct property_entry max17047_props[] = { { } }; -static const struct property_entry fusb302_props[] = { +/* Not const because we need to update "usb-role-switch" property. */ +static struct property_entry fusb302_props[] = { +/* +* usb-role-switch property must be first as we rely on fixed +* position to adjust it once we know the real node. +*/ +PROPERTY_ENTRY_REF ("usb-role-switch" ,NULL ),PROPERTY_ENTRY_STRING ("linux,extcon-name" ,"cht_wcove_pwrsrc" ), { } };@@ -131,16 +117,22 @@ static const struct property_entry usb_connector_props[] = {PROPERTY_ENTRY_U32_ARRAY ("source-pdos" , src_pdo),PROPERTY_ENTRY_U32_ARRAY ("sink-pdos" , snk_pdo),PROPERTY_ENTRY_U32 ("op-sink-microwatt" ,2500000 ), +PROPERTY_ENTRY_REF ("orientation-switch" , + &nodes[INT33FE_NODE_PI3USB30532 ]), +PROPERTY_ENTRY_REF ("mode-switch" , + &nodes[INT33FE_NODE_PI3USB30532 ]), +PROPERTY_ENTRY_REF ("displayport" , + &nodes[INT33FE_NODE_DISPLAYPORT]), { } };static const struct software_node nodes[] = { - {"fusb302" ,NULL , fusb302_props, fusb302_refs }, + {"fusb302" ,NULL , fusb302_props }, {"max17047" ,NULL , max17047_props }, {"pi3usb30532" }, {"displayport" }, {"usb-role-switch" }, - {"connector" , &nodes[0 ], usb_connector_props, usb_connector_refs }, + {"connector" , &nodes[0 ], usb_connector_props }, { } };@@ -174,7 +166,13 @@ static int cht_int33fe_setup_mux(struct cht_int33fe_data *data)
drivers/platform/x86/intel_cht_int33fe.c static int cht_int33fe_setup_mux(struct cht_int33fe_data *data) · line 175
Quoted 10 lines
drivers/platform/x86/intel_cht_int33fe.c +7
-1data->mux =fwnode_handle_get (dev->fwnode);put_device (dev); - mux_ref.node =to_software_node (data->mux); + +/* +* Update "usb-role-switch" property with real node. Note that we +* rely on software_node_register_nodes() to use the original +* instance of properties instead of copying them. +*/ + fusb302_props[0 ].value.ref.node =to_software_node (data->mux);
There are other changes to this driver and to swnode.c in Rafael's tree, so if you send v2 soon, then please rebase on top of his devprop branch, or alternatively linux-next.
thanks,
Signature · 1 line
heikki
Re: [PATCH 2/3] platform/x86: intel_cht_int33fe: use inline reference properties
Quoted 22 lines · Heikki Krogerus
Hi,
Quoted 19 lines · Dmitry Torokhov
Now that static device properties allow defining reference properties together with all other types of properties, instead of managing them separately, let's adjust the driver.
Signed-off-by Dmitry Torokhov <[email protected]>---
Heikki, I do not have this hardware, so if you could try this out it would be really great.
drivers/platform/x86/intel_cht_int33fe.c | 46 ++++++++++++------------ 1 file changed, 22 insertions(+), 24 deletions(-)drivers/platform/x86/intel_cht_int33fe.c +0
-0@@ -50,28 +50,8 @@ struct cht_int33fe_data {
Quoted 3 lines
drivers/platform/x86/intel_cht_int33fe.c struct cht_int33fe_data { · line 51
Quoted 1 line
drivers/platform/x86/intel_cht_int33fe.c +0
-0static const struct software_node nodes[];I think you can remove that.
Not really, as there is still circular dependency between nodes and properties. I moved it down closer to properties though.
Quoted 12 lines
drivers/platform/x86/intel_cht_int33fe.c struct cht_int33fe_data { · line 53
Quoted 10 lines
drivers/platform/x86/intel_cht_int33fe.c +0
-8-static const struct software_node_ref_args pi3usb30532_ref = { - &nodes[INT33FE_NODE_PI3USB30532 ] -}; - -static const struct software_node_ref_args dp_ref = { - &nodes[INT33FE_NODE_DISPLAYPORT ] -}; -static struct software_node_ref_args mux_ref;I'm pretty sure you should now drop that one.
I ended up reworking things a bit and still using a form of this to reach in and change data, as properties ended up being constants.
Quoted 58 lines
Quoted 58 lines
drivers/platform/x86/intel_cht_int33fe.c +15
-15-static const struct software_node_reference usb_connector_refs[] = { - {"orientation-switch" ,1 , &pi3usb30532_ref}, - {"mode-switch" ,1 , &pi3usb30532_ref}, - {"displayport" ,1 , &dp_ref}, - { } -}; - -static const struct software_node_reference fusb302_refs[] = { - {"usb-role-switch" ,1 , &mux_ref}, - { } -}; -/* * Grrr I severly dislike buggy BIOS-es. At least one BIOS enumerates * the max17047 both through the INT33FE ACPI device (it is right there @@ -107,7 +87,13 @@ static const struct property_entry max17047_props[] = { { } }; -static const struct property_entry fusb302_props[] = { +/* Not const because we need to update "usb-role-switch" property. */ +static struct property_entry fusb302_props[] = { +/* +* usb-role-switch property must be first as we rely on fixed +* position to adjust it once we know the real node. +*/ +PROPERTY_ENTRY_REF ("usb-role-switch" ,NULL ),PROPERTY_ENTRY_STRING ("linux,extcon-name" ,"cht_wcove_pwrsrc" ), { } };@@ -131,16 +117,22 @@ static const struct property_entry usb_connector_props[] = {PROPERTY_ENTRY_U32_ARRAY ("source-pdos" , src_pdo),PROPERTY_ENTRY_U32_ARRAY ("sink-pdos" , snk_pdo),PROPERTY_ENTRY_U32 ("op-sink-microwatt" ,2500000 ), +PROPERTY_ENTRY_REF ("orientation-switch" , + &nodes[INT33FE_NODE_PI3USB30532 ]), +PROPERTY_ENTRY_REF ("mode-switch" , + &nodes[INT33FE_NODE_PI3USB30532 ]), +PROPERTY_ENTRY_REF ("displayport" , + &nodes[INT33FE_NODE_DISPLAYPORT]), { } };static const struct software_node nodes[] = { - {"fusb302" ,NULL , fusb302_props, fusb302_refs }, + {"fusb302" ,NULL , fusb302_props }, {"max17047" ,NULL , max17047_props }, {"pi3usb30532" }, {"displayport" }, {"usb-role-switch" }, - {"connector" , &nodes[0 ], usb_connector_props, usb_connector_refs }, + {"connector" , &nodes[0 ], usb_connector_props }, { } };@@ -174,7 +166,13 @@ static int cht_int33fe_setup_mux(struct cht_int33fe_data *data)
Quoted 14 lines
drivers/platform/x86/intel_cht_int33fe.c static int cht_int33fe_setup_mux(struct cht_int33fe_data *data) · line 175
Quoted 10 lines
drivers/platform/x86/intel_cht_int33fe.c +7
-1data->mux =fwnode_handle_get (dev->fwnode);put_device (dev); - mux_ref.node =to_software_node (data->mux); + +/* +* Update "usb-role-switch" property with real node. Note that we +* rely on software_node_register_nodes() to use the original +* instance of properties instead of copying them. +*/ + fusb302_props[0 ].value.ref.node =to_software_node (data->mux);There are other changes to this driver and to
swnode.cin Rafael's tree, so if you send v2 soon, then please rebase on top of his devprop branch, or alternatively linux-next.
Yep, did that, will re-post series shortly.
Signature · 1 line
Dmitry
PATCH 3/3 software node: remove separate handling of references
In reply to Dmitry TorokhovNow that all users of references have moved to reference properties, we can remove separate handling of references.
--- drivers/base/swnode.c | 31 +++++++++---------------------- include/linux/property.h | 26 ++++++-------------------- 2 files changed, 15 insertions(+), 42 deletions(-)
drivers/base/swnode.c +9 -22
@@ -568,7 +568,6 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode, {struct swnode *swnode =to_swnode (fwnode);const struct software_node_reference *ref; -const struct software_node_ref_args *ref_args;const struct property_entry *prop;struct fwnode_handle *refnode;int i;
@@ -577,30 +576,18 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode,return -ENOENT ; prop =property_entry_get (swnode->node->properties, propname); -if (prop) { -if (prop->type !=DEV_PROP_REF ) -return -EINVAL ; - -if (index *sizeof (*ref_args) >= prop->length) -return -ENOENT ; - - ref_args = prop->is_array ? - &prop->pointer.ref[index] : &prop->value.ref; - }else { -if (!swnode->node->references) -return -ENOENT ; +if (!prop) +return -ENOENT ; -for (ref = swnode->node->references; ref->name; ref++) -if (!strcmp (ref->name, propname)) -break ; +if (prop->type !=DEV_PROP_REF ) +return -EINVAL ; -if (!ref->name || index > (ref->nrefs -1 )) -return -ENOENT ; +if (index *sizeof (*ref) >= prop->length) +return -ENOENT ; - ref_args = &ref->refs[index]; - } + ref = prop->is_array ? &prop->pointer.ref[index] : &prop->value.ref; - refnode =software_node_fwnode (ref_args->node); + refnode =software_node_fwnode (ref->node);if (!refnode)return -ENOENT ;
@@ -619,7 +606,7 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode, args->nargs = nargs;for (i =0 ; i < nargs; i++) - args->args[i] = ref_args->args[i]; + args->args[i] = ref->args[i];return 0 ; }
include/linux/property.h +6 -20
@@ -223,12 +223,12 @@ static inline int fwnode_property_count_u64(const struct fwnode_handle *fwnode,struct software_node ;/** -* struct software_node_ref_args - Reference property with additional arguments +* struct software_node_reference - Named software node reference property * @node: Reference to a software node * @nargs: Number of elements in @args array * @args: Integer arguments */ -struct software_node_ref_args { +struct software_node_reference {const struct software_node *node;unsigned int nargs;u64 args[NR_FWNODE_REFERENCE_ARGS ];
@@ -255,7 +255,7 @@ struct property_entry {const u32 *u32_data;const u64 *u64_data;const char *const *str; -const struct software_node_ref_args *ref; +const struct software_node_reference *ref; } pointer;union {u8 u8_data;
@@ -263,7 +263,7 @@ struct property_entry {u32 u32_data;u64 u64_data;const char *str; -struct software_node_ref_args ref; +struct software_node_reference ref; } value; }; };
@@ -305,7 +305,7 @@ struct property_entry { (struct property_entry ) { \ .name = _name_, \ .length =ARRAY_SIZE (_val_) * \ -sizeof (struct software_node_ref_args ), \ +sizeof (struct software_node_reference ), \ .is_array = true, \ .type =DEV_PROP_REF , \ .pointer.ref = _val_, \
@@ -344,7 +344,7 @@ struct property_entry {#define PROPERTY_ENTRY_REF (_name_, _ref_, ...) \ (struct property_entry) { \ .name = _name_, \ - .length = sizeof(struct software_node_ref_args), \ + .length = sizeof(struct software_node_reference), \ .type = DEV_PROP_REF, \ .value.ref.node = _ref_, \ .value.ref.nargs = \
@@ -415,30 +415,16 @@ int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,/* -------------------------------------------------------------------------- */ /* Software fwnode support - when HW description is incomplete or missing */ -/** -* struct software_node_reference - Named software node reference property -* @name: Name of the property -* @nrefs: Number of elements in @refs array -* @refs: Array of references with optional arguments -*/ -struct software_node_reference { -const char *name; -unsigned int nrefs; -const struct software_node_ref_args *refs; -}; -/** * struct software_node - Software node description * @name: Name of the software node * @parent: Parent of the software node * @properties: Array of device properties -* @references: Array of software node reference properties */ struct software_node {const char *name;const struct software_node *parent;const struct property_entry *properties; -const struct software_node_reference *references; };bool is_software_node (const struct fwnode_handle *fwnode);
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
Andy Shevchenko
reviewerRe: [PATCH 3/3] software node: remove separate handling of references
Quoted 2 lines · Dmitry Torokhov
Now that all users of references have moved to reference properties, we can remove separate handling of references.
This is good one!
Signature · 2 lines
With Best Regards, Andy Shevchenko
Heikki Krogerus
reviewerQuoted 8 lines · Dmitry Torokhov
It is possible to store references to software nodes in the same fashion as other static properties, so that users do not need to define separate structures:
const struct software_node gpio_bank_b_node = { .name = "B", };
Quoted 8 lines
const struct property_entry simone_key_enter_props[] __initconst = { PROPERTY_ENTRY_U32("linux,code", KEY_ENTER), PROPERTY_ENTRY_STRING("label", "enter"), PROPERTY_ENTRY_REF("gpios", &gpio_bank_b_node, 123, GPIO_ACTIVE_LOW), { } };Signed-off-by Dmitry Torokhov <[email protected]>
This looks really good to me. I'll wait for Andy's comments on the idea, but to me it makes sense.
Thanks Dmitry!
Signature · 1 line
heikki
Andy Shevchenko
reviewerQuoted 16 lines · Heikki Krogerus
Quoted 15 lines · Dmitry Torokhov
It is possible to store references to software nodes in the same fashion as other static properties, so that users do not need to define separate structures:
const struct software_node gpio_bank_b_node = { .name = "B", };const struct property_entry simone_key_enter_props[] __initconst = { PROPERTY_ENTRY_U32("linux,code", KEY_ENTER), PROPERTY_ENTRY_STRING("label", "enter"), PROPERTY_ENTRY_REF("gpios", &gpio_bank_b_node, 123, GPIO_ACTIVE_LOW), { } };
Quoted 4 lines
Quoted 1 line
Signed-off-by Dmitry Torokhov <[email protected]>This looks really good to me. I'll wait for Andy's comments on the idea, but to me it makes sense.
Idea in general is fine. Though, taking into consideration, for example, drivers/mfd/intel-lpss-pci.c, the size of predefined structures bumps a lot. I think we always should keep a pointer. In this case we may not add another property type.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Heikki Krogerus
reviewerQuoted 19 lines · Andy Shevchenko
Quoted 18 lines · Heikki Krogerus
Quoted 16 lines · Dmitry Torokhov
It is possible to store references to software nodes in the same fashion as other static properties, so that users do not need to define separate structures:
const struct software_node gpio_bank_b_node = { .name = "B", };const struct property_entry simone_key_enter_props[] __initconst = { PROPERTY_ENTRY_U32("linux,code", KEY_ENTER), PROPERTY_ENTRY_STRING("label", "enter"), PROPERTY_ENTRY_REF("gpios", &gpio_bank_b_node, 123, GPIO_ACTIVE_LOW), { } };Signed-off-by Dmitry Torokhov <[email protected]>
Quoted 7 lines
Quoted 2 lines
This looks really good to me. I'll wait for Andy's comments on the idea, but to me it makes sense.
Idea in general is fine. Though, taking into consideration, for example,
drivers/mfd/intel-lpss-pci.c, the size of predefined structures bumps a lot. I think we always should keep a pointer. In this case we may not add another property type.
Yeah, you have a point.
thanks,
Signature · 1 line
heikki
Andy Shevchenko
reviewerQuoted 7 lines · Dmitry Torokhov
It is possible to store references to software nodes in the same fashion as other static properties, so that users do not need to define separate structures:
const struct software_node gpio_bank_b_node = { .name = "B", };
Why this can't be __initconst?
Quoted 6 lines
const struct property_entry simone_key_enter_props[] __initconst = {
PROPERTY_ENTRY_U32("linux,code", KEY_ENTER),
PROPERTY_ENTRY_STRING("label", "enter"),
PROPERTY_ENTRY_REF("gpios", &gpio_bank_b_node, 123, GPIO_ACTIVE_LOW),
{ }
};So it's basically mimics the concept of phandle, right?
drivers/base/swnode.c software_node_get_reference_args(const struct fwnode_handle *fwnode, · line 588
Quoted 2 lines
drivers/base/swnode.c +2
-0+ ref_args = prop->is_array ? + &prop->pointer.ref[index] : &prop->value.ref;
Better to do if with explicit 'if ()' as it's done in the rest of the code.
if (prop->is_array) ref_args = ...; else ref_args = ...;
include/linux/property.h enum dev_prop_type { · line 26
Quoted 2 lines
include/linux/property.h +1
-1- DEV_PROP_MAX, +DEV_PROP_MAX
It seems it wasn't ever used, so, can be dropped completely.
include/linux/property.h struct property_entry { · line 266
Quoted 13 lines
include/linux/property.h +2
-0@@ -240,6 +255,7 @@ struct property_entry {const u32 *u32_data;const u64 *u64_data;const char *const *str; +const struct software_node_ref_args *ref; } pointer;union {u8 u8_data;@@ -247,6 +263,7 @@ struct property_entry {u32 u32_data;u64 u64_data;const char *str; +struct software_node_ref_args ref;
Hmm... This bumps the size of union a lot for each existing property_entry. Is there any other way? Maybe we can keep pointer and allocate memory for it when copying?
include/linux/property.h struct property_entry { · line 308
Quoted 7 lines
include/linux/property.h +5
-0} value; +#define PROPERTY_ENTRY_REF_ARRAY (_name_, _val_) \ +(struct property_entry) { \ + .name = _name_, \ + .length = ARRAY_SIZE(_val_) * \ + sizeof(struct software_node_ref_args), \
I would rather leave it on one line and shift right all \:s in this macro.
Quoted 5 lines
include/linux/property.h +5
-0+ .is_array = true, \ + .type = DEV_PROP_REF, \ + .pointer.ref = _val_, \ +} +
include/linux/property.h struct property_entry {
Quoted 10 lines
include/linux/property.h +8
-0+#define PROPERTY_ENTRY_REF (_name_, _ref_, ...) \ +(struct property_entry) { \ + .name = _name_, \ + .length = sizeof(struct software_node_ref_args), \ + .type = DEV_PROP_REF, \ + .value.ref.node = _ref_, \ + .value.ref.nargs = \ + ARRAY_SIZE(((u64[]){ 0, ##__VA_ARGS__ })) - 1, \
Ditto.
Quoted 2 lines
include/linux/property.h +2
-0+ .value.ref.args = { __VA_ARGS__ }, \ +}
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 10 lines · Andy Shevchenko
Quoted 7 lines · Dmitry Torokhov
It is possible to store references to software nodes in the same fashion as other static properties, so that users do not need to define separate structures:
const struct software_node gpio_bank_b_node = { .name = "B", };Why this can't be
__initconst?
It may or it may not. I'll remove __inticonst from below as well to not confuse things.
Quoted 9 lines
Quoted 7 lines
const struct property_entry simone_key_enter_props[] __initconst = { PROPERTY_ENTRY_U32("linux,code", KEY_ENTER), PROPERTY_ENTRY_STRING("label", "enter"), PROPERTY_ENTRY_REF("gpios", &gpio_bank_b_node, 123, GPIO_ACTIVE_LOW), { } };So it's basically mimics the concept of phandle, right?
Yes.
Quoted 10 lines
drivers/base/swnode.c software_node_get_reference_args(const struct fwnode_handle *fwnode, · line 588
Quoted 3 lines
drivers/base/swnode.c +2
-0+ ref_args = prop->is_array ? + &prop->pointer.ref[index] : &prop->value.ref;Better to do if with explicit 'if ()' as it's done in the rest of the code.
if (prop->is_array) ref_args = ...; else ref_args = ...;
OK, it will be gone actually.
Quoted 5 lines
include/linux/property.h enum dev_prop_type { · line 26
Quoted 3 lines
include/linux/property.h +1
-1- DEV_PROP_MAX, +DEV_PROP_MAX It seems it wasn't ever used, so, can be dropped completely.
OK.
Quoted 10 lines
Quoted 10 lines
include/linux/property.h +1
-0@@ -240,6 +255,7 @@ struct property_entry {const u32 *u32_data;const u64 *u64_data;const char *const *str; +const struct software_node_ref_args *ref; } pointer;union {u8 u8_data;@@ -247,6 +263,7 @@ struct property_entry {
Quoted 8 lines
include/linux/property.h struct property_entry { · line 266
Quoted 4 lines
include/linux/property.h +1
-0u32 u32_data;u64 u64_data;const char *str; +struct software_node_ref_args ref;Hmm... This bumps the size of union a lot for each existing
property_entry. Is there any other way? Maybe we can keep pointer and allocate memory for it when copying?
Right, I think we can always store references as arrays, even when we only need single entry, thus we do not need to increase the size of the structure.
I just posted v2 implementing that, please take another look.
Thanks.
Signature · 1 line
Dmitry