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

Commit 0770db49 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mhi: cntrl: qcom: disable runtime PM support in a graceful manner"

parents 365365e9 fe0ec623

drivers/bus/mhi/controllers/mhi_arch_qcom.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -52,8 +52,6 @@ enum MHI_DEBUG_LEVEL mhi_ipc_log_lvl = MHI_MSG_LVL_ERROR; 




#endif

#endif





extern void pm_runtime_init(struct device *dev);



static int mhi_arch_set_bus_request(struct mhi_controller *mhi_cntrl, int index)

static int mhi_arch_set_bus_request(struct mhi_controller *mhi_cntrl, int index)

{

{

	struct mhi_dev *mhi_dev = mhi_controller_get_devdata(mhi_cntrl);

	struct mhi_dev *mhi_dev = mhi_controller_get_devdata(mhi_cntrl);
@@ -105,7 +103,7 @@ static int mhi_arch_esoc_ops_power_on(void *priv, bool mdm_state) 
	MHI_LOG("Enter\n");

	MHI_LOG("Enter\n");





	/* reset rpm state */

	/* reset rpm state */

	pm_runtime_init(&pci_dev->dev);

	pm_runtime_set_active(&pci_dev->dev);

	pm_runtime_enable(&pci_dev->dev);

	pm_runtime_enable(&pci_dev->dev);

	mutex_unlock(&mhi_cntrl->pm_mutex);

	mutex_unlock(&mhi_cntrl->pm_mutex);

	pm_runtime_forbid(&pci_dev->dev);

	pm_runtime_forbid(&pci_dev->dev);

drivers/bus/mhi/controllers/mhi_qcom.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -67,6 +67,9 @@ void mhi_deinit_pci_dev(struct mhi_controller *mhi_cntrl) 
	struct mhi_dev *mhi_dev = mhi_controller_get_devdata(mhi_cntrl);

	struct mhi_dev *mhi_dev = mhi_controller_get_devdata(mhi_cntrl);

	struct pci_dev *pci_dev = mhi_dev->pci_dev;

	struct pci_dev *pci_dev = mhi_dev->pci_dev;





	pm_runtime_mark_last_busy(&pci_dev->dev);

	pm_runtime_dont_use_autosuspend(&pci_dev->dev);

	pm_runtime_disable(&pci_dev->dev);

	pci_free_irq_vectors(pci_dev);

	pci_free_irq_vectors(pci_dev);

	kfree(mhi_cntrl->irq);

	kfree(mhi_cntrl->irq);

	mhi_cntrl->irq = NULL;

	mhi_cntrl->irq = NULL;