On 11/20/23 11:46 AM, Claudiu wrote:
> From: Claudiu Beznea <[email protected]>
> RZ/G3S supports enabling/disabling clocks for its modules (including
> Ethernet module). For this commit adds runtime PM support which
> relies on PM domain to enable/disable Ethernet clocks.
That's not exactly something new in RZ/G3S. The ravb driver has unconditional
RPM calls already in the probe() and remove() methods... And the sh_eth driver
has RPM support since 2009...
> At the end of probe ravb_pm_runtime_put() is called which will turn
I'd suggest a shorter name, like ravb_rpm_put() but (looking at this function)
it doesn't seem hardly needed...
> off the Ethernet clocks (if no other request arrives at the driver).
> After that if the interface is brought up (though ravb_open()) then
> the clocks remain enabled until interface is brought down (operation
> done though ravb_close()).
>
> If any request arrives to the driver while the interface is down the
> clocks are enabled to serve the request and then disabled.
>
> Signed-off-by: Claudiu Beznea <[email protected]>
> ---
> drivers/net/ethernet/renesas/ravb.h | 1 +
> drivers/net/ethernet/renesas/ravb_main.c | 99 ++++++++++++++++++++++--
> 2 files changed, 93 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
> index c2d8d890031f..50f358472aab 100644
> --- a/drivers/net/ethernet/renesas/ravb.h
> +++ b/drivers/net/ethernet/renesas/ravb.h
> @@ -1044,6 +1044,7 @@ struct ravb_hw_info {
> unsigned magic_pkt:1; /* E-MAC supports magic packet detection */
> unsigned half_duplex:1; /* E-MAC supports half duplex mode */
> unsigned refclk_in_pd:1; /* Reference clock is part of a power domain. */
> + unsigned rpm:1; /* Runtime PM available. */
No, I don't think this flag makes any sense. We should support RPM
unconditionally...
[...]
> diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
> index f4634ac0c972..d70ed7e5f7f6 100644
> --- a/drivers/net/ethernet/renesas/ravb_main.c
> +++ b/drivers/net/ethernet/renesas/ravb_main.c
> @@ -145,12 +145,41 @@ static void ravb_read_mac_address(struct device_node *np,
[...]
> +static void ravb_pm_runtime_put(struct ravb_private *priv)
> +{
> + const struct ravb_hw_info *info = priv->info;
> + struct device *dev = &priv->pdev->dev;
> +
> + if (!info->rpm)
> + return;
> +
> + pm_runtime_mark_last_busy(dev);
Not very familiar with RPM... what's this for?
> + pm_runtime_put_autosuspend(dev);
Why not the usual pm_runtime_put()?
> +}
> +
> static void ravb_mdio_ctrl(struct mdiobb_ctrl *ctrl, u32 mask, int set)
> {
> struct ravb_private *priv = container_of(ctrl, struct ravb_private,
> mdiobb);
> + int ret;
> +
> + ret = ravb_pm_runtime_get(priv);
> + if (ret < 0)
> + return;
>
> ravb_modify(priv->ndev, PIR, mask, set ? mask : 0);
> +
> + ravb_pm_runtime_put(priv);
Hmm, does this even work? :-/ Do the MDIO bits retain the values while
the AVB core is not clocked or even powered down?
Note that the sh_eth driver has RPM calls in the {read|write}_c{22?45}()
methods which do the full register read/write while the core is powere up
and clocked...
[...]
> @@ -2064,6 +2107,11 @@ static struct net_device_stats *ravb_get_stats(struct net_device *ndev)
> struct ravb_private *priv = netdev_priv(ndev);
> const struct ravb_hw_info *info = priv->info;
> struct net_device_stats *nstats, *stats0, *stats1;
> + int ret;
> +
> + ret = ravb_pm_runtime_get(priv);
> + if (ret < 0)
> + return NULL;
Hm, sh_eth.c doesn't have any RPM calls in this method. Again, do
the hardware counters remain valid across powering the MAC core down?
[...]
> @@ -2115,11 +2165,18 @@ static void ravb_set_rx_mode(struct net_device *ndev)
> {
> struct ravb_private *priv = netdev_priv(ndev);
> unsigned long flags;
> + int ret;
> +
> + ret = ravb_pm_runtime_get(priv);
> + if (ret < 0)
> + return;
Hm, sh_eth.c doesn't have any RPM calls in this method either.
Does changing the promiscous mode have sense for an offlined interface?
[...]
> @@ -2187,6 +2244,11 @@ static int ravb_close(struct net_device *ndev)
> if (info->nc_queues)
> ravb_ring_free(ndev, RAVB_NC);
>
> + /* Note that if RPM is enabled on plaforms with ccc_gac=1 this needs to be
It's "platforms". :-)
> skipped and
Overly long line?
> + * added to suspend function after PTP is stopped.
I guess we'll have to do that because RPM is actually not RZ/G3
specific...
> + */
> + ravb_pm_runtime_put(priv);
> +
> return 0;
> }
>
> @@ -2636,6 +2699,12 @@ static int ravb_probe(struct platform_device *pdev)
> if (error)
> return error;
>
> + info = of_device_get_match_data(&pdev->dev);
> +
> + if (info->rpm) {
> + pm_runtime_set_autosuspend_delay(&pdev->dev, 100);
Why exactly 100 ms?
> + pm_runtime_use_autosuspend(&pdev->dev);
> + }
Before calling pm_runtime_enable()?
> pm_runtime_enable(&pdev->dev);
[...]
> @@ -2880,6 +2950,8 @@ static int ravb_probe(struct platform_device *pdev)
> pm_runtime_put(&pdev->dev);
> pm_runtime_disable:
> pm_runtime_disable(&pdev->dev);
> + if (info->rpm)
> + pm_runtime_dont_use_autosuspend(&pdev->dev);
After calling pm_runtime_disable()?
[...]
> @@ -2908,6 +2985,8 @@ static void ravb_remove(struct platform_device *pdev)
> priv->desc_bat_dma);
> pm_runtime_put_sync(&pdev->dev);
> pm_runtime_disable(&pdev->dev);
> + if (info->rpm)
> + pm_runtime_dont_use_autosuspend(&pdev->dev);
After calling pm_runtime_disable()?
[...]
MBR, Sergey
On 22.11.2023 18:25, Sergey Shtylyov wrote:
> On 11/20/23 11:46 AM, Claudiu wrote:
>
>> From: Claudiu Beznea <[email protected]>
>
>> RZ/G3S supports enabling/disabling clocks for its modules (including
>> Ethernet module). For this commit adds runtime PM support which
>> relies on PM domain to enable/disable Ethernet clocks.
>
> That's not exactly something new in RZ/G3S. The ravb driver has unconditional
> RPM calls already in the probe() and remove() methods...
> And the sh_eth driver
> has RPM support since 2009...
>
>> At the end of probe ravb_pm_runtime_put() is called which will turn
>
> I'd suggest a shorter name, like ravb_rpm_put() but (looking at this function)
> it doesn't seem hardly needed...
>
>> off the Ethernet clocks (if no other request arrives at the driver).
>> After that if the interface is brought up (though ravb_open()) then
>> the clocks remain enabled until interface is brought down (operation
>> done though ravb_close()).
>>
>> If any request arrives to the driver while the interface is down the
>> clocks are enabled to serve the request and then disabled.
>>
>> Signed-off-by: Claudiu Beznea <[email protected]>
>> ---
>> drivers/net/ethernet/renesas/ravb.h | 1 +
>> drivers/net/ethernet/renesas/ravb_main.c | 99 ++++++++++++++++++++++--
>> 2 files changed, 93 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
>> index c2d8d890031f..50f358472aab 100644
>> --- a/drivers/net/ethernet/renesas/ravb.h
>> +++ b/drivers/net/ethernet/renesas/ravb.h
>> @@ -1044,6 +1044,7 @@ struct ravb_hw_info {
>> unsigned magic_pkt:1; /* E-MAC supports magic packet detection */
>> unsigned half_duplex:1; /* E-MAC supports half duplex mode */
>> unsigned refclk_in_pd:1; /* Reference clock is part of a power domain. */
>> + unsigned rpm:1; /* Runtime PM available. */
>
> No, I don't think this flag makes any sense. We should support RPM
> unconditionally...
The reasons I've limited only to RZ/G3S are:
1/ I don't have all the platforms to test it
2/ on G1H this doesn't work. I tried to debugged it but I don't have a
platform at hand, only remotely, and is hardly to debug once the
ethernet fails to work: probe is working(), open is executed, PHY is
initialized and then TX/RX is not working... don't know why ATM.
>
> [...]
>> diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
>> index f4634ac0c972..d70ed7e5f7f6 100644
>> --- a/drivers/net/ethernet/renesas/ravb_main.c
>> +++ b/drivers/net/ethernet/renesas/ravb_main.c
>> @@ -145,12 +145,41 @@ static void ravb_read_mac_address(struct device_node *np,
> [...]
>> +static void ravb_pm_runtime_put(struct ravb_private *priv)
>> +{
>> + const struct ravb_hw_info *info = priv->info;
>> + struct device *dev = &priv->pdev->dev;
>> +
>> + if (!info->rpm)
>> + return;
>> +
>> + pm_runtime_mark_last_busy(dev);
>
> Not very familiar with RPM... what's this for?
It timestamps the last time the device has been used and then after
autosuspend delay ms passes starting from this timestamp RPM core suspends
the device. It's useful if there are consecutive requests to driver to
avoid actually doing hardware changes for each RPM get/put.
>
>> + pm_runtime_put_autosuspend(dev);
>
> Why not the usual pm_runtime_put()?
For the same reason explained above.
>
>> +}
>> +
>> static void ravb_mdio_ctrl(struct mdiobb_ctrl *ctrl, u32 mask, int set)
>> {
>> struct ravb_private *priv = container_of(ctrl, struct ravb_private,
>> mdiobb);
>> + int ret;
>> +
>> + ret = ravb_pm_runtime_get(priv);
>> + if (ret < 0)
>> + return;
>>
>> ravb_modify(priv->ndev, PIR, mask, set ? mask : 0);
>> +
>> + ravb_pm_runtime_put(priv);
>
> Hmm, does this even work? :-/ Do the MDIO bits retain the values while
> the AVB core is not clocked or even powered down?
This actually is not needed. It's a leftover. I double checked with
mii-tools to access the device while the interface is down and the IOCTL is
blocked in this case by
https://elixir.bootlin.com/linux/latest/source/drivers/net/ethernet/renesas/ravb_main.c#L2266
> Note that the sh_eth driver has RPM calls in the {read|write}_c{22?45}()
> methods which do the full register read/write while the core is powere up
> and clocked...
>
> [...]
>> @@ -2064,6 +2107,11 @@ static struct net_device_stats *ravb_get_stats(struct net_device *ndev)
>> struct ravb_private *priv = netdev_priv(ndev);
>> const struct ravb_hw_info *info = priv->info;
>> struct net_device_stats *nstats, *stats0, *stats1;
>> + int ret;
>> +
>> + ret = ravb_pm_runtime_get(priv);
>> + if (ret < 0)
>> + return NULL;
>
> Hm, sh_eth.c doesn't have any RPM calls in this method. Again, do
In setups where systemd is enabled, user space calls this method in
different stages (e.g. at boot time or when running ifconfig ethX, even if
interface is down). W/o runtime resuming here the system will fail to boot.
The other approach I wanted to take was to:
if (!netif_running(dev))
return &ndev->stats;
But I didn't choose this path as there are some counters updated to nstat
only in this function, e.g. nstats->tx_dropped += ravb_read(ndev, TROCR);
and wanted an opinion about it.
> the hardware counters remain valid across powering the MAC core down?
The power domain that the Ethernet clocks of RZ/G3S belong disables the
clock and switches the Ethernet module to standby. There is no information
in HW manual that the content of registers will be lost.
>
> [...]
>> @@ -2115,11 +2165,18 @@ static void ravb_set_rx_mode(struct net_device *ndev)
>> {
>> struct ravb_private *priv = netdev_priv(ndev);
>> unsigned long flags;
>> + int ret;
>> +
>> + ret = ravb_pm_runtime_get(priv);
>> + if (ret < 0)
>> + return;
>
> Hm, sh_eth.c doesn't have any RPM calls in this method either.
> Does changing the promiscous mode have sense for an offlined interface?
I've added it for scenarios when the interface is down and user tries to
configure it. I don't know to answer your question. W/o RPM resume here
user space blocks if tries to access it and interface is down. I can just
return if interface is down. Let me know if you prefer this way.
>
> [...]
>> @@ -2187,6 +2244,11 @@ static int ravb_close(struct net_device *ndev)
>> if (info->nc_queues)
>> ravb_ring_free(ndev, RAVB_NC);
>>
>> + /* Note that if RPM is enabled on plaforms with ccc_gac=1 this needs to be
>
> It's "platforms". :-)
>
>> skipped and
>
> Overly long line?
Not more than 100 chars. Do you want it to 80?
>
>> + * added to suspend function after PTP is stopped.
>
> I guess we'll have to do that because RPM is actually not RZ/G3
> specific...
yes
>
>> + */
>> + ravb_pm_runtime_put(priv);
>> +
>> return 0;
>> }
>>
>> @@ -2636,6 +2699,12 @@ static int ravb_probe(struct platform_device *pdev)
>> if (error)
>> return error;
>>
>> + info = of_device_get_match_data(&pdev->dev);
>> +
>> + if (info->rpm) {
>> + pm_runtime_set_autosuspend_delay(&pdev->dev, 100);
>
> Why exactly 100 ms?
I noticed Ethernet drivers using this functionality are using this default
value. It can be anyway changed though sysfs.
>
>> + pm_runtime_use_autosuspend(&pdev->dev);
>> + }
>
> Before calling pm_runtime_enable()?
Drivers that I know and checked sets autosuspend before enabling RPM. Code
seems written to allow both scenarios but I think it's better to have
everything setup before enabling RPM.
>
>> pm_runtime_enable(&pdev->dev);
> [...]
>> @@ -2880,6 +2950,8 @@ static int ravb_probe(struct platform_device *pdev)
>> pm_runtime_put(&pdev->dev);
>> pm_runtime_disable:
>> pm_runtime_disable(&pdev->dev);
>> + if (info->rpm)
>> + pm_runtime_dont_use_autosuspend(&pdev->dev);
>
> After calling pm_runtime_disable()?
Based on the above explanation and the fact that I would like to keep the
calls here in reverse order I prefer to have it in this way.
>
> [...]
>> @@ -2908,6 +2985,8 @@ static void ravb_remove(struct platform_device *pdev)
>> priv->desc_bat_dma);
>> pm_runtime_put_sync(&pdev->dev);
>> pm_runtime_disable(&pdev->dev);
>> + if (info->rpm)
>> + pm_runtime_dont_use_autosuspend(&pdev->dev);
>
> After calling pm_runtime_disable()?
Ditto.
>
> [...]
>
> MBR, Sergey