powerpc/powernv: Rework exports to support subnodes
PATCH v2 1/2 powerpc/powernv: Rework exports to support subnodes
Originally we only had a handful of exported memory ranges, but we'd to export the per-core trace buffers. This results in a lot of files in the exports directory which is a but unfortunate. We can clean things up a bit by turning subnodes into subdirectories of the exports directory.
--- arch/powerpc/platforms/powernv/opal.c | 114 +++++++++++++++++++++------------- 1 file changed, 72 insertions(+), 42 deletions(-)
arch/powerpc/platforms/powernv/opal.c +72 -42
@@ -752,6 +752,75 @@ static ssize_t export_attr_read(struct file *fp, struct kobject *kobj, bin_attr->size); } +static int opal_add_one_export (struct kobject *parent,const char *export_name, +struct device_node *np,const char *prop_name) +{ +struct bin_attribute *attr =NULL ; +const char *name =NULL ; +u64 vals[2 ]; +int rc; + + rc =of_property_read_u64_array (np, prop_name, &vals[0 ],2 ); +if (rc) + goto out; + + attr =kzalloc (sizeof (*attr),GFP_KERNEL ); + name =kstrdup (export_name,GFP_KERNEL ); +if (!name) { + rc = -ENOMEM ; + goto out; + } + +sysfs_bin_attr_init (attr); + attr->attr.name = name; + attr->attr.mode =0400 ; + attr->read = export_attr_read; + attr->private =__va (vals[0 ]); + attr->size = vals[1 ]; + + rc =sysfs_create_bin_file (parent, attr); +out: +if (rc) { +kfree (name); +kfree (attr); + } + +return rc; +} + +static void opal_add_exported_attrs (struct device_node *np, +struct kobject *kobj) +{ +struct device_node *child; +struct property *prop; + +for_each_property_of_node (np, prop) { +int rc; + +if (!strcmp (prop->name,"name" ) || + !strcmp (prop->name,"phandle" )) +continue ; + + rc =opal_add_one_export (kobj, prop->name, np, prop->name); +if (rc) { +pr_warn ("Unable to add export %pOF/%s, rc = %d!\n" , + np, prop->name, rc); + } + } + +for_each_child_of_node (np, child) { +struct kobject *child_kobj; + + child_kobj =kobject_create_and_add (child->name, kobj); +if (!child_kobj) { +pr_err ("Unable to create export dir for %pOF\n" , child); +continue ; + } + +opal_add_exported_attrs (child, child_kobj); + } +} +/* * opal_export_attrs: creates a sysfs node for each property listed in * the device-tree under /ibm,opal/firmware/exports/
@@ -761,12 +830,8 @@ static ssize_t export_attr_read(struct file *fp, struct kobject *kobj,*/ static void opal_export_attrs (void ) { -struct bin_attribute *attr;struct device_node *np; -struct property *prop;struct kobject *kobj; -u64 vals[2 ]; -int rc; np =of_find_node_by_path ("/ibm,opal/firmware/exports" );if (!np)
@@ -779,41 +844,7 @@ static void opal_export_attrs(void)return ; } -for_each_property_of_node (np, prop) { -if (!strcmp (prop->name,"name" ) || !strcmp (prop->name,"phandle" )) -continue ; - -if (of_property_read_u64_array (np, prop->name, &vals[0 ],2 )) -continue ; - - attr =kzalloc (sizeof (*attr),GFP_KERNEL ); - -if (attr ==NULL ) { -pr_warn ("Failed kmalloc for bin_attribute!" ); -continue ; - } - -sysfs_bin_attr_init (attr); - attr->attr.name =kstrdup (prop->name,GFP_KERNEL ); - attr->attr.mode =0400 ; - attr->read = export_attr_read; - attr->private =__va (vals[0 ]); - attr->size = vals[1 ]; - -if (attr->attr.name ==NULL ) { -pr_warn ("Failed kstrdup for bin_attribute attr.name" ); -kfree (attr); -continue ; - } - - rc =sysfs_create_bin_file (kobj, attr); -if (rc) { -pr_warn ("Error %d creating OPAL sysfs exports/%s file\n" , - rc, prop->name); -kfree (attr->attr.name); -kfree (attr); - } - } +opal_add_exported_attrs (np, kobj);of_node_put (np); }
@@ -974,11 +1005,10 @@ static int __init opal_init(void)opal_sys_param_init ();/* Setup message log sysfs interface. */ opal_msglog_sysfs_init (); +/* Add all export properties*/ +opal_export_attrs (); } -/* Export all properties */ -opal_export_attrs (); -/* Initialize platform devices: IPMI backend, PRD & flash interface */ opal_pdev_init ("ibm,opal-ipmi" );opal_pdev_init ("ibm,opal-flash" );
Signature · 1 line
2.9.5
PATCH v2 2/2 powerpc/powernv: Use common code for the symbol_map export
Long before we had a generic way for firmware to export memory ranges of interest we added a special case for the skiboot symbol map. The code is pretty much identical to the generic export so re-use the code.
---
v2: Actually compile.
--- arch/powerpc/platforms/powernv/opal.c | 48 ++++++++--------------------------- 1 file changed, 10 insertions(+), 38 deletions(-)
arch/powerpc/platforms/powernv/opal.c +10 -38
@@ -708,42 +708,6 @@ static int opal_sysfs_init(void)return 0 ; } -static ssize_t symbol_map_read (struct file *fp,struct kobject *kobj, -struct bin_attribute *bin_attr, -char *buf,loff_t off,size_t count) -{ -return memory_read_from_buffer (buf, count, &off, bin_attr->private, - bin_attr->size); -} - -static struct bin_attribute symbol_map_attr = { - .attr = {.name ="symbol_map" , .mode =0400 }, - .read = symbol_map_read -}; - -static void opal_export_symmap (void ) -{ -const __be64 *syms; -unsigned int size; -struct device_node *fw; -int rc; - - fw =of_find_node_by_path ("/ibm,opal/firmware" ); -if (!fw) -return ; - syms =of_get_property (fw,"symbol-map" , &size); -if (!syms || size !=2 *sizeof (__be64)) -return ; - -/* Setup attributes */ - symbol_map_attr.private =__va (be64_to_cpu (syms[0 ])); - symbol_map_attr.size =be64_to_cpu (syms[1 ]); - - rc =sysfs_create_bin_file (opal_kobj, &symbol_map_attr); -if (rc) -pr_warn ("Error %d creating OPAL symbols file\n" , rc); -} -static ssize_t export_attr_read (struct file *fp,struct kobject *kobj,struct bin_attribute *bin_attr,char *buf,loff_t off,size_t count)
@@ -832,6 +796,7 @@ static void opal_export_attrs(void) {struct device_node *np;struct kobject *kobj; +int rc; np =of_find_node_by_path ("/ibm,opal/firmware/exports" );if (!np)
@@ -846,6 +811,15 @@ static void opal_export_attrs(void)opal_add_exported_attrs (np, kobj); +/* +* NB: symbol_map existed before the generic export interface so it +* lives under the top level opal_kobj. +*/ + rc =opal_add_one_export (opal_kobj,"symbol_map" , + np->parent,"symbol-map" ); +if (rc) +pr_warn ("Error %d creating OPAL symbols file\n" , rc); +of_node_put (np); }
@@ -991,8 +965,6 @@ static int __init opal_init(void)/* Create "opal" kobject under /sys/firmware */ rc =opal_sysfs_init ();if (rc ==0 ) { -/* Export symbol map to userspace */ -opal_export_symmap ();/* Setup dump region interface */ opal_dump_region_init ();/* Setup error log interface */
Signature · 1 line
2.9.5
Quoted 6 lines · Oliver O'Halloran
Originally we only had a handful of exported memory ranges, but we'd to export the per-core trace buffers. This results in a lot of files in the exports directory which is a but unfortunate. We can clean things up a bit by turning subnodes into subdirectories of the exports directory.
Signed-off-by Oliver O'Halloran <[email protected]>
Series applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/db93361260e2411f854514e8b54b6c31a5b2d5bd
cheers