From patchwork Mon May 4 17:58:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 189300 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=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 A4551C3A5A9 for ; Mon, 4 May 2020 18:15:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8612D2192A for ; Mon, 4 May 2020 18:15:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="nKm/NU/E" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730851AbgEDSP5 (ORCPT ); Mon, 4 May 2020 14:15:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1730708AbgEDR7J (ORCPT ); Mon, 4 May 2020 13:59:09 -0400 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56924C061A41 for ; Mon, 4 May 2020 10:59:09 -0700 (PDT) Received: by mail-qk1-x741.google.com with SMTP id k81so463180qke.5 for ; Mon, 04 May 2020 10:59:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hmchGPRatpHGz7FXodcq0SJqPYC5mC9nnx68TlaFw4w=; b=nKm/NU/E8zknhGFBOyhBDH4qXUn8D776cT5h6JHftF4GhhDK6x9ry2rz/3390vKj+L tN2liW5eIzpYXyOpEagl2/5lPJmBZ/VQImzT4IVSWB4A1XwFTg5LAMBg+Y79lMTvnRbz fqUzQGcouFhzr7nhC+k8ZJKatIpZACKQ5KsgukU8IdQ4ybdM5qw3Q2p8bw7XJfI58Ne8 d+GGbZTZ274frK+wfzNePMwxV38lK3jsUAI762x47ra+I05WuZNE7YyUGRj4Ej2dR8IG Zvj23kfA5xhRNdBa/Sm5jyZbT83OnNaTEKCCSmD7asI0QyaFyDOXBFhqBZG9KzBxltEi hTnA== 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=hmchGPRatpHGz7FXodcq0SJqPYC5mC9nnx68TlaFw4w=; b=P3Ean+0IGeVNz2d5Di04OCQzHwLeJktrBgCYRPOa8l8/U498GtFDoQq+zlk8vZA3kC 92wnrwrXDp0nHlcJ5XJRco1IULu7I/BQi3P+/SBTqGyMcDZKXPqhbsXjjE1OOTRZ6J4p cyOQl5dQN7cQ/n8w+4LaMc/pCsz7KSBeCgN2h3ahVCKM0XWY+95+QkrhTWqFkMCgsphK phV1FCwkPF0fv5gnfiXPxv+c0crKXxVYna/j0VWaTUcW6tza+6N5PMGYk0K1J0BajxFB xHpjTNsjiPr7dpOfx2jFAEhxwMofVEou8Jn/hludgJDIlawHORlKR4lu2JdxRNk2ECCq 7THg== X-Gm-Message-State: AGi0PuZqPPGKWl8hQL07xp8d4P2gOI4nz57EfLLr8wdwJgrsifhDZZyZ SJ8un892y/O+Rwe/l80r3ow8jg== X-Google-Smtp-Source: APiQypKHzejQhJPuhrRIg5ZslvlTZGo4JtzrXdUU6lsW+xZU4Q0pY9zUQ7/oIZ0C/MMhJDrMkTTBcg== X-Received: by 2002:a05:620a:15c1:: with SMTP id o1mr387681qkm.187.1588615148533; Mon, 04 May 2020 10:59:08 -0700 (PDT) Received: from beast.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id h19sm11271088qtk.78.2020.05.04.10.59.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 10:59:08 -0700 (PDT) From: Alex Elder To: robh+dt@kernel.org, davem@davemloft.net Cc: evgreen@chromium.org, subashab@codeaurora.org, cpratapa@codeaurora.org, bjorn.andersson@linaro.org, agross@kernel.org, devicetree@vger.kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 1/4] dt-bindings: net: add IPA iommus property Date: Mon, 4 May 2020 12:58:56 -0500 Message-Id: <20200504175859.22606-2-elder@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200504175859.22606-1-elder@linaro.org> References: <20200504175859.22606-1-elder@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The IPA accesses "IMEM" and main system memory through an SMMU, so its DT node requires an iommus property to define range of stream IDs it uses. Signed-off-by: Alex Elder --- Documentation/devicetree/bindings/net/qcom,ipa.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/qcom,ipa.yaml b/Documentation/devicetree/bindings/net/qcom,ipa.yaml index 140f15245654..7b749fc04c32 100644 --- a/Documentation/devicetree/bindings/net/qcom,ipa.yaml +++ b/Documentation/devicetree/bindings/net/qcom,ipa.yaml @@ -20,7 +20,10 @@ description: The GSI is an integral part of the IPA, but it is logically isolated and has a distinct interrupt and a separately-defined address space. - See also soc/qcom/qcom,smp2p.txt and interconnect/interconnect.txt. + See also soc/qcom/qcom,smp2p.txt and interconnect/interconnect.txt. See + iommu/iommu.txt and iommu/arm,smmu.yaml for more information about SMMU + bindings. + - | -------- --------- @@ -54,6 +57,9 @@ properties: - const: ipa-shared - const: gsi + iommus: + maxItems: 1 + clocks: maxItems: 1 @@ -126,6 +132,7 @@ properties: required: - compatible + - iommus - reg - clocks - interrupts @@ -164,6 +171,7 @@ examples: modem-init; modem-remoteproc = <&mss_pil>; + iommus = <&apps_smmu 0x720 0x3>; reg = <0 0x1e40000 0 0x7000>, <0 0x1e47000 0 0x2000>, <0 0x1e04000 0 0x2c000>; From patchwork Mon May 4 17:58:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 189301 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=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 7B4B0C4724C for ; Mon, 4 May 2020 18:15:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5282424959 for ; Mon, 4 May 2020 18:15:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="NVt8Dwh4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731507AbgEDSPo (ORCPT ); Mon, 4 May 2020 14:15:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1730723AbgEDR7N (ORCPT ); Mon, 4 May 2020 13:59:13 -0400 Received: from mail-qv1-xf44.google.com (mail-qv1-xf44.google.com [IPv6:2607:f8b0:4864:20::f44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4F14C061A0F for ; Mon, 4 May 2020 10:59:12 -0700 (PDT) Received: by mail-qv1-xf44.google.com with SMTP id ck5so78199qvb.11 for ; Mon, 04 May 2020 10:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kIcOiZ/oPstJ19Kfdf6vLqJLoLSUMaJLmWxn/KilYeo=; b=NVt8Dwh4+CTyP1vo2RSASr1fPyWYfMxcIzj+ZPt5qqtg5YrS2p+IKWrWj42OcUyh+5 OzO1UvF03v5eU3rMG3Lpl7aJBApAulWfu0cozycioqpalvngqKk3NQ7wlTTXwmZfjTEV zLbsv3kUjst2El8qwm0HxHz0Gb15uuskdtfIQ3rtbgx8OYSZ8+ZPPsrXOlJKyVCFs3qH ue4WgIbWDEjUMtMVYkBdJ4qDcHUzE1APvKcUZenGeFa71p/zHB3pr2dYuoGsOk9MF/QB gL/LzWdnjgcA026ni4Tur2igitqX6bbHMR9yEc2hwI6tvgYzNhZJb4JHW8WmIihR3Qsu dZoQ== 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=kIcOiZ/oPstJ19Kfdf6vLqJLoLSUMaJLmWxn/KilYeo=; b=RjLHeeP0RP+3rNKVMhSpDDGyaRJ1ShSTLZNtR0irOTXxPYgqkONTnjO9ZeCftjNZtY OqP9yXFiVqDn3+ouz8DWipYtj/00Ho0zIPJcmEnZidJO9mjxV6r5MNg48TH+8t5WTiiQ 4CO2Sck/Kpcrm6u8EV1XXj4d7NTsdcxvSoTV/q/V6TlN/hKIpCKy+IR71g4SgJ57Tt5Y MA5nIIkv6jb6ctecjjrxh1gxrD4QsmKMQuIrexYkgaWwU//1i3Cg/UMY5k5fM+TcGfCK pzp7U4qlKQe/hRaF1hXTevkZ+ZulrajjMv69OjUvPc1E09vsea82KzkpNo3NK6db+mO4 0vIQ== X-Gm-Message-State: AGi0PuaHwXEyo2FWwtqPSc0rIZsuzs/94umJSa9nzy+wI8tmS/0vh2zT WPb4o3pEL4nv8V4DAHZXYnIiyg== X-Google-Smtp-Source: APiQypKwlFzf3a5OW4qNpEvJrr8gPZ9dkd0M9EM8AjzM6n1GJsuVm8Mc14EGeBeLg0ARGw3GoPVGPg== X-Received: by 2002:a0c:da87:: with SMTP id z7mr269986qvj.141.1588615151983; Mon, 04 May 2020 10:59:11 -0700 (PDT) Received: from beast.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id h19sm11271088qtk.78.2020.05.04.10.59.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 10:59:11 -0700 (PDT) From: Alex Elder To: davem@davemloft.net Cc: evgreen@chromium.org, subashab@codeaurora.org, cpratapa@codeaurora.org, bjorn.andersson@linaro.org, agross@kernel.org, robh+dt@kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 3/4] net: ipa: define IMEM memory region for IPA Date: Mon, 4 May 2020 12:58:58 -0500 Message-Id: <20200504175859.22606-4-elder@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200504175859.22606-1-elder@linaro.org> References: <20200504175859.22606-1-elder@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Define a region of IMEM memory available for use by IPA in the platform configuration data. Initialize it from ipa_mem_init(). The memory must be mapped for access through an SMMU. Signed-off-by: Alex Elder Reviewed-by: Bjorn Andersson --- drivers/net/ipa/ipa.h | 5 ++ drivers/net/ipa/ipa_data-sc7180.c | 2 + drivers/net/ipa/ipa_data-sdm845.c | 2 + drivers/net/ipa/ipa_data.h | 6 ++- drivers/net/ipa/ipa_mem.c | 84 +++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+), 1 deletion(-) diff --git a/drivers/net/ipa/ipa.h b/drivers/net/ipa/ipa.h index 23fb29889e5a..32f6dfafdb05 100644 --- a/drivers/net/ipa/ipa.h +++ b/drivers/net/ipa/ipa.h @@ -47,6 +47,8 @@ struct ipa_interrupt; * @mem_offset: Offset from @mem_virt used for access to IPA memory * @mem_size: Total size (bytes) of memory at @mem_virt * @mem: Array of IPA-local memory region descriptors + * @imem_iova: I/O virtual address of IPA region in IMEM + * @imem_size; Size of IMEM region * @zero_addr: DMA address of preallocated zero-filled memory * @zero_virt: Virtual address of preallocated zero-filled memory * @zero_size: Size (bytes) of preallocated zero-filled memory @@ -88,6 +90,9 @@ struct ipa { u32 mem_size; const struct ipa_mem *mem; + unsigned long imem_iova; + size_t imem_size; + dma_addr_t zero_addr; void *zero_virt; size_t zero_size; diff --git a/drivers/net/ipa/ipa_data-sc7180.c b/drivers/net/ipa/ipa_data-sc7180.c index f97e7e4e61c1..e9007d151c68 100644 --- a/drivers/net/ipa/ipa_data-sc7180.c +++ b/drivers/net/ipa/ipa_data-sc7180.c @@ -299,6 +299,8 @@ static const struct ipa_mem ipa_mem_local_data[] = { static struct ipa_mem_data ipa_mem_data = { .local_count = ARRAY_SIZE(ipa_mem_local_data), .local = ipa_mem_local_data, + .imem_addr = 0x146a8000, + .imem_size = 0x00002000, }; /* Configuration data for the SC7180 SoC. */ diff --git a/drivers/net/ipa/ipa_data-sdm845.c b/drivers/net/ipa/ipa_data-sdm845.c index c55507e94559..c0e207085550 100644 --- a/drivers/net/ipa/ipa_data-sdm845.c +++ b/drivers/net/ipa/ipa_data-sdm845.c @@ -321,6 +321,8 @@ static const struct ipa_mem ipa_mem_local_data[] = { static struct ipa_mem_data ipa_mem_data = { .local_count = ARRAY_SIZE(ipa_mem_local_data), .local = ipa_mem_local_data, + .imem_addr = 0x146bd000, + .imem_size = 0x00002000, }; /* Configuration data for the SDM845 SoC. */ diff --git a/drivers/net/ipa/ipa_data.h b/drivers/net/ipa/ipa_data.h index 51d8e5a6f23a..69957af56ccd 100644 --- a/drivers/net/ipa/ipa_data.h +++ b/drivers/net/ipa/ipa_data.h @@ -245,13 +245,17 @@ struct ipa_resource_data { }; /** - * struct ipa_mem - IPA-local memory region description + * struct ipa_mem - description of IPA memory regions * @local_count: number of regions defined in the local[] array * @local: array of IPA-local memory region descriptors + * @imem_addr: physical address of IPA region within IMEM + * @imem_size: size in bytes of IPA IMEM region */ struct ipa_mem_data { u32 local_count; const struct ipa_mem *local; + u32 imem_addr; + u32 imem_size; }; /** diff --git a/drivers/net/ipa/ipa_mem.c b/drivers/net/ipa/ipa_mem.c index fb4de2a12796..3c0916597fe1 100644 --- a/drivers/net/ipa/ipa_mem.c +++ b/drivers/net/ipa/ipa_mem.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "ipa.h" @@ -266,6 +267,79 @@ int ipa_mem_zero_modem(struct ipa *ipa) return 0; } +/** + * ipa_imem_init() - Initialize IMEM memory used by the IPA + * @ipa: IPA pointer + * @addr: Physical address of the IPA region in IMEM + * @size: Size (bytes) of the IPA region in IMEM + * + * IMEM is a block of shared memory separate from system DRAM, and + * a portion of this memory is available for the IPA to use. The + * modem accesses this memory directly, but the IPA accesses it + * via the IOMMU, using the AP's credentials. + * + * If this region exists (size > 0) we map it for read/write access + * through the IOMMU using the IPA device. + * + * Note: @addr and @size are not guaranteed to be page-aligned. + */ +static int ipa_imem_init(struct ipa *ipa, unsigned long addr, size_t size) +{ + struct device *dev = &ipa->pdev->dev; + struct iommu_domain *domain; + unsigned long iova; + phys_addr_t phys; + int ret; + + if (!size) + return 0; /* IMEM memory not used */ + + domain = iommu_get_domain_for_dev(dev); + if (!domain) { + dev_err(dev, "no IOMMU domain found for IMEM\n"); + return -EINVAL; + } + + /* Align the address down and the size up to page boundaries */ + phys = addr & PAGE_MASK; + size = PAGE_ALIGN(size + addr - phys); + iova = phys; /* We just want a direct mapping */ + + ret = iommu_map(domain, iova, phys, size, IOMMU_READ | IOMMU_WRITE); + if (ret) + return ret; + + ipa->imem_iova = iova; + ipa->imem_size = size; + + return 0; +} + +static void ipa_imem_exit(struct ipa *ipa) +{ + struct iommu_domain *domain; + struct device *dev; + + if (!ipa->imem_size) + return; + + dev = &ipa->pdev->dev; + domain = iommu_get_domain_for_dev(dev); + if (domain) { + size_t size; + + size = iommu_unmap(domain, ipa->imem_iova, ipa->imem_size); + if (size != ipa->imem_size) + dev_warn(dev, "unmapped %zu IMEM bytes, expected %lu\n", + size, ipa->imem_size); + } else { + dev_err(dev, "couldn't get IPA IOMMU domain for IMEM\n"); + } + + ipa->imem_size = 0; + ipa->imem_iova = 0; +} + /* Perform memory region-related initialization */ int ipa_mem_init(struct ipa *ipa, const struct ipa_mem_data *mem_data) { @@ -305,11 +379,21 @@ int ipa_mem_init(struct ipa *ipa, const struct ipa_mem_data *mem_data) /* The ipa->mem[] array is indexed by enum ipa_mem_id values */ ipa->mem = mem_data->local; + ret = ipa_imem_init(ipa, mem_data->imem_addr, mem_data->imem_size); + if (ret) + goto err_unmap; + return 0; + +err_unmap: + memunmap(ipa->mem_virt); + + return ret; } /* Inverse of ipa_mem_init() */ void ipa_mem_exit(struct ipa *ipa) { + ipa_imem_exit(ipa); memunmap(ipa->mem_virt); }