ARM: davinci: da8xx: Fix sleeping function called from invalid context
Everytime the usb20 phy is enabled, there is a "sleeping function called from invalid context" BUG. In addition, there is a recursive locking happening because of the recurse call to clk_enable(). clk_enable() from arch/arm/mach-davinci/clock.c uses spin_lock_irqsave() before to invoke the callback usb20_phy_clk_enable(). usb20_phy_clk_enable() uses clk_get() and clk_enable_prepapre() which may sleep. Replace clk_prepare_enable() by davinci_clk_enable(). Signed-off-by: Alexandre Bailon <abailon@baylibre.com> Suggested-by: David Lechner <david@lechnology.com> [nsekhar@ti.com: minor commit description adjustment] Signed-off-by: Sekhar Nori <nsekhar@ti.com>
This commit is contained in:
parent
48cd30b495
commit
d1df1e01af
|
@ -22,6 +22,8 @@
|
||||||
#define DA8XX_USB0_BASE 0x01e00000
|
#define DA8XX_USB0_BASE 0x01e00000
|
||||||
#define DA8XX_USB1_BASE 0x01e25000
|
#define DA8XX_USB1_BASE 0x01e25000
|
||||||
|
|
||||||
|
static struct clk *usb20_clk;
|
||||||
|
|
||||||
static struct platform_device da8xx_usb_phy = {
|
static struct platform_device da8xx_usb_phy = {
|
||||||
.name = "da8xx-usb-phy",
|
.name = "da8xx-usb-phy",
|
||||||
.id = -1,
|
.id = -1,
|
||||||
|
@ -158,26 +160,13 @@ int __init da8xx_register_usb_refclkin(int rate)
|
||||||
|
|
||||||
static void usb20_phy_clk_enable(struct clk *clk)
|
static void usb20_phy_clk_enable(struct clk *clk)
|
||||||
{
|
{
|
||||||
struct clk *usb20_clk;
|
|
||||||
int err;
|
|
||||||
u32 val;
|
u32 val;
|
||||||
u32 timeout = 500000; /* 500 msec */
|
u32 timeout = 500000; /* 500 msec */
|
||||||
|
|
||||||
val = readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));
|
val = readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));
|
||||||
|
|
||||||
usb20_clk = clk_get(&da8xx_usb20_dev.dev, "usb20");
|
|
||||||
if (IS_ERR(usb20_clk)) {
|
|
||||||
pr_err("could not get usb20 clk: %ld\n", PTR_ERR(usb20_clk));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* The USB 2.O PLL requires that the USB 2.O PSC is enabled as well. */
|
/* The USB 2.O PLL requires that the USB 2.O PSC is enabled as well. */
|
||||||
err = clk_prepare_enable(usb20_clk);
|
davinci_clk_enable(usb20_clk);
|
||||||
if (err) {
|
|
||||||
pr_err("failed to enable usb20 clk: %d\n", err);
|
|
||||||
clk_put(usb20_clk);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Turn on the USB 2.0 PHY, but just the PLL, and not OTG. The USB 1.1
|
* Turn on the USB 2.0 PHY, but just the PLL, and not OTG. The USB 1.1
|
||||||
|
@ -197,8 +186,7 @@ static void usb20_phy_clk_enable(struct clk *clk)
|
||||||
|
|
||||||
pr_err("Timeout waiting for USB 2.0 PHY clock good\n");
|
pr_err("Timeout waiting for USB 2.0 PHY clock good\n");
|
||||||
done:
|
done:
|
||||||
clk_disable_unprepare(usb20_clk);
|
davinci_clk_disable(usb20_clk);
|
||||||
clk_put(usb20_clk);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void usb20_phy_clk_disable(struct clk *clk)
|
static void usb20_phy_clk_disable(struct clk *clk)
|
||||||
|
@ -285,11 +273,19 @@ static struct clk_lookup usb20_phy_clk_lookup =
|
||||||
int __init da8xx_register_usb20_phy_clk(bool use_usb_refclkin)
|
int __init da8xx_register_usb20_phy_clk(bool use_usb_refclkin)
|
||||||
{
|
{
|
||||||
struct clk *parent;
|
struct clk *parent;
|
||||||
int ret = 0;
|
int ret;
|
||||||
|
|
||||||
|
usb20_clk = clk_get(&da8xx_usb20_dev.dev, "usb20");
|
||||||
|
ret = PTR_ERR_OR_ZERO(usb20_clk);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
parent = clk_get(NULL, use_usb_refclkin ? "usb_refclkin" : "pll0_aux");
|
parent = clk_get(NULL, use_usb_refclkin ? "usb_refclkin" : "pll0_aux");
|
||||||
if (IS_ERR(parent))
|
ret = PTR_ERR_OR_ZERO(parent);
|
||||||
return PTR_ERR(parent);
|
if (ret) {
|
||||||
|
clk_put(usb20_clk);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
usb20_phy_clk.parent = parent;
|
usb20_phy_clk.parent = parent;
|
||||||
ret = clk_register(&usb20_phy_clk);
|
ret = clk_register(&usb20_phy_clk);
|
||||||
|
|
Loading…
Reference in a new issue