2023-11-05 09:51:58

by Jan Kiszka

Subject: [PATCH net v2] net: ti: icssg-prueth: Add missing icss_iep_put to error path

From: Jan Kiszka <[email protected]>

Analogously to prueth_remove.

Fixes: 186734c15886 ("net: ti: icssg-prueth: add packet timestamping and ptp support")
Fixes: 443a2367ba3c ("net: ti: icssg-prueth: am65x SR2.0 add 10M full duplex support")
Signed-off-by: Jan Kiszka <[email protected]>
---

Changes in v2:
- add proper tags

This was lost from the TI SDK version while ripping out SR1.0 support -
which we are currently restoring for upstream.

drivers/net/ethernet/ti/icssg/icssg_prueth.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
index 6c4b64227ac8..d119b2bb8158 100644
--- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c
+++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
@@ -2206,6 +2206,9 @@ static int prueth_probe(struct platform_device *pdev)
if (prueth->pdata.quirk_10m_link_issue)
icss_iep_exit_fw(prueth->iep1);

+ icss_iep_put(prueth->iep1);
+ icss_iep_put(prueth->iep0);
+
free_pool:
gen_pool_free(prueth->sram_pool,
(unsigned long)prueth->msmcram.va, msmc_ram_size);
--
2.35.3

2023-11-06 10:16:18

by Wojciech Drewek

Subject: Re: [PATCH net v2] net: ti: icssg-prueth: Add missing icss_iep_put to error path

On 05.11.2023 10:51, Jan Kiszka wrote:
> From: Jan Kiszka <[email protected]>
>
> Analogously to prueth_remove.
>
> Fixes: 186734c15886 ("net: ti: icssg-prueth: add packet timestamping and ptp support")
> Fixes: 443a2367ba3c ("net: ti: icssg-prueth: am65x SR2.0 add 10M full duplex support")
> Signed-off-by: Jan Kiszka <[email protected]>
> ---
>
> Changes in v2:
> - add proper tags
>
> This was lost from the TI SDK version while ripping out SR1.0 support -
> which we are currently restoring for upstream.
>
> drivers/net/ethernet/ti/icssg/icssg_prueth.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
> index 6c4b64227ac8..d119b2bb8158 100644
> --- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c
> +++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
> @@ -2206,6 +2206,9 @@ static int prueth_probe(struct platform_device *pdev)
> if (prueth->pdata.quirk_10m_link_issue)
> icss_iep_exit_fw(prueth->iep1);
>
> + icss_iep_put(prueth->iep1);
> + icss_iep_put(prueth->iep0);

We could improve it even more IMO.
If we fail to get prueth->iep0 we go to the free_pool (already done)
If we fail to get prueth->iep1 we should go to something like "put_iep0" which calls icss_iep_put(prueth->iep0);
And in case of exit_iep we can call icss_iep_put(prueth->iep1);

> +
> free_pool:
> gen_pool_free(prueth->sram_pool,
> (unsigned long)prueth->msmcram.va, msmc_ram_size);