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

Commit 7dcec757 authored by Sinan Kaya's avatar Sinan Kaya Committed by Vinod Koul
Browse files

dmaengine: qcom_hidma: prevent disable in error 



When an error is observed, we try to disable the channel and prevent
further accesses from the client.

Depending on the type of error, transitioning into disabled state might
not be possible. Adding a check to make sure that HW is in enabled/running
state before the disable transition happens.

Signed-off-by: default avatarSinan Kaya <okaya@codeaurora.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 1001354c

drivers/dma/qcom/hidma_ll.c

+2 −13
Original line number Diff line number Diff line
@@ -564,19 +564,8 @@ int hidma_ll_disable(struct hidma_lldev *lldev) 
	u32 val;

	int ret;



	val = readl(lldev->evca + HIDMA_EVCA_CTRLSTS_REG);

	lldev->evch_state = HIDMA_CH_STATE(val);

	val = readl(lldev->trca + HIDMA_TRCA_CTRLSTS_REG);

	lldev->trch_state = HIDMA_CH_STATE(val);



	/* already suspended by this OS */

	if ((lldev->trch_state == HIDMA_CH_SUSPENDED) ||

	    (lldev->evch_state == HIDMA_CH_SUSPENDED))

		return 0;



	/* already stopped by the manager */

	if ((lldev->trch_state == HIDMA_CH_STOPPED) ||

	    (lldev->evch_state == HIDMA_CH_STOPPED))

	/* The channel needs to be in working state */

	if (!hidma_ll_isenabled(lldev))

		return 0;



	val = readl(lldev->trca + HIDMA_TRCA_CTRLSTS_REG);