| Message ID | 1420651854-17768-2-git-send-email-s-anna@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jan 7, 2015 at 11:30 AM, Suman Anna <s-anna@ti.com> wrote: > Drivers can use of_platform_populate() to create platform devices > for children of the device main node, and a complementary API > of_platform_depopulate() is provided to delete these child platform > devices. The of_platform_depopulate() leverages the platform API > for performing the cleanup of these devices. > > The platform device resources are managed differently between > of_device_add and platform_device_add, and this asymmetry causes > a kernel oops in platform_device_del during removal of the resources. > Manage the platform device resources similar to platform_device_add > to fix this kernel oops. This is a known issue and has been attempted to be fixed before (I believe there is a revert in mainline). The problem is there are known devicetrees which have overlapping resources and they will break with your change. Rob > > Signed-off-by: Suman Anna <s-anna@ti.com> > --- > drivers/of/device.c | 38 +++++++++++++++++++++++++++++++++++++- > 1 file changed, 37 insertions(+), 1 deletion(-) > > diff --git a/drivers/of/device.c b/drivers/of/device.c > index 46d6c75c1404..fa27c1c71f29 100644 > --- a/drivers/of/device.c > +++ b/drivers/of/device.c > @@ -50,6 +50,8 @@ EXPORT_SYMBOL(of_dev_put); > > int of_device_add(struct platform_device *ofdev) > { > + int i, ret; > + > BUG_ON(ofdev->dev.of_node == NULL); > > /* name and id have to be set so that the platform bus doesn't get > @@ -63,7 +65,41 @@ int of_device_add(struct platform_device *ofdev) > if (!ofdev->dev.parent) > set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node)); > > - return device_add(&ofdev->dev); > + for (i = 0; i < ofdev->num_resources; i++) { > + struct resource *p, *r = &ofdev->resource[i]; > + > + if (!r->name) > + r->name = dev_name(&ofdev->dev); > + > + p = r->parent; > + if (!p) { > + if (resource_type(r) == IORESOURCE_MEM) > + p = &iomem_resource; > + else if (resource_type(r) == IORESOURCE_IO) > + p = &ioport_resource; > + } > + > + if (p && insert_resource(p, r)) { > + dev_err(&ofdev->dev, "failed to claim resource %d\n", > + i); > + ret = -EBUSY; > + goto failed; > + } > + } > + > + ret = device_add(&ofdev->dev); > + if (ret == 0) > + return ret; > + > +failed: > + while (--i >= 0) { > + struct resource *r = &ofdev->resource[i]; > + unsigned long type = resource_type(r); > + > + if (type == IORESOURCE_MEM || type == IORESOURCE_IO) > + release_resource(r); > + } > + return ret; > } > > int of_device_register(struct platform_device *pdev) > -- > 2.2.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Rob, On 01/13/2015 02:38 PM, Rob Herring wrote: > On Wed, Jan 7, 2015 at 11:30 AM, Suman Anna <s-anna@ti.com> wrote: >> Drivers can use of_platform_populate() to create platform devices >> for children of the device main node, and a complementary API >> of_platform_depopulate() is provided to delete these child platform >> devices. The of_platform_depopulate() leverages the platform API >> for performing the cleanup of these devices. >> >> The platform device resources are managed differently between >> of_device_add and platform_device_add, and this asymmetry causes >> a kernel oops in platform_device_del during removal of the resources. >> Manage the platform device resources similar to platform_device_add >> to fix this kernel oops. > > This is a known issue and has been attempted to be fixed before (I > believe there is a revert in mainline). The problem is there are known > devicetrees which have overlapping resources and they will break with > your change. Are you referring to 02bbde7849e6 (Revert "of: use platform_device_add")? That one seems to be in registration path, and this crash is in the unregistration path. If so, to fix the crash, should we be skipping the release_resource() for now in platform_device_del for DT nodes, or replace platform_device_unregister with of_device_unregister in of_platform_device_destroy()? This is a common crash and we cannot use of_platform_depopulate() today in drivers to complement of_platform_populate(). Also, the platform_data crash is independent of this, I could reproduce that one even with using of_device_unregister in a loop in driver remove. regards Suman > > Rob > >> >> Signed-off-by: Suman Anna <s-anna@ti.com> >> --- >> drivers/of/device.c | 38 +++++++++++++++++++++++++++++++++++++- >> 1 file changed, 37 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/of/device.c b/drivers/of/device.c >> index 46d6c75c1404..fa27c1c71f29 100644 >> --- a/drivers/of/device.c >> +++ b/drivers/of/device.c >> @@ -50,6 +50,8 @@ EXPORT_SYMBOL(of_dev_put); >> >> int of_device_add(struct platform_device *ofdev) >> { >> + int i, ret; >> + >> BUG_ON(ofdev->dev.of_node == NULL); >> >> /* name and id have to be set so that the platform bus doesn't get >> @@ -63,7 +65,41 @@ int of_device_add(struct platform_device *ofdev) >> if (!ofdev->dev.parent) >> set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node)); >> >> - return device_add(&ofdev->dev); >> + for (i = 0; i < ofdev->num_resources; i++) { >> + struct resource *p, *r = &ofdev->resource[i]; >> + >> + if (!r->name) >> + r->name = dev_name(&ofdev->dev); >> + >> + p = r->parent; >> + if (!p) { >> + if (resource_type(r) == IORESOURCE_MEM) >> + p = &iomem_resource; >> + else if (resource_type(r) == IORESOURCE_IO) >> + p = &ioport_resource; >> + } >> + >> + if (p && insert_resource(p, r)) { >> + dev_err(&ofdev->dev, "failed to claim resource %d\n", >> + i); >> + ret = -EBUSY; >> + goto failed; >> + } >> + } >> + >> + ret = device_add(&ofdev->dev); >> + if (ret == 0) >> + return ret; >> + >> +failed: >> + while (--i >= 0) { >> + struct resource *r = &ofdev->resource[i]; >> + unsigned long type = resource_type(r); >> + >> + if (type == IORESOURCE_MEM || type == IORESOURCE_IO) >> + release_resource(r); >> + } >> + return ret; >> } >> >> int of_device_register(struct platform_device *pdev) >> -- >> 2.2.1 >> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jan 13, 2015 at 3:25 PM, Suman Anna <s-anna@ti.com> wrote: > Hi Rob, > > On 01/13/2015 02:38 PM, Rob Herring wrote: >> On Wed, Jan 7, 2015 at 11:30 AM, Suman Anna <s-anna@ti.com> wrote: >>> Drivers can use of_platform_populate() to create platform devices >>> for children of the device main node, and a complementary API >>> of_platform_depopulate() is provided to delete these child platform >>> devices. The of_platform_depopulate() leverages the platform API >>> for performing the cleanup of these devices. >>> >>> The platform device resources are managed differently between >>> of_device_add and platform_device_add, and this asymmetry causes >>> a kernel oops in platform_device_del during removal of the resources. >>> Manage the platform device resources similar to platform_device_add >>> to fix this kernel oops. >> >> This is a known issue and has been attempted to be fixed before (I >> believe there is a revert in mainline). The problem is there are known >> devicetrees which have overlapping resources and they will break with >> your change. > > Are you referring to 02bbde7849e6 (Revert "of: use > platform_device_add")? I believe that's the one. > That one seems to be in registration path, and > this crash is in the unregistration path. If so, to fix the crash, > should we be skipping the release_resource() for now in > platform_device_del for DT nodes, or replace platform_device_unregister > with of_device_unregister in of_platform_device_destroy()? IIRC, the problem is inserting a resource twice on add from 2 different nodes, not the removal path. Perhaps we could make a collision non-fatal for in the DT case. Grant may have some ideas on what's needed here. > This is a common crash and we cannot use of_platform_depopulate() today > in drivers to complement of_platform_populate(). Yes, I know. > Also, the platform_data crash is independent of this, I could reproduce > that one even with using of_device_unregister in a loop in driver remove. Missed this one. I'll reply to that patch. Rob > > regards > Suman > >> >> Rob >> >>> >>> Signed-off-by: Suman Anna <s-anna@ti.com> >>> --- >>> drivers/of/device.c | 38 +++++++++++++++++++++++++++++++++++++- >>> 1 file changed, 37 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/of/device.c b/drivers/of/device.c >>> index 46d6c75c1404..fa27c1c71f29 100644 >>> --- a/drivers/of/device.c >>> +++ b/drivers/of/device.c >>> @@ -50,6 +50,8 @@ EXPORT_SYMBOL(of_dev_put); >>> >>> int of_device_add(struct platform_device *ofdev) >>> { >>> + int i, ret; >>> + >>> BUG_ON(ofdev->dev.of_node == NULL); >>> >>> /* name and id have to be set so that the platform bus doesn't get >>> @@ -63,7 +65,41 @@ int of_device_add(struct platform_device *ofdev) >>> if (!ofdev->dev.parent) >>> set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node)); >>> >>> - return device_add(&ofdev->dev); >>> + for (i = 0; i < ofdev->num_resources; i++) { >>> + struct resource *p, *r = &ofdev->resource[i]; >>> + >>> + if (!r->name) >>> + r->name = dev_name(&ofdev->dev); >>> + >>> + p = r->parent; >>> + if (!p) { >>> + if (resource_type(r) == IORESOURCE_MEM) >>> + p = &iomem_resource; >>> + else if (resource_type(r) == IORESOURCE_IO) >>> + p = &ioport_resource; >>> + } >>> + >>> + if (p && insert_resource(p, r)) { >>> + dev_err(&ofdev->dev, "failed to claim resource %d\n", >>> + i); >>> + ret = -EBUSY; >>> + goto failed; >>> + } >>> + } >>> + >>> + ret = device_add(&ofdev->dev); >>> + if (ret == 0) >>> + return ret; >>> + >>> +failed: >>> + while (--i >= 0) { >>> + struct resource *r = &ofdev->resource[i]; >>> + unsigned long type = resource_type(r); >>> + >>> + if (type == IORESOURCE_MEM || type == IORESOURCE_IO) >>> + release_resource(r); >>> + } >>> + return ret; >>> } >>> >>> int of_device_register(struct platform_device *pdev) >>> -- >>> 2.2.1 >>> > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 01/13/2015 04:00 PM, Rob Herring wrote: > On Tue, Jan 13, 2015 at 3:25 PM, Suman Anna <s-anna@ti.com> wrote: >> Hi Rob, >> >> On 01/13/2015 02:38 PM, Rob Herring wrote: >>> On Wed, Jan 7, 2015 at 11:30 AM, Suman Anna <s-anna@ti.com> wrote: >>>> Drivers can use of_platform_populate() to create platform devices >>>> for children of the device main node, and a complementary API >>>> of_platform_depopulate() is provided to delete these child platform >>>> devices. The of_platform_depopulate() leverages the platform API >>>> for performing the cleanup of these devices. >>>> >>>> The platform device resources are managed differently between >>>> of_device_add and platform_device_add, and this asymmetry causes >>>> a kernel oops in platform_device_del during removal of the resources. >>>> Manage the platform device resources similar to platform_device_add >>>> to fix this kernel oops. >>> >>> This is a known issue and has been attempted to be fixed before (I >>> believe there is a revert in mainline). The problem is there are known >>> devicetrees which have overlapping resources and they will break with >>> your change. >> >> Are you referring to 02bbde7849e6 (Revert "of: use >> platform_device_add")? > > I believe that's the one. > >> That one seems to be in registration path, and >> this crash is in the unregistration path. If so, to fix the crash, >> should we be skipping the release_resource() for now in >> platform_device_del for DT nodes, or replace platform_device_unregister >> with of_device_unregister in of_platform_device_destroy()? > > IIRC, the problem is inserting a resource twice on add from 2 > different nodes, not the removal path. Perhaps we could make a > collision non-fatal for in the DT case. We may be talking two different things here, I understand that this patch would create an issue with inserting a resource twice in the devicetrees with overlapping resources (just like the commit that was reverted above), but the crash is on devices with resources whose parent, child, sibling pointers have never been initialized (the of_device_add path does not touch these at all), and get dereferenced in platform_device_del()->release_resource(). See the following that has a better explanation [1]. regards Suman [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2014-July/274412.html > Grant may have some ideas on > what's needed here. > >> This is a common crash and we cannot use of_platform_depopulate() today >> in drivers to complement of_platform_populate(). > > Yes, I know. > >> Also, the platform_data crash is independent of this, I could reproduce >> that one even with using of_device_unregister in a loop in driver remove. > > Missed this one. I'll reply to that patch. > > Rob > >> >> regards >> Suman >> >>> >>> Rob >>> >>>> >>>> Signed-off-by: Suman Anna <s-anna@ti.com> >>>> --- >>>> drivers/of/device.c | 38 +++++++++++++++++++++++++++++++++++++- >>>> 1 file changed, 37 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/drivers/of/device.c b/drivers/of/device.c >>>> index 46d6c75c1404..fa27c1c71f29 100644 >>>> --- a/drivers/of/device.c >>>> +++ b/drivers/of/device.c >>>> @@ -50,6 +50,8 @@ EXPORT_SYMBOL(of_dev_put); >>>> >>>> int of_device_add(struct platform_device *ofdev) >>>> { >>>> + int i, ret; >>>> + >>>> BUG_ON(ofdev->dev.of_node == NULL); >>>> >>>> /* name and id have to be set so that the platform bus doesn't get >>>> @@ -63,7 +65,41 @@ int of_device_add(struct platform_device *ofdev) >>>> if (!ofdev->dev.parent) >>>> set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node)); >>>> >>>> - return device_add(&ofdev->dev); >>>> + for (i = 0; i < ofdev->num_resources; i++) { >>>> + struct resource *p, *r = &ofdev->resource[i]; >>>> + >>>> + if (!r->name) >>>> + r->name = dev_name(&ofdev->dev); >>>> + >>>> + p = r->parent; >>>> + if (!p) { >>>> + if (resource_type(r) == IORESOURCE_MEM) >>>> + p = &iomem_resource; >>>> + else if (resource_type(r) == IORESOURCE_IO) >>>> + p = &ioport_resource; >>>> + } >>>> + >>>> + if (p && insert_resource(p, r)) { >>>> + dev_err(&ofdev->dev, "failed to claim resource %d\n", >>>> + i); >>>> + ret = -EBUSY; >>>> + goto failed; >>>> + } >>>> + } >>>> + >>>> + ret = device_add(&ofdev->dev); >>>> + if (ret == 0) >>>> + return ret; >>>> + >>>> +failed: >>>> + while (--i >= 0) { >>>> + struct resource *r = &ofdev->resource[i]; >>>> + unsigned long type = resource_type(r); >>>> + >>>> + if (type == IORESOURCE_MEM || type == IORESOURCE_IO) >>>> + release_resource(r); >>>> + } >>>> + return ret; >>>> } >>>> >>>> int of_device_register(struct platform_device *pdev) >>>> -- >>>> 2.2.1 >>>> >> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Grant, On 01/13/2015 05:04 PM, Suman Anna wrote: > On 01/13/2015 04:00 PM, Rob Herring wrote: >> On Tue, Jan 13, 2015 at 3:25 PM, Suman Anna <s-anna@ti.com> wrote: >>> Hi Rob, >>> >>> On 01/13/2015 02:38 PM, Rob Herring wrote: >>>> On Wed, Jan 7, 2015 at 11:30 AM, Suman Anna <s-anna@ti.com> wrote: >>>>> Drivers can use of_platform_populate() to create platform devices >>>>> for children of the device main node, and a complementary API >>>>> of_platform_depopulate() is provided to delete these child platform >>>>> devices. The of_platform_depopulate() leverages the platform API >>>>> for performing the cleanup of these devices. >>>>> >>>>> The platform device resources are managed differently between >>>>> of_device_add and platform_device_add, and this asymmetry causes >>>>> a kernel oops in platform_device_del during removal of the resources. >>>>> Manage the platform device resources similar to platform_device_add >>>>> to fix this kernel oops. >>>> >>>> This is a known issue and has been attempted to be fixed before (I >>>> believe there is a revert in mainline). The problem is there are known >>>> devicetrees which have overlapping resources and they will break with >>>> your change. >>> >>> Are you referring to 02bbde7849e6 (Revert "of: use >>> platform_device_add")? >> >> I believe that's the one. >> >>> That one seems to be in registration path, and >>> this crash is in the unregistration path. If so, to fix the crash, >>> should we be skipping the release_resource() for now in >>> platform_device_del for DT nodes, or replace platform_device_unregister >>> with of_device_unregister in of_platform_device_destroy()? >> >> IIRC, the problem is inserting a resource twice on add from 2 >> different nodes, not the removal path. Perhaps we could make a >> collision non-fatal for in the DT case. > > We may be talking two different things here, I understand that this > patch would create an issue with inserting a resource twice in the > devicetrees with overlapping resources (just like the commit that was > reverted above), but the crash is on devices with resources whose > parent, child, sibling pointers have never been initialized (the > of_device_add path does not touch these at all), and get dereferenced in > platform_device_del()->release_resource(). See the following that has a > better explanation [1]. > > regards > Suman > > [1] > http://lists.infradead.org/pipermail/linux-arm-kernel/2014-July/274412.html > > >> Grant may have some ideas on >> what's needed here. Ping, any suggestions here? Do we ought to replace platform_device_unregister() with of_device_unregister() similar to the approach taken in 02bbde7849e6 (Revert "of: use platform_device_add")? regards Suman >> >>> This is a common crash and we cannot use of_platform_depopulate() today >>> in drivers to complement of_platform_populate(). >> >> Yes, I know. >> >>> Also, the platform_data crash is independent of this, I could reproduce >>> that one even with using of_device_unregister in a loop in driver remove. >> >> Missed this one. I'll reply to that patch. >> >> Rob >> >>> >>> regards >>> Suman >>> >>>> >>>> Rob >>>> >>>>> >>>>> Signed-off-by: Suman Anna <s-anna@ti.com> >>>>> --- >>>>> drivers/of/device.c | 38 +++++++++++++++++++++++++++++++++++++- >>>>> 1 file changed, 37 insertions(+), 1 deletion(-) >>>>> >>>>> diff --git a/drivers/of/device.c b/drivers/of/device.c >>>>> index 46d6c75c1404..fa27c1c71f29 100644 >>>>> --- a/drivers/of/device.c >>>>> +++ b/drivers/of/device.c >>>>> @@ -50,6 +50,8 @@ EXPORT_SYMBOL(of_dev_put); >>>>> >>>>> int of_device_add(struct platform_device *ofdev) >>>>> { >>>>> + int i, ret; >>>>> + >>>>> BUG_ON(ofdev->dev.of_node == NULL); >>>>> >>>>> /* name and id have to be set so that the platform bus doesn't get >>>>> @@ -63,7 +65,41 @@ int of_device_add(struct platform_device *ofdev) >>>>> if (!ofdev->dev.parent) >>>>> set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node)); >>>>> >>>>> - return device_add(&ofdev->dev); >>>>> + for (i = 0; i < ofdev->num_resources; i++) { >>>>> + struct resource *p, *r = &ofdev->resource[i]; >>>>> + >>>>> + if (!r->name) >>>>> + r->name = dev_name(&ofdev->dev); >>>>> + >>>>> + p = r->parent; >>>>> + if (!p) { >>>>> + if (resource_type(r) == IORESOURCE_MEM) >>>>> + p = &iomem_resource; >>>>> + else if (resource_type(r) == IORESOURCE_IO) >>>>> + p = &ioport_resource; >>>>> + } >>>>> + >>>>> + if (p && insert_resource(p, r)) { >>>>> + dev_err(&ofdev->dev, "failed to claim resource %d\n", >>>>> + i); >>>>> + ret = -EBUSY; >>>>> + goto failed; >>>>> + } >>>>> + } >>>>> + >>>>> + ret = device_add(&ofdev->dev); >>>>> + if (ret == 0) >>>>> + return ret; >>>>> + >>>>> +failed: >>>>> + while (--i >= 0) { >>>>> + struct resource *r = &ofdev->resource[i]; >>>>> + unsigned long type = resource_type(r); >>>>> + >>>>> + if (type == IORESOURCE_MEM || type == IORESOURCE_IO) >>>>> + release_resource(r); >>>>> + } >>>>> + return ret; >>>>> } >>>>> >>>>> int of_device_register(struct platform_device *pdev) >>>>> -- >>>>> 2.2.1 >>>>> >>> > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 22 Jan 2015 15:49:59 -0600 , Suman Anna <s-anna@ti.com> wrote: > Hi Grant, > > On 01/13/2015 05:04 PM, Suman Anna wrote: > > On 01/13/2015 04:00 PM, Rob Herring wrote: > >> On Tue, Jan 13, 2015 at 3:25 PM, Suman Anna <s-anna@ti.com> wrote: > >>> Hi Rob, > >>> > >>> On 01/13/2015 02:38 PM, Rob Herring wrote: > >>>> On Wed, Jan 7, 2015 at 11:30 AM, Suman Anna <s-anna@ti.com> wrote: > >>>>> Drivers can use of_platform_populate() to create platform devices > >>>>> for children of the device main node, and a complementary API > >>>>> of_platform_depopulate() is provided to delete these child platform > >>>>> devices. The of_platform_depopulate() leverages the platform API > >>>>> for performing the cleanup of these devices. > >>>>> > >>>>> The platform device resources are managed differently between > >>>>> of_device_add and platform_device_add, and this asymmetry causes > >>>>> a kernel oops in platform_device_del during removal of the resources. > >>>>> Manage the platform device resources similar to platform_device_add > >>>>> to fix this kernel oops. > >>>> > >>>> This is a known issue and has been attempted to be fixed before (I > >>>> believe there is a revert in mainline). The problem is there are known > >>>> devicetrees which have overlapping resources and they will break with > >>>> your change. > >>> > >>> Are you referring to 02bbde7849e6 (Revert "of: use > >>> platform_device_add")? > >> > >> I believe that's the one. > >> > >>> That one seems to be in registration path, and > >>> this crash is in the unregistration path. If so, to fix the crash, > >>> should we be skipping the release_resource() for now in > >>> platform_device_del for DT nodes, or replace platform_device_unregister > >>> with of_device_unregister in of_platform_device_destroy()? > >> > >> IIRC, the problem is inserting a resource twice on add from 2 > >> different nodes, not the removal path. Perhaps we could make a > >> collision non-fatal for in the DT case. > > > > We may be talking two different things here, I understand that this > > patch would create an issue with inserting a resource twice in the > > devicetrees with overlapping resources (just like the commit that was > > reverted above), but the crash is on devices with resources whose > > parent, child, sibling pointers have never been initialized (the > > of_device_add path does not touch these at all), and get dereferenced in > > platform_device_del()->release_resource(). See the following that has a > > better explanation [1]. > > > > regards > > Suman > > > > [1] > > http://lists.infradead.org/pipermail/linux-arm-kernel/2014-July/274412.html > > > > > >> Grant may have some ideas on > >> what's needed here. > > Ping, any suggestions here? Do we ought to replace > platform_device_unregister() with of_device_unregister() similar to the > approach taken in 02bbde7849e6 (Revert "of: use platform_device_add")? Hi Suman, Yes, I think the solution to both problems is to create an of_device_unregister() function. It's not the prettiest thing, but I think it is for the best. g. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" 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/device.c b/drivers/of/device.c index 46d6c75c1404..fa27c1c71f29 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -50,6 +50,8 @@ EXPORT_SYMBOL(of_dev_put); int of_device_add(struct platform_device *ofdev) { + int i, ret; + BUG_ON(ofdev->dev.of_node == NULL); /* name and id have to be set so that the platform bus doesn't get @@ -63,7 +65,41 @@ int of_device_add(struct platform_device *ofdev) if (!ofdev->dev.parent) set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node)); - return device_add(&ofdev->dev); + for (i = 0; i < ofdev->num_resources; i++) { + struct resource *p, *r = &ofdev->resource[i]; + + if (!r->name) + r->name = dev_name(&ofdev->dev); + + p = r->parent; + if (!p) { + if (resource_type(r) == IORESOURCE_MEM) + p = &iomem_resource; + else if (resource_type(r) == IORESOURCE_IO) + p = &ioport_resource; + } + + if (p && insert_resource(p, r)) { + dev_err(&ofdev->dev, "failed to claim resource %d\n", + i); + ret = -EBUSY; + goto failed; + } + } + + ret = device_add(&ofdev->dev); + if (ret == 0) + return ret; + +failed: + while (--i >= 0) { + struct resource *r = &ofdev->resource[i]; + unsigned long type = resource_type(r); + + if (type == IORESOURCE_MEM || type == IORESOURCE_IO) + release_resource(r); + } + return ret; } int of_device_register(struct platform_device *pdev)
Drivers can use of_platform_populate() to create platform devices for children of the device main node, and a complementary API of_platform_depopulate() is provided to delete these child platform devices. The of_platform_depopulate() leverages the platform API for performing the cleanup of these devices. The platform device resources are managed differently between of_device_add and platform_device_add, and this asymmetry causes a kernel oops in platform_device_del during removal of the resources. Manage the platform device resources similar to platform_device_add to fix this kernel oops. Signed-off-by: Suman Anna <s-anna@ti.com> --- drivers/of/device.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-)