From b26885400f1453f50bcf812d7ceabac810482163 Mon Sep 17 00:00:00 2001 From: Nagarjuna Kristam Date: Tue, 24 May 2022 11:48:21 +0530 Subject: [PATCH] pcie: EDMA: fix EDMA init condition. EDMA library needs to be initialized if there is change in EDMA channel config or when cookie is NULL. Set the condition accordingly. Bug 3622706 Bug 3877429 Change-Id: If919752cce08e203aa9d0b501f26f2e00b523575 Signed-off-by: Nagarjuna Kristam Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2717246 (cherry picked from commit 7434fc757e6c4b23aeb91b73f8e2a62f080c6d24) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2815926 Reviewed-by: Manikanta Maddireddy Reviewed-by: Bitan Biswas GVS: Gerrit_Virtual_Submit --- include/linux/tegra-pcie-edma-test-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/tegra-pcie-edma-test-common.h b/include/linux/tegra-pcie-edma-test-common.h index 298b167f..d2409384 100644 --- a/include/linux/tegra-pcie-edma-test-common.h +++ b/include/linux/tegra-pcie-edma-test-common.h @@ -200,7 +200,7 @@ static int edmalib_common_test(struct edmalib_common *edma) edma->tsz = (u64)edma->stress_count * (nents_per_ch) * (u64)edma->dma_size * 8UL; - if (!edma->cookie && (edma->prev_edma_ch != edma->edma_ch)) { + if (!edma->cookie || (edma->prev_edma_ch != edma->edma_ch)) { dev_info(edma->fdev, "%s: re-init edma lib prev_ch(%x) != current chans(%x)\n", __func__, edma->prev_edma_ch, edma->edma_ch); edma->cookie = tegra_pcie_edma_initialize(&info);