[5.10.y-cip,32/47] net: ravb: Simplify ravb_resume()

Message ID	20240529081039.639010-33-claudiu.beznea.uj@bp.renesas.com (mailing list archive)
State	New
Headers	show Return-Path: <claudiu.beznea@tuxon.dev> ip: 209.85.128.51, mailfrom: claudiu.beznea@tuxon.dev) From: Claudiu <claudiu.beznea@tuxon.dev> To: nobuhiro1.iwamatsu@toshiba.co.jp, pavel@denx.de Cc: cip-dev@lists.cip-project.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, paul.barker.ct@bp.renesas.com Subject: [PATCH 5.10.y-cip 32/47] net: ravb: Simplify ravb_resume() Date: Wed, 29 May 2024 11:10:24 +0300 Message-Id: <20240529081039.639010-33-claudiu.beznea.uj@bp.renesas.com> In-Reply-To: <20240529081039.639010-1-claudiu.beznea.uj@bp.renesas.com> References: <20240529081039.639010-1-claudiu.beznea.uj@bp.renesas.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	Add Ethernet support for Renesas RZ/G3S SoC \| expand [5.10.y-cip,00/47] Add Ethernet support for Renesas RZ/G3S SoC [5.10.y-cip,01/47] clk: renesas: r9a08g045: Add clock and reset support for ETH0 and ETH1 [5.10.y-cip,02/47] pinctrl: renesas: rzg2l: Move arg and index in the main function block [5.10.y-cip,03/47] pinctrl: renesas: rzg2l: Add pin configuration support for pinmux groups [5.10.y-cip,04/47] pinctrl: renesas: rzg2l: Add support to select power source for Ethernet pins [5.10.y-cip,05/47] pinctrl: renesas: rzg2l: Add output enable support [5.10.y-cip,06/47] pinctrl: renesas: rzg2l: Add input enable to the Ethernet pins [5.10.y-cip,07/47] pinctrl: renesas: rzg2l: Fix locking in rzg2l_dt_subnode_to_map() [5.10.y-cip,08/47] ravb: Fix potential use-after-free in ravb_rx_gbeth() [5.10.y-cip,09/47] net: ravb: Fix lack of register setting after system resumed for Gen3 [5.10.y-cip,10/47] net: ravb: Check return value of reset_control_deassert() [5.10.y-cip,11/47] net: ravb: Make write access to CXR35 first before accessing other EMAC registers [5.10.y-cip,12/47] net: ravb: Stop DMA in case of failures on ravb_open() [5.10.y-cip,13/47] net: ravb: Keep reverse order of operations in ravb_remove() [5.10.y-cip,14/47] net: ravb: Wait for operating mode to be applied [5.10.y-cip,15/47] net: ravb: Count packets instead of descriptors in GbEth RX path [5.10.y-cip,16/47] ethernet: renesas: Use div64_ul instead of do_div [5.10.y-cip,17/47] ravb: ravb_close() always returns 0 [5.10.y-cip,18/47] ravb: Use GFP_KERNEL instead of GFP_ATOMIC when possible [5.10.y-cip,19/47] dt-bindings: net: renesas,etheravb: Document RZ/G3S support [5.10.y-cip,20/47] net: ravb: Let IP-specific receive function to interrogate descriptors [5.10.y-cip,21/47] net: ravb: Rely on PM domain to enable gptp_clk [5.10.y-cip,22/47] net: ravb: Make reset controller support mandatory [5.10.y-cip,23/47] net: ravb: Assert/de-assert reset on suspend/resume [5.10.y-cip,24/47] net: ravb: Move reference clock enable/disable on runtime PM APIs [5.10.y-cip,25/47] net: ravb: Move getting/requesting IRQs in the probe() method [5.10.y-cip,26/47] net: ravb: Split GTI computation and set operations [5.10.y-cip,27/47] net: ravb: Move delay mode set in the driver's ndo_open API [5.10.y-cip,28/47] net: ravb: Move DBAT configuration to the driver's ndo_open API [5.10.y-cip,29/47] net: ravb: Move PTP initialization in the driver's ndo_open API for ccc_gac plat… [5.10.y-cip,30/47] net: ravb: Set config mode in ndo_open and reset mode in ndo_close [5.10.y-cip,31/47] net: ravb: Simplify ravb_suspend() [5.10.y-cip,32/47] net: ravb: Simplify ravb_resume() [5.10.y-cip,33/47] ravb: Add Rx checksum offload support for GbEth [5.10.y-cip,34/47] ravb: Add Tx checksum offload support for GbEth [5.10.y-cip,35/47] net: ravb: Get rid of the temporary variable irq [5.10.y-cip,36/47] net: ravb: Keep the reverse order of operations in ravb_close() [5.10.y-cip,37/47] net: ravb: Return cached statistics if the interface is down [5.10.y-cip,38/47] net: ravb: Move the update of ndev->features to ravb_set_features() [5.10.y-cip,39/47] net: ravb: Do not apply features to hardware if the interface is down [5.10.y-cip,40/47] net: ravb: Add runtime PM support [5.10.y-cip,41/47] net: ravb: Fix GbEth jumbo packet RX checksum handling [5.10.y-cip,42/47] net: ravb: Fix RX byte accounting for jumbo packets [5.10.y-cip,43/47] net: ravb: Fix registered interrupt names [5.10.y-cip,44/47] arm64: dts: renesas: r9a08g045: Add Ethernet nodes [5.10.y-cip,45/47] arm64: dts: renesas: rzg3s-smarc-som: Use switches' names to select on-board fun… [5.10.y-cip,46/47] arm64: dts: renesas: rzg3s-smarc-som: Enable the Ethernet interfaces [5.10.y-cip,47/47] arm64: dts: renesas: rzg3s-smarc-som: Guard Ethernet IRQ GPIO hogs

Message ID

20240529081039.639010-33-claudiu.beznea.uj@bp.renesas.com (mailing list archive)

State

New

Headers

From: Claudiu <claudiu.beznea@tuxon.dev>
To: nobuhiro1.iwamatsu@toshiba.co.jp,
	pavel@denx.de
Cc: cip-dev@lists.cip-project.org,
	biju.das.jz@bp.renesas.com,
	prabhakar.mahadev-lad.rj@bp.renesas.com,
	paul.barker.ct@bp.renesas.com
Subject: [PATCH 5.10.y-cip 32/47] net: ravb: Simplify ravb_resume()
Date: Wed, 29 May 2024 11:10:24 +0300
Message-Id: <20240529081039.639010-33-claudiu.beznea.uj@bp.renesas.com>
In-Reply-To: <20240529081039.639010-1-claudiu.beznea.uj@bp.renesas.com>
References: <20240529081039.639010-1-claudiu.beznea.uj@bp.renesas.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

Add Ethernet support for Renesas RZ/G3S SoC | expand

Commit Message

Claudiu Beznea May 29, 2024, 8:10 a.m. UTC

From: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>

commit e95273fe4d02a6096ba5fe8287bcd9513396ec71 upstream.

Remove explicit calls to functions that are called by ravb_open(). There is
no need to have them doubled now that the ravb_open() already contains
what is needed for the interface configuration. Along with it,
configurations needed by PTP were moved to ravb_wol_restore(). With this,
code in ravb_resume() becomes simpler.

Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
---
 drivers/net/ethernet/renesas/ravb_main.c | 58 ++++++++++--------------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 2a7ff0037676..478c75c94f50 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -2944,6 +2944,20 @@  static int ravb_wol_restore(struct net_device *ndev)
 {
 	struct ravb_private *priv = netdev_priv(ndev);
 	const struct ravb_hw_info *info = priv->info;
+	int error;
+
+	/* Set reset mode to rearm the WoL logic. */
+	error = ravb_set_opmode(ndev, CCC_OPC_RESET);
+	if (error)
+		return error;
+
+	/* Set AVB config mode. */
+	error = ravb_set_config_mode(ndev);
+	if (error)
+		return error;
+
+	if (priv->info->ccc_gac)
+		ravb_ptp_init(ndev, priv->pdev);
 
 	if (info->nc_queues)
 		napi_enable(&priv->napi[RAVB_NC]);
@@ -2983,53 +2997,29 @@  static int __maybe_unused ravb_resume(struct device *dev)
 {
 	struct net_device *ndev = dev_get_drvdata(dev);
 	struct ravb_private *priv = netdev_priv(ndev);
-	const struct ravb_hw_info *info = priv->info;
 	int ret;
 
 	ret = reset_control_deassert(priv->rstc);
 	if (ret)
 		return ret;
 
-	/* If WoL is enabled set reset mode to rearm the WoL logic */
+	if (!netif_running(ndev))
+		return 0;
+
+	/* If WoL is enabled restore the interface. */
 	if (priv->wol_enabled) {
-		ret = ravb_set_opmode(ndev, CCC_OPC_RESET);
+		ret = ravb_wol_restore(ndev);
 		if (ret)
 			return ret;
 	}
 
-	/* All register have been reset to default values.
-	 * Restore all registers which where setup at probe time and
-	 * reopen device if it was running before system suspended.
-	 */
-
-	/* Set AVB config mode */
-	ret = ravb_set_config_mode(ndev);
-	if (ret)
+	/* Reopening the interface will restore the device to the working state. */
+	ret = ravb_open(ndev);
+	if (ret < 0)
 		return ret;
 
-	ravb_set_gti(ndev);
-
-	if (info->internal_delay)
-		ravb_set_delay_mode(ndev);
-
-	/* Restore descriptor base address table */
-	ravb_write(ndev, priv->desc_bat_dma, DBAT);
-
-	if (priv->info->ccc_gac)
-		ravb_ptp_init(ndev, priv->pdev);
-
-	if (netif_running(ndev)) {
-		if (priv->wol_enabled) {
-			ret = ravb_wol_restore(ndev);
-			if (ret)
-				return ret;
-		}
-		ret = ravb_open(ndev);
-		if (ret < 0)
-			return ret;
-		ravb_set_rx_mode(ndev);
-		netif_device_attach(ndev);
-	}
+	ravb_set_rx_mode(ndev);
+	netif_device_attach(ndev);
 
 	return ret;
 }

[5.10.y-cip,32/47] net: ravb: Simplify ravb_resume()

Commit Message

Patch