Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752446Ab3GTFDe (ORCPT ); Sat, 20 Jul 2013 01:03:34 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:25676 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751074Ab3GTFDc (ORCPT ); Sat, 20 Jul 2013 01:03:32 -0400 X-AuditID: cbfee68d-b7f096d0000043fc-d3-51ea1a211ab8 Date: Sat, 20 Jul 2013 05:03:29 +0000 (GMT) From: NAVEEN KRISHNA CHATRADHI Subject: Re: [PATCH] of: provide of_platform_unpopulate() To: Sebastian Andrzej Siewior , Rob Herring , Grant Likely Cc: "linux-omap@vger.kernel.org" , "linux-samsung-soc@vger.kernel.org" , "devicetree-discuss@lists.ozlabs.org" , "linux-kernel@vger.kernel.org" , Tony Lindgren , Doug Anderson , Vivek Gautam , Kukjin Kim , Kishon Vijay Abraham I , Roger Quadros , George Cherian , Felipe Balbi Reply-to: ch.naveen@samsung.com MIME-version: 1.0 X-MTR: 20130720050143120@ch.naveen Msgkey: 20130720050143120@ch.naveen X-EPLocale: en_US.windows-1252 X-Priority: 3 X-EPWebmail-Msg-Type: personal X-EPWebmail-Reply-Demand: 0 X-EPApproval-Locale: X-EPHeader: ML X-EPTrCode: X-EPTrName: X-MLAttribute: X-RootMTR: 20130720050143120@ch.naveen X-ParentMTR: X-ArchiveUser: X-CPGSPASS: N Content-type: text/plain; charset=windows-1252 MIME-version: 1.0 Message-id: <21991870.179121374296606237.JavaMail.weblogic@epml22> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIKsWRmVeSWpSXmKPExsWyRsSkVldR6lWgwfJPihaXd81hc2D0+LxJ LoAxissmJTUnsyy1SN8ugStjyamzLAVLEit+n9zE2MD4IK6LkZNDSEBF4u+O6awgtoSAicSu x+/ZIGwxiQv31gPZXEA1SxklWpdeYYYpOnX6MTtEYj6jxP25K1lAEiwCqhLtR6czgthsAuYS 7078AJsqLGAp0bppEgtIg4hAH6PEvbOtYN3MArdYJL6uOccEcYe8xIyJnWCTeAUEJU7OfMIC sU5J4s75e0wQcWWJ6d++Q90nJ7Fk6mUmCJtXYkb7UxaY+LSva6BOlZY4P2sDI8w/i78/horz Sxy7vQOolwOs98n9YJgxuzd/gRovIDH1zEGoVnWJix2LoGw+iTUL37LAjNl1ajkzTO/9LXPB zmEWUJSY0v2QHcI2kDiyaA4rurd4BZwkDvS8ZpnAqDwLSWoWkvZZSNqR1SxgZFnFKJpakFxQ nJReZKhXnJhbXJqXrpecn7uJEZgcTv971ruD8fYB60OMycBImcgsJZqcD0wueSXxhsZmRham JqbGRuaWZqQJK4nzqrVYBwoJpCeWpGanphakFsUXleakFh9iZOLglGpgnPDWpD7l3Vk+VXbb VedMOEXSz255urvS5QKX2eM+FbfFyzd6dk4JvhWfcpmvbbJRVxPTU6uI5ClBZwunvEtj+fD/ F7dE4HQ7q7zq+7vee2ntdpnMESbx40/+7Sfnzn/xuFKyeO+sjMKQmp6/n7N7e6fMF/7aUSCz tNL86j/VvW1PdMovhy94r8RSnJFoqMVcVJwIAI0lpG0kAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpik+LIzCtJLcpLzFFi42I5/e/2TF1FqVeBBi+PS1hc3jWHzYHR4/Mm uQDGqDSbjNTElNQihdS85PyUzLx0WyXv4HjneFMzA0NdQ0sLcyWFvMTcVFslF58AXbfMHKCh SgpliTmlQKGAxOJiJX07m6L80pJUhYz84hJbpWhDcyM9IwM9UyM9Q9NYK0MDAyNToJqEtIwl p86yFCxJrPh9chNjA+ODuC5GTg4hARWJvzums4LYEgImEqdOP2aHsMUkLtxbz9bFyAVUM59R 4v7clSwgCRYBVYn2o9MZQWw2AXOJdyd+gDULC1hKtG6axALSICLQxyhx72wrO4jDLHCLReLr mnNMEOvkJWZM7ASbxCsgKHFy5hMWiHVKEnfO32OCiCtLTP/2nQ0iLiexZOplJgibV2JG+1MW mPi0r2uYIWxpifOzNjDCnL34+2OoOL/Esds7gHo5wHqf3A+GGbN78xeo8QISU88chGpVl7jY sQjK5pNYs/AtC8yYXaeWM8P03t8yF+wcZgFFiSndD9khbAOJI4vmsKJ7i1fASeJAz2uWCYxy s5CkZiFpn4WkHVnNAkaWVYyiqQXJBcVJ6RVGesWJucWleel6yfm5mxjBKerZoh2M/85bH2IU 4GBU4uG9sOJloBBrYllxZe4hRgkOZiURXvY7QCHelMTKqtSi/Pii0pzU4kOMycAonMgsJZqc D0yfeSXxhsYm5qbGphYGhubmZqQJK4nzPmu1DhQSSE8sSc1OTS1ILYLZwsTBKdXAeCv/Vu// 07ty+PZ9LX9mefRj9csnfOGha+adnXPbbHtyXNU7mW+zndRn3uBb/sxH6897sTMrGWe7fjD8 fP1s5tYJzG+Pvd7jsMhfe/8e65cFbb2xs5W0LzPyG8V1HWty9dtnIr3Scc2uhLPsi6fqlRnP 0uwW+xz4r3bq+/trGo+oPKmdy/rA+I4SS3FGoqEWc1FxIgCdRUnSlQMAAA== DLP-Filter: Pass X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id r6K53p7C016481 Content-Length: 9254 Lines: 278 Hello Sebastian, ------- Original Message ------- Sender : Sebastian Andrzej Siewior Date : Jul 19, 2013 23:44 (GMT+05:30) Title : [PATCH] of: provide of_platform_unpopulate() So I called of_platform_populate() on a device to get each child device probed and on rmmod and I need to reverse its doing. After a quick grep I did what others did as well and rmmod ended in: | Unable to handle kernel NULL pointer dereference at virtual address 00000018 | PC is at release_resource+0x18/0x80 | Process rmmod (pid: 2005, stack limit = 0xedc30238) | [] (release_resource+0x18/0x80) from [] (platform_device_del+0x78/0xac) | [] (platform_device_del+0x78/0xac) from [] (platform_device_unregister+0xc/0x18) The problem is that platform_device_del() "releases" each ressource in its tree. This does not work on platform_devices created by OF becuase they were never added via insert_resource(). As a consequence old->parent in __release_resource() is NULL and we explode while accessing ->child. So I either I do something completly wrong _or_ nobody here tested the rmmod path of their driver. This patch provides a common function to unregister / remove devices which added to the system via of_platform_populate(). While this works now on my test case I have not tested any of the driver I modify here so feedback is greatly appreciated. I've tested this on the exynos_adc driver under iio/adc/ and found a bug in the driver. When I fix the bug, your change happily rmmods the module. Will send the patch separately. Thanks for pointing out the bug for me. Cc: Tony Lindgren Cc: Doug Anderson Cc: Vivek Gautam Cc: Naveen Krishna Chatradhi Cc: Kukjin Kim Cc: Kishon Vijay Abraham I Cc: Roger Quadros Cc: George Cherian Cc: Felipe Balbi Signed-off-by: Sebastian Andrzej Siewior --- drivers/bus/omap-ocp2scp.c | 13 ++----------- drivers/iio/adc/exynos_adc.c | 15 ++------------- drivers/mfd/omap-usb-host.c | 9 +-------- drivers/of/platform.c | 22 ++++++++++++++++++++++ drivers/usb/dwc3/dwc3-exynos.c | 11 +---------- drivers/usb/dwc3/dwc3-omap.c | 12 +----------- include/linux/of_platform.h | 4 ++++ 7 files changed, 33 insertions(+), 53 deletions(-) diff --git a/drivers/bus/omap-ocp2scp.c b/drivers/bus/omap-ocp2scp.c index 5511f98..510bb9e 100644 --- a/drivers/bus/omap-ocp2scp.c +++ b/drivers/bus/omap-ocp2scp.c @@ -23,15 +23,6 @@ #include #include -static int ocp2scp_remove_devices(struct device *dev, void *c) -{ - struct platform_device *pdev = to_platform_device(dev); - - platform_device_unregister(pdev); - - return 0; -} - static int omap_ocp2scp_probe(struct platform_device *pdev) { int ret; @@ -51,7 +42,7 @@ static int omap_ocp2scp_probe(struct platform_device *pdev) return 0; err0: - device_for_each_child(&pdev->dev, NULL, ocp2scp_remove_devices); + of_platform_unpopulate(&pdev->dev); return ret; } @@ -59,7 +50,7 @@ static int omap_ocp2scp_probe(struct platform_device *pdev) static int omap_ocp2scp_remove(struct platform_device *pdev) { pm_runtime_disable(&pdev->dev); - device_for_each_child(&pdev->dev, NULL, ocp2scp_remove_devices); + of_platform_unpopulate(&pdev->dev); return 0; } diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c index 9809fc9..10248e1 100644 --- a/drivers/iio/adc/exynos_adc.c +++ b/drivers/iio/adc/exynos_adc.c @@ -216,15 +216,6 @@ static const struct iio_chan_spec exynos_adc_iio_channels[] = { ADC_CHANNEL(9, "adc9"), }; -static int exynos_adc_remove_devices(struct device *dev, void *c) -{ - struct platform_device *pdev = to_platform_device(dev); - - platform_device_unregister(pdev); - - return 0; -} - static void exynos_adc_hw_init(struct exynos_adc *info) { u32 con1, con2; @@ -357,8 +348,7 @@ static int exynos_adc_probe(struct platform_device *pdev) return 0; err_of_populate: - device_for_each_child(&pdev->dev, NULL, - exynos_adc_remove_devices); + of_platform_unpopulate(&pdev->dev); regulator_disable(info->vdd); clk_disable_unprepare(info->clk); err_iio_dev: @@ -375,8 +365,7 @@ static int exynos_adc_remove(struct platform_device *pdev) struct iio_dev *indio_dev = platform_get_drvdata(pdev); struct exynos_adc *info = iio_priv(indio_dev); - device_for_each_child(&pdev->dev, NULL, - exynos_adc_remove_devices); + of_platform_unpopulate(&pdev->dev); regulator_disable(info->vdd); clk_disable_unprepare(info->clk); writel(0, info->enable_reg); diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index 759fae3..bb26cea 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c @@ -832,13 +832,6 @@ static int usbhs_omap_probe(struct platform_device *pdev) return ret; } -static int usbhs_omap_remove_child(struct device *dev, void *data) -{ - dev_info(dev, "unregistering "); - platform_device_unregister(to_platform_device(dev)); - return 0; -} - /** * usbhs_omap_remove - shutdown processing for UHH & TLL HCDs * @pdev: USB Host Controller being removed @@ -871,7 +864,7 @@ static int usbhs_omap_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); /* remove children */ - device_for_each_child(&pdev->dev, NULL, usbhs_omap_remove_child); + of_platform_unpopulate(&pdev->dev); return 0; } diff --git a/drivers/of/platform.c b/drivers/of/platform.c index e0a6514..9cbb0c3 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -473,4 +473,26 @@ int of_platform_populate(struct device_node *root, return rc; } EXPORT_SYMBOL_GPL(of_platform_populate); + +static int of_remove_populated_child(struct device *dev, void *d) +{ + struct platform_device *pdev = to_platform_device(dev); + + of_device_unregister(pdev); + return 0; +} +/** + * of_platform_unpopulate() - Remove populated devices. + * @parent: parent of the populated devices. + * + * The reverse of of_platform_populate() and can only be used a parent was + * specified while invoking the former. + */ +void of_platform_unpopulate(struct device *parent) +{ + if (WARN_ON(!parent)) + return; + device_for_each_child(parent, NULL, of_remove_populated_child); +} +EXPORT_SYMBOL_GPL(of_platform_unpopulate); #endif /* CONFIG_OF_ADDRESS */ diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c index 8ce9d7f..2bf5664 100644 --- a/drivers/usb/dwc3/dwc3-exynos.c +++ b/drivers/usb/dwc3/dwc3-exynos.c @@ -86,15 +86,6 @@ static int dwc3_exynos_register_phys(struct dwc3_exynos *exynos) return ret; } -static int dwc3_exynos_remove_child(struct device *dev, void *unused) -{ - struct platform_device *pdev = to_platform_device(dev); - - platform_device_unregister(pdev); - - return 0; -} - static int dwc3_exynos_probe(struct platform_device *pdev) { struct dwc3_exynos *exynos; @@ -164,7 +155,7 @@ static int dwc3_exynos_remove(struct platform_device *pdev) { struct dwc3_exynos *exynos = platform_get_drvdata(pdev); - device_for_each_child(&pdev->dev, NULL, dwc3_exynos_remove_child); + of_platform_unpopulate(&pdev->dev); platform_device_unregister(exynos->usb2_phy); platform_device_unregister(exynos->usb3_phy); diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c index 077f110..8688613 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c @@ -327,15 +327,6 @@ static irqreturn_t dwc3_omap_interrupt(int irq, void *_omap) return IRQ_HANDLED; } -static int dwc3_omap_remove_core(struct device *dev, void *c) -{ - struct platform_device *pdev = to_platform_device(dev); - - platform_device_unregister(pdev); - - return 0; -} - static void dwc3_omap_enable_irqs(struct dwc3_omap *omap) { u32 reg; @@ -529,8 +520,7 @@ static int dwc3_omap_remove(struct platform_device *pdev) dwc3_omap_disable_irqs(omap); pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); - device_for_each_child(&pdev->dev, NULL, dwc3_omap_remove_core); - + of_platform_unpopulate(&pdev->dev); return 0; } diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h index 05cb4a9..e354f9c 100644 --- a/include/linux/of_platform.h +++ b/include/linux/of_platform.h @@ -72,6 +72,7 @@ extern int of_platform_populate(struct device_node *root, const struct of_device_id *matches, const struct of_dev_auxdata *lookup, struct device *parent); +extern void of_platform_unpopulate(struct device *parent); #else static inline int of_platform_populate(struct device_node *root, const struct of_device_id *matches, @@ -80,6 +81,9 @@ static inline int of_platform_populate(struct device_node *root, { return -ENODEV; } +static inline void of_platform_unpopulate(struct device *parent) +{ +} #endif #endif /* _LINUX_OF_PLATFORM_H */ -- 1.8.3.2

 

 

Thanks & Best Regards, Naveen Krishna Ch SE @ Samsung-B.LAB????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?