Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 965cbbec authored by Gregory CLEMENT's avatar Gregory CLEMENT Committed by David S. Miller
Browse files

net: mvneta: remove data pointer usage from device_node structure 

On year ago Rob Herring wanted to remove the data pointer from the
device_node structure[1]. The mvneta driver seemed to be the only one
which used (abused ?) it. However, the proposal of Rob to remove this
pointer from the driver introduced a regression, and I tested and fixed an
alternative way, but it was never submitted as a proper patch.

Now here it is: Instead of using the device_node structure ->data
pointer, we store the BM private data as the driver data of the BM
platform_device. The core mvneta code can retrieve it by doing a lookup
on which platform_device corresponds to the BM device tree node using
of_find_device_by_node(), and get its driver data

[1]https://www.spinics.net/lists/netdev/msg445197.html



Signed-off-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8466baf7

drivers/net/ethernet/marvell/mvneta.c

+12 −6
Original line number Original line Diff line number Diff line
@@ -4461,14 +4461,18 @@ static int mvneta_probe(struct platform_device *pdev) 




	/* Obtain access to BM resources if enabled and already initialized */

	/* Obtain access to BM resources if enabled and already initialized */

	bm_node = of_parse_phandle(dn, "buffer-manager", 0);

	bm_node = of_parse_phandle(dn, "buffer-manager", 0);

	if (bm_node && bm_node->data) {

	if (bm_node) {

		pp->bm_priv = bm_node->data;

		pp->bm_priv = mvneta_bm_get(bm_node);

		if (pp->bm_priv) {

			err = mvneta_bm_port_init(pdev, pp);

			err = mvneta_bm_port_init(pdev, pp);

			if (err < 0) {

			if (err < 0) {

			dev_info(&pdev->dev, "use SW buffer management\n");

				dev_info(&pdev->dev,

					 "use SW buffer management\n");

				mvneta_bm_put(pp->bm_priv);

				pp->bm_priv = NULL;

				pp->bm_priv = NULL;

			}

			}

		}

		}

	}

	of_node_put(bm_node);

	of_node_put(bm_node);





	err = mvneta_init(&pdev->dev, pp);

	err = mvneta_init(&pdev->dev, pp);
@@ -4527,6 +4531,7 @@ static int mvneta_probe(struct platform_device *pdev) 
		mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_long, 1 << pp->id);

		mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_long, 1 << pp->id);

		mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_short,

		mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_short,

				       1 << pp->id);

				       1 << pp->id);

		mvneta_bm_put(pp->bm_priv);

	}

	}

err_free_stats:

err_free_stats:

	free_percpu(pp->stats);

	free_percpu(pp->stats);
@@ -4564,6 +4569,7 @@ static int mvneta_remove(struct platform_device *pdev) 
		mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_long, 1 << pp->id);

		mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_long, 1 << pp->id);

		mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_short,

		mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_short,

				       1 << pp->id);

				       1 << pp->id);

		mvneta_bm_put(pp->bm_priv);

	}

	}





	return 0;

	return 0;

drivers/net/ethernet/marvell/mvneta_bm.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/netdevice.h>

#include <linux/netdevice.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/skbuff.h>

#include <linux/skbuff.h>

#include <net/hwbm.h>

#include <net/hwbm.h>
@@ -392,6 +393,20 @@ static void mvneta_bm_put_sram(struct mvneta_bm *priv) 
		      MVNETA_BM_BPPI_SIZE);

		      MVNETA_BM_BPPI_SIZE);

}

}





struct mvneta_bm *mvneta_bm_get(struct device_node *node)

{

	struct platform_device *pdev = of_find_device_by_node(node);



	return pdev ? platform_get_drvdata(pdev) : NULL;

}

EXPORT_SYMBOL_GPL(mvneta_bm_get);



void mvneta_bm_put(struct mvneta_bm *priv)

{

	platform_device_put(priv->pdev);

}

EXPORT_SYMBOL_GPL(mvneta_bm_put);



static int mvneta_bm_probe(struct platform_device *pdev)

static int mvneta_bm_probe(struct platform_device *pdev)

{

{

	struct device_node *dn = pdev->dev.of_node;

	struct device_node *dn = pdev->dev.of_node;

drivers/net/ethernet/marvell/mvneta_bm.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -134,6 +134,9 @@ void *mvneta_frag_alloc(unsigned int frag_size); 
void mvneta_frag_free(unsigned int frag_size, void *data);

void mvneta_frag_free(unsigned int frag_size, void *data);





#if IS_ENABLED(CONFIG_MVNETA_BM)

#if IS_ENABLED(CONFIG_MVNETA_BM)

struct mvneta_bm *mvneta_bm_get(struct device_node *node);

void mvneta_bm_put(struct mvneta_bm *priv);



void mvneta_bm_pool_destroy(struct mvneta_bm *priv,

void mvneta_bm_pool_destroy(struct mvneta_bm *priv,

			    struct mvneta_bm_pool *bm_pool, u8 port_map);

			    struct mvneta_bm_pool *bm_pool, u8 port_map);

void mvneta_bm_bufs_free(struct mvneta_bm *priv, struct mvneta_bm_pool *bm_pool,

void mvneta_bm_bufs_free(struct mvneta_bm *priv, struct mvneta_bm_pool *bm_pool,
@@ -178,5 +181,7 @@ static inline void mvneta_bm_pool_put_bp(struct mvneta_bm *priv, 
static inline u32 mvneta_bm_pool_get_bp(struct mvneta_bm *priv,

static inline u32 mvneta_bm_pool_get_bp(struct mvneta_bm *priv,

					struct mvneta_bm_pool *bm_pool)

					struct mvneta_bm_pool *bm_pool)

{ return 0; }

{ return 0; }

struct mvneta_bm *mvneta_bm_get(struct device_node *node) { return NULL; }

void mvneta_bm_put(struct mvneta_bm *priv) {}

#endif /* CONFIG_MVNETA_BM */

#endif /* CONFIG_MVNETA_BM */

#endif
 
#endif