diff options
| author | Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2015-05-26 09:31:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-01 10:15:17 +0900 |
| commit | e50e69d1ac4232af0b6890f16929bf5ceee81538 (patch) | |
| tree | f1c64a18c3f5a38173d5ba06467bd3f2278583c4 /drivers/base/platform.c | |
| parent | 36d4b29260753ad78b1ce4363145332c02519adc (diff) | |
base/platform: Continue on insert_resource() error
insert_resource() can fail when the resource added overlaps
(partially or fully) with another.
Device tree and AMBA devices may contain resources that overlap, so they
could not call platform_device_add (see 02bbde7849e6 ('Revert "of:
use platform_device_add"'))"
On the other hand, device trees are released using
platform_device_unregister(). This function calls platform_device_del(),
which calls release_resource(), that crashes when the resource has not
been added with with insert_resource. This was not an issue when the
device tree could not be modified online, but this is not the case
anymore.
This patch let the flow continue when there is an insert error, after
notifying the user with a dev_err(). r->parent is set to NULL, so
platform_device_del() knows that the resource was not added, and
therefore it should not be released.
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/platform.c')
| -rw-r--r-- | drivers/base/platform.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 46a56f694cec..5a29387e5ff6 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -332,7 +332,7 @@ int platform_device_add(struct platform_device *pdev) */ ret = ida_simple_get(&platform_devid_ida, 0, 0, GFP_KERNEL); if (ret < 0) - goto err_out; + return ret; pdev->id = ret; pdev->id_auto = true; dev_set_name(&pdev->dev, "%s.%d.auto", pdev->name, pdev->id); @@ -340,7 +340,7 @@ int platform_device_add(struct platform_device *pdev) } for (i = 0; i < pdev->num_resources; i++) { - struct resource *p, *r = &pdev->resource[i]; + struct resource *conflict, *p, *r = &pdev->resource[i]; unsigned long type = resource_type(r); if (r->name == NULL) @@ -357,11 +357,14 @@ int platform_device_add(struct platform_device *pdev) p = &ioport_resource; } - if (insert_resource(p, r)) { - dev_err(&pdev->dev, "failed to claim resource %d\n", i); - ret = -EBUSY; - goto failed; - } + conflict = insert_resource_conflict(p, r); + if (!conflict) + continue; + + dev_err(&pdev->dev, + "ignoring resource %pR (conflicts with %s %pR)\n", + r, conflict->name, conflict); + p->parent = NULL; } pr_debug("Registering platform device '%s'. Parent at %s\n", @@ -371,7 +374,7 @@ int platform_device_add(struct platform_device *pdev) if (ret == 0) return ret; - failed: + /* Failure path */ if (pdev->id_auto) { ida_simple_remove(&platform_devid_ida, pdev->id); pdev->id = PLATFORM_DEVID_AUTO; @@ -381,11 +384,11 @@ int platform_device_add(struct platform_device *pdev) struct resource *r = &pdev->resource[i]; unsigned long type = resource_type(r); - if (type == IORESOURCE_MEM || type == IORESOURCE_IO) + if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) && + r->parent) release_resource(r); } - err_out: return ret; } EXPORT_SYMBOL_GPL(platform_device_add); @@ -414,7 +417,8 @@ void platform_device_del(struct platform_device *pdev) struct resource *r = &pdev->resource[i]; unsigned long type = resource_type(r); - if (type == IORESOURCE_MEM || type == IORESOURCE_IO) + if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) && + r->parent) release_resource(r); } } |