From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D69FFC433E6 for ; Mon, 20 Jul 2020 22:21:28 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 95589206E9 for ; Mon, 20 Jul 2020 22:21:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="xxG6zKbZ"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="fA+kiPRz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 95589206E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=miL0rDjI4bZwH23/mBHvAiTtCKhUe6KtIuBIk0Yp0Vg=; b=xxG6zKbZXwVZWLj+7pAassvxe JEv2ml7iZ/sDaCW8+IZvl05GXjrdszSnJ6dxKVXCGQNdjhgAiNyETwzBLAEa/tFi7wrd0NF28Vy1J WDMUePK79Jzkwb5Yd34200HGtWVTT2zIr2RJKDjrf79/xU6XC0B4mN1mPMpZUi5FvX6lJW0uy9LkN QOB4DqdVMAHxcgA7ihedHX53qQMYDfitEvPNXKS+OYl3XVySONE7X7OplAMBpcG7eDc90l5RQ/a53 D6IH1HdqhpccvMYj+YPhBVHr/BQLY3KUR69Vqj5RmkAz+165cuw51HMYRScyFbc9EkEuG5dXxqOUb qcSsrB9QA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxe8l-0001Gg-1k; Mon, 20 Jul 2020 22:20:07 +0000 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxe8g-0001FB-TH for linux-arm-kernel@lists.infradead.org; Mon, 20 Jul 2020 22:20:04 +0000 Received: by mail-pj1-x1043.google.com with SMTP id k5so644226pjg.3 for ; Mon, 20 Jul 2020 15:20:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=9jszjhz+NlIEMcsYPjEDY99gDeChZcLwFFimYQuARMc=; b=fA+kiPRz0BeEjCAj8NYT5t+Px2fReryKsFrX6P/xl3oyDhUtHluigx4CH/gObq04UP OpMwGxE2sALNvSJ221gPiQd37vNNFhrOgx+4zE1oPvnvFtEZn4BPGWO/fI+OpLnccFyU PvpeKAoC+O9mrLPe9pP448RWacaBIVig/TG98phWMhC2hPARTQTQHZbj/Su/GyxAxSUC 7BhyzpcdceK90XVwTZA8jQeEo5F/9jA6oZEJdJ7eKpAf4CxjlJj9t1M3iupaSO5O9sRl H+T33Qi1wMHEfynvfCz5+IL0ZMY8Y0tKRlHcUsaxW9N74Opc12SezicCsYfkX0quvA7I /whg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=9jszjhz+NlIEMcsYPjEDY99gDeChZcLwFFimYQuARMc=; b=R9kduXbn1AR97egng2I4tCNdNyg/udzB4FqXk8Nv+IRqq122fENQDEHTWQIaC8caUW Bt+7XtAfWlMAWKKi4thC1YJlyCd/XEOaAUnrrgAkQgDsm6IUQYP3ZoTSJH6ljTXveYAJ kBWouLsgzJJxytjG0TGiPVeQ5qxAQHRBgEyv4R7acnk9Vt6yHYAyz4x/FFvK/EaZE8PB zdnGnEWg7TovLW2pY6wNSMFxX5jSR8YW+WK7RnwN2I1yYUwINhShH2Bf1jcxLOGmAUzp I47JMtMYJokrmcrZJ/vLr/My8aAM4Y/N9o9Gsd5HOWnqQ5ulYryWIWck5s+G9kxT1XUI uT9Q== X-Gm-Message-State: AOAM532UUgmHvgkvRCNiKrtQ/B3BvFlIyENPEVvDEnaERRdKIIdpweXl j4oUsBmiHrXm/ohKE8tlQrkxnQ== X-Google-Smtp-Source: ABdhPJz74Mp0fsrigR6Dj0fSkYF1x1n5uPU+0vDzc/zgqU35a3aLMFkuToZTtmcfBeiGhzbCgl0d6g== X-Received: by 2002:a17:90b:3685:: with SMTP id mj5mr1477107pjb.123.1595283600821; Mon, 20 Jul 2020 15:20:00 -0700 (PDT) Received: from xps15 (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id w18sm17820927pfi.89.2020.07.20.15.19.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 15:20:00 -0700 (PDT) Date: Mon, 20 Jul 2020 16:19:58 -0600 From: Mathieu Poirier To: Alexandre Bailon Subject: Re: [PATCH 2/6] remoteproc: Add a remoteproc driver for the MT8183's APU Message-ID: <20200720221958.GE1113627@xps15> References: <20200713132927.24925-1-abailon@baylibre.com> <20200713132927.24925-3-abailon@baylibre.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200713132927.24925-3-abailon@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200720_182003_138320_53F2A767 X-CRM114-Status: GOOD ( 28.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ohad@wizery.com, devicetree@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, bjorn.andersson@linaro.org, robh+dt@kernel.org, linux-mediatek@lists.infradead.org, matthias.bgg@gmail.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Jul 13, 2020 at 03:29:23PM +0200, Alexandre Bailon wrote: > This adds a driver to control the APU present in the MT8183. > This loads the firmware and start the DSP. > > Signed-off-by: Alexandre Bailon > --- > drivers/remoteproc/Kconfig | 10 + > drivers/remoteproc/Makefile | 1 + > drivers/remoteproc/mtk_apu_rproc.c | 308 +++++++++++++++++++++++++++++ > 3 files changed, 319 insertions(+) > create mode 100644 drivers/remoteproc/mtk_apu_rproc.c > > diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig > index c4d1731295eb..e116d4a12ac3 100644 > --- a/drivers/remoteproc/Kconfig > +++ b/drivers/remoteproc/Kconfig > @@ -42,6 +42,16 @@ config MTK_SCP > > It's safe to say N here. > > +config MTK_APU > + tristate "Mediatek APU remoteproc support" > + depends on ARCH_MEDIATEK > + depends on MTK_IOMMU > + help > + Say y to support the Mediatek's Accelerated Processing Unit (APU) via > + the remote processor framework. > + > + It's safe to say N here. > + > config OMAP_REMOTEPROC > tristate "OMAP remoteproc support" > depends on ARCH_OMAP4 || SOC_OMAP5 || SOC_DRA7XX > diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile > index e8b886e511f0..2ea231b75fa6 100644 > --- a/drivers/remoteproc/Makefile > +++ b/drivers/remoteproc/Makefile > @@ -12,6 +12,7 @@ remoteproc-y += remoteproc_elf_loader.o > obj-$(CONFIG_IMX_REMOTEPROC) += imx_rproc.o > obj-$(CONFIG_INGENIC_VPU_RPROC) += ingenic_rproc.o > obj-$(CONFIG_MTK_SCP) += mtk_scp.o mtk_scp_ipi.o > +obj-$(CONFIG_MTK_APU) += mtk_apu_rproc.o > obj-$(CONFIG_OMAP_REMOTEPROC) += omap_remoteproc.o > obj-$(CONFIG_WKUP_M3_RPROC) += wkup_m3_rproc.o > obj-$(CONFIG_DA8XX_REMOTEPROC) += da8xx_remoteproc.o > diff --git a/drivers/remoteproc/mtk_apu_rproc.c b/drivers/remoteproc/mtk_apu_rproc.c > new file mode 100644 > index 000000000000..fb416a817ef3 > --- /dev/null > +++ b/drivers/remoteproc/mtk_apu_rproc.c > @@ -0,0 +1,308 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2020 BayLibre SAS > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "remoteproc_internal.h" > + > +/* From MT8183 4.5 Vision Processor Unit (VPU).pdf datasheet */ > +#define SW_RST (0x0000000C) > +#define SW_RST_OCD_HALT_ON_RST BIT(12) > +#define SW_RST_IPU_D_RST BIT(8) > +#define SW_RST_IPU_B_RST BIT(4) > +#define CORE_CTRL (0x00000110) > +#define CORE_CTRL_PDEBUG_ENABLE BIT(31) > +#define CORE_CTRL_SRAM_64K_iMEM (0x00 << 27) > +#define CORE_CTRL_SRAM_96K_iMEM (0x01 << 27) > +#define CORE_CTRL_SRAM_128K_iMEM (0x02 << 27) > +#define CORE_CTRL_SRAM_192K_iMEM (0x03 << 27) > +#define CORE_CTRL_SRAM_256K_iMEM (0x04 << 27) > +#define CORE_CTRL_PBCLK_ENABLE BIT(26) > +#define CORE_CTRL_RUN_STALL BIT(23) > +#define CORE_CTRL_STATE_VECTOR_SELECT BIT(19) > +#define CORE_CTRL_PIF_GATED BIT(17) > +#define CORE_CTRL_NMI BIT(0) > +#define CORE_XTENSA_INT (0x00000114) > +#define CORE_CTL_XTENSA_INT (0x00000118) > +#define CORE_DEFAULT0 (0x0000013C) > +#define CORE_DEFAULT0_QOS_SWAP_0 (0x00 << 28) > +#define CORE_DEFAULT0_QOS_SWAP_1 (0x01 << 28) > +#define CORE_DEFAULT0_QOS_SWAP_2 (0x02 << 28) > +#define CORE_DEFAULT0_QOS_SWAP_3 (0x03 << 28) > +#define CORE_DEFAULT0_ARUSER_USE_IOMMU (0x10 << 23) > +#define CORE_DEFAULT0_AWUSER_USE_IOMMU (0x10 << 18) > +#define CORE_DEFAULT1 (0x00000140) > +#define CORE_DEFAULT0_ARUSER_IDMA_USE_IOMMU (0x10 << 0) > +#define CORE_DEFAULT0_AWUSER_IDMA_USE_IOMMU (0x10 << 5) > +#define CORE_XTENSA_ALTRESETVEC (0x000001F8) > + > +struct mtk_vpu_rproc { > + struct device *dev; > + struct rproc *rproc; > + > + void __iomem *base; > + int irq; > + struct clk *axi; > + struct clk *ipu; > + struct clk *jtag; > +}; > + > +static u32 vpu_read32(struct mtk_vpu_rproc *vpu_rproc, u32 off) > +{ > + return readl(vpu_rproc->base + off); > +} > + > +static void vpu_write32(struct mtk_vpu_rproc *vpu_rproc, u32 off, u32 value) > +{ > + writel(value, vpu_rproc->base + off); > +} > + > +static int mtk_vpu_rproc_start(struct rproc *rproc) > +{ > + struct mtk_vpu_rproc *vpu_rproc = rproc->priv; > + u32 core_ctrl; > + > + vpu_write32(vpu_rproc, CORE_XTENSA_ALTRESETVEC, rproc->bootaddr); > + > + core_ctrl = vpu_read32(vpu_rproc, CORE_CTRL); > + core_ctrl |= CORE_CTRL_PDEBUG_ENABLE | CORE_CTRL_PBCLK_ENABLE | > + CORE_CTRL_STATE_VECTOR_SELECT | CORE_CTRL_RUN_STALL | > + CORE_CTRL_PIF_GATED; > + vpu_write32(vpu_rproc, CORE_CTRL, core_ctrl); > + > + vpu_write32(vpu_rproc, SW_RST, SW_RST_OCD_HALT_ON_RST | > + SW_RST_IPU_B_RST | SW_RST_IPU_D_RST); > + ndelay(27); > + vpu_write32(vpu_rproc, SW_RST, 0); > + > + core_ctrl &= ~CORE_CTRL_PIF_GATED; > + vpu_write32(vpu_rproc, CORE_CTRL, core_ctrl); > + > + vpu_write32(vpu_rproc, CORE_DEFAULT0, CORE_DEFAULT0_AWUSER_USE_IOMMU | > + CORE_DEFAULT0_ARUSER_USE_IOMMU | > + CORE_DEFAULT0_QOS_SWAP_1); > + vpu_write32(vpu_rproc, CORE_DEFAULT1, > + CORE_DEFAULT0_AWUSER_IDMA_USE_IOMMU | > + CORE_DEFAULT0_ARUSER_IDMA_USE_IOMMU); > + > + core_ctrl &= ~CORE_CTRL_RUN_STALL; > + vpu_write32(vpu_rproc, CORE_CTRL, core_ctrl); > + > + return 0; > +} > + > +static int mtk_vpu_rproc_stop(struct rproc *rproc) > +{ > + struct mtk_vpu_rproc *vpu_rproc = rproc->priv; > + u32 core_ctrl; > + > + core_ctrl = vpu_read32(vpu_rproc, CORE_CTRL); > + vpu_write32(vpu_rproc, CORE_CTRL, core_ctrl | CORE_CTRL_RUN_STALL); > + > + return 0; > +} > + > +static void mtk_vpu_rproc_kick(struct rproc *rproc, int vqid) > +{ > + struct mtk_vpu_rproc *vpu_rproc = rproc->priv; > + > + vpu_write32(vpu_rproc, CORE_CTL_XTENSA_INT, 1 << vqid); > +} > + > +static const struct rproc_ops mtk_vpu_rproc_ops = { > + .start = mtk_vpu_rproc_start, > + .stop = mtk_vpu_rproc_stop, > + .kick = mtk_vpu_rproc_kick, > +}; > + > +static irqreturn_t mtk_vpu_rproc_callback(int irq, void *data) > +{ > + struct rproc *rproc = (struct rproc *)data; > + struct mtk_vpu_rproc *vpu_rproc = (struct mtk_vpu_rproc *)rproc->priv; > + > + vpu_write32(vpu_rproc, CORE_XTENSA_INT, 1); > + > + return IRQ_WAKE_THREAD; > +} > + > +static irqreturn_t handle_event(int irq, void *data) > +{ > + struct rproc *rproc = (struct rproc *)data; > + > + rproc_vq_interrupt(rproc, 0); > + rproc_vq_interrupt(rproc, 1); > + > + return IRQ_HANDLED; > +} > + > +static int mtk_vpu_rproc_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct mtk_vpu_rproc *vpu_rproc; > + struct rproc *rproc; > + struct resource *res; > + int ret; > + > + rproc = rproc_alloc(dev, "apu", &mtk_vpu_rproc_ops, NULL, > + sizeof(*vpu_rproc)); > + if (!rproc) > + return -ENOMEM; > + > + rproc->recovery_disabled = true; > + rproc->has_iommu = false; > + > + vpu_rproc = rproc->priv; > + vpu_rproc->rproc = rproc; > + vpu_rproc->dev = dev; > + > + platform_set_drvdata(pdev, rproc); > + > + rproc->domain = iommu_get_domain_for_dev(dev); > + if (!rproc->domain) { > + dev_err(dev, "Failed to get the IOMMU domain\n"); > + ret = -EINVAL; > + goto free_rproc; > + } > + > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + vpu_rproc->base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(vpu_rproc->base)) { > + dev_err(&pdev->dev, "Failed to map mmio\n"); > + ret = PTR_ERR(vpu_rproc->base); > + goto free_rproc; > + } > + > + vpu_rproc->irq = platform_get_irq(pdev, 0); > + if (vpu_rproc->irq < 0) { > + ret = vpu_rproc->irq; > + goto free_rproc; > + } > + > + ret = devm_request_threaded_irq(dev, vpu_rproc->irq, > + mtk_vpu_rproc_callback, handle_event, > + IRQF_SHARED | IRQF_ONESHOT, > + "mtk_vpu-remoteproc", rproc); > + if (ret) { > + dev_err(dev, "devm_request_threaded_irq error: %d\n", ret); > + goto free_rproc; > + } > + > + vpu_rproc->ipu = devm_clk_get(dev, "ipu"); > + if (IS_ERR(vpu_rproc->ipu)) { > + dev_err(dev, "Failed to get ipu clock\n"); > + ret = PTR_ERR(vpu_rproc->ipu); > + goto free_rproc; > + } > + > + ret = clk_prepare_enable(vpu_rproc->ipu); > + if (ret) { > + dev_err(dev, "Failed to enable ipu clock\n"); > + goto free_rproc; > + } > + > + vpu_rproc->axi = devm_clk_get(dev, "axi"); > + if (IS_ERR(vpu_rproc->axi)) { > + dev_err(dev, "Failed to get axi clock\n"); > + ret = PTR_ERR(vpu_rproc->axi); > + goto clk_disable_ipu; > + } > + > + ret = clk_prepare_enable(vpu_rproc->axi); > + if (ret) { > + dev_err(dev, "Failed to enable axi clock\n"); > + goto clk_disable_ipu; > + } > + > + vpu_rproc->jtag = devm_clk_get_optional(dev, "jtag"); > + if (IS_ERR(vpu_rproc->jtag)) { > + dev_err(dev, "Failed to enable jtag clock\n"); > + ret = PTR_ERR(vpu_rproc->jtag); > + goto clk_disable_axi; > + } > + > + ret = clk_prepare_enable(vpu_rproc->jtag); > + if (ret) { > + dev_err(dev, "Failed to enable jtag clock\n"); > + goto clk_disable_axi; > + } I forgot... Clocks get enabled when the system is booted or the module loaded, something that is highly inefficient. Please use rproc->prepare/unprepare() to deal with clocks at the appropriate time. > + > + ret = of_reserved_mem_device_init(dev); > + if (ret) { > + dev_err(dev, "device does not have specific CMA pool\n"); > + goto clk_disable_jtag; > + } > + > + ret = rproc_add(rproc); > + if (ret) { > + dev_err(dev, "rproc_add failed: %d\n", ret); > + goto free_mem; > + } > + > + return 0; > + > +free_mem: > + of_reserved_mem_device_release(dev); > +clk_disable_jtag: > + clk_disable_unprepare(vpu_rproc->jtag); > +clk_disable_axi: > + clk_disable_unprepare(vpu_rproc->axi); > +clk_disable_ipu: > + clk_disable_unprepare(vpu_rproc->ipu); > +free_rproc: > + rproc_free(rproc); > + > + return ret; > +} > + > +static int mtk_vpu_rproc_remove(struct platform_device *pdev) > +{ > + struct rproc *rproc = platform_get_drvdata(pdev); > + struct mtk_vpu_rproc *vpu_rproc = (struct mtk_vpu_rproc *)rproc->priv; > + struct device *dev = &pdev->dev; > + > + disable_irq(vpu_rproc->irq); > + > + rproc_del(rproc); > + of_reserved_mem_device_release(dev); > + clk_disable_unprepare(vpu_rproc->jtag); > + clk_disable_unprepare(vpu_rproc->axi); > + clk_disable_unprepare(vpu_rproc->ipu); > + rproc_free(rproc); > + > + return 0; > +} > + > +static const struct of_device_id mtk_vpu_rproc_of_match[] __maybe_unused = { > + { .compatible = "mediatek,mt8183-apu", }, > + { /* sentinel */ }, > +}; > +MODULE_DEVICE_TABLE(of, mtk_vpu_rproc_of_match); > + > +static struct platform_driver mtk_vpu_rproc_driver = { > + .probe = mtk_vpu_rproc_probe, > + .remove = mtk_vpu_rproc_remove, > + .driver = { > + .name = "mtk_vpu-rproc", > + .of_match_table = of_match_ptr(mtk_vpu_rproc_of_match), > + }, > +}; > +module_platform_driver(mtk_vpu_rproc_driver); > + > +MODULE_LICENSE("GPL v2"); > +MODULE_AUTHOR("Alexandre Bailon"); > +MODULE_DESCRIPTION("Mt8183 VPU Remote Processor control driver"); > -- > 2.26.2 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel