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

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

mv643xx_eth: get rid of static variables, allow multiple instances 



Move mv643xx_eth's static state (ethernet register block base address
and MII management interface spinlock) into a struct hanging off the
shared platform device.  This is necessary to support chips that
contain multiple mv643xx_eth silicon blocks.

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Acked-by: default avatarNicolas Pitre <nico@marvell.com>
Signed-off-by: default avatarDale Farnsworth <dale@farnsworth.org>
parent e31a94ed

arch/arm/mach-orion5x/common.c

+2 −0
Original line number Diff line number Diff line
@@ -223,7 +223,9 @@ static struct platform_device orion5x_eth = { 


void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data)

{

	eth_data->shared = &orion5x_eth_shared;

	orion5x_eth.dev.platform_data = eth_data;



	platform_device_register(&orion5x_eth_shared);

	platform_device_register(&orion5x_eth);

}

arch/powerpc/platforms/chrp/pegasos_eth.c

+4 −0
Original line number Diff line number Diff line
@@ -58,7 +58,9 @@ static struct resource mv643xx_eth0_resources[] = { 




static struct mv643xx_eth_platform_data eth0_pd = {

	.shared		= &mv643xx_eth_shared_device,

	.port_number	= 0,



	.tx_sram_addr = PEGASOS2_SRAM_BASE_ETH0,

	.tx_sram_size = PEGASOS2_SRAM_TXRING_SIZE,

	.tx_queue_size = PEGASOS2_SRAM_TXRING_SIZE/16,
@@ -88,7 +90,9 @@ static struct resource mv643xx_eth1_resources[] = { 
};



static struct mv643xx_eth_platform_data eth1_pd = {

	.shared		= &mv643xx_eth_shared_device,

	.port_number	= 1,



	.tx_sram_addr = PEGASOS2_SRAM_BASE_ETH1,

	.tx_sram_size = PEGASOS2_SRAM_TXRING_SIZE,

	.tx_queue_size = PEGASOS2_SRAM_TXRING_SIZE/16,

arch/powerpc/sysdev/mv64x60_dev.c

+2 −0
Original line number Diff line number Diff line
@@ -239,6 +239,8 @@ static int __init mv64x60_eth_device_setup(struct device_node *np, int id, 


	memset(&pdata, 0, sizeof(pdata));



	pdata.shared = shared_pdev;



	prop = of_get_property(np, "reg", NULL);

	if (!prop)

		return -ENODEV;

arch/ppc/syslib/mv64x60.c

+3 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ static struct resource mv64x60_eth0_resources[] = { 
};



static struct mv643xx_eth_platform_data eth0_pd = {

	.shared		= &mv64x60_eth_shared_device;

	.port_number	= 0,

};
@@ -366,6 +367,7 @@ static struct resource mv64x60_eth1_resources[] = { 
};



static struct mv643xx_eth_platform_data eth1_pd = {

	.shared		= &mv64x60_eth_shared_device;

	.port_number	= 1,

};
@@ -391,6 +393,7 @@ static struct resource mv64x60_eth2_resources[] = { 
};



static struct mv643xx_eth_platform_data eth2_pd = {

	.shared		= &mv64x60_eth_shared_device;

	.port_number	= 2,

};

drivers/net/mv643xx_eth.c

+45 −17
Original line number Diff line number Diff line
@@ -507,7 +507,15 @@ struct mv643xx_mib_counters { 
	u32 late_collision;

};



struct mv643xx_shared_private {

	void __iomem *eth_base;



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

	spinlock_t phy_lock;

};



struct mv643xx_private {

	struct mv643xx_shared_private *shared;

	int port_num;			/* User Ethernet port number	*/



	u32 rx_sram_addr;		/* Base address of rx sram area */
@@ -614,19 +622,14 @@ static const struct ethtool_ops mv643xx_ethtool_ops; 
static char mv643xx_driver_name[] = "mv643xx_eth";

static char mv643xx_driver_version[] = "1.0";



static void __iomem *mv643xx_eth_base;



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

static DEFINE_SPINLOCK(mv643xx_eth_phy_lock);



static inline u32 rdl(struct mv643xx_private *mp, int offset)

{

	return readl(mv643xx_eth_base + offset);

	return readl(mp->shared->eth_base + offset);

}



static inline void wrl(struct mv643xx_private *mp, int offset, u32 data)

{

	writel(data, mv643xx_eth_base + offset);

	writel(data, mp->shared->eth_base + offset);

}



/*
@@ -1827,6 +1830,11 @@ static int mv643xx_eth_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	if (pd->shared == NULL) {

		printk(KERN_ERR "No mv643xx_eth_platform_data->shared\n");

		return -ENODEV;

	}



	dev = alloc_etherdev(sizeof(struct mv643xx_private));

	if (!dev)

		return -ENOMEM;
@@ -1877,6 +1885,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev) 


	spin_lock_init(&mp->lock);



	mp->shared = platform_get_drvdata(pd->shared);

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



	/* set default config values */
@@ -1986,27 +1995,46 @@ static int mv643xx_eth_remove(struct platform_device *pdev) 
static int mv643xx_eth_shared_probe(struct platform_device *pdev)

{

	static int mv643xx_version_printed = 0;

	struct mv643xx_shared_private *msp;

	struct resource *res;

	int ret;



	if (!mv643xx_version_printed++)

		printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");



	ret = -EINVAL;

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (res == NULL)

		return -ENODEV;

		goto out;



	mv643xx_eth_base = ioremap(res->start, res->end - res->start + 1);

	if (mv643xx_eth_base == NULL)

		return -ENOMEM;

	ret = -ENOMEM;

	msp = kmalloc(sizeof(*msp), GFP_KERNEL);

	if (msp == NULL)

		goto out;

	memset(msp, 0, sizeof(*msp));



	msp->eth_base = ioremap(res->start, res->end - res->start + 1);

	if (msp->eth_base == NULL)

		goto out_free;



	spin_lock_init(&msp->phy_lock);



	platform_set_drvdata(pdev, msp);



	return 0;



out_free:

	kfree(msp);

out:

	return ret;

}



static int mv643xx_eth_shared_remove(struct platform_device *pdev)

{

	iounmap(mv643xx_eth_base);

	mv643xx_eth_base = NULL;

	struct mv643xx_shared_private *msp = platform_get_drvdata(pdev);



	iounmap(msp->eth_base);

	kfree(msp);



	return 0;

}
@@ -2911,7 +2939,7 @@ static void eth_port_read_smi_reg(struct mv643xx_private *mp, 
	int i;



	/* the SMI register is a shared resource */

	spin_lock_irqsave(&mv643xx_eth_phy_lock, flags);

	spin_lock_irqsave(&mp->shared->phy_lock, flags);



	/* wait for the SMI register to become available */

	for (i = 0; rdl(mp, SMI_REG) & ETH_SMI_BUSY; i++) {
@@ -2936,7 +2964,7 @@ static void eth_port_read_smi_reg(struct mv643xx_private *mp, 


	*value = rdl(mp, SMI_REG) & 0xffff;

out:

	spin_unlock_irqrestore(&mv643xx_eth_phy_lock, flags);

	spin_unlock_irqrestore(&mp->shared->phy_lock, flags);

}



/*
@@ -2969,7 +2997,7 @@ static void eth_port_write_smi_reg(struct mv643xx_private *mp, 
	phy_addr = ethernet_phy_get(mp);



	/* the SMI register is a shared resource */

	spin_lock_irqsave(&mv643xx_eth_phy_lock, flags);

	spin_lock_irqsave(&mp->shared->phy_lock, flags);



	/* wait for the SMI register to become available */

	for (i = 0; rdl(mp, SMI_REG) & ETH_SMI_BUSY; i++) {
@@ -2983,7 +3011,7 @@ static void eth_port_write_smi_reg(struct mv643xx_private *mp, 
	wrl(mp, SMI_REG, (phy_addr << 16) | (phy_reg << 21) |

				ETH_SMI_OPCODE_WRITE | (value & 0xffff));

out:

	spin_unlock_irqrestore(&mv643xx_eth_phy_lock, flags);

	spin_unlock_irqrestore(&mp->shared->phy_lock, flags);

}



/*