phy: tegra: xusb: Fix crash during pad power on/down
Jon Hunter
maintainerPATCH 1/1 phy: tegra: xusb: Fix crash during pad power on/down
Commit a88520bfc0ec ("usb: gadget: tegra: Reduce pad power") added calls to tegra_phy_xusb_utmi_pad_power_on/down in the Tegra XUDC driver to control the pad power. This change is causing a kernel panic when powering down the pads on entering suspend with the Jetson TX2 platform. The panic occurs because the 'xudc->curr_utmi_phy' is not configured on this platform and we do not check to see if the pointer is valid before attempting to deference the pointer. Fix this by checking to see if the 'phy' pointer passed to tegra_phy_xusb_utmi_pad_power_on/down is valid.
--- drivers/phy/tegra/xusb.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/phy/tegra/xusb.c +16 -4
@@ -1461,8 +1461,14 @@ EXPORT_SYMBOL_GPL(tegra_phy_xusb_utmi_port_reset);void tegra_phy_xusb_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 tegra_xusb_lane *lane; +struct tegra_xusb_padctl *padctl; + +if (!phy) +return ; + + lane =phy_get_drvdata (phy); + padctl = lane->pad->padctl;if (padctl->soc->ops->utmi_pad_power_on) padctl->soc->ops->utmi_pad_power_on (phy);
@@ -1471,8 +1477,14 @@ EXPORT_SYMBOL_GPL(tegra_phy_xusb_utmi_pad_power_on);void tegra_phy_xusb_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 tegra_xusb_lane *lane; +struct tegra_xusb_padctl *padctl; + +if (!phy) +return ; + + lane =phy_get_drvdata (phy); + padctl = lane->pad->padctl;if (padctl->soc->ops->utmi_pad_power_down) padctl->soc->ops->utmi_pad_power_down (phy);
Signature · 1 line
2.7.4
Quoted 8 lines · Jon Hunter
Commit
a88520bfc0ec("usb: gadget: tegra: Reduce pad power") added calls to tegra_phy_xusb_utmi_pad_power_on/down in the Tegra XUDC driver to control the pad power. This change is causing a kernel panic when powering down the pads on entering suspend with the Jetson TX2 platform. The panic occurs because the 'xudc->curr_utmi_phy' is not configured on this platform and we do not check to see if the pointer is valid before attempting to deference the pointer. Fix this by checking to see if the 'phy' pointer passed to tegra_phy_xusb_utmi_pad_power_on/down is valid.
Applied, thanks
Signature · 1 line
~Vinod
Jon Hunter
maintainerHi Vinod,
Quoted 10 lines · Vinod Koul
Quoted 8 lines · Jon Hunter
Commit
a88520bfc0ec("usb: gadget: tegra: Reduce pad power") added calls to tegra_phy_xusb_utmi_pad_power_on/down in the Tegra XUDC driver to control the pad power. This change is causing a kernel panic when powering down the pads on entering suspend with the Jetson TX2 platform. The panic occurs because the 'xudc->curr_utmi_phy' is not configured on this platform and we do not check to see if the pointer is valid before attempting to deference the pointer. Fix this by checking to see if the 'phy' pointer passed to tegra_phy_xusb_utmi_pad_power_on/down is valid.
Quoted 2 lines
Applied, thanks
We need this fix for Linux v6.1. The crash is still seen as of v6.1-rc3.
Thanks
Jon
Signature · 1 line
nvpublic
Vinod Koul
maintainerQuoted 13 lines · Jon Hunter
Hi Vinod,
Quoted 10 lines · Vinod Koul
Quoted 8 lines · Jon Hunter
Commit
a88520bfc0ec("usb: gadget: tegra: Reduce pad power") added calls to tegra_phy_xusb_utmi_pad_power_on/down in the Tegra XUDC driver to control the pad power. This change is causing a kernel panic when powering down the pads on entering suspend with the Jetson TX2 platform. The panic occurs because the 'xudc->curr_utmi_phy' is not configured on this platform and we do not check to see if the pointer is valid before attempting to deference the pointer. Fix this by checking to see if the 'phy' pointer passed to tegra_phy_xusb_utmi_pad_power_on/down is valid.
Quoted 4 lines
Quoted 2 lines
Applied, thanks
We need this fix for Linux v6.1. The crash is still seen as of v6.1-rc3.
This is in phy/fixes so should be in v6.1 or in linus's tree shortly
Signature · 1 line
~Vinod