Merge "msm: mhi: Prevent IRQ mask race condition in MHI" (554e3607) · Commits · e / devices / android_kernel_sony_msm8994

drivers/net/ethernet/msm/msm_rmnet_mhi.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -125,7 +125,7 @@ struct rmnet_mhi_private {
	u32 rx_enabled;		u32 rx_enabled;
	u32 mhi_enabled;		u32 mhi_enabled;
	struct net_device *dev;		struct net_device *dev;
	int32_t irq_masked_cntr;		atomic_t irq_masked_cntr;
	rwlock_t out_chan_full_lock;		rwlock_t out_chan_full_lock;
	};		};

	@@ -310,9 +310,9 @@ static int rmnet_mhi_poll(struct napi_struct *napi, int budget)

	/* We got a NULL descriptor back */		/* We got a NULL descriptor back */
	if (should_reschedule == false) {		if (should_reschedule == false) {
	if (rmnet_mhi_ptr->irq_masked_cntr) {		if (atomic_read(&rmnet_mhi_ptr->irq_masked_cntr)) {
			atomic_dec(&rmnet_mhi_ptr->irq_masked_cntr);
	mhi_unmask_irq(rmnet_mhi_ptr->rx_client_handle);		mhi_unmask_irq(rmnet_mhi_ptr->rx_client_handle);
	--rmnet_mhi_ptr->irq_masked_cntr;
	}		}
	} else {		} else {
	if (received_packets == budget)		if (received_packets == budget)
	@@ -497,7 +497,7 @@ static void rmnet_mhi_rx_cb(struct mhi_result *result)

	if (napi_schedule_prep(&(rmnet_mhi_ptr->napi))) {		if (napi_schedule_prep(&(rmnet_mhi_ptr->napi))) {
	mhi_mask_irq(rmnet_mhi_ptr->rx_client_handle);		mhi_mask_irq(rmnet_mhi_ptr->rx_client_handle);
	rmnet_mhi_ptr->irq_masked_cntr++;		atomic_inc(&rmnet_mhi_ptr->irq_masked_cntr);
	__napi_schedule(&(rmnet_mhi_ptr->napi));		__napi_schedule(&(rmnet_mhi_ptr->napi));
	} else {		} else {
	rx_interrupts_in_masked_irq[rmnet_mhi_ptr->dev_index]++;		rx_interrupts_in_masked_irq[rmnet_mhi_ptr->dev_index]++;
	@@ -539,9 +539,9 @@ static int rmnet_mhi_close(struct net_device *dev)
	rmnet_mhi_ptr->mhi_enabled = 0;		rmnet_mhi_ptr->mhi_enabled = 0;
	rmnet_mhi_disable_iface(rmnet_mhi_ptr);		rmnet_mhi_disable_iface(rmnet_mhi_ptr);
	napi_disable(&(rmnet_mhi_ptr->napi));		napi_disable(&(rmnet_mhi_ptr->napi));
	if (rmnet_mhi_ptr->irq_masked_cntr) {		if (atomic_read(&rmnet_mhi_ptr->irq_masked_cntr)) {
			atomic_dec(&rmnet_mhi_ptr->irq_masked_cntr);
	mhi_unmask_irq(rmnet_mhi_ptr->rx_client_handle);		mhi_unmask_irq(rmnet_mhi_ptr->rx_client_handle);
	--rmnet_mhi_ptr->irq_masked_cntr;
	}		}
	return 0;		return 0;
	}		}