| Message ID | 1438834307-26960-42-git-send-email-gwshan@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Wed, Aug 5, 2015 at 11:11 PM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: > The PowerNV PCI hotplug driver is going to use the OF changeset > to manage the changed device sub-tree, which requires those OF > changeset functions are exported. > > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> > --- > drivers/of/dynamic.c | 65 ++++++++++++++++++++++++++++++++++++--------------- > drivers/of/overlay.c | 8 +++---- > drivers/of/unittest.c | 4 ++-- > include/linux/of.h | 2 ++ > 4 files changed, 54 insertions(+), 25 deletions(-) > > diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c > index 53826b8..af65b5b 100644 > --- a/drivers/of/dynamic.c > +++ b/drivers/of/dynamic.c > @@ -646,6 +646,7 @@ void of_changeset_init(struct of_changeset *ocs) > memset(ocs, 0, sizeof(*ocs)); > INIT_LIST_HEAD(&ocs->entries); > } > +EXPORT_SYMBOL(of_changeset_init); We probably want these to be the _GPL variant. > > /** > * of_changeset_destroy - Destroy a changeset > @@ -662,20 +663,9 @@ void of_changeset_destroy(struct of_changeset *ocs) > list_for_each_entry_safe_reverse(ce, cen, &ocs->entries, node) > __of_changeset_entry_destroy(ce); > } > +EXPORT_SYMBOL(of_changeset_destroy); > > -/** > - * of_changeset_apply - Applies a changeset > - * > - * @ocs: changeset pointer > - * > - * Applies a changeset to the live tree. > - * Any side-effects of live tree state changes are applied here on > - * sucess, like creation/destruction of devices and side-effects > - * like creation of sysfs properties and directories. > - * Returns 0 on success, a negative error value in case of an error. > - * On error the partially applied effects are reverted. > - */ > -int of_changeset_apply(struct of_changeset *ocs) > +int __of_changeset_apply(struct of_changeset *ocs) > { > struct of_changeset_entry *ce; > int ret; > @@ -704,17 +694,30 @@ int of_changeset_apply(struct of_changeset *ocs) > } > > /** > - * of_changeset_revert - Reverts an applied changeset > + * of_changeset_apply - Applies a changeset > * > * @ocs: changeset pointer > * > - * Reverts a changeset returning the state of the tree to what it > - * was before the application. > - * Any side-effects like creation/destruction of devices and > - * removal of sysfs properties and directories are applied. > + * Applies a changeset to the live tree. > + * Any side-effects of live tree state changes are applied here on > + * sucess, like creation/destruction of devices and side-effects s/sucess/success/ > + * like creation of sysfs properties and directories. > * Returns 0 on success, a negative error value in case of an error. > + * On error the partially applied effects are reverted. > */ > -int of_changeset_revert(struct of_changeset *ocs) > +int of_changeset_apply(struct of_changeset *ocs) > +{ > + int ret; > + > + mutex_lock(&of_mutex); > + ret = __of_changeset_apply(ocs); > + mutex_unlock(&of_mutex); > + > + return ret; > +} > +EXPORT_SYMBOL(of_changeset_apply); > + > +int __of_changeset_revert(struct of_changeset *ocs) > { > struct of_changeset_entry *ce; > int ret; > @@ -742,6 +745,29 @@ int of_changeset_revert(struct of_changeset *ocs) > } > > /** > + * of_changeset_revert - Reverts an applied changeset > + * > + * @ocs: changeset pointer > + * > + * Reverts a changeset returning the state of the tree to what it > + * was before the application. > + * Any side-effects like creation/destruction of devices and > + * removal of sysfs properties and directories are applied. > + * Returns 0 on success, a negative error value in case of an error. > + */ > +int of_changeset_revert(struct of_changeset *ocs) > +{ > + int ret; > + > + mutex_lock(&of_mutex); > + ret = __of_changeset_revert(ocs); > + mutex_unlock(&of_mutex); > + > + return ret; > +} > +EXPORT_SYMBOL(of_changeset_revert); > + > +/** > * of_changeset_action - Perform a changeset action > * > * @ocs: changeset pointer > @@ -779,3 +805,4 @@ int of_changeset_action(struct of_changeset *ocs, unsigned long action, > list_add_tail(&ce->node, &ocs->entries); > return 0; > } > +EXPORT_SYMBOL(of_changeset_action); > diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c > index 24e025f..804ea33 100644 > --- a/drivers/of/overlay.c > +++ b/drivers/of/overlay.c > @@ -378,9 +378,9 @@ int of_overlay_create(struct device_node *tree) > } > > /* apply the changeset */ > - err = of_changeset_apply(&ov->cset); > + err = __of_changeset_apply(&ov->cset); > if (err) { > - pr_err("%s: of_changeset_apply() failed for tree@%s\n", > + pr_err("%s: __of_changeset_apply() failed for tree@%s\n", > __func__, tree->full_name); > goto err_revert_overlay; > } > @@ -508,7 +508,7 @@ int of_overlay_destroy(int id) > > > list_del(&ov->node); > - of_changeset_revert(&ov->cset); > + __of_changeset_revert(&ov->cset); > of_free_overlay_info(ov); > idr_remove(&ov_idr, id); > of_changeset_destroy(&ov->cset); > @@ -539,7 +539,7 @@ int of_overlay_destroy_all(void) > /* the tail of list is guaranteed to be safe to remove */ > list_for_each_entry_safe_reverse(ov, ovn, &ov_list, node) { > list_del(&ov->node); > - of_changeset_revert(&ov->cset); > + __of_changeset_revert(&ov->cset); > of_free_overlay_info(ov); > idr_remove(&ov_idr, ov->id); > kfree(ov); > diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c > index 2270830..06eb3e5 100644 > --- a/drivers/of/unittest.c > +++ b/drivers/of/unittest.c > @@ -527,7 +527,7 @@ static void __init of_unittest_changeset(void) > unittest(!of_changeset_update_property(&chgset, parent, ppupdate), "fail update prop\n"); > unittest(!of_changeset_remove_property(&chgset, parent, ppremove), "fail remove prop\n"); > mutex_lock(&of_mutex); > - unittest(!of_changeset_apply(&chgset), "apply failed\n"); > + unittest(!__of_changeset_apply(&chgset), "apply failed\n"); You can just remove the mutex here. > mutex_unlock(&of_mutex); > > /* Make sure node names are constructed correctly */ > @@ -536,7 +536,7 @@ static void __init of_unittest_changeset(void) > of_node_put(np); > > mutex_lock(&of_mutex); > - unittest(!of_changeset_revert(&chgset), "revert failed\n"); > + unittest(!__of_changeset_revert(&chgset), "revert failed\n"); And here. > mutex_unlock(&of_mutex); > > of_changeset_destroy(&chgset); > diff --git a/include/linux/of.h b/include/linux/of.h > index edc068d..5c030e1 100644 > --- a/include/linux/of.h > +++ b/include/linux/of.h > @@ -1001,7 +1001,9 @@ extern int of_reconfig_get_state_change(unsigned long action, > > extern void of_changeset_init(struct of_changeset *ocs); > extern void of_changeset_destroy(struct of_changeset *ocs); > +extern int __of_changeset_apply(struct of_changeset *ocs); > extern int of_changeset_apply(struct of_changeset *ocs); > +extern int __of_changeset_revert(struct of_changeset *ocs); These should go in of_private.h. > extern int of_changeset_revert(struct of_changeset *ocs); > extern int of_changeset_action(struct of_changeset *ocs, > unsigned long action, struct device_node *np, > -- > 2.1.0 > > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Aug 06, 2015 at 08:48:10AM -0500, Rob Herring wrote: >On Wed, Aug 5, 2015 at 11:11 PM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: Thanks, Rob. All your comments will be covered in next revision. Thanks, Gavin >> The PowerNV PCI hotplug driver is going to use the OF changeset >> to manage the changed device sub-tree, which requires those OF >> changeset functions are exported. >> >> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> >> --- >> drivers/of/dynamic.c | 65 ++++++++++++++++++++++++++++++++++++--------------- >> drivers/of/overlay.c | 8 +++---- >> drivers/of/unittest.c | 4 ++-- >> include/linux/of.h | 2 ++ >> 4 files changed, 54 insertions(+), 25 deletions(-) >> >> diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c >> index 53826b8..af65b5b 100644 >> --- a/drivers/of/dynamic.c >> +++ b/drivers/of/dynamic.c >> @@ -646,6 +646,7 @@ void of_changeset_init(struct of_changeset *ocs) >> memset(ocs, 0, sizeof(*ocs)); >> INIT_LIST_HEAD(&ocs->entries); >> } >> +EXPORT_SYMBOL(of_changeset_init); > >We probably want these to be the _GPL variant. > >> >> /** >> * of_changeset_destroy - Destroy a changeset >> @@ -662,20 +663,9 @@ void of_changeset_destroy(struct of_changeset *ocs) >> list_for_each_entry_safe_reverse(ce, cen, &ocs->entries, node) >> __of_changeset_entry_destroy(ce); >> } >> +EXPORT_SYMBOL(of_changeset_destroy); >> >> -/** >> - * of_changeset_apply - Applies a changeset >> - * >> - * @ocs: changeset pointer >> - * >> - * Applies a changeset to the live tree. >> - * Any side-effects of live tree state changes are applied here on >> - * sucess, like creation/destruction of devices and side-effects >> - * like creation of sysfs properties and directories. >> - * Returns 0 on success, a negative error value in case of an error. >> - * On error the partially applied effects are reverted. >> - */ >> -int of_changeset_apply(struct of_changeset *ocs) >> +int __of_changeset_apply(struct of_changeset *ocs) >> { >> struct of_changeset_entry *ce; >> int ret; >> @@ -704,17 +694,30 @@ int of_changeset_apply(struct of_changeset *ocs) >> } >> >> /** >> - * of_changeset_revert - Reverts an applied changeset >> + * of_changeset_apply - Applies a changeset >> * >> * @ocs: changeset pointer >> * >> - * Reverts a changeset returning the state of the tree to what it >> - * was before the application. >> - * Any side-effects like creation/destruction of devices and >> - * removal of sysfs properties and directories are applied. >> + * Applies a changeset to the live tree. >> + * Any side-effects of live tree state changes are applied here on >> + * sucess, like creation/destruction of devices and side-effects > >s/sucess/success/ > >> + * like creation of sysfs properties and directories. >> * Returns 0 on success, a negative error value in case of an error. >> + * On error the partially applied effects are reverted. >> */ >> -int of_changeset_revert(struct of_changeset *ocs) >> +int of_changeset_apply(struct of_changeset *ocs) >> +{ >> + int ret; >> + >> + mutex_lock(&of_mutex); >> + ret = __of_changeset_apply(ocs); >> + mutex_unlock(&of_mutex); >> + >> + return ret; >> +} >> +EXPORT_SYMBOL(of_changeset_apply); >> + >> +int __of_changeset_revert(struct of_changeset *ocs) >> { >> struct of_changeset_entry *ce; >> int ret; >> @@ -742,6 +745,29 @@ int of_changeset_revert(struct of_changeset *ocs) >> } >> >> /** >> + * of_changeset_revert - Reverts an applied changeset >> + * >> + * @ocs: changeset pointer >> + * >> + * Reverts a changeset returning the state of the tree to what it >> + * was before the application. >> + * Any side-effects like creation/destruction of devices and >> + * removal of sysfs properties and directories are applied. >> + * Returns 0 on success, a negative error value in case of an error. >> + */ >> +int of_changeset_revert(struct of_changeset *ocs) >> +{ >> + int ret; >> + >> + mutex_lock(&of_mutex); >> + ret = __of_changeset_revert(ocs); >> + mutex_unlock(&of_mutex); >> + >> + return ret; >> +} >> +EXPORT_SYMBOL(of_changeset_revert); >> + >> +/** >> * of_changeset_action - Perform a changeset action >> * >> * @ocs: changeset pointer >> @@ -779,3 +805,4 @@ int of_changeset_action(struct of_changeset *ocs, unsigned long action, >> list_add_tail(&ce->node, &ocs->entries); >> return 0; >> } >> +EXPORT_SYMBOL(of_changeset_action); >> diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c >> index 24e025f..804ea33 100644 >> --- a/drivers/of/overlay.c >> +++ b/drivers/of/overlay.c >> @@ -378,9 +378,9 @@ int of_overlay_create(struct device_node *tree) >> } >> >> /* apply the changeset */ >> - err = of_changeset_apply(&ov->cset); >> + err = __of_changeset_apply(&ov->cset); >> if (err) { >> - pr_err("%s: of_changeset_apply() failed for tree@%s\n", >> + pr_err("%s: __of_changeset_apply() failed for tree@%s\n", >> __func__, tree->full_name); >> goto err_revert_overlay; >> } >> @@ -508,7 +508,7 @@ int of_overlay_destroy(int id) >> >> >> list_del(&ov->node); >> - of_changeset_revert(&ov->cset); >> + __of_changeset_revert(&ov->cset); >> of_free_overlay_info(ov); >> idr_remove(&ov_idr, id); >> of_changeset_destroy(&ov->cset); >> @@ -539,7 +539,7 @@ int of_overlay_destroy_all(void) >> /* the tail of list is guaranteed to be safe to remove */ >> list_for_each_entry_safe_reverse(ov, ovn, &ov_list, node) { >> list_del(&ov->node); >> - of_changeset_revert(&ov->cset); >> + __of_changeset_revert(&ov->cset); >> of_free_overlay_info(ov); >> idr_remove(&ov_idr, ov->id); >> kfree(ov); >> diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c >> index 2270830..06eb3e5 100644 >> --- a/drivers/of/unittest.c >> +++ b/drivers/of/unittest.c >> @@ -527,7 +527,7 @@ static void __init of_unittest_changeset(void) >> unittest(!of_changeset_update_property(&chgset, parent, ppupdate), "fail update prop\n"); >> unittest(!of_changeset_remove_property(&chgset, parent, ppremove), "fail remove prop\n"); >> mutex_lock(&of_mutex); >> - unittest(!of_changeset_apply(&chgset), "apply failed\n"); >> + unittest(!__of_changeset_apply(&chgset), "apply failed\n"); > >You can just remove the mutex here. > >> mutex_unlock(&of_mutex); >> >> /* Make sure node names are constructed correctly */ >> @@ -536,7 +536,7 @@ static void __init of_unittest_changeset(void) >> of_node_put(np); >> >> mutex_lock(&of_mutex); >> - unittest(!of_changeset_revert(&chgset), "revert failed\n"); >> + unittest(!__of_changeset_revert(&chgset), "revert failed\n"); > >And here. > >> mutex_unlock(&of_mutex); >> >> of_changeset_destroy(&chgset); >> diff --git a/include/linux/of.h b/include/linux/of.h >> index edc068d..5c030e1 100644 >> --- a/include/linux/of.h >> +++ b/include/linux/of.h >> @@ -1001,7 +1001,9 @@ extern int of_reconfig_get_state_change(unsigned long action, >> >> extern void of_changeset_init(struct of_changeset *ocs); >> extern void of_changeset_destroy(struct of_changeset *ocs); >> +extern int __of_changeset_apply(struct of_changeset *ocs); >> extern int of_changeset_apply(struct of_changeset *ocs); >> +extern int __of_changeset_revert(struct of_changeset *ocs); > >These should go in of_private.h. > >> extern int of_changeset_revert(struct of_changeset *ocs); >> extern int of_changeset_action(struct of_changeset *ocs, >> unsigned long action, struct device_node *np, >> -- >> 2.1.0 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe devicetree" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index 53826b8..af65b5b 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -646,6 +646,7 @@ void of_changeset_init(struct of_changeset *ocs) memset(ocs, 0, sizeof(*ocs)); INIT_LIST_HEAD(&ocs->entries); } +EXPORT_SYMBOL(of_changeset_init); /** * of_changeset_destroy - Destroy a changeset @@ -662,20 +663,9 @@ void of_changeset_destroy(struct of_changeset *ocs) list_for_each_entry_safe_reverse(ce, cen, &ocs->entries, node) __of_changeset_entry_destroy(ce); } +EXPORT_SYMBOL(of_changeset_destroy); -/** - * of_changeset_apply - Applies a changeset - * - * @ocs: changeset pointer - * - * Applies a changeset to the live tree. - * Any side-effects of live tree state changes are applied here on - * sucess, like creation/destruction of devices and side-effects - * like creation of sysfs properties and directories. - * Returns 0 on success, a negative error value in case of an error. - * On error the partially applied effects are reverted. - */ -int of_changeset_apply(struct of_changeset *ocs) +int __of_changeset_apply(struct of_changeset *ocs) { struct of_changeset_entry *ce; int ret; @@ -704,17 +694,30 @@ int of_changeset_apply(struct of_changeset *ocs) } /** - * of_changeset_revert - Reverts an applied changeset + * of_changeset_apply - Applies a changeset * * @ocs: changeset pointer * - * Reverts a changeset returning the state of the tree to what it - * was before the application. - * Any side-effects like creation/destruction of devices and - * removal of sysfs properties and directories are applied. + * Applies a changeset to the live tree. + * Any side-effects of live tree state changes are applied here on + * sucess, like creation/destruction of devices and side-effects + * like creation of sysfs properties and directories. * Returns 0 on success, a negative error value in case of an error. + * On error the partially applied effects are reverted. */ -int of_changeset_revert(struct of_changeset *ocs) +int of_changeset_apply(struct of_changeset *ocs) +{ + int ret; + + mutex_lock(&of_mutex); + ret = __of_changeset_apply(ocs); + mutex_unlock(&of_mutex); + + return ret; +} +EXPORT_SYMBOL(of_changeset_apply); + +int __of_changeset_revert(struct of_changeset *ocs) { struct of_changeset_entry *ce; int ret; @@ -742,6 +745,29 @@ int of_changeset_revert(struct of_changeset *ocs) } /** + * of_changeset_revert - Reverts an applied changeset + * + * @ocs: changeset pointer + * + * Reverts a changeset returning the state of the tree to what it + * was before the application. + * Any side-effects like creation/destruction of devices and + * removal of sysfs properties and directories are applied. + * Returns 0 on success, a negative error value in case of an error. + */ +int of_changeset_revert(struct of_changeset *ocs) +{ + int ret; + + mutex_lock(&of_mutex); + ret = __of_changeset_revert(ocs); + mutex_unlock(&of_mutex); + + return ret; +} +EXPORT_SYMBOL(of_changeset_revert); + +/** * of_changeset_action - Perform a changeset action * * @ocs: changeset pointer @@ -779,3 +805,4 @@ int of_changeset_action(struct of_changeset *ocs, unsigned long action, list_add_tail(&ce->node, &ocs->entries); return 0; } +EXPORT_SYMBOL(of_changeset_action); diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 24e025f..804ea33 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -378,9 +378,9 @@ int of_overlay_create(struct device_node *tree) } /* apply the changeset */ - err = of_changeset_apply(&ov->cset); + err = __of_changeset_apply(&ov->cset); if (err) { - pr_err("%s: of_changeset_apply() failed for tree@%s\n", + pr_err("%s: __of_changeset_apply() failed for tree@%s\n", __func__, tree->full_name); goto err_revert_overlay; } @@ -508,7 +508,7 @@ int of_overlay_destroy(int id) list_del(&ov->node); - of_changeset_revert(&ov->cset); + __of_changeset_revert(&ov->cset); of_free_overlay_info(ov); idr_remove(&ov_idr, id); of_changeset_destroy(&ov->cset); @@ -539,7 +539,7 @@ int of_overlay_destroy_all(void) /* the tail of list is guaranteed to be safe to remove */ list_for_each_entry_safe_reverse(ov, ovn, &ov_list, node) { list_del(&ov->node); - of_changeset_revert(&ov->cset); + __of_changeset_revert(&ov->cset); of_free_overlay_info(ov); idr_remove(&ov_idr, ov->id); kfree(ov); diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 2270830..06eb3e5 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -527,7 +527,7 @@ static void __init of_unittest_changeset(void) unittest(!of_changeset_update_property(&chgset, parent, ppupdate), "fail update prop\n"); unittest(!of_changeset_remove_property(&chgset, parent, ppremove), "fail remove prop\n"); mutex_lock(&of_mutex); - unittest(!of_changeset_apply(&chgset), "apply failed\n"); + unittest(!__of_changeset_apply(&chgset), "apply failed\n"); mutex_unlock(&of_mutex); /* Make sure node names are constructed correctly */ @@ -536,7 +536,7 @@ static void __init of_unittest_changeset(void) of_node_put(np); mutex_lock(&of_mutex); - unittest(!of_changeset_revert(&chgset), "revert failed\n"); + unittest(!__of_changeset_revert(&chgset), "revert failed\n"); mutex_unlock(&of_mutex); of_changeset_destroy(&chgset); diff --git a/include/linux/of.h b/include/linux/of.h index edc068d..5c030e1 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1001,7 +1001,9 @@ extern int of_reconfig_get_state_change(unsigned long action, extern void of_changeset_init(struct of_changeset *ocs); extern void of_changeset_destroy(struct of_changeset *ocs); +extern int __of_changeset_apply(struct of_changeset *ocs); extern int of_changeset_apply(struct of_changeset *ocs); +extern int __of_changeset_revert(struct of_changeset *ocs); extern int of_changeset_revert(struct of_changeset *ocs); extern int of_changeset_action(struct of_changeset *ocs, unsigned long action, struct device_node *np,
The PowerNV PCI hotplug driver is going to use the OF changeset to manage the changed device sub-tree, which requires those OF changeset functions are exported. Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> --- drivers/of/dynamic.c | 65 ++++++++++++++++++++++++++++++++++++--------------- drivers/of/overlay.c | 8 +++---- drivers/of/unittest.c | 4 ++-- include/linux/of.h | 2 ++ 4 files changed, 54 insertions(+), 25 deletions(-)