LinuxLists.cc - [PATCH 0/9] usb: musb: several bugfixes for the musb driver

2014-07-18 09:34:30

Subject: [PATCH 0/9] usb: musb: several bugfixes for the musb driver

The first three patches do some source code cleanup in the files that
are modified in the subsequent patches.

Patch 4 carries the proper fix reported in commit:
7adb5c876e9c ("usb: musb: Fix panic upon musb_am335x module removal")

Patch 6 makes the USBOTG_ID pin override via the USB_MODE register
really work.

Patch 5 makes the error message upon driver probe failure visible
without having to recompile the driver with DEBUG enabled.

Patch 7 makes sure the parameters for the usb_gen_phy are properly set
up before registering it.

Patch 8 makes it possible to use the driver with HW that requires
external regulators or clocks.

Patch 9 reinstates module unloading support for the musb_am335x driver
which was disabled due to a false failure analysis

2014-07-18 09:32:00

by Lothar Waßmann

[permalink] [raw]

Subject: [PATCH 3/9] usb: musb_am335x: source cleanup

- remove comma after end of list delimiter
The empty entry must always be the last item in the list, thus there
is no point in having a trailing comma to facilitate adding
succeding entries.
Remove the comma, so that inadvertedly adding an entry after the end
of list sentinel will produce a compile time error rather than an
unreachable entry in the list.
- consistently use tabs for indentation

Signed-off-by: Lothar Waßmann <[email protected]>
---
drivers/usb/musb/musb_am335x.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/musb/musb_am335x.c b/drivers/usb/musb/musb_am335x.c
index 1e58ed2..164c868 100644
--- a/drivers/usb/musb/musb_am335x.c
+++ b/drivers/usb/musb/musb_am335x.c
@@ -21,14 +21,14 @@ err:

static const struct of_device_id am335x_child_of_match[] = {
{ .compatible = "ti,am33xx-usb" },
- { },
+ { }
};
MODULE_DEVICE_TABLE(of, am335x_child_of_match);

static struct platform_driver am335x_child_driver = {
.probe = am335x_child_probe,
- .driver = {
- .name = "am335x-usb-childs",
+ .driver = {
+ .name = "am335x-usb-childs",
.of_match_table = am335x_child_of_match,
},
};
--
1.7.10.4

2014-07-18 09:32:13

by Lothar Waßmann

[permalink] [raw]

Subject: [PATCH 6/9] usb: musb: core: properly setup the HW before registering it to the USB core

Without this patch overriding the USBOTG_ID pin by setting the iddig
bit in the USB_MODE register doesn't work because it happens too late
to be recognized correctly.

Signed-off-by: Lothar Waßmann <[email protected]>
---
drivers/usb/musb/musb_core.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index f867b44..bbf2aefb 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1988,18 +1988,21 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)

switch (musb->port_mode) {
case MUSB_PORT_MODE_HOST:
- status = musb_host_setup(musb, plat->power);
+ status = musb_platform_set_mode(musb, MUSB_HOST);
if (status < 0)
goto fail3;
- status = musb_platform_set_mode(musb, MUSB_HOST);
+ status = musb_host_setup(musb, plat->power);
break;
case MUSB_PORT_MODE_GADGET:
- status = musb_gadget_setup(musb);
+ status = musb_platform_set_mode(musb, MUSB_PERIPHERAL);
if (status < 0)
goto fail3;
- status = musb_platform_set_mode(musb, MUSB_PERIPHERAL);
+ status = musb_gadget_setup(musb);
break;
case MUSB_PORT_MODE_DUAL_ROLE:
+ status = musb_platform_set_mode(musb, MUSB_OTG);
+ if (status < 0)
+ goto fail3;
status = musb_host_setup(musb, plat->power);
if (status < 0)
goto fail3;
@@ -2008,7 +2011,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
musb_host_cleanup(musb);
goto fail3;
}
- status = musb_platform_set_mode(musb, MUSB_OTG);
break;
default:
dev_err(dev, "unsupported port mode %d\n", musb->port_mode);
--
1.7.10.4

2014-07-18 09:32:21

by Lothar Waßmann

[permalink] [raw]

Subject: [PATCH 1/9] usb: musb: core: cleanup - remove some useless 'break's from switch statements

Signed-off-by: Lothar Waßmann <[email protected]>
---
drivers/usb/musb/musb_core.c | 4 ----
1 file changed, 4 deletions(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index b841ee0..8623112 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -680,7 +680,6 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
default:
/* "should not happen" */
musb->is_active = 0;
- break;
}
}

@@ -737,7 +736,6 @@ b_host:
if (hcd)
hcd->self.is_b_host = 0;
}
- break;
}

musb_host_poke_root_hub(musb);
@@ -787,7 +785,6 @@ b_host:
default:
WARNING("unhandled DISCONNECT transition (%s)\n",
usb_otg_state_string(musb->xceiv->state));
- break;
}
}

@@ -2015,7 +2012,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
break;
default:
dev_err(dev, "unsupported port mode %d\n", musb->port_mode);
- break;
}

if (status < 0)
--
1.7.10.4

2014-07-18 09:32:11

by Lothar Waßmann

[permalink] [raw]

Subject: [PATCH 2/9] usb: phy: am335x: group the #includes by subdirs

Signed-off-by: Lothar Waßmann <[email protected]>
---
drivers/usb/phy/phy-am335x.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/phy/phy-am335x.c b/drivers/usb/phy/phy-am335x.c
index b70e055..91c71ab 100644
--- a/drivers/usb/phy/phy-am335x.c
+++ b/drivers/usb/phy/phy-am335x.c
@@ -1,13 +1,13 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
-#include <linux/usb/otg.h>
-#include <linux/usb/usb_phy_generic.h>
#include <linux/slab.h>
#include <linux/clk.h>
-#include <linux/regulator/consumer.h>
#include <linux/of.h>
#include <linux/of_address.h>
+#include <linux/regulator/consumer.h>
+#include <linux/usb/otg.h>
+#include <linux/usb/usb_phy_generic.h>

#include "am35x-phy-control.h"
#include "phy-generic.h"
--
1.7.10.4

2014-07-18 09:32:50

by Lothar Waßmann

[permalink] [raw]

Subject: [PATCH 9/9] usb: musb: musb_am335x: reinstate module loading/unloading support

There is no need to throw the baby out with the bath due to a bad
failure analysis. The commit:
7adb5c876e9c usb: musb: Fix panic upon musb_am335x module removal
came to a wrong conclusion about the cause of the crash it was
"fixing". The real culprit was the phy-am335x module that was removed
from underneath its users that were still referencing data from it.
After having fixed this in a previous patch, module unloading can be
reinstated.

Another bug with module loading/unloading was the fact, that after
removing the devices instantiated from DT their 'OF_POPULATED' flag
was still set, so that re-loading the module after an unload had no
effect. This is also fixed in this patch.

Signed-off-by: Lothar Waßmann <[email protected]>
---
drivers/usb/musb/musb_am335x.c | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/musb/musb_am335x.c b/drivers/usb/musb/musb_am335x.c
index 164c868..152a6f5 100644
--- a/drivers/usb/musb/musb_am335x.c
+++ b/drivers/usb/musb/musb_am335x.c
@@ -19,6 +19,22 @@ err:
return ret;
}

+static int of_remove_populated_child(struct device *dev, void *d)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+
+ of_device_unregister(pdev);
+ of_node_clear_flag(pdev->dev.of_node, OF_POPULATED);
+ return 0;
+}
+
+static int am335x_child_remove(struct platform_device *pdev)
+{
+ device_for_each_child(&pdev->dev, NULL, of_remove_populated_child);
+ pm_runtime_disable(&pdev->dev);
+ return 0;
+}
+
static const struct of_device_id am335x_child_of_match[] = {
{ .compatible = "ti,am33xx-usb" },
{ }
@@ -27,17 +43,14 @@ MODULE_DEVICE_TABLE(of, am335x_child_of_match);

static struct platform_driver am335x_child_driver = {
.probe = am335x_child_probe,
+ .remove = am335x_child_remove,
.driver = {
.name = "am335x-usb-childs",
.of_match_table = am335x_child_of_match,
},
};

-static int __init am335x_child_init(void)
-{
- return platform_driver_register(&am335x_child_driver);
-}
-module_init(am335x_child_init);
+module_platform_driver(am335x_child_driver);

MODULE_DESCRIPTION("AM33xx child devices");
MODULE_LICENSE("GPL v2");
--
1.7.10.4

2014-07-18 09:32:08

by Lothar Waßmann

[permalink] [raw]

Subject: [PATCH 7/9] usb: phy: am335x: setup the gen_phy function pointers _before_ adding the phy

Make sure all parameters are correctly set up before registering the
PHY with the USB framework.

Signed-off-by: Lothar Waßmann <[email protected]>
---
drivers/usb/phy/phy-am335x.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/phy/phy-am335x.c b/drivers/usb/phy/phy-am335x.c
index 91c71ab..6522fa7 100644
--- a/drivers/usb/phy/phy-am335x.c
+++ b/drivers/usb/phy/phy-am335x.c
@@ -56,11 +56,12 @@ static int am335x_phy_probe(struct platform_device *pdev)
if (ret)
return ret;

+ am_phy->usb_phy_gen.phy.init = am335x_init;
+ am_phy->usb_phy_gen.phy.shutdown = am335x_shutdown;
+
ret = usb_add_phy_dev(&am_phy->usb_phy_gen.phy);
if (ret)
return ret;
- am_phy->usb_phy_gen.phy.init = am335x_init;
- am_phy->usb_phy_gen.phy.shutdown = am335x_shutdown;

platform_set_drvdata(pdev, am_phy);
device_init_wakeup(dev, true);
--
1.7.10.4

2014-07-18 09:31:58

by Lothar Waßmann

[permalink] [raw]

Subject: [PATCH 8/9] usb: phy: am335x: call usb_gen_phy_init()/usb_gen_phy_shutdown() in am335x_init()/am335x_shutdown()

This patch makes it possible to use the musb driver with HW that
requires external regulators or clocks.

Signed-off-by: Lothar Waßmann <[email protected]>
---
drivers/usb/phy/phy-am335x.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/usb/phy/phy-am335x.c b/drivers/usb/phy/phy-am335x.c
index 6522fa7..de25674 100644
--- a/drivers/usb/phy/phy-am335x.c
+++ b/drivers/usb/phy/phy-am335x.c
@@ -22,6 +22,7 @@ static int am335x_init(struct usb_phy *phy)
{
struct am335x_phy *am_phy = dev_get_drvdata(phy->dev);

+ usb_gen_phy_init(phy);
phy_ctrl_power(am_phy->phy_ctrl, am_phy->id, true);
return 0;
}
@@ -31,6 +32,7 @@ static void am335x_shutdown(struct usb_phy *phy)
struct am335x_phy *am_phy = dev_get_drvdata(phy->dev);

phy_ctrl_power(am_phy->phy_ctrl, am_phy->id, false);
+ usb_gen_phy_shutdown(phy);
}

static int am335x_phy_probe(struct platform_device *pdev)
--
1.7.10.4

2014-07-18 09:31:56

by Lothar Waßmann

[permalink] [raw]

Subject: [PATCH 5/9] usb: musb: print error message with dev_err() instead of dev_dbg()

Signed-off-by: Lothar Waßmann <[email protected]>
---
drivers/usb/musb/musb_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 8623112..f867b44 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1878,7 +1878,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
* Fail when the board needs a feature that's not enabled.
*/
if (!plat) {
- dev_dbg(dev, "no platform_data?\n");
+ dev_err(dev, "no platform_data?\n");
status = -ENODEV;
goto fail0;
}
--
1.7.10.4

2014-07-18 09:31:55

by Lothar Waßmann

[permalink] [raw]

Subject: [PATCH 4/9] usb: phy: am335x-control: prevent module from being unloaded when in use

This patch fixes the real cause of the crash that was "fixed" by
commit 7adb5c876e9c usb: musb: Fix panic upon musb_am335x module removal

Signed-off-by: Lothar Waßmann <[email protected]>
---
drivers/usb/phy/phy-am335x-control.c | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/drivers/usb/phy/phy-am335x-control.c b/drivers/usb/phy/phy-am335x-control.c
index 35b6083..df3e1ba 100644
--- a/drivers/usb/phy/phy-am335x-control.c
+++ b/drivers/usb/phy/phy-am335x-control.c
@@ -140,6 +140,9 @@ static int am335x_control_usb_probe(struct platform_device *pdev)
const struct of_device_id *of_id;
const struct phy_control *phy_ctrl;

+ if (!try_module_get(pdev->dev.parent->driver->owner))
+ return -EPROBE_DEFER;
+
of_id = of_match_node(omap_control_usb_id_table, pdev->dev.of_node);
if (!of_id)
return -EINVAL;
@@ -171,8 +174,15 @@ static int am335x_control_usb_probe(struct platform_device *pdev)
return 0;
}

+static int am335x_control_usb_remove(struct platform_device *pdev)
+{
+ module_put(pdev->dev.parent->driver->owner);
+ return 0;
+}
+
static struct platform_driver am335x_control_driver = {
.probe = am335x_control_usb_probe,
+ .remove = am335x_control_usb_remove,
.driver = {
.name = "am335x-control-usb",
.owner = THIS_MODULE,
--
1.7.10.4

2014-07-18 13:45:44

Subject: [PATCH 0/9] usb: musb: several bugfixes for the musb driver

Subject: [PATCH 3/9] usb: musb_am335x: source cleanup

Subject: [PATCH 6/9] usb: musb: core: properly setup the HW before registering it to the USB core

Subject: [PATCH 1/9] usb: musb: core: cleanup - remove some useless 'break's from switch statements

Subject: [PATCH 2/9] usb: phy: am335x: group the #includes by subdirs

Subject: [PATCH 9/9] usb: musb: musb_am335x: reinstate module loading/unloading support

Subject: [PATCH 7/9] usb: phy: am335x: setup the gen_phy function pointers _before_ adding the phy

Subject: [PATCH 8/9] usb: phy: am335x: call usb_gen_phy_init()/usb_gen_phy_shutdown() in am335x_init()/am335x_shutdown()

Subject: [PATCH 5/9] usb: musb: print error message with dev_err() instead of dev_dbg()

Subject: [PATCH 4/9] usb: phy: am335x-control: prevent module from being unloaded when in use

Subject: Re: [PATCH 1/9] usb: musb: core: cleanup - remove some useless 'break's from switch statements

Attachments:

Subject: Re: [PATCH 2/9] usb: phy: am335x: group the #includes by subdirs

Attachments:

Subject: Re: [PATCH 3/9] usb: musb_am335x: source cleanup

Attachments:

Subject: Re: [PATCH 4/9] usb: phy: am335x-control: prevent module from being unloaded when in use

Attachments:

Subject: Re: [PATCH 5/9] usb: musb: print error message with dev_err() instead of dev_dbg()

Attachments:

Subject: Re: [PATCH 6/9] usb: musb: core: properly setup the HW before registering it to the USB core

Attachments:

Subject: Re: [PATCH 7/9] usb: phy: am335x: setup the gen_phy function pointers _before_ adding the phy

Attachments:

Subject: Re: [PATCH 8/9] usb: phy: am335x: call usb_gen_phy_init()/usb_gen_phy_shutdown() in am335x_init()/am335x_shutdown()

Attachments:

Subject: Re: [PATCH 9/9] usb: musb: musb_am335x: reinstate module loading/unloading support

Attachments:

Subject: Re: [PATCH 0/9] usb: musb: several bugfixes for the musb driver

Subject: Re: [PATCH 0/9] usb: musb: several bugfixes for the musb driver

Attachments:

Subject: Re: [PATCH 0/9] usb: musb: several bugfixes for the musb driver

Subject: Re: [PATCH 8/9] usb: phy: am335x: call usb_gen_phy_init()/usb_gen_phy_shutdown() in am335x_init()/am335x_shutdown()

Subject: Re: [PATCH 8/9] usb: phy: am335x: call usb_gen_phy_init()/usb_gen_phy_shutdown() in am335x_init()/am335x_shutdown()

Attachments:

Subject: Re: [PATCH 0/9] usb: musb: several bugfixes for the musb driver

Attachments:

Subject: Re: [PATCH 0/9] usb: musb: several bugfixes for the musb driver

Subject: Re: [PATCH 0/9] usb: musb: several bugfixes for the musb driver

Attachments:

Subject: Re: [PATCH 9/9] usb: musb: musb_am335x: reinstate module loading/unloading support

Subject: Re: [PATCH 8/9] usb: phy: am335x: call usb_gen_phy_init()/usb_gen_phy_shutdown() in am335x_init()/am335x_shutdown()

Subject: Re: [PATCH 9/9] usb: musb: musb_am335x: reinstate module loading/unloading support

Attachments:

Subject: Re: [PATCH 8/9] usb: phy: am335x: call usb_gen_phy_init()/usb_gen_phy_shutdown() in am335x_init()/am335x_shutdown()

Attachments: