AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

usb: phy: tegra: Move utmip_pad_count checking under lock

Browse Source 
It's unlikely that two drivers could manage PHY's state simultaneously in
practice, nevertheless the utmip_pad_count checking should be under lock,
for consistency.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20200106013416.9604-16-digetx@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dmitry Osipenko 2020-01-06 04:34:11 +03:00 committed by Greg Kroah-Hartman
parent aecc5af3ec
commit 92bd2ef26c
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/usb/phy/phy-tegra-usb.c
View File

@ -348,30 +348,31 @@ static int utmip_pad_power_off(struct tegra_usb_phy *phy)
void __iomem *base = phy->pad_regs; void __iomem *base = phy->pad_regs;
unsigned long flags; unsigned long flags;
u32 val; u32 val;
int err; int ret;
ret = clk_prepare_enable(phy->pad_clk);
if (ret)
return ret;
spin_lock_irqsave(&utmip_pad_lock, flags);
if (!utmip_pad_count) { if (!utmip_pad_count) {
dev_err(phy->u_phy.dev, "UTMIP pad already powered off\n"); dev_err(phy->u_phy.dev, "UTMIP pad already powered off\n");
return -EINVAL; ret = -EINVAL;
goto ulock;
} }
err = clk_prepare_enable(phy->pad_clk);
if (err)
return err;
spin_lock_irqsave(&utmip_pad_lock, flags);
if (--utmip_pad_count == 0) { if (--utmip_pad_count == 0) {
val = readl_relaxed(base + UTMIP_BIAS_CFG0); val = readl_relaxed(base + UTMIP_BIAS_CFG0);
val |= UTMIP_OTGPD | UTMIP_BIASPD; val |= UTMIP_OTGPD | UTMIP_BIASPD;
writel_relaxed(val, base + UTMIP_BIAS_CFG0); writel_relaxed(val, base + UTMIP_BIAS_CFG0);
} }
ulock:
spin_unlock_irqrestore(&utmip_pad_lock, flags); spin_unlock_irqrestore(&utmip_pad_lock, flags);
clk_disable_unprepare(phy->pad_clk); clk_disable_unprepare(phy->pad_clk);
return 0; return ret;
} }
static int utmi_wait_register(void __iomem *reg, u32 mask, u32 result) static int utmi_wait_register(void __iomem *reg, u32 mask, u32 result)