A genpd provider that uses the ->attach_dev() callback to look up resources for a device fails to do so when the device has multiple PM domains attached. That is because when genpd invokes the ->attach_dev() callback, it passes the allocated virtual device as the in-parameter. To address this problem, simply assign the dev->of_node for the virtual device, based upon the original device's OF node.
Unified · Split
| @@ -2272,6 +2272,7 @@ EXPORT_SYMBOL_GPL(of_genpd_remove_last); · 2271 unmodified lines | ||
| 2272 | 2272 | |
| 2273 | 2273 | static void genpd_release_dev(struct device *dev) |
| 2274 | 2274 | { |
| 2275 | + of_node_put(dev->of_node); | |
| 2275 | 2276 | kfree(dev); |
| 2276 | 2277 | } |
| 2277 | 2278 | |
| @@ -2333,14 +2334,14 @@ static void genpd_dev_pm_sync(struct device *dev) · 55 unmodified lines | ||
| 2333 | 2334 | genpd_queue_power_off_work(pd); |
| 2334 | 2335 | } |
| 2335 | 2336 | |
| 2336 | −static int __genpd_dev_pm_attach(struct device *dev, struct device_node *np, | |
| 2337 | − unsigned int index, bool power_on) | |
| 2337 | +static int __genpd_dev_pm_attach(struct device *dev, unsigned int index, | |
| 2338 | + bool power_on) | |
| 2338 | 2339 | { |
| 2339 | 2340 | struct of_phandle_args pd_args; |
| 2340 | 2341 | struct generic_pm_domain *pd; |
| 2341 | 2342 | int ret; |
| 2342 | 2343 | |
| 2343 | − ret = of_parse_phandle_with_args(np, "power-domains", | |
| 2344 | + ret = of_parse_phandle_with_args(dev->of_node, "power-domains", | |
| 2344 | 2345 | "#power-domain-cells", index, &pd_args); |
| 2345 | 2346 | if (ret < 0) |
| 2346 | 2347 | return ret; |
| @@ -2408,7 +2409,7 @@ int genpd_dev_pm_attach(struct device *dev) · 61 unmodified lines | ||
| 2408 | 2409 | "#power-domain-cells") != 1) |
| 2409 | 2410 | return 0; |
| 2410 | 2411 | |
| 2411 | − return __genpd_dev_pm_attach(dev, dev->of_node, 0, true); | |
| 2412 | + return __genpd_dev_pm_attach(dev, 0, true); | |
| 2412 | 2413 | } |
| 2413 | 2414 | EXPORT_SYMBOL_GPL(genpd_dev_pm_attach); |
| 2414 | 2415 | |
| @@ -2452,6 +2453,7 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev, · 37 unmodified lines | ||
| 2452 | 2453 | dev_set_name(virt_dev, "genpd:%u:%s", index, dev_name(dev)); |
| 2453 | 2454 | virt_dev->bus = &genpd_bus_type; |
| 2454 | 2455 | virt_dev->release = genpd_release_dev; |
| 2456 | + virt_dev->of_node = of_node_get(dev->of_node); | |
| 2455 | 2457 | |
| 2456 | 2458 | ret = device_register(virt_dev); |
| 2457 | 2459 | if (ret) { |
| @@ -2460,7 +2462,7 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev, · 2 unmodified lines | ||
| 2460 | 2462 | } |
| 2461 | 2463 | |
| 2462 | 2464 | /* Try to attach the device to the PM domain at the specified index. */ |
| 2463 | − ret = __genpd_dev_pm_attach(virt_dev, dev->of_node, index, false); | |
| 2465 | + ret = __genpd_dev_pm_attach(virt_dev, index, false); | |
| 2464 | 2466 | if (ret < 1) { |
| 2465 | 2467 | device_unregister(virt_dev); |
| 2466 | 2468 | return ret ? ERR_PTR(ret) : NULL; |