[5.10.y-cip,37/61] ravb: remove APSR_DM

Message ID	20220110122331.24114-38-prabhakar.mahadev-lad.rj@bp.renesas.com (mailing list archive)
State	Accepted
Delegated to:	Pavel Machek
Headers	show Return-Path: <prabhakar.mahadev-lad.rj@bp.renesas.com> ip: 210.160.252.172, mailfrom: prabhakar.mahadev-lad.rj@bp.renesas.com) From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> To: cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>, Pavel Machek <pavel@denx.de> Cc: Biju Das <biju.das.jz@bp.renesas.com> Subject: [PATCH 5.10.y-cip 37/61] ravb: remove APSR_DM Date: Mon, 10 Jan 2022 12:23:07 +0000 Message-Id: <20220110122331.24114-38-prabhakar.mahadev-lad.rj@bp.renesas.com> In-Reply-To: <20220110122331.24114-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20220110122331.24114-1-prabhakar.mahadev-lad.rj@bp.renesas.com>
Series	Add Ethernet support to RZ/G2L \| expand [5.10.y-cip,00/61] Add Ethernet support to RZ/G2L [5.10.y-cip,01/61] dt-bindings: net: renesas,etheravb: Add additional clocks [5.10.y-cip,02/61] dt-bindings: net: renesas,etheravb: Fix optional second clock name [5.10.y-cip,03/61] dt-bindings: net: renesas,etheravb: Document Gigabit Ethernet IP [5.10.y-cip,04/61] dt-bindings: net: renesas,etheravb: Drop "int_" prefix and "_n" suffix from inte… [5.10.y-cip,05/61] net: ethernet: ravb: Enable optional refclk [5.10.y-cip,06/61] net: ethernet: ravb: Fix release of refclk [5.10.y-cip,07/61] net: ethernet: ravb: Use devm_platform_get_and_ioremap_resource() [5.10.y-cip,08/61] ravb: Fix a typo in comment [5.10.y-cip,09/61] ravb: Remove checks for unsupported internal delay modes [5.10.y-cip,10/61] ravb: Use unsigned int for num_tx_desc variable in struct ravb_private [5.10.y-cip,11/61] ravb: Add struct ravb_hw_info to driver data [5.10.y-cip,12/61] ravb: Add aligned_tx to struct ravb_hw_info [5.10.y-cip,13/61] ravb: Add max_rx_len to struct ravb_hw_info [5.10.y-cip,14/61] ravb: Add stats_len to struct ravb_hw_info [5.10.y-cip,15/61] ravb: Add gstrings_stats and gstrings_size to struct ravb_hw_info [5.10.y-cip,16/61] ravb: Add net_features and net_hw_features to struct ravb_hw_info [5.10.y-cip,17/61] ravb: Add internal delay hw feature to struct ravb_hw_info [5.10.y-cip,18/61] ravb: Add tx_counters to struct ravb_hw_info [5.10.y-cip,19/61] ravb: Remove the macros NUM_TX_DESC_GEN[23] [5.10.y-cip,20/61] ravb: Add multi_irq to struct ravb_hw_info [5.10.y-cip,21/61] ravb: Add no_ptp_cfg_active to struct ravb_hw_info [5.10.y-cip,22/61] ravb: Add ptp_cfg_active to struct ravb_hw_info [5.10.y-cip,23/61] ravb: Factorise ravb_ring_free function [5.10.y-cip,24/61] ravb: Factorise ravb_ring_format function [5.10.y-cip,25/61] ravb: Factorise ravb_ring_init function [5.10.y-cip,26/61] ravb: Factorise ravb_rx function [5.10.y-cip,27/61] ravb: Factorise ravb_adjust_link function [5.10.y-cip,28/61] ravb: Factorise ravb_set_features [5.10.y-cip,29/61] ravb: Factorise ravb_dmac_init function [5.10.y-cip,30/61] ravb: Factorise ravb_emac_init function [5.10.y-cip,31/61] ravb: Add reset support [5.10.y-cip,32/61] ravb: Rename "ravb_set_features_rx_csum" function to "ravb_set_features_rcar" [5.10.y-cip,33/61] ravb: Rename "no_ptp_cfg_active" and "ptp_cfg_active" variables [5.10.y-cip,34/61] ravb: Add nc_queue to struct ravb_hw_info [5.10.y-cip,35/61] ravb: Add support for RZ/G2L SoC [5.10.y-cip,36/61] ravb: Initialize GbEthernet DMAC [5.10.y-cip,37/61] ravb: remove APSR_DM [5.10.y-cip,38/61] ravb: Exclude gPTP feature support for RZ/G2L [5.10.y-cip,39/61] ravb: Add tsrq to struct ravb_hw_info [5.10.y-cip,40/61] ravb: Add magic_pkt to struct ravb_hw_info [5.10.y-cip,41/61] ravb: Add half_duplex to struct ravb_hw_info [5.10.y-cip,42/61] ravb: update "undocumented" annotations [5.10.y-cip,43/61] ravb: Remove extra TAB [5.10.y-cip,44/61] ravb: Initialize GbEthernet E-MAC [5.10.y-cip,45/61] ravb: Add rx_max_buf_size to struct ravb_hw_info [5.10.y-cip,46/61] ravb: Use ALIGN macro for max_rx_len [5.10.y-cip,47/61] ravb: Fillup ravb_alloc_rx_desc_gbeth() stub [5.10.y-cip,48/61] ravb: Fillup ravb_rx_ring_free_gbeth() stub [5.10.y-cip,49/61] ravb: Fillup ravb_rx_ring_format_gbeth() stub [5.10.y-cip,50/61] ravb: Fillup ravb_rx_gbeth() stub [5.10.y-cip,51/61] ravb: Add carrier_counters to struct ravb_hw_info [5.10.y-cip,52/61] ravb: Add support to retrieve stats for GbEthernet [5.10.y-cip,53/61] ravb: Rename "tsrq" variable [5.10.y-cip,54/61] ravb: Optimize ravb_emac_init_gbeth function [5.10.y-cip,55/61] ravb: Rename "nc_queue" feature bit [5.10.y-cip,56/61] ravb: Update ravb_emac_init_gbeth() [5.10.y-cip,57/61] ravb: Fix typo AVB->DMAC [5.10.y-cip,58/61] clk: renesas: r9a07g044: Add ethernet clock sources [5.10.y-cip,59/61] clk: renesas: r9a07g044: Add GbEthernet clock/reset [5.10.y-cip,60/61] arm64: dts: renesas: r9a07g044: Add GbEthernet nodes [5.10.y-cip,61/61] arm64: dts: renesas: rzg2l-smarc-som: Enable Ethernet

Message ID

20220110122331.24114-38-prabhakar.mahadev-lad.rj@bp.renesas.com (mailing list archive)

State

Accepted

Delegated to:

Pavel Machek

Headers

From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
To: cip-dev@lists.cip-project.org,
	Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>,
	Pavel Machek <pavel@denx.de>
Cc: Biju Das <biju.das.jz@bp.renesas.com>
Subject: [PATCH 5.10.y-cip 37/61] ravb: remove APSR_DM
Date: Mon, 10 Jan 2022 12:23:07 +0000
Message-Id: <20220110122331.24114-38-prabhakar.mahadev-lad.rj@bp.renesas.com>
In-Reply-To: <20220110122331.24114-1-prabhakar.mahadev-lad.rj@bp.renesas.com>
References: <20220110122331.24114-1-prabhakar.mahadev-lad.rj@bp.renesas.com>

Series

Add Ethernet support to RZ/G2L | expand

Commit Message

Lad Prabhakar Jan. 10, 2022, 12:23 p.m. UTC

From: Sergey Shtylyov <s.shtylyov@omprussia.ru>

commit f4d680e5024805d52a3bbcee20581ab7b83bcfbf upstream.

According to the R-Car Series, 3rd Generation User's Manual: Hardware,
Rev. 1.50, there's no APSR.DM field, instead there are 2 independent
RX/TX clock internal delay bits. Follow the suit: remove #define APSR_DM
and rename #define's APSR_DM_{R|T}DM to APSR_{R|T}DM.

While at it, do several more things to the declaration of *enum* APSR_BIT:
- remove superfluous indentation;
- annotate APSR_MEMS as undocumented;
- annotate APSR as R-Car Gen3 only.

Signed-off-by: Sergey Shtylyov <s.shtylyov@omprussia.ru>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
 drivers/net/ethernet/renesas/ravb.h      | 11 +++++------
 drivers/net/ethernet/renesas/ravb_main.c |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index f122ff413469..e61f08e0df59 100644
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -242,13 +242,12 @@  enum ESR_BIT {
 	ESR_EIL		= 0x00001000,
 };
 
-/* APSR */
+/* APSR (R-Car Gen3 only) */
 enum APSR_BIT {
-	APSR_MEMS		= 0x00000002,
-	APSR_CMSW		= 0x00000010,
-	APSR_DM			= 0x00006000,	/* Undocumented? */
-	APSR_DM_RDM		= 0x00002000,
-	APSR_DM_TDM		= 0x00004000,
+	APSR_MEMS	= 0x00000002,	/* Undocumented */
+	APSR_CMSW	= 0x00000010,
+	APSR_RDM	= 0x00002000,
+	APSR_TDM	= 0x00004000,
 };
 
 /* RCR */
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 0cc969cf523a..97b32094beeb 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -2252,10 +2252,10 @@  static void ravb_set_delay_mode(struct net_device *ndev)
 	u32 set = 0;
 
 	if (priv->rxcidm)
-		set |= APSR_DM_RDM;
+		set |= APSR_RDM;
 	if (priv->txcidm)
-		set |= APSR_DM_TDM;
-	ravb_modify(ndev, APSR, APSR_DM, set);
+		set |= APSR_TDM;
+	ravb_modify(ndev, APSR, APSR_RDM | APSR_TDM, set);
 }
 
 static int ravb_probe(struct platform_device *pdev)

[5.10.y-cip,37/61] ravb: remove APSR_DM

Commit Message

Patch