Commit f1f0c751 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Greg Kroah-Hartman
Browse files

usb: phy: tegra: Keep CPU interrupts enabled 



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

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20200106013416.9604-17-digetx@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 92bd2ef2

drivers/usb/phy/phy-tegra-usb.c

+4 −6
Original line number Diff line number Diff line
@@ -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);