Commit 938dfdaa authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by David S. Miller
Browse files

net: stmmac: Allocate and pass soc/board specific data to callbacks 



The current .init and .exit callbacks requires access to driver
private data structures. This is not a good seperation and abstraction.

Instead, we add a new .setup callback for allocating private data, and
pass the returned pointer to the other callbacks.

Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c5e4ddbd

Documentation/networking/stmmac.txt

+8 −4
Original line number Diff line number Diff line
@@ -127,8 +127,9 @@ struct plat_stmmacenet_data { 
	int riwt_off;

	void (*fix_mac_speed)(void *priv, unsigned int speed);

	void (*bus_setup)(void __iomem *ioaddr);

	int (*init)(struct platform_device *pdev);

	void (*exit)(struct platform_device *pdev);

	void *(*setup)(struct platform_device *pdev);

	int (*init)(struct platform_device *pdev, void *priv);

	void (*exit)(struct platform_device *pdev, void *priv);

	void *custom_cfg;

	void *custom_data;

	void *bsp_priv;
@@ -169,10 +170,13 @@ Where: 
 o bus_setup: perform HW setup of the bus. For example, on some ST platforms

	     this field is used to configure the AMBA  bridge to generate more

	     efficient STBus traffic.

 o init/exit: callbacks used for calling a custom initialization;

 o setup/init/exit: callbacks used for calling a custom initialization;

	     this is sometime necessary on some platforms (e.g. ST boxes)

	     where the HW needs to have set some PIO lines or system cfg

	     registers.

	     registers. setup should return a pointer to private data,

	     which will be stored in bsp_priv, and then passed to init and

	     exit callbacks. init/exit callbacks should not use or modify

	     platform data.

 o custom_cfg/custom_data: this is a custom configuration that can be passed

			   while initializing the resources.

 o bsp_priv: another private pointer.

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+14 −4
Original line number Diff line number Diff line
@@ -144,9 +144,16 @@ static int stmmac_pltfr_probe(struct platform_device *pdev) 
		}

	}



	/* Custom setup (if needed) */

	if (plat_dat->setup) {

		plat_dat->bsp_priv = plat_dat->setup(pdev);

		if (IS_ERR(plat_dat->bsp_priv))

			return PTR_ERR(plat_dat->bsp_priv);

	}



	/* Custom initialisation (if needed)*/

	if (plat_dat->init) {

		ret = plat_dat->init(pdev);

		ret = plat_dat->init(pdev, plat_dat->bsp_priv);

		if (unlikely(ret))

			return ret;

	}
@@ -203,7 +210,10 @@ static int stmmac_pltfr_remove(struct platform_device *pdev) 
	int ret = stmmac_dvr_remove(ndev);



	if (priv->plat->exit)

		priv->plat->exit(pdev);

		priv->plat->exit(pdev, priv->plat->bsp_priv);



	if (priv->plat->free)

		priv->plat->free(pdev, priv->plat->bsp_priv);



	return ret;

}
@@ -218,7 +228,7 @@ static int stmmac_pltfr_suspend(struct device *dev) 


	ret = stmmac_suspend(ndev);

	if (priv->plat->exit)

		priv->plat->exit(pdev);

		priv->plat->exit(pdev, priv->plat->bsp_priv);



	return ret;

}
@@ -230,7 +240,7 @@ static int stmmac_pltfr_resume(struct device *dev) 
	struct platform_device *pdev = to_platform_device(dev);



	if (priv->plat->init)

		priv->plat->init(pdev);

		priv->plat->init(pdev, priv->plat->bsp_priv);



	return stmmac_resume(ndev);

}

include/linux/stmmac.h

+4 −2
Original line number Diff line number Diff line
@@ -113,8 +113,10 @@ struct plat_stmmacenet_data { 
	int max_speed;

	void (*fix_mac_speed)(void *priv, unsigned int speed);

	void (*bus_setup)(void __iomem *ioaddr);

	int (*init)(struct platform_device *pdev);

	void (*exit)(struct platform_device *pdev);

	void *(*setup)(struct platform_device *pdev);

	void (*free)(struct platform_device *pdev, void *priv);

	int (*init)(struct platform_device *pdev, void *priv);

	void (*exit)(struct platform_device *pdev, void *priv);

	void *custom_cfg;

	void *custom_data;

	void *bsp_priv;

CRA Git | Maintained and supported by SUSTech CRA and CCSE