[PATCH net-next v2 0/2] net: systemport: Minor IO macros changes

netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH net-next v2 0/2] net: systemport: Minor IO macros changes
@ 2024-10-21 17:49 Florian Fainelli
  2024-10-21 17:49 ` [PATCH net-next v2 1/2] net: systemport: Remove unused txchk accessors Florian Fainelli
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Florian Fainelli @ 2024-10-21 17:49 UTC (permalink / raw)
  To: netdev
  Cc: Florian Fainelli, Broadcom internal kernel review list,
	David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
	Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
	open list, open list:CLANG/LLVM BUILD SUPPORT:, vladimir.oltean

This patch series addresses the warning initially reported by Vladimir
here:

https://lore.kernel.org/all/20241014150139.927423-1-vladimir.oltean@nxp.com/

and follows on with proceeding with his suggestion the IO macros to the
header file.

Changes in v2:

- also removed the TBUF accessor

Florian Fainelli (2):
  net: systemport: Remove unused txchk accessors
  net: systemport: Move IO macros to header file

 drivers/net/ethernet/broadcom/bcmsysport.c | 24 ----------------------
 drivers/net/ethernet/broadcom/bcmsysport.h | 23 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 24 deletions(-)

-- 
2.43.0


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

* [PATCH net-next v2 1/2] net: systemport: Remove unused txchk accessors
  2024-10-21 17:49 [PATCH net-next v2 0/2] net: systemport: Minor IO macros changes Florian Fainelli
@ 2024-10-21 17:49 ` Florian Fainelli
  2024-10-23 18:42   ` Simon Horman
  2024-10-21 17:49 ` [PATCH net-next v2 2/2] net: systemport: Move IO macros to header file Florian Fainelli
  2024-10-28 23:00 ` [PATCH net-next v2 0/2] net: systemport: Minor IO macros changes patchwork-bot+netdevbpf
  2 siblings, 1 reply; 6+ messages in thread
From: Florian Fainelli @ 2024-10-21 17:49 UTC (permalink / raw)
  To: netdev
  Cc: Florian Fainelli, Vladimir Oltean,
	Broadcom internal kernel review list, David S. Miller,
	Eric Dumazet, Jakub Kicinski, Paolo Abeni, Nathan Chancellor,
	Nick Desaulniers, Bill Wendling, Justin Stitt, open list,
	open list:CLANG/LLVM BUILD SUPPORT:

Vladimir reported the following warning with clang-16 and W=1:

warning: unused function 'txchk_readl' [-Wunused-function]
BCM_SYSPORT_IO_MACRO(txchk, SYS_PORT_TXCHK_OFFSET);
note: expanded from macro 'BCM_SYSPORT_IO_MACRO'

warning: unused function 'txchk_writel' [-Wunused-function]
note: expanded from macro 'BCM_SYSPORT_IO_MACRO'

warning: unused function 'tbuf_readl' [-Wunused-function]
BCM_SYSPORT_IO_MACRO(tbuf, SYS_PORT_TBUF_OFFSET);
note: expanded from macro 'BCM_SYSPORT_IO_MACRO'

warning: unused function 'tbuf_writel' [-Wunused-function]
note: expanded from macro 'BCM_SYSPORT_IO_MACRO'

The TXCHK and RBUF blocks are not being accessed, remove the IO macros
used to access those blocks. No functional impact.

Reported-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
 drivers/net/ethernet/broadcom/bcmsysport.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 0b7088ca4822..9e42b5db721e 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -46,9 +46,7 @@ BCM_SYSPORT_IO_MACRO(umac, SYS_PORT_UMAC_OFFSET);
 BCM_SYSPORT_IO_MACRO(gib, SYS_PORT_GIB_OFFSET);
 BCM_SYSPORT_IO_MACRO(tdma, SYS_PORT_TDMA_OFFSET);
 BCM_SYSPORT_IO_MACRO(rxchk, SYS_PORT_RXCHK_OFFSET);
-BCM_SYSPORT_IO_MACRO(txchk, SYS_PORT_TXCHK_OFFSET);
 BCM_SYSPORT_IO_MACRO(rbuf, SYS_PORT_RBUF_OFFSET);
-BCM_SYSPORT_IO_MACRO(tbuf, SYS_PORT_TBUF_OFFSET);
 BCM_SYSPORT_IO_MACRO(topctrl, SYS_PORT_TOPCTRL_OFFSET);
 
 /* On SYSTEMPORT Lite, any register after RDMA_STATUS has the exact
-- 
2.43.0


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

* Re: [PATCH net-next v2 1/2] net: systemport: Remove unused txchk accessors
  2024-10-21 17:49 ` [PATCH net-next v2 1/2] net: systemport: Remove unused txchk accessors Florian Fainelli
@ 2024-10-23 18:42   ` Simon Horman
  0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2024-10-23 18:42 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: netdev, Vladimir Oltean, Broadcom internal kernel review list,
	David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
	Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
	open list, open list:CLANG/LLVM BUILD SUPPORT:

On Mon, Oct 21, 2024 at 10:49:34AM -0700, Florian Fainelli wrote:
> Vladimir reported the following warning with clang-16 and W=1:
> 
> warning: unused function 'txchk_readl' [-Wunused-function]
> BCM_SYSPORT_IO_MACRO(txchk, SYS_PORT_TXCHK_OFFSET);
> note: expanded from macro 'BCM_SYSPORT_IO_MACRO'
> 
> warning: unused function 'txchk_writel' [-Wunused-function]
> note: expanded from macro 'BCM_SYSPORT_IO_MACRO'
> 
> warning: unused function 'tbuf_readl' [-Wunused-function]
> BCM_SYSPORT_IO_MACRO(tbuf, SYS_PORT_TBUF_OFFSET);
> note: expanded from macro 'BCM_SYSPORT_IO_MACRO'
> 
> warning: unused function 'tbuf_writel' [-Wunused-function]
> note: expanded from macro 'BCM_SYSPORT_IO_MACRO'
> 
> The TXCHK and RBUF blocks are not being accessed, remove the IO macros
> used to access those blocks. No functional impact.
> 
> Reported-by: Vladimir Oltean <vladimir.oltean@nxp.com>
> Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

Reviewed-by: Simon Horman <horms@kernel.org>

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

* [PATCH net-next v2 2/2] net: systemport: Move IO macros to header file
  2024-10-21 17:49 [PATCH net-next v2 0/2] net: systemport: Minor IO macros changes Florian Fainelli
  2024-10-21 17:49 ` [PATCH net-next v2 1/2] net: systemport: Remove unused txchk accessors Florian Fainelli
@ 2024-10-21 17:49 ` Florian Fainelli
  2024-10-23 18:42   ` Simon Horman
  2024-10-28 23:00 ` [PATCH net-next v2 0/2] net: systemport: Minor IO macros changes patchwork-bot+netdevbpf
  2 siblings, 1 reply; 6+ messages in thread
From: Florian Fainelli @ 2024-10-21 17:49 UTC (permalink / raw)
  To: netdev
  Cc: Florian Fainelli, Vladimir Oltean,
	Broadcom internal kernel review list, David S. Miller,
	Eric Dumazet, Jakub Kicinski, Paolo Abeni, Nathan Chancellor,
	Nick Desaulniers, Bill Wendling, Justin Stitt, open list,
	open list:CLANG/LLVM BUILD SUPPORT:

Move the BCM_SYSPORT_IO_MACRO() definition and its use to bcmsysport.h
where it is more appropriate and where static inline helpers are
acceptable. While at it, make sure that the macro 'offset' argument does
not trigger a checkpatch warning due to possible argument re-use.

Suggested-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
 drivers/net/ethernet/broadcom/bcmsysport.c | 22 ---------------------
 drivers/net/ethernet/broadcom/bcmsysport.h | 23 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 9e42b5db721e..caff6e87a488 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -27,28 +27,6 @@
 
 #include "bcmsysport.h"
 
-/* I/O accessors register helpers */
-#define BCM_SYSPORT_IO_MACRO(name, offset) \
-static inline u32 name##_readl(struct bcm_sysport_priv *priv, u32 off)	\
-{									\
-	u32 reg = readl_relaxed(priv->base + offset + off);		\
-	return reg;							\
-}									\
-static inline void name##_writel(struct bcm_sysport_priv *priv,		\
-				  u32 val, u32 off)			\
-{									\
-	writel_relaxed(val, priv->base + offset + off);			\
-}									\
-
-BCM_SYSPORT_IO_MACRO(intrl2_0, SYS_PORT_INTRL2_0_OFFSET);
-BCM_SYSPORT_IO_MACRO(intrl2_1, SYS_PORT_INTRL2_1_OFFSET);
-BCM_SYSPORT_IO_MACRO(umac, SYS_PORT_UMAC_OFFSET);
-BCM_SYSPORT_IO_MACRO(gib, SYS_PORT_GIB_OFFSET);
-BCM_SYSPORT_IO_MACRO(tdma, SYS_PORT_TDMA_OFFSET);
-BCM_SYSPORT_IO_MACRO(rxchk, SYS_PORT_RXCHK_OFFSET);
-BCM_SYSPORT_IO_MACRO(rbuf, SYS_PORT_RBUF_OFFSET);
-BCM_SYSPORT_IO_MACRO(topctrl, SYS_PORT_TOPCTRL_OFFSET);
-
 /* On SYSTEMPORT Lite, any register after RDMA_STATUS has the exact
  * same layout, except it has been moved by 4 bytes up, *sigh*
  */
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h
index 335cf6631db5..a34296f989f1 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.h
+++ b/drivers/net/ethernet/broadcom/bcmsysport.h
@@ -773,4 +773,27 @@ struct bcm_sysport_priv {
 	struct bcm_sysport_tx_ring *ring_map[DSA_MAX_PORTS * 8];
 
 };
+
+/* I/O accessors register helpers */
+#define BCM_SYSPORT_IO_MACRO(name, offset) \
+static inline u32 name##_readl(struct bcm_sysport_priv *priv, u32 off)	\
+{									\
+	u32 reg = readl_relaxed(priv->base + (offset) + off);		\
+	return reg;							\
+}									\
+static inline void name##_writel(struct bcm_sysport_priv *priv,		\
+				  u32 val, u32 off)			\
+{									\
+	writel_relaxed(val, priv->base + (offset) + off);		\
+}									\
+
+BCM_SYSPORT_IO_MACRO(intrl2_0, SYS_PORT_INTRL2_0_OFFSET);
+BCM_SYSPORT_IO_MACRO(intrl2_1, SYS_PORT_INTRL2_1_OFFSET);
+BCM_SYSPORT_IO_MACRO(umac, SYS_PORT_UMAC_OFFSET);
+BCM_SYSPORT_IO_MACRO(gib, SYS_PORT_GIB_OFFSET);
+BCM_SYSPORT_IO_MACRO(tdma, SYS_PORT_TDMA_OFFSET);
+BCM_SYSPORT_IO_MACRO(rxchk, SYS_PORT_RXCHK_OFFSET);
+BCM_SYSPORT_IO_MACRO(rbuf, SYS_PORT_RBUF_OFFSET);
+BCM_SYSPORT_IO_MACRO(topctrl, SYS_PORT_TOPCTRL_OFFSET);
+
 #endif /* __BCM_SYSPORT_H */
-- 
2.43.0


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

* Re: [PATCH net-next v2 2/2] net: systemport: Move IO macros to header file
  2024-10-21 17:49 ` [PATCH net-next v2 2/2] net: systemport: Move IO macros to header file Florian Fainelli
@ 2024-10-23 18:42   ` Simon Horman
  0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2024-10-23 18:42 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: netdev, Vladimir Oltean, Broadcom internal kernel review list,
	David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
	Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
	open list, open list:CLANG/LLVM BUILD SUPPORT:

On Mon, Oct 21, 2024 at 10:49:35AM -0700, Florian Fainelli wrote:
> Move the BCM_SYSPORT_IO_MACRO() definition and its use to bcmsysport.h
> where it is more appropriate and where static inline helpers are
> acceptable. While at it, make sure that the macro 'offset' argument does
> not trigger a checkpatch warning due to possible argument re-use.
> 
> Suggested-by: Vladimir Oltean <vladimir.oltean@nxp.com>
> Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

Reviewed-by: Simon Horman <horms@kernel.org>


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

* Re: [PATCH net-next v2 0/2] net: systemport: Minor IO macros changes
  2024-10-21 17:49 [PATCH net-next v2 0/2] net: systemport: Minor IO macros changes Florian Fainelli
  2024-10-21 17:49 ` [PATCH net-next v2 1/2] net: systemport: Remove unused txchk accessors Florian Fainelli
  2024-10-21 17:49 ` [PATCH net-next v2 2/2] net: systemport: Move IO macros to header file Florian Fainelli
@ 2024-10-28 23:00 ` patchwork-bot+netdevbpf
  2 siblings, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-10-28 23:00 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: netdev, bcm-kernel-feedback-list, davem, edumazet, kuba, pabeni,
	nathan, ndesaulniers, morbo, justinstitt, linux-kernel, llvm,
	vladimir.oltean

Hello:

This series was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Mon, 21 Oct 2024 10:49:33 -0700 you wrote:
> This patch series addresses the warning initially reported by Vladimir
> here:
> 
> https://lore.kernel.org/all/20241014150139.927423-1-vladimir.oltean@nxp.com/
> 
> and follows on with proceeding with his suggestion the IO macros to the
> header file.
> 
> [...]

Here is the summary with links:
  - [net-next,v2,1/2] net: systemport: Remove unused txchk accessors
    https://git.kernel.org/netdev/net-next/c/890bde75a236
  - [net-next,v2,2/2] net: systemport: Move IO macros to header file
    https://git.kernel.org/netdev/net-next/c/e69fbd287d5a

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] 6+ messages in thread

end of thread, other threads:[~2024-10-28 23:00 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-21 17:49 [PATCH net-next v2 0/2] net: systemport: Minor IO macros changes Florian Fainelli
2024-10-21 17:49 ` [PATCH net-next v2 1/2] net: systemport: Remove unused txchk accessors Florian Fainelli
2024-10-23 18:42   ` Simon Horman
2024-10-21 17:49 ` [PATCH net-next v2 2/2] net: systemport: Move IO macros to header file Florian Fainelli
2024-10-23 18:42   ` Simon Horman
2024-10-28 23:00 ` [PATCH net-next v2 0/2] net: systemport: Minor IO macros changes 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;
as well as URLs for NNTP newsgroup(s).