Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

rockchip: rockchip-inno-usb2: Fix Synchronous Abort on usb start

Browse Source 
Fix NULL pointer dereference that happen when rockchip-inno-usb2 clock
enabled before device probe. This early clock enable call happen in process
of parent clock activation added in ac30d90f33.

Fixes: 229218373c ("phy: rockchip-inno-usb2: Add support for clkout_ctl_phy").
Fixes: ac30d90f33 ("clk: Ensure the parent clocks are enabled while reparenting")
Co-authored-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Alex Shumsky <alexthreed@gmail.com>
Reviewed-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Alex Shumsky
2025-07-03 09:04:48 +03:00
committed by Kever Yang
parent e4c8b32d03
commit 1848a50437
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/phy/rockchip/phy-rockchip-inno-usb2.c
View File

@@ -167,20 +167,27 @@ static struct phy_ops rockchip_usb2phy_ops = {
.of_xlate = rockchip_usb2phy_of_xlate,
};
static void rockchip_usb2phy_clkout_ctl(struct clk *clk, struct regmap **base,
const struct usb2phy_reg **clkout_ctl)
static int rockchip_usb2phy_clkout_ctl(struct clk *clk, struct regmap **base,
const struct usb2phy_reg **clkout_ctl)
{
struct udevice *parent = dev_get_parent(clk->dev);
struct rockchip_usb2phy *priv = dev_get_priv(parent);
const struct rockchip_usb2phy_cfg *phy_cfg = priv->phy_cfg;
if (priv->phy_cfg->clkout_ctl_phy.enable) {
// phy_cfg can be NULL if this function called before probe (when parent
// clocks are enabled)
if (!phy_cfg)
return -EINVAL;
if (phy_cfg->clkout_ctl_phy.enable) {
*base = priv->phy_base;
*clkout_ctl = &phy_cfg->clkout_ctl_phy;
} else {
*base = priv->reg_base;
*clkout_ctl = &phy_cfg->clkout_ctl;
}
return 0;
}
/**
@@ -206,7 +213,8 @@ int rockchip_usb2phy_clk_enable(struct clk *clk)
const struct usb2phy_reg *clkout_ctl;
struct regmap *base;
rockchip_usb2phy_clkout_ctl(clk, &base, &clkout_ctl);
if (rockchip_usb2phy_clkout_ctl(clk, &base, &clkout_ctl))
return -ENOSYS;
/* turn on 480m clk output if it is off */
if (!property_enabled(base, clkout_ctl)) {
@@ -230,7 +238,8 @@ int rockchip_usb2phy_clk_disable(struct clk *clk)
const struct usb2phy_reg *clkout_ctl;
struct regmap *base;
rockchip_usb2phy_clkout_ctl(clk, &base, &clkout_ctl);
if (rockchip_usb2phy_clkout_ctl(clk, &base, &clkout_ctl))
return -ENOSYS;
/* turn off 480m clk output */
property_enable(base, clkout_ctl, false);