[PATCH net-next v5 0/2] Fix CPTS release action in am65-cpts driver

mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed

* [PATCH net-next v5 0/2] Fix CPTS release action in am65-cpts driver
@ 2023-01-20  7:07 Siddharth Vadapalli
  2023-01-20  7:07 ` [PATCH net-next v5 1/2] net: ethernet: ti: am65-cpsw: Delete unreachable error handling code Siddharth Vadapalli
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Siddharth Vadapalli @ 2023-01-20  7:07 UTC (permalink / raw)
  To: davem, edumazet, kuba, linux, pabeni, rogerq, leon
  Cc: leonro, anthony.l.nguyen, netdev, linux-kernel, linux-arm-kernel,
	vigneshr, srk, s-vadapalli

Delete unreachable code in am65_cpsw_init_cpts() function, which was
Reported-by: Leon Romanovsky <leon@kernel.org>
at:
https://lore.kernel.org/r/Y8aHwSnVK9+sAb24@unreal

Remove the devm action associated with am65_cpts_release() and invoke the
function directly on the cleanup and exit paths.

Changes from v4:
1. Rebase series on net-next commit: cff9b79e9ad5
2. Collect Reviewed-by tags from Leon Romanovsky, Tony Nguyen and
   Roger Quadros for all patches in the series.

Changes from v3:
1. Rebase patch 2/2 on net-next commit: cff9b79e9ad5
2. Collect Reviewed-by tags from Leon Romanovsky, Tony Nguyen and
   Roger Quadros for patch 2/2.

Changes from v2:
1. Drop Reviewed-by tag from Roger Quadros.
2. Add cleanup patch for deleting unreachable error handling code in
   am65_cpsw_init_cpts().
3. Drop am65_cpsw_cpts_cleanup() function and directly invoke
   am65_cpts_release().

Changes from v1:
1. Fix the build issue when "CONFIG_TI_K3_AM65_CPTS" is not set. This
   error was reported by kernel test robot <lkp@intel.com> at:
   https://lore.kernel.org/r/202301142105.lt733Lt3-lkp@intel.com/
2. Collect Reviewed-by tag from Roger Quadros.

v4:
https://lore.kernel.org/r/20230120044201.357950-1-s-vadapalli@ti.com/
v3:
https://lore.kernel.org/r/20230118095439.114222-1-s-vadapalli@ti.com/
v2:
https://lore.kernel.org/r/20230116044517.310461-1-s-vadapalli@ti.com/
v1:
https://lore.kernel.org/r/20230113104816.132815-1-s-vadapalli@ti.com/

Siddharth Vadapalli (2):
  net: ethernet: ti: am65-cpsw: Delete unreachable error handling code
  net: ethernet: ti: am65-cpsw/cpts: Fix CPTS release action

 drivers/net/ethernet/ti/am65-cpsw-nuss.c |  7 ++-----
 drivers/net/ethernet/ti/am65-cpts.c      | 15 +++++----------
 drivers/net/ethernet/ti/am65-cpts.h      |  5 +++++
 3 files changed, 12 insertions(+), 15 deletions(-)

-- 
2.25.1

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH net-next v5 1/2] net: ethernet: ti: am65-cpsw: Delete unreachable error handling code
  2023-01-20  7:07 [PATCH net-next v5 0/2] Fix CPTS release action in am65-cpts driver Siddharth Vadapalli
@ 2023-01-20  7:07 ` Siddharth Vadapalli
  2023-01-20  7:07 ` [PATCH net-next v5 2/2] net: ethernet: ti: am65-cpsw/cpts: Fix CPTS release action Siddharth Vadapalli
  2023-01-24  9:30 ` [PATCH net-next v5 0/2] Fix CPTS release action in am65-cpts driver patchwork-bot+netdevbpf
  2 siblings, 0 replies; 4+ messages in thread
From: Siddharth Vadapalli @ 2023-01-20  7:07 UTC (permalink / raw)
  To: davem, edumazet, kuba, linux, pabeni, rogerq, leon
  Cc: leonro, anthony.l.nguyen, netdev, linux-kernel, linux-arm-kernel,
	vigneshr, srk, s-vadapalli

The am65_cpts_create() function returns -EOPNOTSUPP only when the config
"CONFIG_TI_K3_AM65_CPTS" is disabled. Also, in the am65_cpsw_init_cpts()
function, am65_cpts_create() can only be invoked if the config
"CONFIG_TI_K3_AM65_CPTS" is enabled. Thus, the error handling code for the
case in which the return value of am65_cpts_create() is -EOPNOTSUPP, is
unreachable. Hence delete it.

Reported-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Reviewed-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
---
 drivers/net/ethernet/ti/am65-cpsw-nuss.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index c696da89962f..fde4800cf81a 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -1937,11 +1937,6 @@ static int am65_cpsw_init_cpts(struct am65_cpsw_common *common)
 		int ret = PTR_ERR(cpts);
 
 		of_node_put(node);
-		if (ret == -EOPNOTSUPP) {
-			dev_info(dev, "cpts disabled\n");
-			return 0;
-		}
-
 		dev_err(dev, "cpts create err %d\n", ret);
 		return ret;
 	}
-- 
2.25.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH net-next v5 2/2] net: ethernet: ti: am65-cpsw/cpts: Fix CPTS release action
  2023-01-20  7:07 [PATCH net-next v5 0/2] Fix CPTS release action in am65-cpts driver Siddharth Vadapalli
  2023-01-20  7:07 ` [PATCH net-next v5 1/2] net: ethernet: ti: am65-cpsw: Delete unreachable error handling code Siddharth Vadapalli
@ 2023-01-20  7:07 ` Siddharth Vadapalli
  2023-01-24  9:30 ` [PATCH net-next v5 0/2] Fix CPTS release action in am65-cpts driver patchwork-bot+netdevbpf
  2 siblings, 0 replies; 4+ messages in thread
From: Siddharth Vadapalli @ 2023-01-20  7:07 UTC (permalink / raw)
  To: davem, edumazet, kuba, linux, pabeni, rogerq, leon
  Cc: leonro, anthony.l.nguyen, netdev, linux-kernel, linux-arm-kernel,
	vigneshr, srk, s-vadapalli

The am65_cpts_release() function is registered as a devm_action in the
am65_cpts_create() function in am65-cpts driver. When the am65-cpsw driver
invokes am65_cpts_create(), am65_cpts_release() is added in the set of devm
actions associated with the am65-cpsw driver's device.

In the event of probe failure or probe deferral, the platform_drv_probe()
function invokes dev_pm_domain_detach() which powers off the CPSW and the
CPSW's CPTS hardware, both of which share the same power domain. Since the
am65_cpts_disable() function invoked by the am65_cpts_release() function
attempts to reset the CPTS hardware by writing to its registers, the CPTS
hardware is assumed to be powered on at this point. However, the hardware
is powered off before the devm actions are executed.

Fix this by getting rid of the devm action for am65_cpts_release() and
invoking it directly on the cleanup and exit paths.

Fixes: f6bd59526ca5 ("net: ethernet: ti: introduce am654 common platform time sync driver")
Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Reviewed-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
---
 drivers/net/ethernet/ti/am65-cpsw-nuss.c |  2 ++
 drivers/net/ethernet/ti/am65-cpts.c      | 15 +++++----------
 drivers/net/ethernet/ti/am65-cpts.h      |  5 +++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index fde4800cf81a..b23027874cc4 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -2914,6 +2914,7 @@ static int am65_cpsw_nuss_probe(struct platform_device *pdev)
 
 err_free_phylink:
 	am65_cpsw_nuss_phylink_cleanup(common);
+	am65_cpts_release(common->cpts);
 err_of_clear:
 	of_platform_device_destroy(common->mdio_dev, NULL);
 err_pm_clear:
@@ -2942,6 +2943,7 @@ static int am65_cpsw_nuss_remove(struct platform_device *pdev)
 	 */
 	am65_cpsw_nuss_cleanup_ndev(common);
 	am65_cpsw_nuss_phylink_cleanup(common);
+	am65_cpts_release(common->cpts);
 	am65_cpsw_disable_serdes_phy(common);
 
 	of_platform_device_destroy(common->mdio_dev, NULL);
diff --git a/drivers/net/ethernet/ti/am65-cpts.c b/drivers/net/ethernet/ti/am65-cpts.c
index bf0f74b20ba6..16ee9c29cb35 100644
--- a/drivers/net/ethernet/ti/am65-cpts.c
+++ b/drivers/net/ethernet/ti/am65-cpts.c
@@ -1052,14 +1052,13 @@ static int am65_cpts_of_parse(struct am65_cpts *cpts, struct device_node *node)
 	return cpts_of_mux_clk_setup(cpts, node);
 }
 
-static void am65_cpts_release(void *data)
+void am65_cpts_release(struct am65_cpts *cpts)
 {
-	struct am65_cpts *cpts = data;
-
 	ptp_clock_unregister(cpts->ptp_clock);
 	am65_cpts_disable(cpts);
 	clk_disable_unprepare(cpts->refclk);
 }
+EXPORT_SYMBOL_GPL(am65_cpts_release);
 
 struct am65_cpts *am65_cpts_create(struct device *dev, void __iomem *regs,
 				   struct device_node *node)
@@ -1139,18 +1138,12 @@ struct am65_cpts *am65_cpts_create(struct device *dev, void __iomem *regs,
 	}
 	cpts->phc_index = ptp_clock_index(cpts->ptp_clock);
 
-	ret = devm_add_action_or_reset(dev, am65_cpts_release, cpts);
-	if (ret) {
-		dev_err(dev, "failed to add ptpclk reset action %d", ret);
-		return ERR_PTR(ret);
-	}
-
 	ret = devm_request_threaded_irq(dev, cpts->irq, NULL,
 					am65_cpts_interrupt,
 					IRQF_ONESHOT, dev_name(dev), cpts);
 	if (ret < 0) {
 		dev_err(cpts->dev, "error attaching irq %d\n", ret);
-		return ERR_PTR(ret);
+		goto reset_ptpclk;
 	}
 
 	dev_info(dev, "CPTS ver 0x%08x, freq:%u, add_val:%u pps:%d\n",
@@ -1159,6 +1152,8 @@ struct am65_cpts *am65_cpts_create(struct device *dev, void __iomem *regs,
 
 	return cpts;
 
+reset_ptpclk:
+	am65_cpts_release(cpts);
 refclk_disable:
 	clk_disable_unprepare(cpts->refclk);
 	return ERR_PTR(ret);
diff --git a/drivers/net/ethernet/ti/am65-cpts.h b/drivers/net/ethernet/ti/am65-cpts.h
index bd08f4b2edd2..6e14df0be113 100644
--- a/drivers/net/ethernet/ti/am65-cpts.h
+++ b/drivers/net/ethernet/ti/am65-cpts.h
@@ -18,6 +18,7 @@ struct am65_cpts_estf_cfg {
 };
 
 #if IS_ENABLED(CONFIG_TI_K3_AM65_CPTS)
+void am65_cpts_release(struct am65_cpts *cpts);
 struct am65_cpts *am65_cpts_create(struct device *dev, void __iomem *regs,
 				   struct device_node *node);
 int am65_cpts_phc_index(struct am65_cpts *cpts);
@@ -31,6 +32,10 @@ void am65_cpts_estf_disable(struct am65_cpts *cpts, int idx);
 void am65_cpts_suspend(struct am65_cpts *cpts);
 void am65_cpts_resume(struct am65_cpts *cpts);
 #else
+static inline void am65_cpts_release(struct am65_cpts *cpts)
+{
+}
+
 static inline struct am65_cpts *am65_cpts_create(struct device *dev,
 						 void __iomem *regs,
 						 struct device_node *node)
-- 
2.25.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH net-next v5 0/2] Fix CPTS release action in am65-cpts driver
  2023-01-20  7:07 [PATCH net-next v5 0/2] Fix CPTS release action in am65-cpts driver Siddharth Vadapalli
  2023-01-20  7:07 ` [PATCH net-next v5 1/2] net: ethernet: ti: am65-cpsw: Delete unreachable error handling code Siddharth Vadapalli
  2023-01-20  7:07 ` [PATCH net-next v5 2/2] net: ethernet: ti: am65-cpsw/cpts: Fix CPTS release action Siddharth Vadapalli
@ 2023-01-24  9:30 ` patchwork-bot+netdevbpf
  2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-01-24  9:30 UTC (permalink / raw)
  To: Siddharth Vadapalli
  Cc: davem, edumazet, kuba, linux, pabeni, rogerq, leon, leonro,
	anthony.l.nguyen, netdev, linux-kernel, linux-arm-kernel,
	vigneshr, srk

Hello:

This series was applied to netdev/net-next.git (master)
by Paolo Abeni <pabeni@redhat.com>:

On Fri, 20 Jan 2023 12:37:29 +0530 you wrote:
> Delete unreachable code in am65_cpsw_init_cpts() function, which was
> Reported-by: Leon Romanovsky <leon@kernel.org>
> at:
> https://lore.kernel.org/r/Y8aHwSnVK9+sAb24@unreal
> 
> Remove the devm action associated with am65_cpts_release() and invoke the
> function directly on the cleanup and exit paths.
> 
> [...]

Here is the summary with links:
  - [net-next,v5,1/2] net: ethernet: ti: am65-cpsw: Delete unreachable error handling code
    https://git.kernel.org/netdev/net-next/c/0a974b1fff7f
  - [net-next,v5,2/2] net: ethernet: ti: am65-cpsw/cpts: Fix CPTS release action
    https://git.kernel.org/netdev/net-next/c/4ad8766cd398

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-01-24  9:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-20  7:07 [PATCH net-next v5 0/2] Fix CPTS release action in am65-cpts driver Siddharth Vadapalli
2023-01-20  7:07 ` [PATCH net-next v5 1/2] net: ethernet: ti: am65-cpsw: Delete unreachable error handling code Siddharth Vadapalli
2023-01-20  7:07 ` [PATCH net-next v5 2/2] net: ethernet: ti: am65-cpsw/cpts: Fix CPTS release action Siddharth Vadapalli
2023-01-24  9:30 ` [PATCH net-next v5 0/2] Fix CPTS release action in am65-cpts driver patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®