From patchwork Thu Sep 5 04:44:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pi-Hsun Shih X-Patchwork-Id: 11132129 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2020B16B1 for ; Thu, 5 Sep 2019 04:46:28 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 F14AD20674 for ; Thu, 5 Sep 2019 04:46:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="B8yOJCMr"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="OSAA4j8n" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F14AD20674 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zXfxXHjP0I+BtuVJPev5ceebCoEf4HgulNq0hNCNWh8=; b=B8yOJCMr3AKZou 8tDQvLkntgrQk6AG1oeT8uf0UV8Jmsz7+vgULuS8BmMNjpmc6uXbRS1pm+sYJLl9b7dgfhdXXG0GN zq6ZS9XfI+xKN2eYudM4P3ZSb0Aym+ZIH7byVfhfkuMu2U1GxgMqLWFlJoILr+mzhvXmvK+g5/o7H jDePWfHx+yKLWf3sQQGtk8uXGT2toBIEBmopluePgSV1jHb+w05d/iuFrolMviMHh+BxDFv7mb08v emTSR5uu27ZOLhloh+XqTt43DipD0TxbfAUkWk9QjzVqQz8fo9+Nr7HMglTe00Ov30YzX9NIp1xuz UcEzhYK0YKAa++oMUpqw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i5jf9-00059L-IX; Thu, 05 Sep 2019 04:46:27 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i5jdm-0002gf-9F for linux-mediatek@lists.infradead.org; Thu, 05 Sep 2019 04:45:06 +0000 Received: by mail-pl1-x644.google.com with SMTP id 4so656227pld.10 for ; Wed, 04 Sep 2019 21:45:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bRGvB4FsX3sc1y+CdvVLnmW4v02ZV/EIsDQEKYPXa6Y=; b=OSAA4j8nmaX7rGp5FGQ/BWiigxzA61SWkLVMEwwZEK8yQmh2Ex0vACaRCmPIsCTHAI ddScWGXflunjmklKMOrYyb4FzWWtx73pxf/PFcvgkTGVL4imaCSn0cyJvC7w4H+ItH9w 8km87L3d4+qK/tuEIxnVis2yfzZpvdnBRSPMA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bRGvB4FsX3sc1y+CdvVLnmW4v02ZV/EIsDQEKYPXa6Y=; b=o5zurTtTT4HnzTwvtnhuQNTO1R5nnECVuYtZD0cuUa7o2XvqP+R6RHTvv2I4JnSdRm ayXOa457Fi62OVGBPfGtdxEVQrdbyybz5kDhDIDCPY6V13wGQp4flOGG7jN+4muZHKIt wpLbjr20ser/qNCcYapNuucimdSIKPe5HHPEkHeNwidQpIDN3lvaQ9WGf2K5prbxy222 U+XGUPzLof4L2yY/rYbF+T4QcaT1jcQQCHP1D6pmvFq7hJ5QSuQ/kA8VdCRHO02wA34s g1KiOhy2DUvPwcSTQvHFxeomEYyJ6imfPBBjEaYMmRuqdS2vbfnmmoO2pFLMmUONKZeA riog== X-Gm-Message-State: APjAAAWUzSyxLc7vkcQxT8/3T+g1cKR60YJAHhaO8puWrragoYy2faGJ k/oRIza5p9GleLZUBV1RXhBN1Q== X-Google-Smtp-Source: APXvYqwiCbsGQKLJ5eIBi1U8SH0ZnsjhRgoYCr/N83FOJbHQw9IrILoCMx2N/hDWq7+LpwW/LWuODw== X-Received: by 2002:a17:902:ac94:: with SMTP id h20mr1304243plr.117.1567658701196; Wed, 04 Sep 2019 21:45:01 -0700 (PDT) Received: from pihsun-z840.tpe.corp.google.com ([2401:fa00:1:10:7889:7a43:f899:134c]) by smtp.googlemail.com with ESMTPSA id v22sm602272pgk.69.2019.09.04.21.44.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 21:45:00 -0700 (PDT) From: Pi-Hsun Shih To: Subject: [PATCH v18 3/5] remoteproc: mt8183: add reserved memory manager API Date: Thu, 5 Sep 2019 12:44:24 +0800 Message-Id: <20190905044432.150131-4-pihsun@chromium.org> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog In-Reply-To: <20190905044432.150131-1-pihsun@chromium.org> References: <20190905044432.150131-1-pihsun@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190904_214502_406790_36AA04D3 X-CRM114-Status: GOOD ( 12.43 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:644 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-mediatek@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 Ben-Cohen , Erin Lo , "open list:REMOTE PROCESSOR REMOTEPROC SUBSYSTEM" , open list , Bjorn Andersson , "moderated list:ARM/Mediatek SoC support" , Pi-Hsun Shih , Matthias Brugger , "moderated list:ARM/Mediatek SoC support" Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org From: Erin Lo Add memory table mapping API for other driver to lookup reserved physical and virtual memory Signed-off-by: Erin Lo Signed-off-by: Pi-Hsun Shih --- Changes from v17, v16, v15: - No change. Changes from v14: - Fix a typo in variable name in DEBUG section. Changes from v13: - Add one more reserved region. - Rename scp_get_reserve_* to scp_get_reserved_*. - Minor fixes addressing comment. Changes from v12: - Reformat a line to fit 80 character width. Changes from v11: - No change. Changes from v10: - Fix some type mismatch warnings when printing debug messages. Changes from v9: - No change. Changes from v8: - Add more reserved regions for camera ISP. Changes from v7, v6, v5: - No change. Changes from v4: - New patch. --- drivers/remoteproc/mtk_scp.c | 145 +++++++++++++++++++++++++++++ include/linux/remoteproc/mtk_scp.h | 25 +++++ 2 files changed, 170 insertions(+) diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c index c7dcc385d6a7..abfcbdd0dd4d 100644 --- a/drivers/remoteproc/mtk_scp.c +++ b/drivers/remoteproc/mtk_scp.c @@ -375,11 +375,142 @@ void *scp_mapping_dm_addr(struct platform_device *pdev, u32 mem_addr) } EXPORT_SYMBOL_GPL(scp_mapping_dm_addr); +#if SCP_RESERVED_MEM +static phys_addr_t scp_mem_base_phys; +static phys_addr_t scp_mem_base_virt; +static size_t scp_mem_size; + +static struct scp_reserve_mblock scp_reserve_mblock[] = { + { + .num = SCP_ISP_MEM_ID, + .start_phys = 0x0, + .start_virt = 0x0, + .size = 0x200000, /*2MB*/ + }, + { + .num = SCP_ISP_MEM2_ID, + .start_phys = 0x0, + .start_virt = 0x0, + .size = 0x800000, /*8MB*/ + }, + { + .num = SCP_MDP_MEM_ID, + .start_phys = 0x0, + .start_virt = 0x0, + .size = 0x600000, /*6MB*/ + }, + { + .num = SCP_DIP_MEM_ID, + .start_phys = 0x0, + .start_virt = 0x0, + .size = 0x900000, /*9MB*/ + }, + { + .num = SCP_FD_MEM_ID, + .start_phys = 0x0, + .start_virt = 0x0, + .size = 0x100000, /*1MB*/ + }, + { + .num = SCP_FD_MEM2_ID, + .start_phys = 0x0, + .start_virt = 0x0, + .size = 0x100000, /*1MB*/ + }, +}; + +static int scp_reserve_mem_init(struct mtk_scp *scp) +{ + enum scp_reserve_mem_id_t id; + phys_addr_t accumlate_memory_size = 0; + + scp_mem_base_phys = (phys_addr_t) (scp->phys_addr + MAX_CODE_SIZE); + scp_mem_size = scp->dram_size - MAX_CODE_SIZE; + + dev_info(scp->dev, + "phys:0x%llx - 0x%llx (0x%llx)\n", + (unsigned long long)scp_mem_base_phys, + (unsigned long long)(scp_mem_base_phys + scp_mem_size), + (unsigned long long)scp_mem_size); + accumlate_memory_size = 0; + for (id = 0; id < SCP_NUMS_MEM_ID; id++) { + scp_reserve_mblock[id].start_phys = + scp_mem_base_phys + accumlate_memory_size; + accumlate_memory_size += scp_reserve_mblock[id].size; + dev_info( + scp->dev, + "[reserve_mem:%d]: phys:0x%llx - 0x%llx (0x%llx)\n", id, + (unsigned long long)scp_reserve_mblock[id].start_phys, + (unsigned long long)(scp_reserve_mblock[id].start_phys + + scp_reserve_mblock[id].size), + (unsigned long long)scp_reserve_mblock[id].size); + } + return 0; +} + +static int scp_reserve_memory_ioremap(struct mtk_scp *scp) +{ + enum scp_reserve_mem_id_t id; + phys_addr_t accumlate_memory_size = 0; + + scp_mem_base_virt = (phys_addr_t)(size_t)ioremap_wc(scp_mem_base_phys, + scp_mem_size); + + dev_info(scp->dev, + "virt:0x%llx - 0x%llx (0x%llx)\n", + (unsigned long long)scp_mem_base_virt, + (unsigned long long)(scp_mem_base_virt + scp_mem_size), + (unsigned long long)scp_mem_size); + for (id = 0; id < SCP_NUMS_MEM_ID; id++) { + scp_reserve_mblock[id].start_virt = + scp_mem_base_virt + accumlate_memory_size; + accumlate_memory_size += scp_reserve_mblock[id].size; + } + /* the reserved memory should be larger then expected memory + * or scp_reserve_mblock does not match dts + */ + WARN_ON(accumlate_memory_size > scp_mem_size); + return 0; +} +phys_addr_t scp_get_reserved_mem_phys(enum scp_reserve_mem_id_t id) +{ + if (id >= SCP_NUMS_MEM_ID) { + pr_err("[SCP] no reserve memory for %d", id); + return 0; + } + return scp_reserve_mblock[id].start_phys; +} +EXPORT_SYMBOL_GPL(scp_get_reserved_mem_phys); + +phys_addr_t scp_get_reserved_mem_virt(enum scp_reserve_mem_id_t id) +{ + if (id >= SCP_NUMS_MEM_ID) { + pr_err("[SCP] no reserve memory for %d", id); + return 0; + } + return scp_reserve_mblock[id].start_virt; +} +EXPORT_SYMBOL_GPL(scp_get_reserved_mem_virt); + +size_t scp_get_reserved_mem_size(enum scp_reserve_mem_id_t id) +{ + if (id >= SCP_NUMS_MEM_ID) { + pr_err("[SCP] no reserve memory for %d", id); + return 0; + } + return scp_reserve_mblock[id].size; +} +EXPORT_SYMBOL_GPL(scp_get_reserved_mem_size); +#endif + static int scp_map_memory_region(struct mtk_scp *scp) { struct device_node *node; struct resource r; int ret; +#ifdef DEBUG + enum scp_reserve_mem_id_t id; +#endif node = of_parse_phandle(scp->dev->of_node, "memory-region", 0); if (!node) { @@ -402,6 +533,20 @@ static int scp_map_memory_region(struct mtk_scp *scp) return -EBUSY; } +#if SCP_RESERVED_MEM + scp_reserve_mem_init(scp); + scp_reserve_memory_ioremap(scp); +#ifdef DEBUG + for (id = 0; id < SCP_NUMS_MEM_ID; id++) { + dev_info(scp->dev, + "[mem_reserve-%d] phys:0x%llx,virt:0x%llx,size:0x%llx\n", + id, + scp_get_reserved_mem_phys(id), + scp_get_reserved_mem_virt(id), + scp_get_reserved_mem_size(id)); + } +#endif +#endif return 0; } diff --git a/include/linux/remoteproc/mtk_scp.h b/include/linux/remoteproc/mtk_scp.h index 535a51ce3233..4e037af2b126 100644 --- a/include/linux/remoteproc/mtk_scp.h +++ b/include/linux/remoteproc/mtk_scp.h @@ -138,4 +138,29 @@ unsigned int scp_get_venc_hw_capa(struct platform_device *pdev); void *scp_mapping_dm_addr(struct platform_device *pdev, u32 mem_addr); +#define SCP_RESERVED_MEM (1) +#if SCP_RESERVED_MEM +/* scp reserve memory ID definition*/ +enum scp_reserve_mem_id_t { + SCP_ISP_MEM_ID, + SCP_ISP_MEM2_ID, + SCP_MDP_MEM_ID, + SCP_DIP_MEM_ID, + SCP_FD_MEM_ID, + SCP_FD_MEM2_ID, + SCP_NUMS_MEM_ID, +}; + +struct scp_reserve_mblock { + enum scp_reserve_mem_id_t num; + u64 start_phys; + u64 start_virt; + u64 size; +}; + +extern phys_addr_t scp_get_reserved_mem_phys(enum scp_reserve_mem_id_t id); +extern phys_addr_t scp_get_reserved_mem_virt(enum scp_reserve_mem_id_t id); +extern size_t scp_get_reserved_mem_size(enum scp_reserve_mem_id_t id); +#endif + #endif /* _MTK_SCP_H */