lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Thu, 22 Jul 2021 23:42:20 +0300
From:   Sergei Shtylyov <sergei.shtylyov@...il.com>
To:     Biju Das <biju.das.jz@...renesas.com>,
        "David S. Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>
Cc:     Geert Uytterhoeven <geert+renesas@...der.be>,
        Sergey Shtylyov <s.shtylyov@...russia.ru>,
        Adam Ford <aford173@...il.com>, Andrew Lunn <andrew@...n.ch>,
        Yuusuke Ashizuka <ashiduka@...itsu.com>,
        Yoshihiro Shimoda <yoshihiro.shimoda.uh@...esas.com>,
        netdev@...r.kernel.org, linux-renesas-soc@...r.kernel.org,
        Chris Paterson <Chris.Paterson2@...esas.com>,
        Biju Das <biju.das@...renesas.com>,
        Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@...renesas.com>
Subject: Re: [PATCH net-next 05/18] ravb: Replace chip type with a structure
 for driver data

Hello!

On 7/22/21 5:13 PM, Biju Das wrote:

> The DMAC and EMAC blocks of Gigabit Ethernet IP is almost similar to
> Ethernet AVB. With few changes in driver we can support both the IP.
> 
> This patch is in preparation for supporting the same by replacing chip
> type by a structure with values, feature bits and function pointers.
> 
> Currently only values is added to structure and later patches will add
> features and function pointers.
> 
> Signed-off-by: Biju Das <biju.das.jz@...renesas.com>
> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@...renesas.com>
> ---
>  drivers/net/ethernet/renesas/ravb.h      | 14 +++++
>  drivers/net/ethernet/renesas/ravb_main.c | 76 +++++++++++++++++-------
>  2 files changed, 67 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
> index 80e62ca2e3d3..0ed21262f26b 100644
> --- a/drivers/net/ethernet/renesas/ravb.h
> +++ b/drivers/net/ethernet/renesas/ravb.h
> @@ -988,6 +988,18 @@ enum ravb_chip_id {
>  	RCAR_GEN3,
>  };
>  
> +struct ravb_drv_data {

   I'd rather suggest *struct* ravb_hw_info... This is hardly a driver data, more like
hwrdware's one. :-)

> +	netdev_features_t net_features;
> +	netdev_features_t net_hw_features;
> +	const char (*gstrings_stats)[ETH_GSTRING_LEN];
> +	size_t gstrings_size;
> +	size_t stats_len;
> +	u32 num_gstat_queue;
> +	size_t skb_sz;
> +	u8 num_tx_desc;
> +	enum ravb_chip_id chip_id;

   Mhm, I'd expect that chip_id is no longer needed with the feature structs... 

[...]
> @@ -1040,6 +1052,8 @@ struct ravb_private {
>  	unsigned txcidm:1;		/* TX Clock Internal Delay Mode */
>  	unsigned rgmii_override:1;	/* Deprecated rgmii-*id behavior */
>  	int num_tx_desc;		/* TX descriptors per packet */
> +
> +	const struct ravb_drv_data *info;

   So data or info? :-)

[...]
> diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
> index 805397088850..84ebd6fef711 100644
> --- a/drivers/net/ethernet/renesas/ravb_main.c
> +++ b/drivers/net/ethernet/renesas/ravb_main.c
[...]
> @@ -1176,9 +1179,12 @@ static void ravb_get_ethtool_stats(struct net_device *ndev,
>  
>  static void ravb_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
>  {
> +	struct ravb_private *priv = netdev_priv(ndev);
> +	const struct ravb_drv_data *info = priv->info;
> +
>  	switch (stringset) {
>  	case ETH_SS_STATS:
> -		memcpy(data, ravb_gstrings_stats, sizeof(ravb_gstrings_stats));
> +		memcpy(data, info->gstrings_stats, info->gstrings_size);
>  		break;
>  	}
>  }
> @@ -1924,12 +1930,36 @@ static int ravb_mdio_release(struct ravb_private *priv)
>  	return 0;
>  }
>  
> +static const struct ravb_drv_data ravb_gen3_data = {
> +	.net_features = NETIF_F_RXCSUM,
> +	.net_hw_features = NETIF_F_RXCSUM,
> +	.gstrings_stats = ravb_gstrings_stats,
> +	.gstrings_size = sizeof(ravb_gstrings_stats),
> +	.stats_len = ARRAY_SIZE(ravb_gstrings_stats),
> +	.num_gstat_queue = NUM_RX_QUEUE,
> +	.skb_sz = RX_BUF_SZ + RAVB_ALIGN - 1,
> +	.num_tx_desc = NUM_TX_DESC_GEN3,
> +	.chip_id = RCAR_GEN3,
> +};
> +
> +static const struct ravb_drv_data ravb_gen2_data = {
> +	.net_features = NETIF_F_RXCSUM,
> +	.net_hw_features = NETIF_F_RXCSUM,

   Mhm, why have the fields that don't change from SoC to SoC anyway?
I do think they should be added when a new SoC support is added...

> +	.gstrings_stats = ravb_gstrings_stats,
> +	.gstrings_size = sizeof(ravb_gstrings_stats),
> +	.stats_len = ARRAY_SIZE(ravb_gstrings_stats),

   Same question...

> +	.num_gstat_queue = NUM_RX_QUEUE,
> +	.skb_sz = RX_BUF_SZ + RAVB_ALIGN - 1,

   Again why?

> +	.num_tx_desc = NUM_TX_DESC_GEN2,
> +	.chip_id = RCAR_GEN2,
> +};
> +
[...]
> @@ -2052,15 +2082,15 @@ static int ravb_probe(struct platform_device *pdev)
>  	if (!ndev)
>  		return -ENOMEM;
>  
> -	ndev->features = NETIF_F_RXCSUM;
> -	ndev->hw_features = NETIF_F_RXCSUM;
> +	info = of_device_get_match_data(&pdev->dev);
> +
> +	ndev->features = info->net_features;
> +	ndev->hw_features = info->net_hw_features;
>  
>  	pm_runtime_enable(&pdev->dev);
>  	pm_runtime_get_sync(&pdev->dev);
>  
> -	chip_id = (enum ravb_chip_id)of_device_get_match_data(&pdev->dev);
> -
> -	if (chip_id == RCAR_GEN3)
> +	if (info->chip_id == RCAR_GEN3)

   Ugh...

>  		irq = platform_get_irq_byname(pdev, "ch22");
>  	else
>  		irq = platform_get_irq(pdev, 0);
[...]
> @@ -2099,7 +2130,7 @@ static int ravb_probe(struct platform_device *pdev)
>  	priv->avb_link_active_low =
>  		of_property_read_bool(np, "renesas,ether-link-active-low");
>  
> -	if (chip_id == RCAR_GEN3) {
> +	if (info->chip_id == RCAR_GEN3) {

   Ugh...

>  		irq = platform_get_irq_byname(pdev, "ch24");
>  		if (irq < 0) {
>  			error = irq;
[...]
> @@ -2184,7 +2214,7 @@ static int ravb_probe(struct platform_device *pdev)
>  	INIT_LIST_HEAD(&priv->ts_skb_list);
>  
>  	/* Initialise PTP Clock driver */
> -	if (chip_id != RCAR_GEN2)
> +	if (info->chip_id != RCAR_GEN2)
>  		ravb_ptp_init(ndev, pdev);

   Ugh...

>  
>  	/* Debug message level */
> @@ -2232,7 +2262,7 @@ static int ravb_probe(struct platform_device *pdev)
>  			  priv->desc_bat_dma);
>  
>  	/* Stop PTP Clock driver */
> -	if (chip_id != RCAR_GEN2)
> +	if (info->chip_id != RCAR_GEN2)
>  		ravb_ptp_stop(ndev);

  Ugh...


>  out_disable_refclk:
>  	clk_disable_unprepare(priv->refclk);

MBR, Sergei

Powered by blists - more mailing lists