Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp620883pxb; Tue, 2 Feb 2021 13:27:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJw/OCHNfKrSfGETIP+SFUJSo4u/Xb8cUd1W4RdD+M1RsCQ5mRFmiNaICtfh92sCrzchGBQS X-Received: by 2002:a17:906:33db:: with SMTP id w27mr3050278eja.43.1612301236753; Tue, 02 Feb 2021 13:27:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612301236; cv=none; d=google.com; s=arc-20160816; b=0QBA9nCuuIcvbDxeIYUdxIoA8PUUDmF+EIIEDSqUHxnGk475cTCRW0ZQoBGHy9bibw prw1FUg8HUe18zAdx9SU2a70obVuK2maxNrVB97fnAJCNDdnJHgWTVXiDOKUfMMbISR6 ZNBgmaEE+WUGSNZ3noHQvTveIFTaufOmu/hI7W84Uz040oR1ZNdG8huptIhHQEBtF7tL ffG6sG9nA87LaxI/mpf4I6SVIdELSv/BXznWye/qaRqX9y2WEIghrI4Duo7Vi9g4yEkn wktz9rL1ybHYT4cpDGAJpix1tXO7hbrDdiYhn72JgB4MC34hz/X/y4pRQAbPsEyrB3uW KvWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=w0ELnjcsqAoFlkxI+LU8aqcUHPM67N31KnUI2zZorBw=; b=sSQBY0BVRBK9Dv1C1G/6QH3tQFVjNPhQmoqrBYc27Pln7xJdok2Qi6eJ/gd4Vzw+/I epgJ0oQfuUP22DYf7MrNri6+KoX4TWzx1huv1rxjTxmtOx5u8aWwt2wcEXIB6S0B/7Xw VsQZgi2V6M8mJc1mlJLZ+m17iG81P8887Mz0drEuK88S+kbvzhO8yABhasfloVVWjhD9 IwoRrA0qgwH3LTPeLcPKkTUMBoZCyq2Jh2tB8clObc8z/y2GpnJgYHObF2OKwXTmSB+K YdKgfgFyLNWnGJTS89NXrGDpLFnjz/u7JdIxWNeiCLEAzv96xPvaW4sCNIJS0TKAV1R3 q7Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@synopsys.com header.s=mail header.b=GjhGm88G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=synopsys.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z8si11835398edx.338.2021.02.02.13.26.48; Tue, 02 Feb 2021 13:27:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@synopsys.com header.s=mail header.b=GjhGm88G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=synopsys.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232091AbhBBMrI (ORCPT + 99 others); Tue, 2 Feb 2021 07:47:08 -0500 Received: from smtprelay-out1.synopsys.com ([149.117.87.133]:56122 "EHLO smtprelay-out1.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231720AbhBBMly (ORCPT ); Tue, 2 Feb 2021 07:41:54 -0500 Received: from mailhost.synopsys.com (mdc-mailhost1.synopsys.com [10.225.0.209]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by smtprelay-out1.synopsys.com (Postfix) with ESMTPS id E6889C00B9; Tue, 2 Feb 2021 12:40:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1612269654; bh=26bcMb1hhhSb/6zwC97LYr49GH4oBhX47qSAAxTu+pw=; h=From:To:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=GjhGm88GM6mqrJMkA0Y+ywVA1p248HNrq/7yH7qnM54QfXUUFWtsVrDNfnHPB+lbj Ks5KgvgqwFXNyafJeEPpDQgWp+Ty+C63WdbiH37bSrOxBe4grUdehQw4pb3eGHZJ7L so7xFv42Wyjxz1an247V7WrgYjecggbctAkQXooIjBd3me68pGgNSjE7azJ5rdBJCC jL6DZqpTr7x+OtA5XQskocGLEt7dNrCsvxyiBaPFDQz1OtlddwJAKAGkNw7IuY9tdf XIxE8LJDY3iGQt1wB67ptKQBoRAAWJ7xfJkoPF0aOPJ8C/lyHUsMzQE/JZB7/sDs1l Y6o/s4mElHrkg== Received: from de02dwia024.internal.synopsys.com (de02dwia024.internal.synopsys.com [10.225.19.81]) by mailhost.synopsys.com (Postfix) with ESMTP id ADD47A024B; Tue, 2 Feb 2021 12:40:52 +0000 (UTC) X-SNPS-Relay: synopsys.com From: Gustavo Pimentel To: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, Gustavo Pimentel , Vinod Koul , Dan Williams Subject: [PATCH v2 07/15] dmaengine: dw-edma: Improve number of channels check Date: Tue, 2 Feb 2021 13:40:21 +0100 Message-Id: <235c630e318a52af5b36e01deacf720e2e4f1b57.1612269537.git.gustavo.pimentel@synopsys.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It was added some extra checks to ensure that the driver doesn't try to use more DMA channels than actually are available in hardware. Signed-off-by: Gustavo Pimentel --- drivers/dma/dw-edma/dw-edma-core.c | 21 +++++++++------------ drivers/dma/dw-edma/dw-edma-core.h | 2 ++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/dma/dw-edma/dw-edma-core.c b/drivers/dma/dw-edma/dw-edma-core.c index 0fe3835..5495cf7 100644 --- a/drivers/dma/dw-edma/dw-edma-core.c +++ b/drivers/dma/dw-edma/dw-edma-core.c @@ -914,19 +914,16 @@ int dw_edma_probe(struct dw_edma_chip *chip) raw_spin_lock_init(&dw->lock); - if (!dw->wr_ch_cnt) { - /* Find out how many write channels are supported by hardware */ - dw->wr_ch_cnt = dw_edma_v0_core_ch_count(dw, EDMA_DIR_WRITE); - if (!dw->wr_ch_cnt) - return -EINVAL; - } + dw->wr_ch_cnt = min_t(u16, dw->wr_ch_cnt, + dw_edma_v0_core_ch_count(dw, EDMA_DIR_WRITE)); + dw->wr_ch_cnt = min_t(u16, dw->wr_ch_cnt, EDMA_MAX_WR_CH); - if (!dw->rd_ch_cnt) { - /* Find out how many read channels are supported by hardware */ - dw->rd_ch_cnt = dw_edma_v0_core_ch_count(dw, EDMA_DIR_READ); - if (!dw->rd_ch_cnt) - return -EINVAL; - } + dw->rd_ch_cnt = min_t(u16, dw->rd_ch_cnt, + dw_edma_v0_core_ch_count(dw, EDMA_DIR_READ)); + dw->rd_ch_cnt = min_t(u16, dw->rd_ch_cnt, EDMA_MAX_RD_CH); + + if (!dw->wr_ch_cnt && !dw->rd_ch_cnt) + return -EINVAL; dev_vdbg(dev, "Channels:\twrite=%d, read=%d\n", dw->wr_ch_cnt, dw->rd_ch_cnt); diff --git a/drivers/dma/dw-edma/dw-edma-core.h b/drivers/dma/dw-edma/dw-edma-core.h index f72ebaa..650b1c7 100644 --- a/drivers/dma/dw-edma/dw-edma-core.h +++ b/drivers/dma/dw-edma/dw-edma-core.h @@ -15,6 +15,8 @@ #include "../virt-dma.h" #define EDMA_LL_SZ 24 +#define EDMA_MAX_WR_CH 8 +#define EDMA_MAX_RD_CH 8 enum dw_edma_dir { EDMA_DIR_WRITE = 0, -- 2.7.4