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

usb: phy: tegra: Move utmip_pad_count checking under lock 



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: default avatarDmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20200106013416.9604-16-digetx@gmail.com


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

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

+11 −10
Original line number Diff line number Diff line
@@ -348,30 +348,31 @@ static int utmip_pad_power_off(struct tegra_usb_phy *phy) 
	void __iomem *base = phy->pad_regs;

	unsigned long flags;

	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) {

		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) {

		val = readl_relaxed(base + UTMIP_BIAS_CFG0);

		val |= UTMIP_OTGPD | UTMIP_BIASPD;

		writel_relaxed(val, base + UTMIP_BIAS_CFG0);

	}



ulock:

	spin_unlock_irqrestore(&utmip_pad_lock, flags);



	clk_disable_unprepare(phy->pad_clk);



	return 0;

	return ret;

}



static int utmi_wait_register(void __iomem *reg, u32 mask, u32 result)