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

Commit f2ce825d authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Dale Farnsworth
Browse files

mv643xx_eth: mbus decode window support 



Make it possible to pass mbus_dram_target_info to the mv643xx_eth
driver via the platform data, and make the mv643xx_eth driver
program the window registers based on this data if it is passed in.

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Reviewed-by: default avatarTzachi Perelstein <tzachi@marvell.com>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarDale Farnsworth <dale@farnsworth.org>
parent fa3959f4

drivers/net/mv643xx_eth.c

+51 −0
Original line number Diff line number Diff line
@@ -91,6 +91,11 @@ 
 */

#define PHY_ADDR_REG				0x0000

#define SMI_REG					0x0004

#define WINDOW_BASE(i)				(0x0200 + ((i) << 3))

#define WINDOW_SIZE(i)				(0x0204 + ((i) << 3))

#define WINDOW_REMAP_HIGH(i)			(0x0280 + ((i) << 2))

#define WINDOW_BAR_ENABLE			0x0290

#define WINDOW_PROTECT(i)			(0x0294 + ((i) << 4))



/*

 * Per-port registers.
@@ -512,6 +517,8 @@ struct mv643xx_shared_private { 


	/* used to protect SMI_REG, which is shared across ports */

	spinlock_t phy_lock;



	u32 win_protect;

};



struct mv643xx_private {
@@ -1888,6 +1895,9 @@ static int mv643xx_eth_probe(struct platform_device *pdev) 
	mp->shared = platform_get_drvdata(pd->shared);

	port_num = mp->port_num = pd->port_number;



	if (mp->shared->win_protect)

		wrl(mp, WINDOW_PROTECT(port_num), mp->shared->win_protect);



	/* set default config values */

	eth_port_uc_addr_get(mp, dev->dev_addr);

	mp->rx_ring_size = PORT_DEFAULT_RECEIVE_QUEUE_SIZE;
@@ -1992,9 +2002,44 @@ static int mv643xx_eth_remove(struct platform_device *pdev) 
	return 0;

}



static void mv643xx_eth_conf_mbus_windows(struct mv643xx_shared_private *msp,

					  struct mbus_dram_target_info *dram)

{

	void __iomem *base = msp->eth_base;

	u32 win_enable;

	u32 win_protect;

	int i;



	for (i = 0; i < 6; i++) {

		writel(0, base + WINDOW_BASE(i));

		writel(0, base + WINDOW_SIZE(i));

		if (i < 4)

			writel(0, base + WINDOW_REMAP_HIGH(i));

	}



	win_enable = 0x3f;

	win_protect = 0;



	for (i = 0; i < dram->num_cs; i++) {

		struct mbus_dram_window *cs = dram->cs + i;



		writel((cs->base & 0xffff0000) |

			(cs->mbus_attr << 8) |

			dram->mbus_dram_target_id, base + WINDOW_BASE(i));

		writel((cs->size - 1) & 0xffff0000, base + WINDOW_SIZE(i));



		win_enable &= ~(1 << i);

		win_protect |= 3 << (2 * i);

	}



	writel(win_enable, base + WINDOW_BAR_ENABLE);

	msp->win_protect = win_protect;

}



static int mv643xx_eth_shared_probe(struct platform_device *pdev)

{

	static int mv643xx_version_printed = 0;

	struct mv643xx_eth_shared_platform_data *pd = pdev->dev.platform_data;

	struct mv643xx_shared_private *msp;

	struct resource *res;

	int ret;
@@ -2021,6 +2066,12 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, msp);



	/*

	 * (Re-)program MBUS remapping windows if we are asked to.

	 */

	if (pd != NULL && pd->dram != NULL)

		mv643xx_eth_conf_mbus_windows(msp, pd->dram);



	return 0;



out_free:

include/linux/mv643xx_eth.h

+6 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#ifndef __LINUX_MV643XX_ETH_H

#define __LINUX_MV643XX_ETH_H



#include <linux/mbus.h>



#define MV643XX_ETH_SHARED_NAME		"mv643xx_eth_shared"

#define MV643XX_ETH_NAME		"mv643xx_eth"

#define MV643XX_ETH_SHARED_REGS		0x2000
@@ -13,6 +15,10 @@ 
#define MV643XX_ETH_SIZE_REG_4		0x2224

#define MV643XX_ETH_BASE_ADDR_ENABLE_REG	0x2290



struct mv643xx_eth_shared_platform_data {

	struct mbus_dram_target_info	*dram;

};



struct mv643xx_eth_platform_data {

	struct platform_device	*shared;

	int		port_number;