phy: tegra: xusb: Use a bitmask for UTMI pad power state tracking
Subsystems (4)
PATCH v3 1/1 phy: tegra: xusb: Use a bitmask for UTMI pad power state tracking
The current implementation uses bias_pad_enable as a reference count to manage the shared bias pad for all UTMI PHYs. However, during system suspension with connected USB devices, multiple power-down requests for the UTMI pad result in a mismatch in the reference count, which in turn produces warnings such as:
[ 237.762967] WARNING: CPU: 10 PID: 1618 at tegra186_utmi_pad_power_down+0x160/0x170 [ 237.763103] Call trace: [ 237.763104] tegra186_utmi_pad_power_down+0x160/0x170 [ 237.763107] tegra186_utmi_phy_power_off+0x10/0x30 [ 237.763110] phy_power_off+0x48/0x100 [ 237.763113] tegra_xusb_enter_elpg+0x204/0x500 [ 237.763119] tegra_xusb_suspend+0x48/0x140 [ 237.763122] platform_pm_suspend+0x2c/0xb0 [ 237.763125] dpm_run_callback.isra.0+0x20/0xa0 [ 237.763127] __device_suspend+0x118/0x330 [ 237.763129] dpm_suspend+0x10c/0x1f0 [ 237.763130] dpm_suspend_start+0x88/0xb0 [ 237.763132] suspend_devices_and_enter+0x120/0x500 [ 237.763135] pm_suspend+0x1ec/0x270
The root cause was traced back to the dynamic power-down changes introduced in commit a30951d31b25 ("xhci: tegra: USB2 pad power controls"), where the UTMI pad was being powered down without verifying its current state. This unbalanced behavior led to discrepancies in the reference count.
To rectify this issue, this patch replaces the single reference counter with a bitmask, renamed to utmi_pad_enabled. Each bit in the mask corresponds to one of the four USB2 PHYs, allowing us to track each pad's enablement status individually.
With this change:
- The bias pad is powered on only when the mask is clear.
- Each UTMI pad is powered on or down based on its corresponding bit in the mask, preventing redundant operations.
- The overall power state of the shared bias pad is maintained correctly during suspend/resume cycles.
The mutex used to prevent race conditions during UTMI pad enable/disable operations has been moved from the tegra186_utmi_bias_pad_power_on/off functions to the parent functions tegra186_utmi_pad_power_on/down. This change ensures that there are no race conditions when updating the bitmask.
---
V1 -> V2: holding the padctl->lock to protect shared bitmask V2 -> V3: updating the commit message with the mutex changes
drivers/phy/tegra/xusb-tegra186.c | 44 +++++++++++++++++++------------ 1 file changed, 27 insertions(+), 17 deletions(-)
drivers/phy/tegra/xusb-tegra186.c +27 -17
@@ -237,6 +237,8 @@#define DATA0_VAL_PD BIT(1)#define USE_XUSB_AO BIT(4) +#define TEGRA_UTMI_PAD_MAX 4 +#define TEGRA186_LANE (_name, _offset, _shift, _mask, _type) \ { \ .name = _name, \
@@ -269,7 +271,7 @@ struct tegra186_xusb_padctl {/* UTMI bias and tracking */ struct clk *usb2_trk_clk; -unsigned int bias_pad_enable; +DECLARE_BITMAP (utmi_pad_enabled,TEGRA_UTMI_PAD_MAX );/* padctl context */ struct tegra186_xusb_padctl_context context;
@@ -603,12 +605,8 @@ static void tegra186_utmi_bias_pad_power_on(struct tegra_xusb_padctl *padctl)u32 value;int err; -mutex_lock (&padctl->lock); - -if (priv->bias_pad_enable++ >0 ) { -mutex_unlock (&padctl->lock); +if (!bitmap_empty (priv->utmi_pad_enabled,TEGRA_UTMI_PAD_MAX ))return ; - } err =clk_prepare_enable (priv->usb2_trk_clk);if (err <0 )
@@ -667,17 +665,8 @@ static void tegra186_utmi_bias_pad_power_off(struct tegra_xusb_padctl *padctl)struct tegra186_xusb_padctl *priv =to_tegra186_xusb_padctl (padctl);u32 value; -mutex_lock (&padctl->lock); - -if (WARN_ON (priv->bias_pad_enable ==0 )) { -mutex_unlock (&padctl->lock); -return ; - } - -if (--priv->bias_pad_enable >0 ) { -mutex_unlock (&padctl->lock); +if (!bitmap_empty (priv->utmi_pad_enabled,TEGRA_UTMI_PAD_MAX ))return ; - } value =padctl_readl (padctl,XUSB_PADCTL_USB2_BIAS_PAD_CTL1 ); value |=USB2_PD_TRK ;
@@ -690,13 +679,13 @@ static void tegra186_utmi_bias_pad_power_off(struct tegra_xusb_padctl *padctl)clk_disable_unprepare (priv->usb2_trk_clk); } -mutex_unlock (&padctl->lock); }static void tegra186_utmi_pad_power_on (struct phy *phy) {struct tegra_xusb_lane *lane =phy_get_drvdata (phy);struct tegra_xusb_padctl *padctl = lane->pad->padctl; +struct tegra186_xusb_padctl *priv =to_tegra186_xusb_padctl (padctl);struct tegra_xusb_usb2_port *port;struct device *dev = padctl->dev;unsigned int index = lane->index;
@@ -705,9 +694,16 @@ static void tegra186_utmi_pad_power_on(struct phy *phy)if (!phy)return ; +mutex_lock (&padctl->lock); +if (test_bit (index, priv->utmi_pad_enabled)) { +mutex_unlock (&padctl->lock); +return ; + } + port =tegra_xusb_find_usb2_port (padctl, index);if (!port) {dev_err (dev,"no port found for USB2 lane %u\n" , index); +mutex_unlock (&padctl->lock);return ; }
@@ -724,18 +720,28 @@ static void tegra186_utmi_pad_power_on(struct phy *phy) value =padctl_readl (padctl,XUSB_PADCTL_USB2_OTG_PADX_CTL1 (index)); value &= ~USB2_OTG_PD_DR ;padctl_writel (padctl, value,XUSB_PADCTL_USB2_OTG_PADX_CTL1 (index)); + +set_bit (index, priv->utmi_pad_enabled); +mutex_unlock (&padctl->lock); }static void tegra186_utmi_pad_power_down (struct phy *phy) {struct tegra_xusb_lane *lane =phy_get_drvdata (phy);struct tegra_xusb_padctl *padctl = lane->pad->padctl; +struct tegra186_xusb_padctl *priv =to_tegra186_xusb_padctl (padctl);unsigned int index = lane->index;u32 value;if (!phy)return ; +mutex_lock (&padctl->lock); +if (!test_bit (index, priv->utmi_pad_enabled)) { +mutex_unlock (&padctl->lock); +return ; + } +dev_dbg (padctl->dev,"power down UTMI pad %u\n" , index); value =padctl_readl (padctl,XUSB_PADCTL_USB2_OTG_PADX_CTL0 (index));
@@ -748,7 +754,11 @@ static void tegra186_utmi_pad_power_down(struct phy *phy)udelay (2 ); +clear_bit (index, priv->utmi_pad_enabled); +tegra186_utmi_bias_pad_power_off (padctl); + +mutex_unlock (&padctl->lock); } static int tegra186_xusb_padctl_vbus_override(struct tegra_xusb_padctl *padctl,
Signature · 1 line
2.25.1
Quoted 171 lines · Wayne Chang
The current implementation uses
bias_pad_enableas a reference count to manage the shared bias pad for all UTMI PHYs. However, during system suspension with connected USB devices, multiple power-down requests for the UTMI pad result in a mismatch in the reference count, which in turn produces warnings such as:[ 237.762967] WARNING: CPU: 10 PID: 1618 at tegra186_utmi_pad_power_down+0x160/0x170 [ 237.763103] Call trace: [ 237.763104] tegra186_utmi_pad_power_down+0x160/0x170 [ 237.763107] tegra186_utmi_phy_power_off+0x10/0x30 [ 237.763110] phy_power_off+0x48/0x100 [ 237.763113] tegra_xusb_enter_elpg+0x204/0x500 [ 237.763119] tegra_xusb_suspend+0x48/0x140 [ 237.763122] platform_pm_suspend+0x2c/0xb0 [ 237.763125] dpm_run_callback.isra.0+0x20/0xa0 [ 237.763127] __device_suspend+0x118/0x330 [ 237.763129] dpm_suspend+0x10c/0x1f0 [ 237.763130] dpm_suspend_start+0x88/0xb0 [ 237.763132] suspend_devices_and_enter+0x120/0x500 [ 237.763135] pm_suspend+0x1ec/0x270The root cause was traced back to the dynamic power-down changes introduced in commit
a30951d31b25("xhci: tegra: USB2 pad power controls"), where the UTMI pad was being powered down without verifying its current state. This unbalanced behavior led to discrepancies in the reference count.To rectify this issue, this patch replaces the single reference counter with a bitmask, renamed to
utmi_pad_enabled. Each bit in the mask corresponds to one of the four USB2 PHYs, allowing us to track each pad's enablement status individually.With this change:
- The bias pad is powered on only when the mask is clear.
- Each UTMI pad is powered on or down based on its corresponding bit in the mask, preventing redundant operations.
- The overall power state of the shared bias pad is maintained correctly during suspend/resume cycles.The mutex used to prevent race conditions during UTMI pad enable/disable operations has been moved from the tegra186_utmi_bias_pad_power_on/off functions to the parent functions tegra186_utmi_pad_power_on/down. This change ensures that there are no race conditions when updating the bitmask.
Fixes a30951d31b25 ("xhci: tegra: USB2 pad power controls")Signed-off-by Wayne Chang <[email protected]>---
V1 -> V2: holding thepadctl->lockto protect shared bitmask V2 -> V3: updating the commit message with the mutex changesdrivers/phy/tegra/xusb-tegra186.c | 44 +++++++++++++++++++------------ 1 file changed, 27 insertions(+), 17 deletions(-)drivers/phy/tegra/xusb-tegra186.c +23
-17@@ -237,6 +237,8 @@#define DATA0_VAL_PD BIT(1)#define USE_XUSB_AO BIT(4) +#define TEGRA_UTMI_PAD_MAX 4 +#define TEGRA186_LANE (_name, _offset, _shift, _mask, _type) \ { \ .name = _name, \@@ -269,7 +271,7 @@ struct tegra186_xusb_padctl {/* UTMI bias and tracking */ struct clk *usb2_trk_clk; -unsigned int bias_pad_enable; +DECLARE_BITMAP (utmi_pad_enabled,TEGRA_UTMI_PAD_MAX );/* padctl context */ struct tegra186_xusb_padctl_context context;@@ -603,12 +605,8 @@ static void tegra186_utmi_bias_pad_power_on(struct tegra_xusb_padctl *padctl)u32 value;int err; -mutex_lock (&padctl->lock); - -if (priv->bias_pad_enable++ >0 ) { -mutex_unlock (&padctl->lock); +if (!bitmap_empty (priv->utmi_pad_enabled,TEGRA_UTMI_PAD_MAX ))return ; - } err =clk_prepare_enable (priv->usb2_trk_clk);if (err <0 )@@ -667,17 +665,8 @@ static void tegra186_utmi_bias_pad_power_off(struct tegra_xusb_padctl *padctl)struct tegra186_xusb_padctl *priv =to_tegra186_xusb_padctl (padctl);u32 value; -mutex_lock (&padctl->lock); - -if (WARN_ON (priv->bias_pad_enable ==0 )) { -mutex_unlock (&padctl->lock); -return ; - } - -if (--priv->bias_pad_enable >0 ) { -mutex_unlock (&padctl->lock); +if (!bitmap_empty (priv->utmi_pad_enabled,TEGRA_UTMI_PAD_MAX ))return ; - } value =padctl_readl (padctl,XUSB_PADCTL_USB2_BIAS_PAD_CTL1 ); value |=USB2_PD_TRK ;@@ -690,13 +679,13 @@ static void tegra186_utmi_bias_pad_power_off(struct tegra_xusb_padctl *padctl)clk_disable_unprepare (priv->usb2_trk_clk); } -mutex_unlock (&padctl->lock); }static void tegra186_utmi_pad_power_on (struct phy *phy) {struct tegra_xusb_lane *lane =phy_get_drvdata (phy);struct tegra_xusb_padctl *padctl = lane->pad->padctl; +struct tegra186_xusb_padctl *priv =to_tegra186_xusb_padctl (padctl);struct tegra_xusb_usb2_port *port;struct device *dev = padctl->dev;unsigned int index = lane->index;@@ -705,9 +694,16 @@ static void tegra186_utmi_pad_power_on(struct phy *phy)if (!phy)return ; +mutex_lock (&padctl->lock); +if (test_bit (index, priv->utmi_pad_enabled)) { +mutex_unlock (&padctl->lock); +return ; + } + port =tegra_xusb_find_usb2_port (padctl, index);if (!port) {dev_err (dev,"no port found for USB2 lane %u\n" , index); +mutex_unlock (&padctl->lock);return ; }@@ -724,18 +720,28 @@ static void tegra186_utmi_pad_power_on(struct phy *phy) value =padctl_readl (padctl,XUSB_PADCTL_USB2_OTG_PADX_CTL1 (index)); value &= ~USB2_OTG_PD_DR ;padctl_writel (padctl, value,XUSB_PADCTL_USB2_OTG_PADX_CTL1 (index)); + +set_bit (index, priv->utmi_pad_enabled); +mutex_unlock (&padctl->lock); }static void tegra186_utmi_pad_power_down (struct phy *phy) {struct tegra_xusb_lane *lane =phy_get_drvdata (phy);struct tegra_xusb_padctl *padctl = lane->pad->padctl; +struct tegra186_xusb_padctl *priv =to_tegra186_xusb_padctl (padctl);unsigned int index = lane->index;u32 value;if (!phy)return ; +mutex_lock (&padctl->lock); +if (!test_bit (index, priv->utmi_pad_enabled)) { +mutex_unlock (&padctl->lock); +return ; + } +dev_dbg (padctl->dev,"power down UTMI pad %u\n" , index); value =padctl_readl (padctl,XUSB_PADCTL_USB2_OTG_PADX_CTL0 (index));@@ -748,7 +754,11 @@ static void tegra186_utmi_pad_power_down(struct phy *phy)
drivers/phy/tegra/xusb-tegra186.c static void tegra186_utmi_pad_power_down(struct phy *phy) · line 764
Quoted 10 lines
drivers/phy/tegra/xusb-tegra186.c +4
-0udelay (2 ); +clear_bit (index, priv->utmi_pad_enabled); +tegra186_utmi_bias_pad_power_off (padctl); + +mutex_unlock (&padctl->lock); } static int tegra186_xusb_padctl_vbus_override(struct tegra_xusb_padctl *padctl,
Cheers!
Jon
Signature · 1 line
nvpublic
Quoted 21 lines · Wayne Chang
The current implementation uses
bias_pad_enableas a reference count to manage the shared bias pad for all UTMI PHYs. However, during system suspension with connected USB devices, multiple power-down requests for the UTMI pad result in a mismatch in the reference count, which in turn produces warnings such as:[ 237.762967] WARNING: CPU: 10 PID: 1618 at tegra186_utmi_pad_power_down+0x160/0x170 [ 237.763103] Call trace: [ 237.763104] tegra186_utmi_pad_power_down+0x160/0x170 [ 237.763107] tegra186_utmi_phy_power_off+0x10/0x30 [ 237.763110] phy_power_off+0x48/0x100 [ 237.763113] tegra_xusb_enter_elpg+0x204/0x500 [ 237.763119] tegra_xusb_suspend+0x48/0x140 [ 237.763122] platform_pm_suspend+0x2c/0xb0 [ 237.763125] dpm_run_callback.isra.0+0x20/0xa0 [ 237.763127] __device_suspend+0x118/0x330 [ 237.763129] dpm_suspend+0x10c/0x1f0 [ 237.763130] dpm_suspend_start+0x88/0xb0 [ 237.763132] suspend_devices_and_enter+0x120/0x500 [ 237.763135] pm_suspend+0x1ec/0x270
Quoted 1 line
[...]
Applied, thanks!
[1/1] phy: tegra: xusb: Use a bitmask for UTMI pad power state tracking
commit: b47158fb42959c417ff2662075c0d46fb783d5d1
Best regards,
Signature · 1 line
~Vinod