Received: by 2002:a25:b794:0:0:0:0:0 with SMTP id n20csp5286800ybh; Wed, 7 Aug 2019 03:46:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqw6JLFMqs15aOl90EKv8A+405/JucyGtNaZq3cNghGRBab/PsA1YM8rYMVKxDsWmHTGRGmb X-Received: by 2002:a17:90a:ab01:: with SMTP id m1mr7397954pjq.69.1565174797183; Wed, 07 Aug 2019 03:46:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565174797; cv=none; d=google.com; s=arc-20160816; b=cXNc3FdZnCoj+yiQXieWQSwthEnKKjbHeLBKU8LMyBz0m43bBj5K254vekXnCY3q6b AzjGavJCzuEO0LG/yvnK7uuIPf4tgA8ZjRdIB6b7V58pZiUr+by6SCwohKpsYCjAPMSD qyMRaFbnUBennVqwAXKY4zHzaBc2BrKjBW+jDZKm4EwWlGJXp+sb+9kovhLJpg4lyjvg HP6+wIGNTLkFMgc8CnaO1UGNFVFivtFRXdQR0SH7zMe76vIP+44oKf6INLzOCGyjeMEg 8bwf0auZE3Bw4qRFQYb9d/cNrt+MlvpVWJiil5HOiODE35u8r5gp+ay6MNCbxpa/Jly2 A59A== 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=2YqBkdocqXk9XySuT6T0cGeHKIouo7HT01yj7smB86c=; b=v0G9S7Yw2xDXhmtmgUu3H4YcmKybnwW1hGThCNwguG+Sz6ptFvvjuyT4/M/QqGdYcj nCFMssGnj1lzj/UiV5wvNMEf5pdPw4zxSiM95HnQfJIBh0hPfZTU7nAyihrzI4b9CcrV geJmaHizmHufmdx4HnL0pxWifIBg9mbAMy3Oy5tSfimsLVL4nK5S8OqFxoiitWCwG8Xi JljcuWnqLH6i8EdLYgvt1rfJ/MtGxK8ExDtv5aSyEDEHFUX27QlwclRr702ZhRtVAW8/ s2CtpEllUEJzebLtZf0ChU+kjvS5H928XyGbfnh7bhSsTOxfmPqABZ2q27j2k4FCbXZa NsyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@chromium.org header.s=google header.b=dom6hz2D; 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 y8si50062644pgr.89.2019.08.07.03.46.22; Wed, 07 Aug 2019 03:46:37 -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=dom6hz2D; 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 S2387694AbfHGKoP (ORCPT + 99 others); Wed, 7 Aug 2019 06:44:15 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:34492 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387676AbfHGKoN (ORCPT ); Wed, 7 Aug 2019 06:44:13 -0400 Received: by mail-pl1-f193.google.com with SMTP id i2so40228719plt.1 for ; Wed, 07 Aug 2019 03:44:13 -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=2YqBkdocqXk9XySuT6T0cGeHKIouo7HT01yj7smB86c=; b=dom6hz2D0pdOEiWok/kU7VkC1T8mq0NDpCw8Ia6rezy+txA9czlrA+TlVxRrdvApeG NyEk3MmEKqW1wVW0dmEopPl4oAeCMQchms6iLdYsuuUXpKjoefVzULIDD+F8bj0MhsDe Uac5ND9Eh+BteV1VXC9l4KS9c59B8MauH9xRI= 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=2YqBkdocqXk9XySuT6T0cGeHKIouo7HT01yj7smB86c=; b=KwqxIAzkPpzz9QUw3afmxN2cB6qNqQYqyzmSs28EL2RpPSoZmMLaKV7DTEC8LcZOcA T3UZCC4kX8c4mNtracT3SEPffzT5rslKG4E2I/JKNpsg7Kb4uvWSUIup9s5HHJG6Q6cZ 1ulhJPsCKwaLh8UZIPH+KDEFMCOVsSph/XS1yJtL1HiFV9RvlqpzHT+ghYPxlwTmSgYS A1pJo+7wk4P56US7SDvG6U6eiQFDIg5/1ZIq0dMhwz9ywXsSe3YlIxmE4Gx3R/G31zb5 cecqlwkXQteMNQqwoUqvpGMDbcOhmd8jf6tRF1EdK0d6cQ2DC+/JELnwI5i1pf1r+VFl Ck1g== X-Gm-Message-State: APjAAAVwEoJefVJG0biWDg93OeRCJcJGpycDE0G7rbYDzhdbMTn0YRsS v2HNfTA2T34yA6GnkXzWJVZwsw== X-Received: by 2002:a65:6288:: with SMTP id f8mr7039492pgv.292.1565174652874; Wed, 07 Aug 2019 03:44: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 a3sm24747697pje.3.2019.08.07.03.44.10 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 07 Aug 2019 03:44:12 -0700 (PDT) From: Pi-Hsun Shih Cc: Pi-Hsun Shih , Erin Lo , Ohad Ben-Cohen , Bjorn Andersson , Matthias Brugger , 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 v15 3/5] remoteproc: mt8183: add reserved memory manager API Date: Wed, 7 Aug 2019 18:43:44 +0800 Message-Id: <20190807104352.259767-4-pihsun@chromium.org> X-Mailer: git-send-email 2.22.0.770.g0f2c4a37fd-goog In-Reply-To: <20190807104352.259767-1-pihsun@chromium.org> References: <20190807104352.259767-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 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 2e4fa3e41f84..ae820a35bd52 100644 --- a/drivers/remoteproc/mtk_scp.c +++ b/drivers/remoteproc/mtk_scp.c @@ -366,11 +366,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) { @@ -393,6 +524,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 b80d8e3f7959..707556f6b899 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 */ -- 2.22.0.770.g0f2c4a37fd-goog