| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <9cc2d594-a930-4c4a-86ee-47228af28936@gmail.com>
Date: Fri, 27 Sep 2024 14:16:42 +0800
From: Frank Wang <frawang.cn@...il.com>
To: Heiko Stuebner <heiko@...ech.de>, vkoul@...nel.org, kishon@...nel.org,
robh@...nel.org, krzk+dt@...nel.org, conor+dt@...nel.org
Cc: linux-phy@...ts.infradead.org, devicetree@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
linux-rockchip@...ts.infradead.org, william.wu@...k-chips.com,
tim.chen@...k-chips.com, frank.wang@...k-chips.com
Subject: Re: [PATCH v3 2/2] phy: rockchip: inno-usb2: Add usb2 phys support
for rk3576
Hi Heiko,
On 2024/9/26 18:48, Heiko Stuebner wrote:
> Am Donnerstag, 26. September 2024, 12:32:23 CEST schrieb Frank Wang:
>> From: William Wu <william.wu@...k-chips.com>
>>
>> The RK3576 SoC has two independent USB2.0 PHYs, and each PHY has
>> one port.
>>
>> This change also converts the clock management from single to bulk
>> as some Rockchip SoCs (e.g RK3576) have more than one clock.
>>
>> Signed-off-by: William Wu <william.wu@...k-chips.com>
>> Signed-off-by: Frank Wang <frank.wang@...k-chips.com>
>> ---
>> Changelog:
>> v3:
>> - amend the commit log adds clocks converting.
>> - retrieve the clock by "clks.id" in *_clk480m_register() function.
>>
>> v2:
>> - no changes.
>> v1:
>> - https://patchwork.kernel.org/project/linux-phy/patch/20240923025326.10467-2-frank.wang@rock-chips.com/
>>
>> drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 139 +++++++++++++++++-
>> 1 file changed, 131 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
>> index 4f71373ae6e1..642c7857c5ae 100644
>> --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
>> +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
>> @@ -229,9 +229,10 @@ struct rockchip_usb2phy_port {
>> * @dev: pointer to device.
>> * @grf: General Register Files regmap.
>> * @usbgrf: USB General Register Files regmap.
>> - * @clk: clock struct of phy input clk.
>> + * @clks: array of phy input clocks.
>> * @clk480m: clock struct of phy output clk.
>> * @clk480m_hw: clock struct of phy output clk management.
>> + * @num_clks: number of phy input clocks.
>> * @phy_reset: phy reset control.
>> * @chg_state: states involved in USB charger detection.
>> * @chg_type: USB charger types.
>> @@ -246,9 +247,10 @@ struct rockchip_usb2phy {
>> struct device *dev;
>> struct regmap *grf;
>> struct regmap *usbgrf;
>> - struct clk *clk;
>> + struct clk_bulk_data *clks;
>> struct clk *clk480m;
>> struct clk_hw clk480m_hw;
>> + int num_clks;
>> struct reset_control *phy_reset;
>> enum usb_chg_state chg_state;
>> enum power_supply_type chg_type;
>> @@ -376,7 +378,9 @@ rockchip_usb2phy_clk480m_register(struct rockchip_usb2phy *rphy)
>> {
>> struct device_node *node = rphy->dev->of_node;
>> struct clk_init_data init;
>> + struct clk *refclk = NULL;
>> const char *clk_name;
>> + int i;
>> int ret = 0;
>>
>> init.flags = 0;
>> @@ -386,8 +390,15 @@ rockchip_usb2phy_clk480m_register(struct rockchip_usb2phy *rphy)
>> /* optional override of the clockname */
>> of_property_read_string(node, "clock-output-names", &init.name);
>>
>> - if (rphy->clk) {
>> - clk_name = __clk_get_name(rphy->clk);
>> + for (i = 0; i < rphy->num_clks; i++) {
>> + if (!strncmp(rphy->clks[i].id, "phyclk", 6)) {
>> + refclk = rphy->clks[i].clk;
>> + break;
>> + }
>> + }
>> +
>> + if (!IS_ERR(refclk)) {
>> + clk_name = __clk_get_name(refclk);
>> init.parent_names = &clk_name;
>> init.num_parents = 1;
>> } else {
>> @@ -1406,22 +1417,29 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
>> if (IS_ERR(rphy->phy_reset))
>> return PTR_ERR(rphy->phy_reset);
>>
>> - rphy->clk = devm_clk_get_optional_enabled(dev, "phyclk");
>> - if (IS_ERR(rphy->clk)) {
>> - return dev_err_probe(&pdev->dev, PTR_ERR(rphy->clk),
>> + ret = devm_clk_bulk_get_all(dev, &rphy->clks);
>> + if (ret == -EPROBE_DEFER) {
>> + return dev_err_probe(&pdev->dev, -EPROBE_DEFER,
>> "failed to get phyclk\n");
>> }
>>
>> + /* Clocks are optional */
>> + rphy->num_clks = ret < 0 ? 0 : ret;
>> +
>> ret = rockchip_usb2phy_clk480m_register(rphy);
>> if (ret) {
>> dev_err(dev, "failed to register 480m output clock\n");
>> return ret;
>> }
>>
>> + ret = clk_bulk_prepare_enable(rphy->num_clks, rphy->clks);
>> + if (ret)
>> + return ret;
>> +
> Do you actually need that separate enable step?
> There exists devm_clk_bulk_get_all_enable()
>
> https://elixir.bootlin.com/linux/v6.11/source/include/linux/clk.h#L511
>
> which you could use above. Especially as otherwise you'd need a remove
> callback to disable the clock on driver unbind?
>
Using devm_clk_bulk_get_all() just can get clocknumbers,
anddevm_clk_bulk_get_all_enable() is not.
It seems that there is no other API can get the number of clocks separately.
>> if (rphy->phy_cfg->phy_tuning) {
>> ret = rphy->phy_cfg->phy_tuning(rphy);
>> if (ret)
>> - return ret;
>> + goto disable_clks;
>> }
>>
>> index = 0;
>> @@ -1484,6 +1502,8 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
>>
>> put_child:
>> of_node_put(child_np);
>> +disable_clks:
>> + clk_bulk_disable_unprepare(rphy->num_clks, rphy->clks);
>> return ret;
>> }
>>
>> @@ -1495,6 +1515,30 @@ static int rk3128_usb2phy_tuning(struct rockchip_usb2phy *rphy)
>> BIT(2) << BIT_WRITEABLE_SHIFT | 0);
>> }
>
> I still maintain, that this maybe should be two separate patches.
> And you even seem to have nice "cut-here" in it ;-)
>
> The code above converts the driver to use clk_bulk to handle
> multiple clocks for controller variants needing it.
>
>
> And the code below adds the rk3576-specific data to the driver.
>
Make sense, I shall split two separate patches in the next version.
BTW, should I send the clk_bulk process patch as a separate series? I
mean I shouldn't send it together with this series, right?
Best regards,
Frank
>
>> [...]
>>
>> +
>> static const struct rockchip_usb2phy_cfg rk3588_phy_cfgs[] = {
>> {
>> .reg = 0x0000,
>> @@ -2094,6 +2216,7 @@ static const struct of_device_id rockchip_usb2phy_dt_match[] = {
>> { .compatible = "rockchip,rk3366-usb2phy", .data = &rk3366_phy_cfgs },
>> { .compatible = "rockchip,rk3399-usb2phy", .data = &rk3399_phy_cfgs },
>> { .compatible = "rockchip,rk3568-usb2phy", .data = &rk3568_phy_cfgs },
>> + { .compatible = "rockchip,rk3576-usb2phy", .data = &rk3576_phy_cfgs },
>> { .compatible = "rockchip,rk3588-usb2phy", .data = &rk3588_phy_cfgs },
>> { .compatible = "rockchip,rv1108-usb2phy", .data = &rv1108_phy_cfgs },
>> {}
>>
>
Powered by blists - more mailing lists