* [PATCH 1/6] driver core: platform: Remove duplicated device_remove_properties() call
2018-11-05 14:59 [PATCH 0/6] device property: Introducing software nodes Heikki Krogerus
@ 2018-11-05 14:59 ` Heikki Krogerus
2018-11-05 14:59 ` [PATCH 2/6] drivers core: Prepare support for multiple platform notifications Heikki Krogerus
` (4 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Heikki Krogerus @ 2018-11-05 14:59 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Dmitry Torokhov, Linus Walleij, Andy Shevchenko, Mika Westerberg,
linux-kernel, linux-acpi
device_remove_properties() is called for every device in device_del().
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
drivers/base/platform.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 41b91af95afb..0fb5f140f1b0 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -448,7 +448,6 @@ void platform_device_del(struct platform_device *pdev)
int i;
if (pdev) {
- device_remove_properties(&pdev->dev);
device_del(&pdev->dev);
if (pdev->id_auto) {
--
2.19.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/6] drivers core: Prepare support for multiple platform notifications
2018-11-05 14:59 [PATCH 0/6] device property: Introducing software nodes Heikki Krogerus
2018-11-05 14:59 ` [PATCH 1/6] driver core: platform: Remove duplicated device_remove_properties() call Heikki Krogerus
@ 2018-11-05 14:59 ` Heikki Krogerus
2018-11-05 14:59 ` [PATCH 3/6] ACPI / glue: Add acpi_platform_notify() function Heikki Krogerus
` (3 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Heikki Krogerus @ 2018-11-05 14:59 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Dmitry Torokhov, Linus Walleij, Andy Shevchenko, Mika Westerberg,
linux-kernel, linux-acpi
Since it should be possible to support several hardware
description models at the same time (at least in theory),
for example ACPI and devicetree on a running system, the
platform notifications need to be handled differently.
For now a single "platform_notify" callback function was
used to notify the underlying base system which is in charge
of the hardware description when a new device entry was
added to the system, but that callback is available to only
a single base system at the time. This will add a function
device_platform_notify() and replace all direct
platform_notify() calls with it.
device_platform_notify() will first simply call the
platform_notify() callback, so this commit has no functional
affect, however, the idea is that individual base systems
will put their direct notification calls there instead of
using the platform_notify function pointer.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
drivers/base/core.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 04bbcd779e11..3972ef3f080b 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -728,6 +728,16 @@ static inline int device_is_not_partition(struct device *dev)
}
#endif
+static int
+device_platform_notify(struct device *dev, enum kobject_action action)
+{
+ if (platform_notify && action == KOBJ_ADD)
+ platform_notify(dev);
+ else if (platform_notify_remove && action == KOBJ_REMOVE)
+ platform_notify_remove(dev);
+ return 0;
+}
+
/**
* dev_driver_string - Return a device's driver name, if at all possible
* @dev: struct device to get the name of
@@ -1883,8 +1893,9 @@ int device_add(struct device *dev)
}
/* notify platform of device entry */
- if (platform_notify)
- platform_notify(dev);
+ error = device_platform_notify(dev, KOBJ_ADD);
+ if (error)
+ goto platform_error;
error = device_create_file(dev, &dev_attr_uevent);
if (error)
@@ -1960,6 +1971,8 @@ int device_add(struct device *dev)
SymlinkError:
device_remove_file(dev, &dev_attr_uevent);
attrError:
+ device_platform_notify(dev, KOBJ_REMOVE);
+platform_error:
kobject_uevent(&dev->kobj, KOBJ_REMOVE);
glue_dir = get_glue_dir(dev);
kobject_del(&dev->kobj);
@@ -2077,14 +2090,10 @@ void device_del(struct device *dev)
bus_remove_device(dev);
device_pm_remove(dev);
driver_deferred_probe_del(dev);
+ device_platform_notify(dev, KOBJ_REMOVE);
device_remove_properties(dev);
device_links_purge(dev);
- /* Notify the platform of the removal, in case they
- * need to do anything...
- */
- if (platform_notify_remove)
- platform_notify_remove(dev);
if (dev->bus)
blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
BUS_NOTIFY_REMOVED_DEVICE, dev);
--
2.19.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/6] ACPI / glue: Add acpi_platform_notify() function
2018-11-05 14:59 [PATCH 0/6] device property: Introducing software nodes Heikki Krogerus
2018-11-05 14:59 ` [PATCH 1/6] driver core: platform: Remove duplicated device_remove_properties() call Heikki Krogerus
2018-11-05 14:59 ` [PATCH 2/6] drivers core: Prepare support for multiple platform notifications Heikki Krogerus
@ 2018-11-05 14:59 ` Heikki Krogerus
2018-11-05 14:59 ` [PATCH 4/6] drivers: base: Introducing software nodes to the firmware node framework Heikki Krogerus
` (2 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Heikki Krogerus @ 2018-11-05 14:59 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Dmitry Torokhov, Linus Walleij, Andy Shevchenko, Mika Westerberg,
linux-kernel, linux-acpi
Instead of relying on the "platform_notify" callback hook,
introducing separate notification function
acpi_platform_notify() and calling that directly from
drivers core when device entries are added and removed.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
drivers/acpi/bus.c | 1 -
drivers/acpi/glue.c | 21 +++++++++++++--------
drivers/acpi/internal.h | 1 -
drivers/base/core.c | 7 +++++++
include/linux/acpi.h | 10 ++++++++++
5 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index bb3d96dea6db..99d820a693a8 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -1237,7 +1237,6 @@ static int __init acpi_init(void)
acpi_kobj = NULL;
}
- init_acpi_device_notify();
result = acpi_bus_init();
if (result) {
disable_acpi();
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 12ba2bee8789..edd10b3c7ec8 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -296,7 +296,7 @@ int acpi_unbind_one(struct device *dev)
}
EXPORT_SYMBOL_GPL(acpi_unbind_one);
-static int acpi_platform_notify(struct device *dev)
+static int acpi_device_notify(struct device *dev)
{
struct acpi_bus_type *type = acpi_get_bus_type(dev);
struct acpi_device *adev;
@@ -343,7 +343,7 @@ static int acpi_platform_notify(struct device *dev)
return ret;
}
-static int acpi_platform_notify_remove(struct device *dev)
+static int acpi_device_notify_remove(struct device *dev)
{
struct acpi_device *adev = ACPI_COMPANION(dev);
struct acpi_bus_type *type;
@@ -361,12 +361,17 @@ static int acpi_platform_notify_remove(struct device *dev)
return 0;
}
-void __init init_acpi_device_notify(void)
+int acpi_platform_notify(struct device *dev, enum kobject_action action)
{
- if (platform_notify || platform_notify_remove) {
- printk(KERN_ERR PREFIX "Can't use platform_notify\n");
- return;
+ switch (action) {
+ case KOBJ_ADD:
+ acpi_device_notify(dev);
+ break;
+ case KOBJ_REMOVE:
+ acpi_device_notify_remove(dev);
+ break;
+ default:
+ break;
}
- platform_notify = acpi_platform_notify;
- platform_notify_remove = acpi_platform_notify_remove;
+ return 0;
}
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 530a3f675490..83a7dfb7d1cf 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -23,7 +23,6 @@
int early_acpi_osi_init(void);
int acpi_osi_init(void);
acpi_status acpi_os_initialize1(void);
-void init_acpi_device_notify(void);
int acpi_scan_init(void);
void acpi_pci_root_init(void);
void acpi_pci_link_init(void);
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 3972ef3f080b..260cbdf44f1d 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -8,6 +8,7 @@
* Copyright (c) 2006 Novell, Inc.
*/
+#include <linux/acpi.h>
#include <linux/device.h>
#include <linux/err.h>
#include <linux/fwnode.h>
@@ -731,6 +732,12 @@ static inline int device_is_not_partition(struct device *dev)
static int
device_platform_notify(struct device *dev, enum kobject_action action)
{
+ int ret;
+
+ ret = acpi_platform_notify(dev, action);
+ if (ret)
+ return ret;
+
if (platform_notify && action == KOBJ_ADD)
platform_notify(dev);
else if (platform_notify_remove && action == KOBJ_REMOVE)
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index ed80f147bd50..4ba2e2d24676 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -1313,4 +1313,14 @@ static inline int find_acpi_cpu_cache_topology(unsigned int cpu, int level)
}
#endif
+#ifdef CONFIG_ACPI
+extern int acpi_platform_notify(struct device *dev, enum kobject_action action);
+#else
+static inline int
+acpi_platform_notify(struct device *dev, enum kobject_action action)
+{
+ return 0;
+}
+#endif
+
#endif /*_LINUX_ACPI_H*/
--
2.19.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/6] drivers: base: Introducing software nodes to the firmware node framework
2018-11-05 14:59 [PATCH 0/6] device property: Introducing software nodes Heikki Krogerus
` (2 preceding siblings ...)
2018-11-05 14:59 ` [PATCH 3/6] ACPI / glue: Add acpi_platform_notify() function Heikki Krogerus
@ 2018-11-05 14:59 ` Heikki Krogerus
2018-11-07 4:39 ` Dan Carpenter
2018-11-05 14:59 ` [PATCH 5/6] device property: Move device_add_properties() to swnode.c Heikki Krogerus
2018-11-05 14:59 ` [PATCH 6/6] device property: Remove struct property_set Heikki Krogerus
5 siblings, 1 reply; 12+ messages in thread
From: Heikki Krogerus @ 2018-11-05 14:59 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Dmitry Torokhov, Linus Walleij, Andy Shevchenko, Mika Westerberg,
linux-kernel, linux-acpi
Software node is a new struct fwnode_handle type that can be
used to describe devices in kernel (software). It is meant
to complement fwnodes representing real firmware nodes when
they are incomplete (for example missing device properties)
and to supply the primary fwnode when the firmware lacks
hardware description for a device completely.
The software node type is really meant to replace the
currently used "property_set" struct fwnode_handle type. The
handling of struct property_set is glued to the generic
device property handling code, and it is not possible to
create a struct property_set independently from the device
that it is bind to. struct property_set is only created when
device properties are added to already initialized struct
device, and control of it is only possible from the generic
property handling code.
Software nodes are instead designed to be created
independently from the device entries (struct device). It
makes them much more flexible, as then the device meant to
be bind to the node can be created at a later time, and from
another location. It is also possible to bind multiple
devices to a single software node if needed.
The software node implementation also includes support for
node hierarchy which was the main motivation for this
commit. The node hierarchy was something that was requested
for the struct property_set, but it did not seem reasonable
to try to extend the property_set support for that purpose.
struct property_set was really meant only for device
property handling like the name suggests.
Support for struct property_set is not yet removed in this
commit, but it will be in the following one.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
.../ABI/testing/sysfs-devices-software_node | 10 +
drivers/base/Makefile | 2 +-
drivers/base/core.c | 4 +
drivers/base/swnode.c | 493 ++++++++++++++++++
include/linux/property.h | 12 +
5 files changed, 520 insertions(+), 1 deletion(-)
create mode 100644 Documentation/ABI/testing/sysfs-devices-software_node
create mode 100644 drivers/base/swnode.c
diff --git a/Documentation/ABI/testing/sysfs-devices-software_node b/Documentation/ABI/testing/sysfs-devices-software_node
new file mode 100644
index 000000000000..85df37de359f
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-devices-software_node
@@ -0,0 +1,10 @@
+What: /sys/devices/.../software_node/
+Date: January 2019
+Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
+Description:
+ This directory contains the details about the device that are
+ assigned in kernel (i.e. software), as opposed to the
+ firmware_node directory which contains the details that are
+ assigned for the device in firmware. The main attributes in the
+ directory will show the properties the device has, and the
+ relationship it has to some of the other devices.
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 704f44295810..157452080f3d 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -6,7 +6,7 @@ obj-y := component.o core.o bus.o dd.o syscore.o \
cpu.o firmware.o init.o map.o devres.o \
attribute_container.o transport_class.o \
topology.o container.o property.o cacheinfo.o \
- devcon.o
+ devcon.o swnode.o
obj-$(CONFIG_DEVTMPFS) += devtmpfs.o
obj-y += power/
obj-$(CONFIG_ISA_BUS_API) += isa.o
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 260cbdf44f1d..a2f14098663f 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -738,6 +738,10 @@ device_platform_notify(struct device *dev, enum kobject_action action)
if (ret)
return ret;
+ ret = software_node_notify(dev, action);
+ if (ret)
+ return ret;
+
if (platform_notify && action == KOBJ_ADD)
platform_notify(dev);
else if (platform_notify_remove && action == KOBJ_REMOVE)
diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
new file mode 100644
index 000000000000..db60e8edf366
--- /dev/null
+++ b/drivers/base/swnode.c
@@ -0,0 +1,493 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Software nodes for the firmware node framework.
+ *
+ * Copyright (C) 2018, Intel Corporation
+ * Author: Heikki Krogerus <heikki.krogerus@linux.intel.com>
+ */
+
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/property.h>
+#include <linux/slab.h>
+
+struct software_node {
+ int id;
+ struct kobject kobj;
+ struct fwnode_handle fwnode;
+
+ /* hierarchy */
+ struct ida child_ids;
+ struct list_head entry;
+ struct list_head children;
+ struct software_node *parent;
+
+ /* properties */
+ const struct property_entry *properties;
+};
+
+static DEFINE_IDA(swnode_root_ids);
+static struct kset *swnode_kset;
+
+#define kobj_to_swnode(_kobj_) container_of(_kobj_, struct software_node, kobj)
+
+static const struct fwnode_operations software_node_ops;
+
+bool is_software_node(const struct fwnode_handle *fwnode)
+{
+ return !IS_ERR_OR_NULL(fwnode) && fwnode->ops == &software_node_ops;
+}
+
+#define to_software_node(__fwnode) \
+ ({ \
+ typeof(__fwnode) __to_software_node_fwnode = __fwnode; \
+ \
+ is_software_node(__to_software_node_fwnode) ? \
+ container_of(__to_software_node_fwnode, \
+ struct software_node, fwnode) : \
+ NULL; \
+ })
+
+/* -------------------------------------------------------------------------- */
+/* property_entry processing */
+
+static const struct property_entry *
+property_entry_get(const struct property_entry *prop, const char *name)
+{
+ if (!prop)
+ return NULL;
+
+ for (; prop->name; prop++)
+ if (!strcmp(name, prop->name))
+ return prop;
+
+ return NULL;
+}
+
+static const void *property_get_pointer(const struct property_entry *prop)
+{
+ switch (prop->type) {
+ case DEV_PROP_U8:
+ if (prop->is_array)
+ return prop->pointer.u8_data;
+ return &prop->value.u8_data;
+ case DEV_PROP_U16:
+ if (prop->is_array)
+ return prop->pointer.u16_data;
+ return &prop->value.u16_data;
+ case DEV_PROP_U32:
+ if (prop->is_array)
+ return prop->pointer.u32_data;
+ return &prop->value.u32_data;
+ case DEV_PROP_U64:
+ if (prop->is_array)
+ return prop->pointer.u64_data;
+ return &prop->value.u64_data;
+ case DEV_PROP_STRING:
+ if (prop->is_array)
+ return prop->pointer.str;
+ return &prop->value.str;
+ default:
+ return NULL;
+ }
+}
+
+static const void *property_entry_find(const struct property_entry *props,
+ const char *propname, size_t length)
+{
+ const struct property_entry *prop;
+ const void *pointer;
+
+ prop = property_entry_get(props, propname);
+ if (!prop)
+ return ERR_PTR(-EINVAL);
+ pointer = property_get_pointer(prop);
+ if (!pointer)
+ return ERR_PTR(-ENODATA);
+ if (length > prop->length)
+ return ERR_PTR(-EOVERFLOW);
+ return pointer;
+}
+
+static int property_entry_read_u8_array(const struct property_entry *props,
+ const char *propname,
+ u8 *values, size_t nval)
+{
+ const void *pointer;
+ size_t length = nval * sizeof(*values);
+
+ pointer = property_entry_find(props, propname, length);
+ if (IS_ERR(pointer))
+ return PTR_ERR(pointer);
+
+ memcpy(values, pointer, length);
+ return 0;
+}
+
+static int property_entry_read_u16_array(const struct property_entry *props,
+ const char *propname,
+ u16 *values, size_t nval)
+{
+ const void *pointer;
+ size_t length = nval * sizeof(*values);
+
+ pointer = property_entry_find(props, propname, length);
+ if (IS_ERR(pointer))
+ return PTR_ERR(pointer);
+
+ memcpy(values, pointer, length);
+ return 0;
+}
+
+static int property_entry_read_u32_array(const struct property_entry *props,
+ const char *propname,
+ u32 *values, size_t nval)
+{
+ const void *pointer;
+ size_t length = nval * sizeof(*values);
+
+ pointer = property_entry_find(props, propname, length);
+ if (IS_ERR(pointer))
+ return PTR_ERR(pointer);
+
+ memcpy(values, pointer, length);
+ return 0;
+}
+
+static int property_entry_read_u64_array(const struct property_entry *props,
+ const char *propname,
+ u64 *values, size_t nval)
+{
+ const void *pointer;
+ size_t length = nval * sizeof(*values);
+
+ pointer = property_entry_find(props, propname, length);
+ if (IS_ERR(pointer))
+ return PTR_ERR(pointer);
+
+ memcpy(values, pointer, length);
+ return 0;
+}
+
+static int
+property_entry_count_elems_of_size(const struct property_entry *props,
+ const char *propname, size_t length)
+{
+ const struct property_entry *prop;
+
+ prop = property_entry_get(props, propname);
+ if (!prop)
+ return -EINVAL;
+
+ return prop->length / length;
+}
+
+static int property_entry_read_int_array(const struct property_entry *props,
+ const char *name,
+ unsigned int elem_size, void *val,
+ size_t nval)
+{
+ if (!val)
+ return property_entry_count_elems_of_size(props, name,
+ elem_size);
+ switch (elem_size) {
+ case sizeof(u8):
+ return property_entry_read_u8_array(props, name, val, nval);
+ case sizeof(u16):
+ return property_entry_read_u16_array(props, name, val, nval);
+ case sizeof(u32):
+ return property_entry_read_u32_array(props, name, val, nval);
+ case sizeof(u64):
+ return property_entry_read_u64_array(props, name, val, nval);
+ }
+
+ return -ENXIO;
+}
+
+static int property_entry_read_string_array(const struct property_entry *props,
+ const char *propname,
+ const char **strings, size_t nval)
+{
+ const struct property_entry *prop;
+ const void *pointer;
+ size_t array_len, length;
+
+ /* Find out the array length. */
+ prop = property_entry_get(props, propname);
+ if (!prop)
+ return -EINVAL;
+
+ if (prop->is_array)
+ /* Find the length of an array. */
+ array_len = property_entry_count_elems_of_size(props, propname,
+ sizeof(const char *));
+ else
+ /* The array length for a non-array string property is 1. */
+ array_len = 1;
+
+ /* Return how many there are if strings is NULL. */
+ if (!strings)
+ return array_len;
+
+ array_len = min(nval, array_len);
+ length = array_len * sizeof(*strings);
+
+ pointer = property_entry_find(props, propname, length);
+ if (IS_ERR(pointer))
+ return PTR_ERR(pointer);
+
+ memcpy(strings, pointer, length);
+
+ return array_len;
+}
+
+/* -------------------------------------------------------------------------- */
+/* fwnode operations */
+
+static struct fwnode_handle *software_node_get(struct fwnode_handle *fwnode)
+{
+ struct software_node *swnode = to_software_node(fwnode);
+
+ kobject_get(&swnode->kobj);
+
+ return &swnode->fwnode;
+}
+
+static void software_node_put(struct fwnode_handle *fwnode)
+{
+ struct software_node *swnode = to_software_node(fwnode);
+
+ kobject_put(&swnode->kobj);
+}
+
+static bool software_node_property_present(const struct fwnode_handle *fwnode,
+ const char *propname)
+{
+ return !!property_entry_get(to_software_node(fwnode)->properties,
+ propname);
+}
+
+static int software_node_read_int_array(const struct fwnode_handle *fwnode,
+ const char *propname,
+ unsigned int elem_size, void *val,
+ size_t nval)
+{
+ struct software_node *swnode = to_software_node(fwnode);
+
+ return property_entry_read_int_array(swnode->properties, propname,
+ elem_size, val, nval);
+}
+
+static int software_node_read_string_array(const struct fwnode_handle *fwnode,
+ const char *propname,
+ const char **val, size_t nval)
+{
+ struct software_node *swnode = to_software_node(fwnode);
+
+ return property_entry_read_string_array(swnode->properties, propname,
+ val, nval);
+}
+
+struct fwnode_handle *
+software_node_get_parent(const struct fwnode_handle *fwnode)
+{
+ struct software_node *swnode = to_software_node(fwnode);
+
+ return swnode->parent ? &swnode->parent->fwnode : NULL;
+}
+
+struct fwnode_handle *
+software_node_get_next_child(const struct fwnode_handle *fwnode,
+ struct fwnode_handle *child)
+{
+ struct software_node *p = to_software_node(fwnode);
+ struct software_node *c = to_software_node(child);
+
+ if (list_empty(&p->children) ||
+ (c && list_is_last(&c->entry, &p->children)))
+ return NULL;
+
+ if (c)
+ c = list_next_entry(c, entry);
+ else
+ c = list_first_entry(&p->children, struct software_node, entry);
+ return &c->fwnode;
+}
+
+
+static const struct fwnode_operations software_node_ops = {
+ .get = software_node_get,
+ .put = software_node_put,
+ .property_present = software_node_property_present,
+ .property_read_int_array = software_node_read_int_array,
+ .property_read_string_array = software_node_read_string_array,
+ .get_parent = software_node_get_parent,
+ .get_next_child_node = software_node_get_next_child,
+};
+
+/* -------------------------------------------------------------------------- */
+
+static int
+software_node_register_properties(struct software_node *swnode,
+ const struct property_entry *properties)
+{
+ struct property_entry *props;
+
+ props = property_entries_dup(properties);
+ if (IS_ERR(props))
+ return PTR_ERR(props);
+
+ swnode->properties = props;
+
+ return 0;
+}
+
+static void software_node_release(struct kobject *kobj)
+{
+ struct software_node *swnode = kobj_to_swnode(kobj);
+
+ if (swnode->parent) {
+ ida_simple_remove(&swnode->parent->child_ids, swnode->id);
+ list_del(&swnode->entry);
+ } else {
+ ida_simple_remove(&swnode_root_ids, swnode->id);
+ }
+
+ ida_destroy(&swnode->child_ids);
+ property_entries_free(swnode->properties);
+ kfree(swnode);
+}
+
+static struct kobj_type software_node_type = {
+ .release = software_node_release,
+ .sysfs_ops = &kobj_sysfs_ops,
+};
+
+struct fwnode_handle *
+fwnode_create_software_node(const struct property_entry *properties,
+ const struct fwnode_handle *parent)
+{
+ struct software_node *p = NULL;
+ struct software_node *swnode;
+ char node_name[20];
+ int ret;
+
+ if (parent) {
+ if (IS_ERR(parent))
+ return ERR_CAST(parent);
+ if (!is_software_node(parent))
+ return ERR_PTR(-EINVAL);
+ p = to_software_node(parent);
+ }
+
+ swnode = kzalloc(sizeof(*swnode), GFP_KERNEL);
+ if (!swnode)
+ return ERR_PTR(-ENOMEM);
+
+ swnode->id = ida_simple_get(p ? &p->child_ids : &swnode_root_ids, 0, 0,
+ GFP_KERNEL);
+ if (swnode->id < 0) {
+ kfree(swnode);
+ return ERR_PTR(swnode->id);
+ }
+
+ sprintf(node_name, "node%d", swnode->id);
+
+ swnode->kobj.kset = swnode_kset;
+ swnode->fwnode.ops = &software_node_ops;
+
+ ida_init(&swnode->child_ids);
+ INIT_LIST_HEAD(&swnode->entry);
+ INIT_LIST_HEAD(&swnode->children);
+ swnode->parent = p;
+
+ if (p)
+ list_add_tail(&swnode->entry, &p->children);
+
+ ret = kobject_init_and_add(&swnode->kobj, &software_node_type,
+ p ? &p->kobj : NULL, node_name);
+ if (ret) {
+ kobject_put(&swnode->kobj);
+ return ERR_PTR(ret);
+ }
+
+ ret = software_node_register_properties(swnode, properties);
+ if (ret) {
+ kobject_put(&swnode->kobj);
+ return ERR_PTR(ret);
+ }
+
+ kobject_uevent(&swnode->kobj, KOBJ_ADD);
+ return &swnode->fwnode;
+}
+EXPORT_SYMBOL_GPL(fwnode_create_software_node);
+
+void fwnode_remove_software_node(struct fwnode_handle *fwnode)
+{
+ struct software_node *swnode = to_software_node(fwnode);
+
+ if (!swnode)
+ return;
+
+ kobject_put(&swnode->kobj);
+}
+EXPORT_SYMBOL_GPL(fwnode_remove_software_node);
+
+int software_node_notify(struct device *dev, unsigned long action)
+{
+ struct fwnode_handle *fwnode = dev_fwnode(dev);
+ struct software_node *swnode;
+ int ret;
+
+ if (!fwnode)
+ return 0;
+
+ if (!is_software_node(fwnode))
+ fwnode = fwnode->secondary;
+ if (!is_software_node(fwnode))
+ return 0;
+
+ swnode = to_software_node(fwnode);
+
+ switch (action) {
+ case KOBJ_ADD:
+ ret = sysfs_create_link(&dev->kobj, &swnode->kobj,
+ "software_node");
+ if (ret)
+ break;
+
+ ret = sysfs_create_link(&swnode->kobj, &dev->kobj,
+ dev_name(dev));
+ if (ret) {
+ sysfs_remove_link(&dev->kobj, "software_node");
+ break;
+ }
+ kobject_get(&swnode->kobj);
+ break;
+ case KOBJ_REMOVE:
+ sysfs_remove_link(&swnode->kobj, dev_name(dev));
+ sysfs_remove_link(&dev->kobj, "software_node");
+ kobject_put(&swnode->kobj);
+ break;
+ default:
+ break;
+ }
+
+ return 0;
+}
+
+static int __init software_node_init(void)
+{
+ swnode_kset = kset_create_and_add("software_nodes", NULL, kernel_kobj);
+ if (!swnode_kset)
+ return -ENOMEM;
+ return 0;
+}
+postcore_initcall(software_node_init);
+
+static void __exit software_node_exit(void)
+{
+ ida_destroy(&swnode_root_ids);
+ kset_unregister(swnode_kset);
+}
+__exitcall(software_node_exit);
diff --git a/include/linux/property.h b/include/linux/property.h
index ac8a1ebc4c1b..3789ec755fb6 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -311,4 +311,16 @@ fwnode_graph_get_remote_node(const struct fwnode_handle *fwnode, u32 port,
int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,
struct fwnode_endpoint *endpoint);
+/* -------------------------------------------------------------------------- */
+/* Software fwnode support - when HW description is incomplete or missing */
+
+bool is_software_node(const struct fwnode_handle *fwnode);
+
+int software_node_notify(struct device *dev, unsigned long action);
+
+struct fwnode_handle *
+fwnode_create_software_node(const struct property_entry *properties,
+ const struct fwnode_handle *parent);
+void fwnode_remove_software_node(struct fwnode_handle *fwnode);
+
#endif /* _LINUX_PROPERTY_H_ */
--
2.19.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 4/6] drivers: base: Introducing software nodes to the firmware node framework
2018-11-05 14:59 ` [PATCH 4/6] drivers: base: Introducing software nodes to the firmware node framework Heikki Krogerus
@ 2018-11-07 4:39 ` Dan Carpenter
0 siblings, 0 replies; 12+ messages in thread
From: Dan Carpenter @ 2018-11-07 4:39 UTC (permalink / raw)
To: kbuild, Heikki Krogerus
Cc: Linus Walleij, Dmitry Torokhov, Rafael J. Wysocki, linux-kernel,
linux-acpi, kbuild-all, Andy Shevchenko, Mika Westerberg
Hi Heikki,
url: https://github.com/0day-ci/linux/commits/Heikki-Krogerus/device-property-Introducing-software-nodes/20181106-031310
smatch warnings:
drivers/base/swnode.c:391 fwnode_create_software_node() error: dereferencing freed memory 'swnode'
# https://github.com/0day-ci/linux/commit/a8c9678ea46a0171baed68e4ec355a9b3f967458
git remote add linux-review https://github.com/0day-ci/linux
git remote update linux-review
git checkout a8c9678ea46a0171baed68e4ec355a9b3f967458
vim +/swnode +391 drivers/base/swnode.c
a8c9678e Heikki Krogerus 2018-11-05 365
a8c9678e Heikki Krogerus 2018-11-05 366 struct fwnode_handle *
a8c9678e Heikki Krogerus 2018-11-05 367 fwnode_create_software_node(const struct property_entry *properties,
a8c9678e Heikki Krogerus 2018-11-05 368 const struct fwnode_handle *parent)
a8c9678e Heikki Krogerus 2018-11-05 369 {
a8c9678e Heikki Krogerus 2018-11-05 370 struct software_node *p = NULL;
a8c9678e Heikki Krogerus 2018-11-05 371 struct software_node *swnode;
a8c9678e Heikki Krogerus 2018-11-05 372 char node_name[20];
a8c9678e Heikki Krogerus 2018-11-05 373 int ret;
a8c9678e Heikki Krogerus 2018-11-05 374
a8c9678e Heikki Krogerus 2018-11-05 375 if (parent) {
a8c9678e Heikki Krogerus 2018-11-05 376 if (IS_ERR(parent))
a8c9678e Heikki Krogerus 2018-11-05 377 return ERR_CAST(parent);
a8c9678e Heikki Krogerus 2018-11-05 378 if (!is_software_node(parent))
a8c9678e Heikki Krogerus 2018-11-05 379 return ERR_PTR(-EINVAL);
a8c9678e Heikki Krogerus 2018-11-05 380 p = to_software_node(parent);
a8c9678e Heikki Krogerus 2018-11-05 381 }
a8c9678e Heikki Krogerus 2018-11-05 382
a8c9678e Heikki Krogerus 2018-11-05 383 swnode = kzalloc(sizeof(*swnode), GFP_KERNEL);
a8c9678e Heikki Krogerus 2018-11-05 384 if (!swnode)
a8c9678e Heikki Krogerus 2018-11-05 385 return ERR_PTR(-ENOMEM);
a8c9678e Heikki Krogerus 2018-11-05 386
a8c9678e Heikki Krogerus 2018-11-05 387 swnode->id = ida_simple_get(p ? &p->child_ids : &swnode_root_ids, 0, 0,
a8c9678e Heikki Krogerus 2018-11-05 388 GFP_KERNEL);
a8c9678e Heikki Krogerus 2018-11-05 389 if (swnode->id < 0) {
a8c9678e Heikki Krogerus 2018-11-05 390 kfree(swnode);
^^^^^^
a8c9678e Heikki Krogerus 2018-11-05 @391 return ERR_PTR(swnode->id);
^^^^^^^^^^
a8c9678e Heikki Krogerus 2018-11-05 392 }
a8c9678e Heikki Krogerus 2018-11-05 393
a8c9678e Heikki Krogerus 2018-11-05 394 sprintf(node_name, "node%d", swnode->id);
a8c9678e Heikki Krogerus 2018-11-05 395
a8c9678e Heikki Krogerus 2018-11-05 396 swnode->kobj.kset = swnode_kset;
a8c9678e Heikki Krogerus 2018-11-05 397 swnode->fwnode.ops = &software_node_ops;
a8c9678e Heikki Krogerus 2018-11-05 398
a8c9678e Heikki Krogerus 2018-11-05 399 ida_init(&swnode->child_ids);
a8c9678e Heikki Krogerus 2018-11-05 400 INIT_LIST_HEAD(&swnode->entry);
a8c9678e Heikki Krogerus 2018-11-05 401 INIT_LIST_HEAD(&swnode->children);
a8c9678e Heikki Krogerus 2018-11-05 402 swnode->parent = p;
a8c9678e Heikki Krogerus 2018-11-05 403
a8c9678e Heikki Krogerus 2018-11-05 404 if (p)
a8c9678e Heikki Krogerus 2018-11-05 405 list_add_tail(&swnode->entry, &p->children);
a8c9678e Heikki Krogerus 2018-11-05 406
a8c9678e Heikki Krogerus 2018-11-05 407 ret = kobject_init_and_add(&swnode->kobj, &software_node_type,
a8c9678e Heikki Krogerus 2018-11-05 408 p ? &p->kobj : NULL, node_name);
a8c9678e Heikki Krogerus 2018-11-05 409 if (ret) {
a8c9678e Heikki Krogerus 2018-11-05 410 kobject_put(&swnode->kobj);
a8c9678e Heikki Krogerus 2018-11-05 411 return ERR_PTR(ret);
a8c9678e Heikki Krogerus 2018-11-05 412 }
a8c9678e Heikki Krogerus 2018-11-05 413
a8c9678e Heikki Krogerus 2018-11-05 414 ret = software_node_register_properties(swnode, properties);
a8c9678e Heikki Krogerus 2018-11-05 415 if (ret) {
a8c9678e Heikki Krogerus 2018-11-05 416 kobject_put(&swnode->kobj);
a8c9678e Heikki Krogerus 2018-11-05 417 return ERR_PTR(ret);
a8c9678e Heikki Krogerus 2018-11-05 418 }
a8c9678e Heikki Krogerus 2018-11-05 419
a8c9678e Heikki Krogerus 2018-11-05 420 kobject_uevent(&swnode->kobj, KOBJ_ADD);
a8c9678e Heikki Krogerus 2018-11-05 421 return &swnode->fwnode;
a8c9678e Heikki Krogerus 2018-11-05 422 }
a8c9678e Heikki Krogerus 2018-11-05 423 EXPORT_SYMBOL_GPL(fwnode_create_software_node);
a8c9678e Heikki Krogerus 2018-11-05 424
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 4/6] drivers: base: Introducing software nodes to the firmware node framework
@ 2018-11-07 4:39 ` Dan Carpenter
0 siblings, 0 replies; 12+ messages in thread
From: Dan Carpenter @ 2018-11-07 4:39 UTC (permalink / raw)
To: kbuild, Heikki Krogerus
Cc: kbuild-all, Rafael J. Wysocki, Dmitry Torokhov, Linus Walleij,
Andy Shevchenko, Mika Westerberg, linux-kernel, linux-acpi
Hi Heikki,
url: https://github.com/0day-ci/linux/commits/Heikki-Krogerus/device-property-Introducing-software-nodes/20181106-031310
smatch warnings:
drivers/base/swnode.c:391 fwnode_create_software_node() error: dereferencing freed memory 'swnode'
# https://github.com/0day-ci/linux/commit/a8c9678ea46a0171baed68e4ec355a9b3f967458
git remote add linux-review https://github.com/0day-ci/linux
git remote update linux-review
git checkout a8c9678ea46a0171baed68e4ec355a9b3f967458
vim +/swnode +391 drivers/base/swnode.c
a8c9678e Heikki Krogerus 2018-11-05 365
a8c9678e Heikki Krogerus 2018-11-05 366 struct fwnode_handle *
a8c9678e Heikki Krogerus 2018-11-05 367 fwnode_create_software_node(const struct property_entry *properties,
a8c9678e Heikki Krogerus 2018-11-05 368 const struct fwnode_handle *parent)
a8c9678e Heikki Krogerus 2018-11-05 369 {
a8c9678e Heikki Krogerus 2018-11-05 370 struct software_node *p = NULL;
a8c9678e Heikki Krogerus 2018-11-05 371 struct software_node *swnode;
a8c9678e Heikki Krogerus 2018-11-05 372 char node_name[20];
a8c9678e Heikki Krogerus 2018-11-05 373 int ret;
a8c9678e Heikki Krogerus 2018-11-05 374
a8c9678e Heikki Krogerus 2018-11-05 375 if (parent) {
a8c9678e Heikki Krogerus 2018-11-05 376 if (IS_ERR(parent))
a8c9678e Heikki Krogerus 2018-11-05 377 return ERR_CAST(parent);
a8c9678e Heikki Krogerus 2018-11-05 378 if (!is_software_node(parent))
a8c9678e Heikki Krogerus 2018-11-05 379 return ERR_PTR(-EINVAL);
a8c9678e Heikki Krogerus 2018-11-05 380 p = to_software_node(parent);
a8c9678e Heikki Krogerus 2018-11-05 381 }
a8c9678e Heikki Krogerus 2018-11-05 382
a8c9678e Heikki Krogerus 2018-11-05 383 swnode = kzalloc(sizeof(*swnode), GFP_KERNEL);
a8c9678e Heikki Krogerus 2018-11-05 384 if (!swnode)
a8c9678e Heikki Krogerus 2018-11-05 385 return ERR_PTR(-ENOMEM);
a8c9678e Heikki Krogerus 2018-11-05 386
a8c9678e Heikki Krogerus 2018-11-05 387 swnode->id = ida_simple_get(p ? &p->child_ids : &swnode_root_ids, 0, 0,
a8c9678e Heikki Krogerus 2018-11-05 388 GFP_KERNEL);
a8c9678e Heikki Krogerus 2018-11-05 389 if (swnode->id < 0) {
a8c9678e Heikki Krogerus 2018-11-05 390 kfree(swnode);
^^^^^^
a8c9678e Heikki Krogerus 2018-11-05 @391 return ERR_PTR(swnode->id);
^^^^^^^^^^
a8c9678e Heikki Krogerus 2018-11-05 392 }
a8c9678e Heikki Krogerus 2018-11-05 393
a8c9678e Heikki Krogerus 2018-11-05 394 sprintf(node_name, "node%d", swnode->id);
a8c9678e Heikki Krogerus 2018-11-05 395
a8c9678e Heikki Krogerus 2018-11-05 396 swnode->kobj.kset = swnode_kset;
a8c9678e Heikki Krogerus 2018-11-05 397 swnode->fwnode.ops = &software_node_ops;
a8c9678e Heikki Krogerus 2018-11-05 398
a8c9678e Heikki Krogerus 2018-11-05 399 ida_init(&swnode->child_ids);
a8c9678e Heikki Krogerus 2018-11-05 400 INIT_LIST_HEAD(&swnode->entry);
a8c9678e Heikki Krogerus 2018-11-05 401 INIT_LIST_HEAD(&swnode->children);
a8c9678e Heikki Krogerus 2018-11-05 402 swnode->parent = p;
a8c9678e Heikki Krogerus 2018-11-05 403
a8c9678e Heikki Krogerus 2018-11-05 404 if (p)
a8c9678e Heikki Krogerus 2018-11-05 405 list_add_tail(&swnode->entry, &p->children);
a8c9678e Heikki Krogerus 2018-11-05 406
a8c9678e Heikki Krogerus 2018-11-05 407 ret = kobject_init_and_add(&swnode->kobj, &software_node_type,
a8c9678e Heikki Krogerus 2018-11-05 408 p ? &p->kobj : NULL, node_name);
a8c9678e Heikki Krogerus 2018-11-05 409 if (ret) {
a8c9678e Heikki Krogerus 2018-11-05 410 kobject_put(&swnode->kobj);
a8c9678e Heikki Krogerus 2018-11-05 411 return ERR_PTR(ret);
a8c9678e Heikki Krogerus 2018-11-05 412 }
a8c9678e Heikki Krogerus 2018-11-05 413
a8c9678e Heikki Krogerus 2018-11-05 414 ret = software_node_register_properties(swnode, properties);
a8c9678e Heikki Krogerus 2018-11-05 415 if (ret) {
a8c9678e Heikki Krogerus 2018-11-05 416 kobject_put(&swnode->kobj);
a8c9678e Heikki Krogerus 2018-11-05 417 return ERR_PTR(ret);
a8c9678e Heikki Krogerus 2018-11-05 418 }
a8c9678e Heikki Krogerus 2018-11-05 419
a8c9678e Heikki Krogerus 2018-11-05 420 kobject_uevent(&swnode->kobj, KOBJ_ADD);
a8c9678e Heikki Krogerus 2018-11-05 421 return &swnode->fwnode;
a8c9678e Heikki Krogerus 2018-11-05 422 }
a8c9678e Heikki Krogerus 2018-11-05 423 EXPORT_SYMBOL_GPL(fwnode_create_software_node);
a8c9678e Heikki Krogerus 2018-11-05 424
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 4/6] drivers: base: Introducing software nodes to the firmware node framework
2018-11-07 4:39 ` Dan Carpenter
(?)
@ 2018-11-07 12:33 ` Heikki Krogerus
-1 siblings, 0 replies; 12+ messages in thread
From: Heikki Krogerus @ 2018-11-07 12:33 UTC (permalink / raw)
To: Dan Carpenter
Cc: kbuild, kbuild-all, Rafael J. Wysocki, Dmitry Torokhov,
Linus Walleij, Andy Shevchenko, Mika Westerberg, linux-kernel,
linux-acpi
On Wed, Nov 07, 2018 at 07:39:33AM +0300, Dan Carpenter wrote:
> Hi Heikki,
>
> url: https://github.com/0day-ci/linux/commits/Heikki-Krogerus/device-property-Introducing-software-nodes/20181106-031310
>
> smatch warnings:
> drivers/base/swnode.c:391 fwnode_create_software_node() error: dereferencing freed memory 'swnode'
>
> # https://github.com/0day-ci/linux/commit/a8c9678ea46a0171baed68e4ec355a9b3f967458
> git remote add linux-review https://github.com/0day-ci/linux
> git remote update linux-review
> git checkout a8c9678ea46a0171baed68e4ec355a9b3f967458
> vim +/swnode +391 drivers/base/swnode.c
>
> a8c9678e Heikki Krogerus 2018-11-05 365
> a8c9678e Heikki Krogerus 2018-11-05 366 struct fwnode_handle *
> a8c9678e Heikki Krogerus 2018-11-05 367 fwnode_create_software_node(const struct property_entry *properties,
> a8c9678e Heikki Krogerus 2018-11-05 368 const struct fwnode_handle *parent)
> a8c9678e Heikki Krogerus 2018-11-05 369 {
> a8c9678e Heikki Krogerus 2018-11-05 370 struct software_node *p = NULL;
> a8c9678e Heikki Krogerus 2018-11-05 371 struct software_node *swnode;
> a8c9678e Heikki Krogerus 2018-11-05 372 char node_name[20];
> a8c9678e Heikki Krogerus 2018-11-05 373 int ret;
> a8c9678e Heikki Krogerus 2018-11-05 374
> a8c9678e Heikki Krogerus 2018-11-05 375 if (parent) {
> a8c9678e Heikki Krogerus 2018-11-05 376 if (IS_ERR(parent))
> a8c9678e Heikki Krogerus 2018-11-05 377 return ERR_CAST(parent);
> a8c9678e Heikki Krogerus 2018-11-05 378 if (!is_software_node(parent))
> a8c9678e Heikki Krogerus 2018-11-05 379 return ERR_PTR(-EINVAL);
> a8c9678e Heikki Krogerus 2018-11-05 380 p = to_software_node(parent);
> a8c9678e Heikki Krogerus 2018-11-05 381 }
> a8c9678e Heikki Krogerus 2018-11-05 382
> a8c9678e Heikki Krogerus 2018-11-05 383 swnode = kzalloc(sizeof(*swnode), GFP_KERNEL);
> a8c9678e Heikki Krogerus 2018-11-05 384 if (!swnode)
> a8c9678e Heikki Krogerus 2018-11-05 385 return ERR_PTR(-ENOMEM);
> a8c9678e Heikki Krogerus 2018-11-05 386
> a8c9678e Heikki Krogerus 2018-11-05 387 swnode->id = ida_simple_get(p ? &p->child_ids : &swnode_root_ids, 0, 0,
> a8c9678e Heikki Krogerus 2018-11-05 388 GFP_KERNEL);
> a8c9678e Heikki Krogerus 2018-11-05 389 if (swnode->id < 0) {
> a8c9678e Heikki Krogerus 2018-11-05 390 kfree(swnode);
> ^^^^^^
> a8c9678e Heikki Krogerus 2018-11-05 @391 return ERR_PTR(swnode->id);
> ^^^^^^^^^^
> a8c9678e Heikki Krogerus 2018-11-05 392 }
Thanks!
--
heikki
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 5/6] device property: Move device_add_properties() to swnode.c
2018-11-05 14:59 [PATCH 0/6] device property: Introducing software nodes Heikki Krogerus
` (3 preceding siblings ...)
2018-11-05 14:59 ` [PATCH 4/6] drivers: base: Introducing software nodes to the firmware node framework Heikki Krogerus
@ 2018-11-05 14:59 ` Heikki Krogerus
2018-11-05 14:59 ` [PATCH 6/6] device property: Remove struct property_set Heikki Krogerus
5 siblings, 0 replies; 12+ messages in thread
From: Heikki Krogerus @ 2018-11-05 14:59 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Dmitry Torokhov, Linus Walleij, Andy Shevchenko, Mika Westerberg,
linux-kernel, linux-acpi
Concentrating struct property_entry processing to
drivers/base/swnode.c
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
drivers/base/property.c | 179 --------------------------------------
drivers/base/swnode.c | 184 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 184 insertions(+), 179 deletions(-)
diff --git a/drivers/base/property.c b/drivers/base/property.c
index 240ab5230ff6..e20642759c67 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -84,44 +84,6 @@ static const void *property_get_pointer(const struct property_entry *prop)
}
}
-static void property_set_pointer(struct property_entry *prop, const void *pointer)
-{
- switch (prop->type) {
- case DEV_PROP_U8:
- if (prop->is_array)
- prop->pointer.u8_data = pointer;
- else
- prop->value.u8_data = *((u8 *)pointer);
- break;
- case DEV_PROP_U16:
- if (prop->is_array)
- prop->pointer.u16_data = pointer;
- else
- prop->value.u16_data = *((u16 *)pointer);
- break;
- case DEV_PROP_U32:
- if (prop->is_array)
- prop->pointer.u32_data = pointer;
- else
- prop->value.u32_data = *((u32 *)pointer);
- break;
- case DEV_PROP_U64:
- if (prop->is_array)
- prop->pointer.u64_data = pointer;
- else
- prop->value.u64_data = *((u64 *)pointer);
- break;
- case DEV_PROP_STRING:
- if (prop->is_array)
- prop->pointer.str = pointer;
- else
- prop->value.str = pointer;
- break;
- default:
- break;
- }
-}
-
static const void *pset_prop_find(const struct property_set *pset,
const char *propname, size_t length)
{
@@ -759,147 +721,6 @@ int fwnode_property_get_reference_args(const struct fwnode_handle *fwnode,
}
EXPORT_SYMBOL_GPL(fwnode_property_get_reference_args);
-static void property_entry_free_data(const struct property_entry *p)
-{
- const void *pointer = property_get_pointer(p);
- size_t i, nval;
-
- if (p->is_array) {
- if (p->type == DEV_PROP_STRING && p->pointer.str) {
- nval = p->length / sizeof(const char *);
- for (i = 0; i < nval; i++)
- kfree(p->pointer.str[i]);
- }
- kfree(pointer);
- } else if (p->type == DEV_PROP_STRING) {
- kfree(p->value.str);
- }
- kfree(p->name);
-}
-
-static int property_copy_string_array(struct property_entry *dst,
- const struct property_entry *src)
-{
- const char **d;
- size_t nval = src->length / sizeof(*d);
- int i;
-
- d = kcalloc(nval, sizeof(*d), GFP_KERNEL);
- if (!d)
- return -ENOMEM;
-
- for (i = 0; i < nval; i++) {
- d[i] = kstrdup(src->pointer.str[i], GFP_KERNEL);
- if (!d[i] && src->pointer.str[i]) {
- while (--i >= 0)
- kfree(d[i]);
- kfree(d);
- return -ENOMEM;
- }
- }
-
- dst->pointer.str = d;
- return 0;
-}
-
-static int property_entry_copy_data(struct property_entry *dst,
- const struct property_entry *src)
-{
- const void *pointer = property_get_pointer(src);
- const void *new;
- int error;
-
- if (src->is_array) {
- if (!src->length)
- return -ENODATA;
-
- if (src->type == DEV_PROP_STRING) {
- error = property_copy_string_array(dst, src);
- if (error)
- return error;
- new = dst->pointer.str;
- } else {
- new = kmemdup(pointer, src->length, GFP_KERNEL);
- if (!new)
- return -ENOMEM;
- }
- } else if (src->type == DEV_PROP_STRING) {
- new = kstrdup(src->value.str, GFP_KERNEL);
- if (!new && src->value.str)
- return -ENOMEM;
- } else {
- new = pointer;
- }
-
- dst->length = src->length;
- dst->is_array = src->is_array;
- dst->type = src->type;
-
- property_set_pointer(dst, new);
-
- dst->name = kstrdup(src->name, GFP_KERNEL);
- if (!dst->name)
- goto out_free_data;
-
- return 0;
-
-out_free_data:
- property_entry_free_data(dst);
- return -ENOMEM;
-}
-
-/**
- * property_entries_dup - duplicate array of properties
- * @properties: array of properties to copy
- *
- * This function creates a deep copy of the given NULL-terminated array
- * of property entries.
- */
-struct property_entry *
-property_entries_dup(const struct property_entry *properties)
-{
- struct property_entry *p;
- int i, n = 0;
-
- while (properties[n].name)
- n++;
-
- p = kcalloc(n + 1, sizeof(*p), GFP_KERNEL);
- if (!p)
- return ERR_PTR(-ENOMEM);
-
- for (i = 0; i < n; i++) {
- int ret = property_entry_copy_data(&p[i], &properties[i]);
- if (ret) {
- while (--i >= 0)
- property_entry_free_data(&p[i]);
- kfree(p);
- return ERR_PTR(ret);
- }
- }
-
- return p;
-}
-EXPORT_SYMBOL_GPL(property_entries_dup);
-
-/**
- * property_entries_free - free previously allocated array of properties
- * @properties: array of properties to destroy
- *
- * This function frees given NULL-terminated array of property entries,
- * along with their data.
- */
-void property_entries_free(const struct property_entry *properties)
-{
- const struct property_entry *p;
-
- for (p = properties; p->name; p++)
- property_entry_free_data(p);
-
- kfree(properties);
-}
-EXPORT_SYMBOL_GPL(property_entries_free);
-
/**
* pset_free_set - releases memory allocated for copied property set
* @pset: Property set to release
diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
index db60e8edf366..652bab67a906 100644
--- a/drivers/base/swnode.c
+++ b/drivers/base/swnode.c
@@ -64,6 +64,45 @@ property_entry_get(const struct property_entry *prop, const char *name)
return NULL;
}
+static void
+property_set_pointer(struct property_entry *prop, const void *pointer)
+{
+ switch (prop->type) {
+ case DEV_PROP_U8:
+ if (prop->is_array)
+ prop->pointer.u8_data = pointer;
+ else
+ prop->value.u8_data = *((u8 *)pointer);
+ break;
+ case DEV_PROP_U16:
+ if (prop->is_array)
+ prop->pointer.u16_data = pointer;
+ else
+ prop->value.u16_data = *((u16 *)pointer);
+ break;
+ case DEV_PROP_U32:
+ if (prop->is_array)
+ prop->pointer.u32_data = pointer;
+ else
+ prop->value.u32_data = *((u32 *)pointer);
+ break;
+ case DEV_PROP_U64:
+ if (prop->is_array)
+ prop->pointer.u64_data = pointer;
+ else
+ prop->value.u64_data = *((u64 *)pointer);
+ break;
+ case DEV_PROP_STRING:
+ if (prop->is_array)
+ prop->pointer.str = pointer;
+ else
+ prop->value.str = pointer;
+ break;
+ default:
+ break;
+ }
+}
+
static const void *property_get_pointer(const struct property_entry *prop)
{
switch (prop->type) {
@@ -241,6 +280,151 @@ static int property_entry_read_string_array(const struct property_entry *props,
return array_len;
}
+static void property_entry_free_data(const struct property_entry *p)
+{
+ const void *pointer = property_get_pointer(p);
+ size_t i, nval;
+
+ if (p->is_array) {
+ if (p->type == DEV_PROP_STRING && p->pointer.str) {
+ nval = p->length / sizeof(const char *);
+ for (i = 0; i < nval; i++)
+ kfree(p->pointer.str[i]);
+ }
+ kfree(pointer);
+ } else if (p->type == DEV_PROP_STRING) {
+ kfree(p->value.str);
+ }
+ kfree(p->name);
+}
+
+static int property_copy_string_array(struct property_entry *dst,
+ const struct property_entry *src)
+{
+ const char **d;
+ size_t nval = src->length / sizeof(*d);
+ int i;
+
+ d = kcalloc(nval, sizeof(*d), GFP_KERNEL);
+ if (!d)
+ return -ENOMEM;
+
+ for (i = 0; i < nval; i++) {
+ d[i] = kstrdup(src->pointer.str[i], GFP_KERNEL);
+ if (!d[i] && src->pointer.str[i]) {
+ while (--i >= 0)
+ kfree(d[i]);
+ kfree(d);
+ return -ENOMEM;
+ }
+ }
+
+ dst->pointer.str = d;
+ return 0;
+}
+
+static int property_entry_copy_data(struct property_entry *dst,
+ const struct property_entry *src)
+{
+ const void *pointer = property_get_pointer(src);
+ const void *new;
+ int error;
+
+ if (src->is_array) {
+ if (!src->length)
+ return -ENODATA;
+
+ if (src->type == DEV_PROP_STRING) {
+ error = property_copy_string_array(dst, src);
+ if (error)
+ return error;
+ new = dst->pointer.str;
+ } else {
+ new = kmemdup(pointer, src->length, GFP_KERNEL);
+ if (!new)
+ return -ENOMEM;
+ }
+ } else if (src->type == DEV_PROP_STRING) {
+ new = kstrdup(src->value.str, GFP_KERNEL);
+ if (!new && src->value.str)
+ return -ENOMEM;
+ } else {
+ new = pointer;
+ }
+
+ dst->length = src->length;
+ dst->is_array = src->is_array;
+ dst->type = src->type;
+
+ property_set_pointer(dst, new);
+
+ dst->name = kstrdup(src->name, GFP_KERNEL);
+ if (!dst->name)
+ goto out_free_data;
+
+ return 0;
+
+out_free_data:
+ property_entry_free_data(dst);
+ return -ENOMEM;
+}
+
+/**
+ * property_entries_dup - duplicate array of properties
+ * @properties: array of properties to copy
+ *
+ * This function creates a deep copy of the given NULL-terminated array
+ * of property entries.
+ */
+struct property_entry *
+property_entries_dup(const struct property_entry *properties)
+{
+ struct property_entry *p;
+ int i, n = 0;
+ int ret;
+
+ while (properties[n].name)
+ n++;
+
+ p = kcalloc(n + 1, sizeof(*p), GFP_KERNEL);
+ if (!p)
+ return ERR_PTR(-ENOMEM);
+
+ for (i = 0; i < n; i++) {
+ ret = property_entry_copy_data(&p[i], &properties[i]);
+ if (ret) {
+ while (--i >= 0)
+ property_entry_free_data(&p[i]);
+ kfree(p);
+ return ERR_PTR(ret);
+ }
+ }
+
+ return p;
+}
+EXPORT_SYMBOL_GPL(property_entries_dup);
+
+/**
+ * property_entries_free - free previously allocated array of properties
+ * @properties: array of properties to destroy
+ *
+ * This function frees given NULL-terminated array of property entries,
+ * along with their data.
+ */
+void property_entries_free(const struct property_entry *properties)
+{
+ const struct property_entry *p;
+
+ if (!properties)
+ return;
+
+ for (p = properties; p->name; p++)
+ property_entry_free_data(p);
+
+ kfree(properties);
+}
+EXPORT_SYMBOL_GPL(property_entries_free);
+
/* -------------------------------------------------------------------------- */
/* fwnode operations */
--
2.19.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 6/6] device property: Remove struct property_set
2018-11-05 14:59 [PATCH 0/6] device property: Introducing software nodes Heikki Krogerus
` (4 preceding siblings ...)
2018-11-05 14:59 ` [PATCH 5/6] device property: Move device_add_properties() to swnode.c Heikki Krogerus
@ 2018-11-05 14:59 ` Heikki Krogerus
2018-11-06 14:46 ` Andy Shevchenko
5 siblings, 1 reply; 12+ messages in thread
From: Heikki Krogerus @ 2018-11-05 14:59 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Dmitry Torokhov, Linus Walleij, Andy Shevchenko, Mika Westerberg,
linux-kernel, linux-acpi
Replacing struct property_set with the software nodes that
were just introduced.
The API and functionality for adding properties to devices
remains the same, however, the goal is to convert the
drivers to use the API for software nodes when the device
has no real firmware node, and use the old API only when
"extra" build-in properties are needed.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
drivers/base/property.c | 346 +++-------------------------------------
1 file changed, 24 insertions(+), 322 deletions(-)
diff --git a/drivers/base/property.c b/drivers/base/property.c
index e20642759c67..1f6b8a21bcfe 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -18,198 +18,6 @@
#include <linux/etherdevice.h>
#include <linux/phy.h>
-struct property_set {
- struct device *dev;
- struct fwnode_handle fwnode;
- const struct property_entry *properties;
-};
-
-static const struct fwnode_operations pset_fwnode_ops;
-
-static inline bool is_pset_node(const struct fwnode_handle *fwnode)
-{
- return !IS_ERR_OR_NULL(fwnode) && fwnode->ops == &pset_fwnode_ops;
-}
-
-#define to_pset_node(__fwnode) \
- ({ \
- typeof(__fwnode) __to_pset_node_fwnode = __fwnode; \
- \
- is_pset_node(__to_pset_node_fwnode) ? \
- container_of(__to_pset_node_fwnode, \
- struct property_set, fwnode) : \
- NULL; \
- })
-
-static const struct property_entry *
-pset_prop_get(const struct property_set *pset, const char *name)
-{
- const struct property_entry *prop;
-
- if (!pset || !pset->properties)
- return NULL;
-
- for (prop = pset->properties; prop->name; prop++)
- if (!strcmp(name, prop->name))
- return prop;
-
- return NULL;
-}
-
-static const void *property_get_pointer(const struct property_entry *prop)
-{
- switch (prop->type) {
- case DEV_PROP_U8:
- if (prop->is_array)
- return prop->pointer.u8_data;
- return &prop->value.u8_data;
- case DEV_PROP_U16:
- if (prop->is_array)
- return prop->pointer.u16_data;
- return &prop->value.u16_data;
- case DEV_PROP_U32:
- if (prop->is_array)
- return prop->pointer.u32_data;
- return &prop->value.u32_data;
- case DEV_PROP_U64:
- if (prop->is_array)
- return prop->pointer.u64_data;
- return &prop->value.u64_data;
- case DEV_PROP_STRING:
- if (prop->is_array)
- return prop->pointer.str;
- return &prop->value.str;
- default:
- return NULL;
- }
-}
-
-static const void *pset_prop_find(const struct property_set *pset,
- const char *propname, size_t length)
-{
- const struct property_entry *prop;
- const void *pointer;
-
- prop = pset_prop_get(pset, propname);
- if (!prop)
- return ERR_PTR(-EINVAL);
- pointer = property_get_pointer(prop);
- if (!pointer)
- return ERR_PTR(-ENODATA);
- if (length > prop->length)
- return ERR_PTR(-EOVERFLOW);
- return pointer;
-}
-
-static int pset_prop_read_u8_array(const struct property_set *pset,
- const char *propname,
- u8 *values, size_t nval)
-{
- const void *pointer;
- size_t length = nval * sizeof(*values);
-
- pointer = pset_prop_find(pset, propname, length);
- if (IS_ERR(pointer))
- return PTR_ERR(pointer);
-
- memcpy(values, pointer, length);
- return 0;
-}
-
-static int pset_prop_read_u16_array(const struct property_set *pset,
- const char *propname,
- u16 *values, size_t nval)
-{
- const void *pointer;
- size_t length = nval * sizeof(*values);
-
- pointer = pset_prop_find(pset, propname, length);
- if (IS_ERR(pointer))
- return PTR_ERR(pointer);
-
- memcpy(values, pointer, length);
- return 0;
-}
-
-static int pset_prop_read_u32_array(const struct property_set *pset,
- const char *propname,
- u32 *values, size_t nval)
-{
- const void *pointer;
- size_t length = nval * sizeof(*values);
-
- pointer = pset_prop_find(pset, propname, length);
- if (IS_ERR(pointer))
- return PTR_ERR(pointer);
-
- memcpy(values, pointer, length);
- return 0;
-}
-
-static int pset_prop_read_u64_array(const struct property_set *pset,
- const char *propname,
- u64 *values, size_t nval)
-{
- const void *pointer;
- size_t length = nval * sizeof(*values);
-
- pointer = pset_prop_find(pset, propname, length);
- if (IS_ERR(pointer))
- return PTR_ERR(pointer);
-
- memcpy(values, pointer, length);
- return 0;
-}
-
-static int pset_prop_count_elems_of_size(const struct property_set *pset,
- const char *propname, size_t length)
-{
- const struct property_entry *prop;
-
- prop = pset_prop_get(pset, propname);
- if (!prop)
- return -EINVAL;
-
- return prop->length / length;
-}
-
-static int pset_prop_read_string_array(const struct property_set *pset,
- const char *propname,
- const char **strings, size_t nval)
-{
- const struct property_entry *prop;
- const void *pointer;
- size_t array_len, length;
-
- /* Find out the array length. */
- prop = pset_prop_get(pset, propname);
- if (!prop)
- return -EINVAL;
-
- if (!prop->is_array)
- /* The array length for a non-array string property is 1. */
- array_len = 1;
- else
- /* Find the length of an array. */
- array_len = pset_prop_count_elems_of_size(pset, propname,
- sizeof(const char *));
-
- /* Return how many there are if strings is NULL. */
- if (!strings)
- return array_len;
-
- array_len = min(nval, array_len);
- length = array_len * sizeof(*strings);
-
- pointer = pset_prop_find(pset, propname, length);
- if (IS_ERR(pointer))
- return PTR_ERR(pointer);
-
- memcpy(strings, pointer, length);
-
- return array_len;
-}
-
struct fwnode_handle *dev_fwnode(struct device *dev)
{
return IS_ENABLED(CONFIG_OF) && dev->of_node ?
@@ -217,51 +25,6 @@ struct fwnode_handle *dev_fwnode(struct device *dev)
}
EXPORT_SYMBOL_GPL(dev_fwnode);
-static bool pset_fwnode_property_present(const struct fwnode_handle *fwnode,
- const char *propname)
-{
- return !!pset_prop_get(to_pset_node(fwnode), propname);
-}
-
-static int pset_fwnode_read_int_array(const struct fwnode_handle *fwnode,
- const char *propname,
- unsigned int elem_size, void *val,
- size_t nval)
-{
- const struct property_set *node = to_pset_node(fwnode);
-
- if (!val)
- return pset_prop_count_elems_of_size(node, propname, elem_size);
-
- switch (elem_size) {
- case sizeof(u8):
- return pset_prop_read_u8_array(node, propname, val, nval);
- case sizeof(u16):
- return pset_prop_read_u16_array(node, propname, val, nval);
- case sizeof(u32):
- return pset_prop_read_u32_array(node, propname, val, nval);
- case sizeof(u64):
- return pset_prop_read_u64_array(node, propname, val, nval);
- }
-
- return -ENXIO;
-}
-
-static int
-pset_fwnode_property_read_string_array(const struct fwnode_handle *fwnode,
- const char *propname,
- const char **val, size_t nval)
-{
- return pset_prop_read_string_array(to_pset_node(fwnode), propname,
- val, nval);
-}
-
-static const struct fwnode_operations pset_fwnode_ops = {
- .property_present = pset_fwnode_property_present,
- .property_read_int_array = pset_fwnode_read_int_array,
- .property_read_string_array = pset_fwnode_property_read_string_array,
-};
-
/**
* device_property_present - check if a property of a device is present
* @dev: Device whose property is being checked
@@ -722,114 +485,53 @@ int fwnode_property_get_reference_args(const struct fwnode_handle *fwnode,
EXPORT_SYMBOL_GPL(fwnode_property_get_reference_args);
/**
- * pset_free_set - releases memory allocated for copied property set
- * @pset: Property set to release
- *
- * Function takes previously copied property set and releases all the
- * memory allocated to it.
- */
-static void pset_free_set(struct property_set *pset)
-{
- if (!pset)
- return;
-
- property_entries_free(pset->properties);
- kfree(pset);
-}
-
-/**
- * pset_copy_set - copies property set
- * @pset: Property set to copy
+ * device_add_properties - Add a collection of properties to a device object.
+ * @dev: Device to add properties to.
+ * @properties: Collection of properties to add.
*
- * This function takes a deep copy of the given property set and returns
- * pointer to the copy. Call device_free_property_set() to free resources
- * allocated in this function.
+ * Associate a collection of device properties represented by @properties with
+ * @dev. The function takes a copy of @properties.
*
- * Return: Pointer to the new property set or error pointer.
+ * WARNING: The callers should not use this function if it is known that there
+ * is no real firmware node associated with @dev! In that case the callers
+ * should create a software node and assign it to @dev directly.
*/
-static struct property_set *pset_copy_set(const struct property_set *pset)
+int device_add_properties(struct device *dev,
+ const struct property_entry *properties)
{
- struct property_entry *properties;
- struct property_set *p;
+ struct fwnode_handle *fwnode;
- p = kzalloc(sizeof(*p), GFP_KERNEL);
- if (!p)
- return ERR_PTR(-ENOMEM);
+ fwnode = fwnode_create_software_node(properties, NULL);
+ if (IS_ERR(fwnode))
+ return PTR_ERR(fwnode);
- properties = property_entries_dup(pset->properties);
- if (IS_ERR(properties)) {
- kfree(p);
- return ERR_CAST(properties);
- }
-
- p->properties = properties;
- return p;
+ set_secondary_fwnode(dev, fwnode);
+ return 0;
}
+EXPORT_SYMBOL_GPL(device_add_properties);
/**
* device_remove_properties - Remove properties from a device object.
* @dev: Device whose properties to remove.
*
* The function removes properties previously associated to the device
- * secondary firmware node with device_add_properties(). Memory allocated
- * to the properties will also be released.
+ * firmware node with device_add_properties(). Memory allocated to the
+ * properties will also be released.
*/
void device_remove_properties(struct device *dev)
{
- struct fwnode_handle *fwnode;
- struct property_set *pset;
+ struct fwnode_handle *fwnode = dev_fwnode(dev);
- fwnode = dev_fwnode(dev);
if (!fwnode)
return;
- /*
- * Pick either primary or secondary node depending which one holds
- * the pset. If there is no real firmware node (ACPI/DT) primary
- * will hold the pset.
- */
- pset = to_pset_node(fwnode);
- if (pset) {
- set_primary_fwnode(dev, NULL);
- } else {
- pset = to_pset_node(fwnode->secondary);
- if (pset && dev == pset->dev)
- set_secondary_fwnode(dev, NULL);
+
+ if (is_software_node(fwnode->secondary)) {
+ fwnode_remove_software_node(fwnode->secondary);
+ set_secondary_fwnode(dev, NULL);
}
- if (pset && dev == pset->dev)
- pset_free_set(pset);
}
EXPORT_SYMBOL_GPL(device_remove_properties);
-/**
- * device_add_properties - Add a collection of properties to a device object.
- * @dev: Device to add properties to.
- * @properties: Collection of properties to add.
- *
- * Associate a collection of device properties represented by @properties with
- * @dev as its secondary firmware node. The function takes a copy of
- * @properties.
- */
-int device_add_properties(struct device *dev,
- const struct property_entry *properties)
-{
- struct property_set *p, pset;
-
- if (!properties)
- return -EINVAL;
-
- pset.properties = properties;
-
- p = pset_copy_set(&pset);
- if (IS_ERR(p))
- return PTR_ERR(p);
-
- p->fwnode.ops = &pset_fwnode_ops;
- set_secondary_fwnode(dev, &p->fwnode);
- p->dev = dev;
- return 0;
-}
-EXPORT_SYMBOL_GPL(device_add_properties);
-
/**
* fwnode_get_next_parent - Iterate to the node's parent
* @fwnode: Firmware whose parent is retrieved
--
2.19.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 6/6] device property: Remove struct property_set
2018-11-05 14:59 ` [PATCH 6/6] device property: Remove struct property_set Heikki Krogerus
@ 2018-11-06 14:46 ` Andy Shevchenko
2018-11-07 12:34 ` Heikki Krogerus
0 siblings, 1 reply; 12+ messages in thread
From: Andy Shevchenko @ 2018-11-06 14:46 UTC (permalink / raw)
To: Heikki Krogerus
Cc: Rafael J. Wysocki, Dmitry Torokhov, Linus Walleij,
Mika Westerberg, linux-kernel, linux-acpi
On Mon, Nov 05, 2018 at 05:59:28PM +0300, Heikki Krogerus wrote:
> Replacing struct property_set with the software nodes that
> were just introduced.
>
> The API and functionality for adding properties to devices
> remains the same, however, the goal is to convert the
> drivers to use the API for software nodes when the device
> has no real firmware node, and use the old API only when
> "extra" build-in properties are needed.
It might be slightly easier to review if you preserve the ordering of
functions, i.e. device_add_properties() and device_remove_properties().
>
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> drivers/base/property.c | 346 +++-------------------------------------
> 1 file changed, 24 insertions(+), 322 deletions(-)
>
> diff --git a/drivers/base/property.c b/drivers/base/property.c
> index e20642759c67..1f6b8a21bcfe 100644
> --- a/drivers/base/property.c
> +++ b/drivers/base/property.c
> @@ -18,198 +18,6 @@
> #include <linux/etherdevice.h>
> #include <linux/phy.h>
>
> -struct property_set {
> - struct device *dev;
> - struct fwnode_handle fwnode;
> - const struct property_entry *properties;
> -};
> -
> -static const struct fwnode_operations pset_fwnode_ops;
> -
> -static inline bool is_pset_node(const struct fwnode_handle *fwnode)
> -{
> - return !IS_ERR_OR_NULL(fwnode) && fwnode->ops == &pset_fwnode_ops;
> -}
> -
> -#define to_pset_node(__fwnode) \
> - ({ \
> - typeof(__fwnode) __to_pset_node_fwnode = __fwnode; \
> - \
> - is_pset_node(__to_pset_node_fwnode) ? \
> - container_of(__to_pset_node_fwnode, \
> - struct property_set, fwnode) : \
> - NULL; \
> - })
> -
> -static const struct property_entry *
> -pset_prop_get(const struct property_set *pset, const char *name)
> -{
> - const struct property_entry *prop;
> -
> - if (!pset || !pset->properties)
> - return NULL;
> -
> - for (prop = pset->properties; prop->name; prop++)
> - if (!strcmp(name, prop->name))
> - return prop;
> -
> - return NULL;
> -}
> -
> -static const void *property_get_pointer(const struct property_entry *prop)
> -{
> - switch (prop->type) {
> - case DEV_PROP_U8:
> - if (prop->is_array)
> - return prop->pointer.u8_data;
> - return &prop->value.u8_data;
> - case DEV_PROP_U16:
> - if (prop->is_array)
> - return prop->pointer.u16_data;
> - return &prop->value.u16_data;
> - case DEV_PROP_U32:
> - if (prop->is_array)
> - return prop->pointer.u32_data;
> - return &prop->value.u32_data;
> - case DEV_PROP_U64:
> - if (prop->is_array)
> - return prop->pointer.u64_data;
> - return &prop->value.u64_data;
> - case DEV_PROP_STRING:
> - if (prop->is_array)
> - return prop->pointer.str;
> - return &prop->value.str;
> - default:
> - return NULL;
> - }
> -}
> -
> -static const void *pset_prop_find(const struct property_set *pset,
> - const char *propname, size_t length)
> -{
> - const struct property_entry *prop;
> - const void *pointer;
> -
> - prop = pset_prop_get(pset, propname);
> - if (!prop)
> - return ERR_PTR(-EINVAL);
> - pointer = property_get_pointer(prop);
> - if (!pointer)
> - return ERR_PTR(-ENODATA);
> - if (length > prop->length)
> - return ERR_PTR(-EOVERFLOW);
> - return pointer;
> -}
> -
> -static int pset_prop_read_u8_array(const struct property_set *pset,
> - const char *propname,
> - u8 *values, size_t nval)
> -{
> - const void *pointer;
> - size_t length = nval * sizeof(*values);
> -
> - pointer = pset_prop_find(pset, propname, length);
> - if (IS_ERR(pointer))
> - return PTR_ERR(pointer);
> -
> - memcpy(values, pointer, length);
> - return 0;
> -}
> -
> -static int pset_prop_read_u16_array(const struct property_set *pset,
> - const char *propname,
> - u16 *values, size_t nval)
> -{
> - const void *pointer;
> - size_t length = nval * sizeof(*values);
> -
> - pointer = pset_prop_find(pset, propname, length);
> - if (IS_ERR(pointer))
> - return PTR_ERR(pointer);
> -
> - memcpy(values, pointer, length);
> - return 0;
> -}
> -
> -static int pset_prop_read_u32_array(const struct property_set *pset,
> - const char *propname,
> - u32 *values, size_t nval)
> -{
> - const void *pointer;
> - size_t length = nval * sizeof(*values);
> -
> - pointer = pset_prop_find(pset, propname, length);
> - if (IS_ERR(pointer))
> - return PTR_ERR(pointer);
> -
> - memcpy(values, pointer, length);
> - return 0;
> -}
> -
> -static int pset_prop_read_u64_array(const struct property_set *pset,
> - const char *propname,
> - u64 *values, size_t nval)
> -{
> - const void *pointer;
> - size_t length = nval * sizeof(*values);
> -
> - pointer = pset_prop_find(pset, propname, length);
> - if (IS_ERR(pointer))
> - return PTR_ERR(pointer);
> -
> - memcpy(values, pointer, length);
> - return 0;
> -}
> -
> -static int pset_prop_count_elems_of_size(const struct property_set *pset,
> - const char *propname, size_t length)
> -{
> - const struct property_entry *prop;
> -
> - prop = pset_prop_get(pset, propname);
> - if (!prop)
> - return -EINVAL;
> -
> - return prop->length / length;
> -}
> -
> -static int pset_prop_read_string_array(const struct property_set *pset,
> - const char *propname,
> - const char **strings, size_t nval)
> -{
> - const struct property_entry *prop;
> - const void *pointer;
> - size_t array_len, length;
> -
> - /* Find out the array length. */
> - prop = pset_prop_get(pset, propname);
> - if (!prop)
> - return -EINVAL;
> -
> - if (!prop->is_array)
> - /* The array length for a non-array string property is 1. */
> - array_len = 1;
> - else
> - /* Find the length of an array. */
> - array_len = pset_prop_count_elems_of_size(pset, propname,
> - sizeof(const char *));
> -
> - /* Return how many there are if strings is NULL. */
> - if (!strings)
> - return array_len;
> -
> - array_len = min(nval, array_len);
> - length = array_len * sizeof(*strings);
> -
> - pointer = pset_prop_find(pset, propname, length);
> - if (IS_ERR(pointer))
> - return PTR_ERR(pointer);
> -
> - memcpy(strings, pointer, length);
> -
> - return array_len;
> -}
> -
> struct fwnode_handle *dev_fwnode(struct device *dev)
> {
> return IS_ENABLED(CONFIG_OF) && dev->of_node ?
> @@ -217,51 +25,6 @@ struct fwnode_handle *dev_fwnode(struct device *dev)
> }
> EXPORT_SYMBOL_GPL(dev_fwnode);
>
> -static bool pset_fwnode_property_present(const struct fwnode_handle *fwnode,
> - const char *propname)
> -{
> - return !!pset_prop_get(to_pset_node(fwnode), propname);
> -}
> -
> -static int pset_fwnode_read_int_array(const struct fwnode_handle *fwnode,
> - const char *propname,
> - unsigned int elem_size, void *val,
> - size_t nval)
> -{
> - const struct property_set *node = to_pset_node(fwnode);
> -
> - if (!val)
> - return pset_prop_count_elems_of_size(node, propname, elem_size);
> -
> - switch (elem_size) {
> - case sizeof(u8):
> - return pset_prop_read_u8_array(node, propname, val, nval);
> - case sizeof(u16):
> - return pset_prop_read_u16_array(node, propname, val, nval);
> - case sizeof(u32):
> - return pset_prop_read_u32_array(node, propname, val, nval);
> - case sizeof(u64):
> - return pset_prop_read_u64_array(node, propname, val, nval);
> - }
> -
> - return -ENXIO;
> -}
> -
> -static int
> -pset_fwnode_property_read_string_array(const struct fwnode_handle *fwnode,
> - const char *propname,
> - const char **val, size_t nval)
> -{
> - return pset_prop_read_string_array(to_pset_node(fwnode), propname,
> - val, nval);
> -}
> -
> -static const struct fwnode_operations pset_fwnode_ops = {
> - .property_present = pset_fwnode_property_present,
> - .property_read_int_array = pset_fwnode_read_int_array,
> - .property_read_string_array = pset_fwnode_property_read_string_array,
> -};
> -
> /**
> * device_property_present - check if a property of a device is present
> * @dev: Device whose property is being checked
> @@ -722,114 +485,53 @@ int fwnode_property_get_reference_args(const struct fwnode_handle *fwnode,
> EXPORT_SYMBOL_GPL(fwnode_property_get_reference_args);
>
> /**
> - * pset_free_set - releases memory allocated for copied property set
> - * @pset: Property set to release
> - *
> - * Function takes previously copied property set and releases all the
> - * memory allocated to it.
> - */
> -static void pset_free_set(struct property_set *pset)
> -{
> - if (!pset)
> - return;
> -
> - property_entries_free(pset->properties);
> - kfree(pset);
> -}
> -
> -/**
> - * pset_copy_set - copies property set
> - * @pset: Property set to copy
> + * device_add_properties - Add a collection of properties to a device object.
> + * @dev: Device to add properties to.
> + * @properties: Collection of properties to add.
> *
> - * This function takes a deep copy of the given property set and returns
> - * pointer to the copy. Call device_free_property_set() to free resources
> - * allocated in this function.
> + * Associate a collection of device properties represented by @properties with
> + * @dev. The function takes a copy of @properties.
> *
> - * Return: Pointer to the new property set or error pointer.
> + * WARNING: The callers should not use this function if it is known that there
> + * is no real firmware node associated with @dev! In that case the callers
> + * should create a software node and assign it to @dev directly.
> */
> -static struct property_set *pset_copy_set(const struct property_set *pset)
> +int device_add_properties(struct device *dev,
> + const struct property_entry *properties)
> {
> - struct property_entry *properties;
> - struct property_set *p;
> + struct fwnode_handle *fwnode;
>
> - p = kzalloc(sizeof(*p), GFP_KERNEL);
> - if (!p)
> - return ERR_PTR(-ENOMEM);
> + fwnode = fwnode_create_software_node(properties, NULL);
> + if (IS_ERR(fwnode))
> + return PTR_ERR(fwnode);
>
> - properties = property_entries_dup(pset->properties);
> - if (IS_ERR(properties)) {
> - kfree(p);
> - return ERR_CAST(properties);
> - }
> -
> - p->properties = properties;
> - return p;
> + set_secondary_fwnode(dev, fwnode);
> + return 0;
> }
> +EXPORT_SYMBOL_GPL(device_add_properties);
>
> /**
> * device_remove_properties - Remove properties from a device object.
> * @dev: Device whose properties to remove.
> *
> * The function removes properties previously associated to the device
> - * secondary firmware node with device_add_properties(). Memory allocated
> - * to the properties will also be released.
> + * firmware node with device_add_properties(). Memory allocated to the
> + * properties will also be released.
> */
> void device_remove_properties(struct device *dev)
> {
> - struct fwnode_handle *fwnode;
> - struct property_set *pset;
> + struct fwnode_handle *fwnode = dev_fwnode(dev);
>
> - fwnode = dev_fwnode(dev);
> if (!fwnode)
> return;
> - /*
> - * Pick either primary or secondary node depending which one holds
> - * the pset. If there is no real firmware node (ACPI/DT) primary
> - * will hold the pset.
> - */
> - pset = to_pset_node(fwnode);
> - if (pset) {
> - set_primary_fwnode(dev, NULL);
> - } else {
> - pset = to_pset_node(fwnode->secondary);
> - if (pset && dev == pset->dev)
> - set_secondary_fwnode(dev, NULL);
> +
> + if (is_software_node(fwnode->secondary)) {
> + fwnode_remove_software_node(fwnode->secondary);
> + set_secondary_fwnode(dev, NULL);
> }
> - if (pset && dev == pset->dev)
> - pset_free_set(pset);
> }
> EXPORT_SYMBOL_GPL(device_remove_properties);
>
> -/**
> - * device_add_properties - Add a collection of properties to a device object.
> - * @dev: Device to add properties to.
> - * @properties: Collection of properties to add.
> - *
> - * Associate a collection of device properties represented by @properties with
> - * @dev as its secondary firmware node. The function takes a copy of
> - * @properties.
> - */
> -int device_add_properties(struct device *dev,
> - const struct property_entry *properties)
> -{
> - struct property_set *p, pset;
> -
> - if (!properties)
> - return -EINVAL;
> -
> - pset.properties = properties;
> -
> - p = pset_copy_set(&pset);
> - if (IS_ERR(p))
> - return PTR_ERR(p);
> -
> - p->fwnode.ops = &pset_fwnode_ops;
> - set_secondary_fwnode(dev, &p->fwnode);
> - p->dev = dev;
> - return 0;
> -}
> -EXPORT_SYMBOL_GPL(device_add_properties);
> -
> /**
> * fwnode_get_next_parent - Iterate to the node's parent
> * @fwnode: Firmware whose parent is retrieved
> --
> 2.19.1
>
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 6/6] device property: Remove struct property_set
2018-11-06 14:46 ` Andy Shevchenko
@ 2018-11-07 12:34 ` Heikki Krogerus
0 siblings, 0 replies; 12+ messages in thread
From: Heikki Krogerus @ 2018-11-07 12:34 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Rafael J. Wysocki, Dmitry Torokhov, Linus Walleij,
Mika Westerberg, linux-kernel, linux-acpi
On Tue, Nov 06, 2018 at 04:46:41PM +0200, Andy Shevchenko wrote:
> On Mon, Nov 05, 2018 at 05:59:28PM +0300, Heikki Krogerus wrote:
> > Replacing struct property_set with the software nodes that
> > were just introduced.
> >
> > The API and functionality for adding properties to devices
> > remains the same, however, the goal is to convert the
> > drivers to use the API for software nodes when the device
> > has no real firmware node, and use the old API only when
> > "extra" build-in properties are needed.
>
> It might be slightly easier to review if you preserve the ordering of
> functions, i.e. device_add_properties() and device_remove_properties().
True, that change does not belong to this series.
thanks,
--
heikki
^ permalink raw reply [flat|nested] 12+ messages in thread