From patchwork Wed Aug 7 10:43:44 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: 11081877 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6165514E5 for ; Wed, 7 Aug 2019 10:44:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A7F6284E9 for ; Wed, 7 Aug 2019 10:44:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3CE5628A03; Wed, 7 Aug 2019 10:44:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B1BD0284E9 for ; Wed, 7 Aug 2019 10:44:51 +0000 (UTC) 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=q+y72kpSqHJXTpTGZFQT6KGAd0fE0IYI8GRPdqOlSPM=; b=r1LPxo1qQJY13l gR0H58hKWvZgc72eC47XFRBXZItMq4zvvMf12DYXm5l3rQLg43IhpQOJ7mbLWJUo79uqelDjMmKFc em5cXKmLzhejkkqI+YwsWV6uOa5Cj3LTt02eK/mPcC5jWShba906qe7IFRSSFhI9/ogKiIvHyXEGV HXK4uQuSy+ZbnGDlNJBoqDm+mS8jOnYWcQJj4cKz75cdb1I+zERN2t7AGH+RjcogROoZmh1mJG9sC XvE1U/xxdC6DwNuusQt+pY6SF6JRZNi6Tnh2ZftrwOVzbUxKOnixXGdTCu7PMlvWLGDdRZ8F7EjFk pEF4tI134l/yGR3gM81Q==; 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 1hvJR5-0007zB-8b; Wed, 07 Aug 2019 10:44:51 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hvJQT-0007SU-HT for linux-arm-kernel@lists.infradead.org; Wed, 07 Aug 2019 10:44:16 +0000 Received: by mail-pl1-x642.google.com with SMTP id k8so40222692plt.3 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=U69Gm2dJUiIB+UmAGarNCajCh43bOx2gSa4pyFWW/p8hh2BNiDEpYfptq20jolIMDJ RaDWp1kvMgfjAlCKZkjSVCzyBG1wtjonS429hEjFpRk1c4zX4UoVhV9qNhZHj0kHUHy3 +Q+VehQGFEEJjZ4kBu67/JctQ8RoV47jRX9q1kj4RDIR/TqZvtDL3s+h8Yogge+s2VwN uXMu3W570LrWQkazHEs90HAHSa2RkOK7XAz0AFlv9dm8bo0ypkIHbrnDNyxDM1j/QchB C8ulYFrRWREydDo9ia+c4WfVhtDdAdBNkySB2m8ooxdqzy4N5UMP0+sz0z25GNUvmscs yTHg== X-Gm-Message-State: APjAAAWKAfr8cHmqwN2HzEx9ibEMfCuRImjft1ZG6sLKgwyCxJnPqJ7L zP8Fr1g20HeMds8u4velABehig== X-Google-Smtp-Source: APXvYqzmBD91OFY0K2AF/a4329Efvw280p+6pyhFZ5gUFLqrtMpy1at3PB9Ys55Aix2JRR3D+Em3ag== 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 To: 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190807_034413_628181_7E4A07CA X-CRM114-Status: GOOD ( 13.87 ) 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 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-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 */