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

Commit f252974e authored by Jeremy Linton's avatar Jeremy Linton Committed by David S. Miller
Browse files

net: smsc911x: Move interrupt allocation to open/stop 



The /proc/irq/xx information is incorrect for smsc911x because
the request_irq is happening before the register_netdev has the
proper device name. Moving it to the open also fixes the case
of when the device is renamed.

Reported-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarJeremy Linton <jeremy.linton@arm.com>
Tested-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a85f00c3

drivers/net/ethernet/smsc/smsc911x.c

+18 −29
Original line number Diff line number Diff line
@@ -1575,6 +1575,7 @@ static int smsc911x_open(struct net_device *dev) 
	unsigned int temp;

	unsigned int intcfg;

	int retval;

	int irq_flags;



	/* find and start the given phy */

	if (!dev->phydev) {
@@ -1645,6 +1646,15 @@ static int smsc911x_open(struct net_device *dev) 
	pdata->software_irq_signal = 0;

	smp_wmb();



	irq_flags = irq_get_trigger_type(dev->irq);

	retval = request_irq(dev->irq, smsc911x_irqhandler,

			     irq_flags | IRQF_SHARED, dev->name, dev);

	if (retval) {

		SMSC_WARN(pdata, probe,

			  "Unable to claim requested irq: %d", dev->irq);

		goto mii_free_out;

	}



	temp = smsc911x_reg_read(pdata, INT_EN);

	temp |= INT_EN_SW_INT_EN_;

	smsc911x_reg_write(pdata, INT_EN, temp);
@@ -1660,7 +1670,7 @@ static int smsc911x_open(struct net_device *dev) 
		netdev_warn(dev, "ISR failed signaling test (IRQ %d)\n",

			    dev->irq);

		retval = -ENODEV;

		goto mii_free_out;

		goto irq_stop_out;

	}

	SMSC_TRACE(pdata, ifup, "IRQ handler passed test using IRQ %d",

		   dev->irq);
@@ -1707,6 +1717,8 @@ static int smsc911x_open(struct net_device *dev) 
	netif_start_queue(dev);

	return 0;



irq_stop_out:

	free_irq(dev->irq, dev);

mii_free_out:

	phy_disconnect(dev->phydev);

	dev->phydev = NULL;
@@ -1733,6 +1745,8 @@ static int smsc911x_stop(struct net_device *dev) 
	dev->stats.rx_dropped += smsc911x_reg_read(pdata, RX_DROP);

	smsc911x_tx_update_txcounters(dev);



	free_irq(dev->irq, dev);



	/* Bring the PHY down */

	if (dev->phydev) {

		phy_stop(dev->phydev);
@@ -2308,7 +2322,6 @@ static int smsc911x_drv_remove(struct platform_device *pdev) 
	mdiobus_free(pdata->mii_bus);



	unregister_netdev(dev);

	free_irq(dev->irq, dev);

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

					   "smsc911x-memory");

	if (!res)
@@ -2393,8 +2406,7 @@ static int smsc911x_drv_probe(struct platform_device *pdev) 
	struct smsc911x_data *pdata;

	struct smsc911x_platform_config *config = dev_get_platdata(&pdev->dev);

	struct resource *res;

	unsigned int intcfg = 0;

	int res_size, irq, irq_flags;

	int res_size, irq;

	int retval;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
@@ -2433,7 +2445,6 @@ static int smsc911x_drv_probe(struct platform_device *pdev) 


	pdata = netdev_priv(dev);

	dev->irq = irq;

	irq_flags = irq_get_trigger_type(irq);

	pdata->ioaddr = ioremap_nocache(res->start, res_size);



	pdata->dev = dev;
@@ -2480,38 +2491,18 @@ static int smsc911x_drv_probe(struct platform_device *pdev) 
	if (retval < 0)

		goto out_disable_resources;



	/* configure irq polarity and type before connecting isr */

	if (pdata->config.irq_polarity == SMSC911X_IRQ_POLARITY_ACTIVE_HIGH)

		intcfg |= INT_CFG_IRQ_POL_;



	if (pdata->config.irq_type == SMSC911X_IRQ_TYPE_PUSH_PULL)

		intcfg |= INT_CFG_IRQ_TYPE_;



	smsc911x_reg_write(pdata, INT_CFG, intcfg);



	/* Ensure interrupts are globally disabled before connecting ISR */

	smsc911x_disable_irq_chip(dev);



	retval = request_irq(dev->irq, smsc911x_irqhandler,

			     irq_flags | IRQF_SHARED, dev->name, dev);

	if (retval) {

		SMSC_WARN(pdata, probe,

			  "Unable to claim requested irq: %d", dev->irq);

		goto out_disable_resources;

	}



	netif_carrier_off(dev);



	retval = smsc911x_mii_init(pdev, dev);

	if (retval) {

		SMSC_WARN(pdata, probe, "Error %i initialising mii", retval);

		goto out_free_irq;

		goto out_disable_resources;

	}



	retval = register_netdev(dev);

	if (retval) {

		SMSC_WARN(pdata, probe, "Error %i registering device", retval);

		goto out_free_irq;

		goto out_disable_resources;

	} else {

		SMSC_TRACE(pdata, probe,

			   "Network interface: \"%s\"", dev->name);
@@ -2552,8 +2543,6 @@ static int smsc911x_drv_probe(struct platform_device *pdev) 


	return 0;



out_free_irq:

	free_irq(dev->irq, dev);

out_disable_resources:

	pm_runtime_put(&pdev->dev);

	pm_runtime_disable(&pdev->dev);