From patchwork Tue May 3 10:53:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 12835598 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0518AC433EF for ; Tue, 3 May 2022 10:53:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233870AbiECK5N (ORCPT ); Tue, 3 May 2022 06:57:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234361AbiECK5L (ORCPT ); Tue, 3 May 2022 06:57:11 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1061733890; Tue, 3 May 2022 03:53:36 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: kholk11) with ESMTPSA id 5428E1F43E0F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1651575214; bh=/Jtsc9+lw7Coi+SAJWUPtQ7xwVJi5H5h91tGI9sgeIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P+sKuHiX7lZEmpgw6/TvHRQfOES1pBdv/6MyMYsKaLuUHrtWbGUBb6QstfsUyUDlO EGBgNIRr5UnP8ORrVLc6K1A4busUTbJ02NTFmNokJAL49nmaaoxkVNrP0iu/YPCBW7 nPat1SfmbRohEeffegyFczus+tGAVbnQG5bMJtD2brNRNpQ1p3V4RFxtsIoSDx+R5p Xvm4zufj9gCUinkGfGiBmXVrscHMNZtQQni9nX7Qz9zApyC7tGIeGEe2/cb8xSV1Vf ZaAauB59XaulaKMVwfOAEBS3jPSqX0NneQ5CkgxDgv6GdxlrpRXXSnrNcqOHy7axW1 6OVjPekA8RJew== From: AngeloGioacchino Del Regno To: sean.wang@mediatek.com Cc: vkoul@kernel.org, matthias.bgg@gmail.com, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, nfraprado@collabora.com, AngeloGioacchino Del Regno Subject: [PATCH 1/2] dmaengine: mediatek-cqdma: Add SoC-specific match data Date: Tue, 3 May 2022 12:53:27 +0200 Message-Id: <20220503105328.54755-2-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220503105328.54755-1-angelogioacchino.delregno@collabora.com> References: <20220503105328.54755-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org On some SoCs the DST2 and SRC2 registers may be at a different offset: add a match data structure and assign it to mt6765 as a preparation for adding support for more SoCs. Signed-off-by: AngeloGioacchino Del Regno Reported-by: kernel test robot --- drivers/dma/mediatek/mtk-cqdma.c | 34 +++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/drivers/dma/mediatek/mtk-cqdma.c b/drivers/dma/mediatek/mtk-cqdma.c index f8847c48ba03..7d8c54da3d58 100644 --- a/drivers/dma/mediatek/mtk-cqdma.c +++ b/drivers/dma/mediatek/mtk-cqdma.c @@ -48,8 +48,6 @@ #define MTK_CQDMA_DST 0x20 #define MTK_CQDMA_LEN1 0x24 #define MTK_CQDMA_LEN2 0x28 -#define MTK_CQDMA_SRC2 0x60 -#define MTK_CQDMA_DST2 0x64 /* Registers setting */ #define MTK_CQDMA_EN_BIT BIT(0) @@ -126,9 +124,20 @@ struct mtk_cqdma_vchan { bool issue_synchronize; }; +/** + * struct mtk_cqdma_plat_data - SoC specific parameters + * @reg_dst2: dst2 register offset + * @reg_src2: src2 register offset + */ +struct mtk_cqdma_plat_data { + u8 reg_src2; + u8 reg_dst2; +}; + /** * struct mtk_cqdma_device - The struct holding info describing CQDMA * device + * @plat: SoC-specific platform data * @ddev: An instance for struct dma_device * @clk: The clock that device internal is using * @dma_requests: The number of VCs the device supports to @@ -231,6 +240,8 @@ static int mtk_cqdma_hard_reset(struct mtk_cqdma_pchan *pc) static void mtk_cqdma_start(struct mtk_cqdma_pchan *pc, struct mtk_cqdma_vdesc *cvd) { + struct mtk_cqdma_device *cqdma = to_cqma_dev(cvd->ch); + /* wait for the previous transaction done */ if (mtk_cqdma_poll_engine_done(pc, true) < 0) dev_err(cqdma2dev(to_cqdma_dev(cvd->ch)), "cqdma wait transaction timeout\n"); @@ -243,17 +254,17 @@ static void mtk_cqdma_start(struct mtk_cqdma_pchan *pc, /* setup the source */ mtk_dma_set(pc, MTK_CQDMA_SRC, cvd->src & MTK_CQDMA_ADDR_LIMIT); #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT - mtk_dma_set(pc, MTK_CQDMA_SRC2, cvd->src >> MTK_CQDMA_ADDR2_SHFIT); + mtk_dma_set(pc, cqdma->plat->reg_src2, cvd->src >> MTK_CQDMA_ADDR2_SHFIT); #else - mtk_dma_set(pc, MTK_CQDMA_SRC2, 0); + mtk_dma_set(pc, cqdma->plat->reg_src2, 0); #endif /* setup the destination */ mtk_dma_set(pc, MTK_CQDMA_DST, cvd->dest & MTK_CQDMA_ADDR_LIMIT); #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT - mtk_dma_set(pc, MTK_CQDMA_DST2, cvd->dest >> MTK_CQDMA_ADDR2_SHFIT); + mtk_dma_set(pc, cqdma->plat->reg_dst2, cvd->dest >> MTK_CQDMA_ADDR2_SHFIT); #else - mtk_dma_set(pc, MTK_CQDMA_DST2, 0); + mtk_dma_set(pc, cqdma->plat->reg_dst2, 0); #endif /* setup the length */ @@ -740,8 +751,13 @@ static void mtk_cqdma_hw_deinit(struct mtk_cqdma_device *cqdma) pm_runtime_disable(cqdma2dev(cqdma)); } +static const struct mtk_cqdma_plat_data cqdma_mt6765 { + .reg_dst2 = 0x64, + .reg_src2 = 0x60, +}; + static const struct of_device_id mtk_cqdma_match[] = { - { .compatible = "mediatek,mt6765-cqdma" }, + { .compatible = "mediatek,mt6765-cqdma", .data = &cqdma_mt6765 }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, mtk_cqdma_match); @@ -758,6 +774,10 @@ static int mtk_cqdma_probe(struct platform_device *pdev) if (!cqdma) return -ENOMEM; + cqdma->plat = device_get_match_data(&pdev->dev); + if (cqdma->plat) + return -EINVAL; + dd = &cqdma->ddev; cqdma->clk = devm_clk_get(&pdev->dev, "cqdma"); From patchwork Tue May 3 10:53:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 12835600 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3AA0C4332F for ; Tue, 3 May 2022 10:53:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234357AbiECK5N (ORCPT ); Tue, 3 May 2022 06:57:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234367AbiECK5L (ORCPT ); Tue, 3 May 2022 06:57:11 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAF143389C; Tue, 3 May 2022 03:53:36 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: kholk11) with ESMTPSA id 1327C1F43E31 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1651575215; bh=DOmjN0rIyrLrzlWHjHQiavdG+fuRwNEWPLPHorvQTtI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CDMc302w1OAhW9kbsJulrPFYSr/a9+Z4wAAI2QGfXGNs/J3TySQw600gYSv1f2Htm 1R+lPVPTRaT5jv5DuHOBuRMerlYcvry+DumksFA1MwxKwpWDpTvCYi173ITFPbMYAI 7b2XRialKZwUxFg2gLhtWHhgu9Ne32TRy6q80cjTtOrqtvdyln++76+W2YVnJ4Msrf 6BnA8ImlAhDZpHrx4phkmpkr46U3pIGfgVpOzFsR4Q8s6Ex6cs1pHjgS60H+cFjGir aTPBL4vTy/6FbtopOIy4KpYhIGGy/Y+hBljKtnk0QJZ11YHGWiBZVd9CcmsqFQZw2A nVdSW7cdiK8SQ== From: AngeloGioacchino Del Regno To: sean.wang@mediatek.com Cc: vkoul@kernel.org, matthias.bgg@gmail.com, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, nfraprado@collabora.com, AngeloGioacchino Del Regno Subject: [PATCH 2/2] dmaengine: mediatek-cqdma: Add support for MediaTek MT6795 Date: Tue, 3 May 2022 12:53:28 +0200 Message-Id: <20220503105328.54755-3-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220503105328.54755-1-angelogioacchino.delregno@collabora.com> References: <20220503105328.54755-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Add a compatible string and platform data for the Helio X10 MT6795 SoC. Signed-off-by: AngeloGioacchino Del Regno --- drivers/dma/mediatek/mtk-cqdma.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/dma/mediatek/mtk-cqdma.c b/drivers/dma/mediatek/mtk-cqdma.c index 7d8c54da3d58..5f8f44d37037 100644 --- a/drivers/dma/mediatek/mtk-cqdma.c +++ b/drivers/dma/mediatek/mtk-cqdma.c @@ -756,8 +756,14 @@ static const struct mtk_cqdma_plat_data cqdma_mt6765 { .reg_src2 = 0x60, }; +static const struct mtk_cqdma_plat_data cqdma_mt6795 { + .reg_dst2 = 0x44, + .reg_src2 = 0x40, +}; + static const struct of_device_id mtk_cqdma_match[] = { { .compatible = "mediatek,mt6765-cqdma", .data = &cqdma_mt6765 }, + { .compatible = "mediatek,mt6795-cqdma", .data = &cqdma_mt6795 }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, mtk_cqdma_match);