Re: [PATCH net-next 02/15] net: sparx5: add indirection layer to register macros

[Jacob Keller]

On 10/1/2024 6:50 AM, Daniel Machon wrote:
> The register macros are used to read and write to the switch registers.
> The registers are largely the same on Sparx5 and lan969x, however in some
> cases they differ. The differences can be one or more of the following:
> target size, register address, register count, group address, group
> count, group size, field position, field size.
> 
> In order to handle these differences, we introduce a new indirection
> layer, that defines and maps them to corresponding values, based on the
> platform. As the register macro arguments can now be non-constants, we
> also add non-constant variants of FIELD_GET and FIELD_PREP.
> 
> Since the indirection layer contributes to longer macros, we have
> changed the formatting of them slightly, to adhere to a 80 character
> limit, and added a comment if a macro is platform-specific.
> 
> With these additions, we can reuse all the existing macros for
> lan969x.
> 
> Signed-off-by: Daniel Machon <daniel.machon@xxxxxxxxxxxxx>
> Reviewed-by: Steen Hegelund <Steen.Hegelund@xxxxxxxxxxxxx>
> ---
>  drivers/net/ethernet/microchip/sparx5/Makefile     |    2 +-
>  .../net/ethernet/microchip/sparx5/sparx5_main.c    |   17 +
>  .../net/ethernet/microchip/sparx5/sparx5_main.h    |   15 +
>  .../ethernet/microchip/sparx5/sparx5_main_regs.h   | 4128 +++++++++++---------
>  .../net/ethernet/microchip/sparx5/sparx5_regs.c    |  219 ++
>  .../net/ethernet/microchip/sparx5/sparx5_regs.h    |  244 ++
>  6 files changed, 2755 insertions(+), 1870 deletions(-)
> 
> diff --git a/drivers/net/ethernet/microchip/sparx5/Makefile b/drivers/net/ethernet/microchip/sparx5/Makefile
> index 288de95add18..3435ca86dd70 100644
> --- a/drivers/net/ethernet/microchip/sparx5/Makefile
> +++ b/drivers/net/ethernet/microchip/sparx5/Makefile
> @@ -11,7 +11,7 @@ sparx5-switch-y  := sparx5_main.o sparx5_packet.o \
>   sparx5_ptp.o sparx5_pgid.o sparx5_tc.o sparx5_qos.o \
>   sparx5_vcap_impl.o sparx5_vcap_ag_api.o sparx5_tc_flower.o \
>   sparx5_tc_matchall.o sparx5_pool.o sparx5_sdlb.o sparx5_police.o \
> - sparx5_psfp.o sparx5_mirror.o
> + sparx5_psfp.o sparx5_mirror.o sparx5_regs.o
>  
>  sparx5-switch-$(CONFIG_SPARX5_DCB) += sparx5_dcb.o
>  sparx5-switch-$(CONFIG_DEBUG_FS) += sparx5_vcap_debugfs.o
> diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
> index 179a1dc0d8f6..9a8d2e8c02a5 100644
> --- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
> +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
> @@ -29,6 +29,8 @@
>  #include "sparx5_port.h"
>  #include "sparx5_qos.h"
>  
> +const struct sparx5_regs *regs;
> +
>  #define QLIM_WM(fraction) \
>  	((SPX5_BUFFER_MEMORY / SPX5_BUFFER_CELL_SZ - 100) * (fraction) / 100)
>  #define IO_RANGES 3
> @@ -759,6 +761,9 @@ static int mchp_sparx5_probe(struct platform_device *pdev)
>  	sparx5->data = device_get_match_data(sparx5->dev);
>  	if (!sparx5->data)
>  		return -EINVAL;
> +
> +	regs = sparx5->data->regs;
> +
>  	/* Do switch core reset if available */
>  	reset = devm_reset_control_get_optional_shared(&pdev->dev, "switch");
>  	if (IS_ERR(reset))
> @@ -937,10 +942,22 @@ static void mchp_sparx5_remove(struct platform_device *pdev)
>  	destroy_workqueue(sparx5->mact_queue);
>  }
>  
> +static const struct sparx5_regs sparx5_regs = {
> +	.tsize = sparx5_tsize,
> +	.gaddr = sparx5_gaddr,
> +	.gcnt = sparx5_gcnt,
> +	.gsize = sparx5_gsize,
> +	.raddr = sparx5_raddr,
> +	.rcnt = sparx5_rcnt,
> +	.fpos = sparx5_fpos,
> +	.fsize = sparx5_fsize,
> +};
> +
>  static const struct sparx5_match_data sparx5_desc = {
>  	.iomap = sparx5_main_iomap,
>  	.iomap_size = ARRAY_SIZE(sparx5_main_iomap),
>  	.ioranges = 3,
> +	.regs = &sparx5_regs,
>  };
>  
>  static const struct of_device_id mchp_sparx5_match[] = {
> diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
> index 845f918aaf5e..e3f22b730d80 100644
> --- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
> +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
> @@ -226,6 +226,17 @@ struct sparx5_mall_entry {
>  #define SPARX5_SKB_CB(skb) \
>  	((struct sparx5_skb_cb *)((skb)->cb))
>  
> +struct sparx5_regs {
> +	const unsigned int *tsize;
> +	const unsigned int *gaddr;
> +	const unsigned int *gcnt;
> +	const unsigned int *gsize;
> +	const unsigned int *raddr;
> +	const unsigned int *rcnt;
> +	const unsigned int *fpos;
> +	const unsigned int *fsize;
> +};
> +
>  struct sparx5_main_io_resource {
>  	enum sparx5_target id;
>  	phys_addr_t offset;
> @@ -233,6 +244,7 @@ struct sparx5_main_io_resource {
>  };
>  
>  struct sparx5_match_data {
> +	const struct sparx5_regs *regs;
>  	const struct sparx5_main_io_resource *iomap;
>  	int ioranges;
>  	int iomap_size;
> @@ -308,6 +320,9 @@ struct sparx5 {
>  	const struct sparx5_match_data *data;
>  };
>  
> +/* sparx5_main.c */
> +extern const struct sparx5_regs *regs;
> +
>  /* sparx5_switchdev.c */
>  int sparx5_register_notifier_blocks(struct sparx5 *sparx5);
>  void sparx5_unregister_notifier_blocks(struct sparx5 *sparx5);
> diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main_regs.h b/drivers/net/ethernet/microchip/sparx5/sparx5_main_regs.h
> index 22acc1f3380c..3783cfd1d855 100644
> --- a/drivers/net/ethernet/microchip/sparx5/sparx5_main_regs.h
> +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main_regs.h
> @@ -1,11 +1,11 @@
>  /* SPDX-License-Identifier: GPL-2.0+
>   * Microchip Sparx5 Switch driver
>   *
> - * Copyright (c) 2021 Microchip Technology Inc.
> + * Copyright (c) 2024 Microchip Technology Inc.
>   */
>  
> -/* This file is autogenerated by cml-utils 2023-02-10 11:18:53 +0100.
> - * Commit ID: c30fb4bf0281cd4a7133bdab6682f9e43c872ada
> +/* This file is autogenerated by cml-utils 2024-09-24 14:13:28 +0200.
> + * Commit ID: 9d07b8d19363f3cd3590ddb3f7a2e2768e16524b
>   */
>  
>  #ifndef _SPARX5_MAIN_REGS_H_
> @@ -15,6 +15,8 @@
>  #include <linux/types.h>
>  #include <linux/bug.h>
>  
> +#include "sparx5_regs.h"
> +
>  enum sparx5_target {
>  	TARGET_ANA_AC = 1,
>  	TARGET_ANA_ACL = 2,
> @@ -52,14 +54,28 @@ enum sparx5_target {
>  	TARGET_VCAP_SUPER = 326,
>  	TARGET_VOP = 327,
>  	TARGET_XQS = 331,
> -	NUM_TARGETS = 332
> +	NUM_TARGETS = 517
>  };
>  
> +/* Non-constant mask variant of FIELD_GET() and FIELD_PREP() */
> +#define spx5_field_get(_mask, _reg) (((_reg) & (_mask)) >> (ffs(_mask) - 1))
> +#define spx5_field_prep(_mask, _val) (((_val) << (ffs(_mask) - 1)) & (_mask))
> +

FIELD_GET and FIELD_SET have restrictions in place to enforce constant
mask, which enables strict checks to ensure things fit and determine the
bit shifts at compile time without ffs.

Would it make sense for these to exist in <linux/bitfields.h>? I'm not
sure how common it is to have non-const masks..

> +#define GADDR(o)  regs->gaddr[o]
> +#define GCNT(o)   regs->gcnt[o]
> +#define GSIZE(o)  regs->gsize[o]
> +#define RADDR(o)  regs->raddr[o]
> +#define RCNT(o)   regs->rcnt[o]
> +#define FPOS(o)   regs->fpos[o]
> +#define FSIZE(o)  regs->fsize[o]
> +#define TSIZE(o)  regs->tsize[o]

This implementation requires 'regs' to be in scope without being passed
as a parameter. I guess thats just assumed here?