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

usb: phy: tegra: Keep CPU interrupts enabled

Browse Source 
There is no good reason for disabling of CPU interrupts in order to
protect the utmip_pad_count modification.

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

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

@ -310,7 +310,6 @@ static int utmip_pad_power_on(struct tegra_usb_phy *phy)
{
struct tegra_utmip_config *config = phy->config;
void __iomem *base = phy->pad_regs;
unsigned long flags;
u32 val;
int err;
@ -318,7 +317,7 @@ static int utmip_pad_power_on(struct tegra_usb_phy *phy)
if (err)
return err;
spin_lock_irqsave(&utmip_pad_lock, flags);
spin_lock(&utmip_pad_lock);
if (utmip_pad_count++ == 0) {
val = readl_relaxed(base + UTMIP_BIAS_CFG0);
@ -336,7 +335,7 @@ static int utmip_pad_power_on(struct tegra_usb_phy *phy)
writel_relaxed(val, base + UTMIP_BIAS_CFG0);
}
spin_unlock_irqrestore(&utmip_pad_lock, flags);
spin_unlock(&utmip_pad_lock);
clk_disable_unprepare(phy->pad_clk);
@ -346,7 +345,6 @@ static int utmip_pad_power_on(struct tegra_usb_phy *phy)
static int utmip_pad_power_off(struct tegra_usb_phy *phy)
{
void __iomem *base = phy->pad_regs;
unsigned long flags;
u32 val;
int ret;
@ -354,7 +352,7 @@ static int utmip_pad_power_off(struct tegra_usb_phy *phy)
if (ret)
return ret;
spin_lock_irqsave(&utmip_pad_lock, flags);
spin_lock(&utmip_pad_lock);
if (!utmip_pad_count) {
dev_err(phy->u_phy.dev, "UTMIP pad already powered off\n");
@ -368,7 +366,7 @@ static int utmip_pad_power_off(struct tegra_usb_phy *phy)
writel_relaxed(val, base + UTMIP_BIAS_CFG0);
}
ulock:
spin_unlock_irqrestore(&utmip_pad_lock, flags);
spin_unlock(&utmip_pad_lock);
clk_disable_unprepare(phy->pad_clk);