From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 753CBC2BA19 for ; Wed, 15 Apr 2020 17:35:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4D62D2076D for ; Wed, 15 Apr 2020 17:35:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="JblkkjYG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2411410AbgDORfO (ORCPT ); Wed, 15 Apr 2020 13:35:14 -0400 Received: from mail27.static.mailgun.info ([104.130.122.27]:62220 "EHLO mail27.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2411346AbgDOReC (ORCPT ); Wed, 15 Apr 2020 13:34:02 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1586972042; h=Content-Transfer-Encoding: Content-Type: MIME-Version: Message-ID: Date: Subject: In-Reply-To: References: Cc: To: From: Sender; bh=CCqk7JpvsFChy4Ee1MmUL0h8jw+HCmWT+Rb1fKKzvFE=; b=JblkkjYGlLsbfCPNNzv1QDGxHOfsIoUqFMMpVu83z0ux3DYOj2y3VzhEOzX059iKFUtzFI5O UXodk5xok8hg2+a2U5DxlGE+otPOC86KM6ECjv7GUC0e/WUcLXdmPjR3I7a/Pm2F0eDD5v8T aDuuObv/Df1VRQ+FaKOtc5LlsCk= X-Mailgun-Sending-Ip: 104.130.122.27 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by mxa.mailgun.org with ESMTP id 5e974579.7f7ecd54ec38-smtp-out-n01; Wed, 15 Apr 2020 17:33:45 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 0D5E0C433BA; Wed, 15 Apr 2020 17:33:44 +0000 (UTC) Received: from Pillair (unknown [183.83.66.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: pillair) by smtp.codeaurora.org (Postfix) with ESMTPSA id 10D9EC433BA; Wed, 15 Apr 2020 17:33:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 10D9EC433BA Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=pillair@codeaurora.org From: To: Cc: , , References: <1585134100-5944-1-git-send-email-pillair@codeaurora.org> <1585134100-5944-4-git-send-email-pillair@codeaurora.org> In-Reply-To: <1585134100-5944-4-git-send-email-pillair@codeaurora.org> Subject: RE: [PATCH v2 3/3] ath10k: Add support for targets without trustzone Date: Wed, 15 Apr 2020 23:03:35 +0530 Message-ID: <001401d6134c$01b5c420$05214c60$@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQI6fc28eknFIs45cOq24ZTPq1i0fwKMRWarp50564A= Content-Language: en-us Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Kalle, I have sent out v3 for this patchset after correcting the firmware structure name which was added in ath10k snoc structure Thanks, Rakesh Pillai. > -----Original Message----- > From: Rakesh Pillai > Sent: Wednesday, March 25, 2020 4:32 PM > To: ath10k@lists.infradead.org > Cc: linux-wireless@vger.kernel.org; devicetree@vger.kernel.org; linux- > kernel@vger.kernel.org; Rakesh Pillai > Subject: [PATCH v2 3/3] ath10k: Add support for targets without trustzone > > Add the support to attach and map iommu > domain for targets which do not have the > support of TrustZone. > > Tested HW: WCN3990 > Tested FW: WLAN.HL.3.1-01040-QCAHLSWMTPLZ-1 > > Signed-off-by: Rakesh Pillai > --- > drivers/net/wireless/ath/ath10k/snoc.c | 118 > ++++++++++++++++++++++++++++++++- > drivers/net/wireless/ath/ath10k/snoc.h | 7 ++ > 2 files changed, 124 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/ath/ath10k/snoc.c > b/drivers/net/wireless/ath/ath10k/snoc.c > index 3633ea5..7a7e79b 100644 > --- a/drivers/net/wireless/ath/ath10k/snoc.c > +++ b/drivers/net/wireless/ath/ath10k/snoc.c > @@ -12,6 +12,7 @@ > #include > #include > #include > +#include > > #include "ce.h" > #include "coredump.h" > @@ -1499,6 +1500,111 @@ static int ath10k_setup_msa_resources(struct > ath10k *ar, u32 msa_size) > return 0; > } > > +static int ath10k_fw_init(struct ath10k *ar) > +{ > + struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar); > + struct device *host_dev = &ar_snoc->dev->dev; > + struct platform_device_info info; > + struct iommu_domain *iommu_dom; > + struct platform_device *pdev; > + struct device_node *node; > + int ret; > + > + node = of_get_child_by_name(host_dev->of_node, "wifi- > firmware"); > + if (!node) { > + ar_snoc->use_tz = true; > + return 0; > + } > + > + memset(&info, 0, sizeof(info)); > + info.fwnode = &node->fwnode; > + info.parent = host_dev; > + info.name = node->name; > + info.dma_mask = DMA_BIT_MASK(32); > + > + pdev = platform_device_register_full(&info); > + if (IS_ERR(pdev)) { > + of_node_put(node); > + return PTR_ERR(pdev); > + } > + > + pdev->dev.of_node = node; > + > + ret = of_dma_configure(&pdev->dev, node, true); > + if (ret) { > + ath10k_err(ar, "dma configure fail: %d\n", ret); > + goto err_unregister; > + } > + > + ar_snoc->fw.dev = &pdev->dev; > + > + iommu_dom = iommu_domain_alloc(&platform_bus_type); > + if (!iommu_dom) { > + ath10k_err(ar, "failed to allocate iommu domain\n"); > + ret = -ENOMEM; > + goto err_unregister; > + } > + > + ret = iommu_attach_device(iommu_dom, ar_snoc->fw.dev); > + if (ret) { > + ath10k_err(ar, "could not attach device: %d\n", ret); > + goto err_iommu_free; > + } > + > + ar_snoc->fw.iommu_domain = iommu_dom; > + ar_snoc->fw.fw_start_addr = ar->msa.paddr; > + > + ret = iommu_map(iommu_dom, ar_snoc->fw.fw_start_addr, > + ar->msa.paddr, ar->msa.mem_size, > + IOMMU_READ | IOMMU_WRITE); > + if (ret) { > + ath10k_err(ar, "failed to map firmware region: %d\n", ret); > + goto err_iommu_detach; > + } > + > + of_node_put(node); > + > + return 0; > + > +err_iommu_detach: > + iommu_detach_device(iommu_dom, ar_snoc->fw.dev); > + > +err_iommu_free: > + iommu_domain_free(iommu_dom); > + > +err_unregister: > + platform_device_unregister(pdev); > + of_node_put(node); > + > + return ret; > +} > + > +static int ath10k_fw_deinit(struct ath10k *ar) > +{ > + struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar); > + const size_t mapped_size = ar_snoc->fw.mapped_mem_size; > + struct iommu_domain *iommu; > + size_t unmapped_size; > + > + if (ar_snoc->use_tz) > + return 0; > + > + iommu = ar_snoc->fw.iommu_domain; > + > + unmapped_size = iommu_unmap(iommu, ar_snoc- > >fw.fw_start_addr, > + mapped_size); > + if (unmapped_size != mapped_size) > + ath10k_err(ar, "failed to unmap firmware: %zu\n", > + unmapped_size); > + > + iommu_detach_device(iommu, ar_snoc->fw.dev); > + iommu_domain_free(iommu); > + > + platform_device_unregister(to_platform_device(ar_snoc->fw.dev)); > + > + return 0; > +} > + > static const struct of_device_id ath10k_snoc_dt_match[] = { > { .compatible = "qcom,wcn3990-wifi", > .data = &drv_priv, > @@ -1607,16 +1713,25 @@ static int ath10k_snoc_probe(struct > platform_device *pdev) > goto err_power_off; > } > > + ret = ath10k_fw_init(ar); > + if (ret) { > + ath10k_err(ar, "failed to initialize firmware: %d\n", ret); > + goto err_power_off; > + } > + > ret = ath10k_qmi_init(ar, msa_size); > if (ret) { > ath10k_warn(ar, "failed to register wlfw qmi client: %d\n", > ret); > - goto err_power_off; > + goto err_fw_deinit; > } > > ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc probe\n"); > > return 0; > > +err_fw_deinit: > + ath10k_fw_deinit(ar); > + > err_power_off: > ath10k_hw_power_off(ar); > > @@ -1648,6 +1763,7 @@ static int ath10k_snoc_remove(struct > platform_device *pdev) > > ath10k_core_unregister(ar); > ath10k_hw_power_off(ar); > + ath10k_fw_deinit(ar); > ath10k_snoc_free_irq(ar); > ath10k_snoc_release_resource(ar); > ath10k_qmi_deinit(ar); > diff --git a/drivers/net/wireless/ath/ath10k/snoc.h > b/drivers/net/wireless/ath/ath10k/snoc.h > index c05df45..18e19fb 100644 > --- a/drivers/net/wireless/ath/ath10k/snoc.h > +++ b/drivers/net/wireless/ath/ath10k/snoc.h > @@ -55,6 +55,13 @@ struct regulator_bulk_data; > struct ath10k_snoc { > struct platform_device *dev; > struct ath10k *ar; > + unsigned int use_tz; > + struct video_firmware { > + struct device *dev; > + dma_addr_t fw_start_addr; > + struct iommu_domain *iommu_domain; > + size_t mapped_mem_size; > + } fw; > void __iomem *mem; > dma_addr_t mem_pa; > struct ath10k_snoc_target_info target_info; > -- > 2.7.4