From ccc854ca556f2598d101c26648ecf88eae5c8bdb Mon Sep 17 00:00:00 2001 From: Srinivasarao Pathipati Date: Mon, 14 Feb 2022 01:30:02 +0530 Subject: [PATCH] dma-buf: suppress warnings for direct dma clients Client with direct dma will have multiple dma buffer segments. Warning is raised as partial cmo only supported with one segment. Suppress these warnings as this is known limitation. Change-Id: Ie534b2b11121e60bf87f671b14ea1b1fd57633af Signed-off-by: Srinivasarao Pathipati --- drivers/soc/qcom/mem_buf_dma_buf.c | 8 +++++--- drivers/staging/android/ion/heaps/msm_ion_dma_buf.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/soc/qcom/mem_buf_dma_buf.c b/drivers/soc/qcom/mem_buf_dma_buf.c index 1927a7bc70c5..1b15e35dae38 100644 --- a/drivers/soc/qcom/mem_buf_dma_buf.c +++ b/drivers/soc/qcom/mem_buf_dma_buf.c @@ -360,9 +360,11 @@ static int mem_buf_sgl_sync_range(struct device *dev, struct scatterlist *sgl, break; if (i > 0) { - pr_warn_ratelimited("Partial cmo only supported with 1 segment\n" - "is dma_set_max_seg_size being set on dev:%s\n", - dev_name(dev)); + if (get_dma_ops(dev)) { + pr_warn_ratelimited("Partial cmo only supported with 1 segment\n" + "is dma_set_max_seg_size being set on dev:%s\n", + dev_name(dev)); + } return -EINVAL; } } diff --git a/drivers/staging/android/ion/heaps/msm_ion_dma_buf.c b/drivers/staging/android/ion/heaps/msm_ion_dma_buf.c index aba5c4d401db..6bd9dd286057 100644 --- a/drivers/staging/android/ion/heaps/msm_ion_dma_buf.c +++ b/drivers/staging/android/ion/heaps/msm_ion_dma_buf.c @@ -500,9 +500,11 @@ static int ion_sgl_sync_range(struct device *dev, struct scatterlist *sgl, break; if (i > 0) { - pr_warn_ratelimited("Partial cmo only supported with 1 segment\n" - "is dma_set_max_seg_size being set on dev:%s\n", - dev_name(dev)); + if (get_dma_ops(dev)) { + pr_warn_ratelimited("Partial cmo only supported with 1 segment\n" + "is dma_set_max_seg_size being set on dev:%s\n", + dev_name(dev)); + } return -EINVAL; } }