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

Commit a29b5f8a authored by Ravi Gummadidala's avatar Ravi Gummadidala Committed by Gerrit - the friendly Code Review server
Browse files

msm: ipa: lock the TX queue during state update 



The netif_stop_queue calls on data path are protected by the
TX queue lock but the netif_wake_queue calls are not. Add
locking on these wake operations to prevent race conditions
on SMP.

Change-Id: Ibb8b04790944c7b969c214ce5359655e2f7e4176
Signed-off-by: default avatarRavi Gummadidala <rgummadi@codeaurora.org>
parent d5e312a9

drivers/platform/msm/ipa/rmnet_ipa.c

+6 −1
Original line number Diff line number Diff line
@@ -1019,6 +1019,7 @@ static void apps_ipa_tx_complete_notify(void *priv, 
		return;

	}

	atomic_dec(&wwan_ptr->outstanding_pkts);

	__netif_tx_lock_bh(netdev_get_tx_queue(dev, 0));

	if (netif_queue_stopped(wwan_ptr->net) &&

		atomic_read(&wwan_ptr->outstanding_pkts) <

					(wwan_ptr->outstanding_low)) {
@@ -1026,6 +1027,7 @@ static void apps_ipa_tx_complete_notify(void *priv, 
				wwan_ptr->outstanding_low);

		netif_wake_queue(wwan_ptr->net);

	}

	__netif_tx_unlock_bh(netdev_get_tx_queue(dev, 0));

	dev_kfree_skb_any(skb);

	ipa_rm_inactivity_timer_release_resource(

		IPA_RM_RESOURCE_WWAN_0_PROD);
@@ -1590,8 +1592,11 @@ void q6_deinitialize_rm(void) 


static void wake_tx_queue(struct work_struct *work)

{

	if (ipa_netdevs[0])

	if (ipa_netdevs[0]) {

		__netif_tx_lock_bh(netdev_get_tx_queue(ipa_netdevs[0], 0));

		netif_wake_queue(ipa_netdevs[0]);

		__netif_tx_unlock_bh(netdev_get_tx_queue(ipa_netdevs[0], 0));

	}

}



/**