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

Commit 1373c0fd authored by Steve Glendinning's avatar Steve Glendinning Committed by David S. Miller
Browse files

smsc911x: leave RX_STOP interrupt permanently enabled 



smsc911x_set_multicast_list currently performs the only non-atomic
read-modify-write of INT_EN.  This patch permanently enables the
RXSTOP_INT interrupt, and changes the ISR to only conditionally run the
multicast filter workaround code.

Signed-off-by: default avatarSteve Glendinning <steve.glendinning@smsc.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a528079e

drivers/net/smsc911x.c

+3 −10
Original line number Diff line number Diff line
@@ -1247,7 +1247,7 @@ static int smsc911x_open(struct net_device *dev) 
	napi_enable(&pdata->napi);



	temp = smsc911x_reg_read(pdata, INT_EN);

	temp |= (INT_EN_TDFA_EN_ | INT_EN_RSFL_EN_);

	temp |= (INT_EN_TDFA_EN_ | INT_EN_RSFL_EN_ | INT_EN_RXSTOP_INT_EN_);

	smsc911x_reg_write(pdata, INT_EN, temp);



	spin_lock_irq(&pdata->mac_lock);
@@ -1419,11 +1419,6 @@ static void smsc911x_set_multicast_list(struct net_device *dev) 


			/* Request the hardware to stop, then perform the

			 * update when we get an RX_STOP interrupt */

			smsc911x_reg_write(pdata, INT_STS, INT_STS_RXSTOP_INT_);

			temp = smsc911x_reg_read(pdata, INT_EN);

			temp |= INT_EN_RXSTOP_INT_EN_;

			smsc911x_reg_write(pdata, INT_EN, temp);



			temp = smsc911x_mac_read(pdata, MAC_CR);

			temp &= ~(MAC_CR_RXEN_);

			smsc911x_mac_write(pdata, MAC_CR, temp);
@@ -1462,10 +1457,8 @@ static irqreturn_t smsc911x_irqhandler(int irq, void *dev_id) 
		/* Called when there is a multicast update scheduled and

		 * it is now safe to complete the update */

		SMSC_TRACE(INTR, "RX Stop interrupt");

		temp = smsc911x_reg_read(pdata, INT_EN);

		temp &= (~INT_EN_RXSTOP_INT_EN_);

		smsc911x_reg_write(pdata, INT_EN, temp);

		smsc911x_reg_write(pdata, INT_STS, INT_STS_RXSTOP_INT_);

		if (pdata->multicast_update_pending)

			smsc911x_rx_multicast_update_workaround(pdata);

		serviced = IRQ_HANDLED;

	}