Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp256777ybi; Fri, 31 May 2019 00:40:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqxL2Re2PpLRFEU3ySTXwggzPWKMaho10VJVMFJommv4l3DH14wUfP7PXkQl0VVbrh4zwpJ/ X-Received: by 2002:a17:90a:dc86:: with SMTP id j6mr6992672pjv.141.1559288442288; Fri, 31 May 2019 00:40:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559288442; cv=none; d=google.com; s=arc-20160816; b=zIFzcYXCAel+oItuvcQxeCs2dA6+UWnpiiZv6fmPN6Z/KNePP/0mcQqRpL7xpEikN0 AOWd7qFSeR8LuJYHZCPp23X7tN11KmHbt1na8woDWl5Kk6tUu67RS0R/Q2xmcu0T7EH/ DvDvA+43lOBLhmgfzqdtpIGErleWZUQq7hdqHajtbgtaB5woMQ+RBMfGJqvEpUkg4BQi ZJddMOAQbX7IofzL0c9wIYbjrrgXp0aKkiU8RUjnKpMl7CeBnIqINmIGpVW3VMpsdX2I gInBkmzKlpzp50gs/f7tBNMd0B2agb6nUvKj6GuOF7eXageL+eCiTurnYE68YFFoOCI0 8v6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=S+dApAfNplFPk6/VTC8DcOBTadHwq2OWlTtgYt5qp1c=; b=kU4zDpRBhTOBO4pxgzPa4KRTzh4NR0n07COqKndQ8NBx5Nzy4JKs/gF5IG63170syQ T/pYI2xV4kFqh4Ev9dziaWnfHffGApmYoqlkoW+t9csw2YiOZ8OPmBLMcs6/67aGLzan pwLm2MdHw1GqXKvBb2K/vL5GpkcGXFO0Oix8WRArudNfrTSB5obg1wyIbPNKKh6MzQgx r0fPCah1PblYHYS1DYt4tSWnxdW2E1J8tsE0yhXs9VsbQuy1V/F3aqUaAGSs6Hc3X9n9 jhb43hQQV5rs+WZNIiWjdnhWLLTVG3bo1g3quzMDY9ezN9zlzOhsZMpv7/3Ek+9sTf0x ZcgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@chromium.org header.s=google header.b=g9ct+cuO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y11si2759143plr.377.2019.05.31.00.40.25; Fri, 31 May 2019 00:40:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@chromium.org header.s=google header.b=g9ct+cuO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726918AbfEaHjN (ORCPT + 99 others); Fri, 31 May 2019 03:39:13 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:38292 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726158AbfEaHjM (ORCPT ); Fri, 31 May 2019 03:39:12 -0400 Received: by mail-pg1-f193.google.com with SMTP id v11so3562066pgl.5 for ; Fri, 31 May 2019 00:39:12 -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=S+dApAfNplFPk6/VTC8DcOBTadHwq2OWlTtgYt5qp1c=; b=g9ct+cuOZhlVOgCv0Rs+CZg5QW7KdswMHcf7E24TWGJfPgNo1XvM9ageJSVjLjwfNW I+z+qTq0JoOBl9SgXwZep90tZK/YcKckJ9QorqfQ/MitZ6Nzi4fVWevShuAwNCaczmcr lK/aO+BQwrcq8mZ3rRXpPZM9Ringl7FU1wSmU= 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=S+dApAfNplFPk6/VTC8DcOBTadHwq2OWlTtgYt5qp1c=; b=L6Jisu25AppGoh8bZl3Ct/YLuCaao0J2Ke1CBsBcWSCe0UMxoP4BT4rVsMGtcH5Wjo o14dZUehhpSpLPmzf+h6NAAj6mZT4WTuRdj0YA+RaeU/454iP37SR6Ca2Nc7AsTCE5aW j0LFMRfgah+ToPqB+xkp6WDnBZxI7WN2LxAZEfgbiJhq3Y4UQt6cqwlCoetkM5JxFim0 ik/huoUX3q7PY6elrmR8TYYvD+XDpKESADCK3aBcYbUKwEUYOlIsfniCDCiHsAWkonT5 naMkFc1cU+spflHoU8qq2TpdIYuSFAADl7eZXEazoE41iym1iMD3d1GpSgbjmAE3Ef9J F/6A== X-Gm-Message-State: APjAAAXcofl7JDK+FF5ApKJRA24+dlIWg2dnZ43Ob1J8pAiQoMcvJMNI 0o2Ow2BXk1+gt2+VA4aEL3vrCg== X-Received: by 2002:a17:90a:2ec9:: with SMTP id h9mr7898942pjs.130.1559288352001; Fri, 31 May 2019 00:39:12 -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 r71sm17051741pjb.2.2019.05.31.00.39.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 May 2019 00:39:11 -0700 (PDT) From: Pi-Hsun Shih Cc: Pi-Hsun Shih , Erin Lo , Ohad Ben-Cohen , Bjorn Andersson , Matthias Brugger , Nicolas Boichat , linux-remoteproc@vger.kernel.org (open list:REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Mediatek SoC support), linux-mediatek@lists.infradead.org (moderated list:ARM/Mediatek SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 3/7] remoteproc: mt8183: add reserved memory manager API Date: Fri, 31 May 2019 15:38:44 +0800 Message-Id: <20190531073848.155444-4-pihsun@chromium.org> X-Mailer: git-send-email 2.22.0.rc1.257.g3120a18244-goog In-Reply-To: <20190531073848.155444-1-pihsun@chromium.org> References: <20190531073848.155444-1-pihsun@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 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 | 135 ++++++++++++++++++++++++++ include/linux/platform_data/mtk_scp.h | 24 +++++ 2 files changed, 159 insertions(+) diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c index c4d900f4fe1c..bebecd470b8d 100644 --- a/drivers/remoteproc/mtk_scp.c +++ b/drivers/remoteproc/mtk_scp.c @@ -348,6 +348,137 @@ void *scp_mapping_dm_addr(struct platform_device *pdev, u32 mem_addr) } EXPORT_SYMBOL_GPL(scp_mapping_dm_addr); +#if SCP_RESERVED_MEM +phys_addr_t scp_mem_base_phys; +phys_addr_t scp_mem_base_virt; +phys_addr_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_DIP_MEM_ID, + .start_phys = 0x0, + .start_virt = 0x0, + .size = 0x900000, /*9MB*/ + }, + { + .num = SCP_MDP_MEM_ID, + .start_phys = 0x0, + .start_virt = 0x0, + .size = 0x600000, /*6MB*/ + }, + { + .num = SCP_FD_MEM_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 = (phys_addr_t) (scp->dram_size - MAX_CODE_SIZE); + + dev_info(scp->dev, + "phys:0x%llx - 0x%llx (0x%llx)\n", + scp_mem_base_phys, + scp_mem_base_phys + scp_mem_size, + 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, scp_reserve_mblock[id].start_phys, + scp_reserve_mblock[id].start_phys + + scp_reserve_mblock[id].size, + 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", + (phys_addr_t)scp_mem_base_virt, + (phys_addr_t)scp_mem_base_virt + (phys_addr_t)scp_mem_size, + 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); +#ifdef DEBUG + for (id = 0; id < NUMS_MEM_ID; id++) { + dev_info(scp->dev, + "[mem_reserve-%d] phys:0x%llx,virt:0x%llx,size:0x%llx\n", + id, + scp_get_reserve_mem_phys(id), + scp_get_reserve_mem_virt(id), + scp_get_reserve_mem_size(id)); + } +#endif + return 0; +} +phys_addr_t scp_get_reserve_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; + } else + return scp_reserve_mblock[id].start_phys; +} +EXPORT_SYMBOL_GPL(scp_get_reserve_mem_phys); + +phys_addr_t scp_get_reserve_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; + } else + return scp_reserve_mblock[id].start_virt; +} +EXPORT_SYMBOL_GPL(scp_get_reserve_mem_virt); + +phys_addr_t scp_get_reserve_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; + } else + return scp_reserve_mblock[id].size; +} +EXPORT_SYMBOL_GPL(scp_get_reserve_mem_size); +#endif + static int scp_map_memory_region(struct mtk_scp *scp) { struct device_node *node; @@ -375,6 +506,10 @@ 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); +#endif return 0; } diff --git a/include/linux/platform_data/mtk_scp.h b/include/linux/platform_data/mtk_scp.h index b81ac5c7d320..96e56fdd0917 100644 --- a/include/linux/platform_data/mtk_scp.h +++ b/include/linux/platform_data/mtk_scp.h @@ -138,4 +138,28 @@ 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_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_reserve_mem_phys(enum scp_reserve_mem_id_t id); +extern phys_addr_t scp_get_reserve_mem_virt(enum scp_reserve_mem_id_t id); +extern phys_addr_t scp_get_reserve_mem_size(enum scp_reserve_mem_id_t id); +#endif + #endif /* _MTK_SCP_H */ -- 2.22.0.rc1.257.g3120a18244-goog