Commit 6d306090 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'mhi-fixes-for-v6.14' of... 

Merge tag 'mhi-fixes-for-v6.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-linus

Manivannan writes:

MHI Host
========

- Use pci_try_reset_function() to reset the MHI function during recovery process
  to avoid the deadlock reported on the X1E80100 CRD device. The deadlock can
  happen if the caller has already acquired the 'device_lock()' while calling
  the recovery function. So using pci_try_reset_function() avoids the deadlock
  by returning -EAGAIN if the lock was already acquired.

* tag 'mhi-fixes-for-v6.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi:
  bus: mhi: host: pci_generic: Use pci_try_reset_function() to avoid deadlock
parents 954b8915 a321d163

drivers/bus/mhi/host/pci_generic.c

+3 −2
Original line number Diff line number Diff line
@@ -1095,8 +1095,9 @@ static void mhi_pci_recovery_work(struct work_struct *work) 
err_unprepare:

	mhi_unprepare_after_power_down(mhi_cntrl);

err_try_reset:

	if (pci_reset_function(pdev))

		dev_err(&pdev->dev, "Recovery failed\n");

	err = pci_try_reset_function(pdev);

	if (err)

		dev_err(&pdev->dev, "Recovery failed: %d\n", err);

}



static void health_check(struct timer_list *t)