From patchwork Thu Sep 28 09:20:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 146155 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3361883vqu; Thu, 28 Sep 2023 07:40:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGhsZFBZkWIzhXNwKiRz3J2M2NfJ0Kw+AmvRsumMR6yqhForVCuje6vhNGnpg1uTh6RaV13 X-Received: by 2002:a05:6a21:2726:b0:121:e573:3680 with SMTP id rm38-20020a056a21272600b00121e5733680mr1123292pzb.62.1695912011803; Thu, 28 Sep 2023 07:40:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695912011; cv=none; d=google.com; s=arc-20160816; b=TWXPSJGShjA8BtUDPa3qQ/9q/y05sATbi3YfR1KsJn5HJRbs/ARgqzonQs0hXtsxMc +alncheYpqSHOUekTipBWYbQ9F57Zh/RZ+J7KYOoMFnif8eFaTzp66QUg0uEOZP5S1LL lWpZxErcemJlI34BgQJ4LnHoUN8KFKr4hTqTtMN+hLvoDyLgpI/7bWrEJrjkfwVNst77 ff3BXrdbZ9x5QAXp7e+rGx6xHYfAMPQTMAo9nKFMHVp43oq6JvdmC77jAXXsqUI5/ALC UR6p6S3LVLrf5F44uSA70T9ZmnBFjUtJFbOo/aSGUIzRp9YMTjGAozwlNPo1Bm+P0CEW 1UyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=N+8cU6fa0dkOhujc4CdFNdtWDl3dgQeMzHDKVHwQ4Uk=; fh=qciho/xsTxNUsKJZ3hehiaQZTIzl+I3IMsnaV40iMRE=; b=tm+ioaN0OnnrFEwexOkzxFlfWrUvaIYzGX06+VzczcxzzXcdLAzSQJSPJ8fW3GwFN5 SCd4vq/RVMiQqrWRc0tveopAQDC79VPlsl7ilOSKB3n7CsBs1Ssv5gFIEcnCpq720z8+ fTD/cJJzPisnLfZeaMO9LOyT8UyE5kOkJZcmqrtg27+exWUp0uJbW/wisRQUZ9IYxl15 QwqrDYtorlNtX+f1tyJqkz5hZLe7Hxq7tTqqZ5DZQa1NSPZMuqM/nTDUIpvpT63vAYan Wiy8wXCoF8b2iMTdkf4byOzjvZvKtRZi3Ozupd6wpYqH4BAg/gWWJXIBDu2ZMAJl229v Ky6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=dhOblrfE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id w4-20020a634744000000b0057763d820d7si18660669pgk.835.2023.09.28.07.40.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 07:40:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=dhOblrfE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id DE8BC813CD92; Thu, 28 Sep 2023 02:21:21 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231624AbjI1JVN (ORCPT + 21 others); Thu, 28 Sep 2023 05:21:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231571AbjI1JVJ (ORCPT ); Thu, 28 Sep 2023 05:21:09 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A2FC198 for ; Thu, 28 Sep 2023 02:21:06 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3231dff4343so5808107f8f.0 for ; Thu, 28 Sep 2023 02:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1695892864; x=1696497664; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=N+8cU6fa0dkOhujc4CdFNdtWDl3dgQeMzHDKVHwQ4Uk=; b=dhOblrfEXhCc8eGhlP1uuRUkq/MRbKiM3rBOvnXbMhGbkurjaNlolnkxz+WsT9X/j+ PXdTYxYLp6bjl6jI/k2QMS4PvcRi98icXp7QPr+pEfl0nODKi+sfPnhDWmc/VyLYqO2G KBXpkq19mSIa6wu+DwhjFdJ9PFYhauOZ4eOdcEYwK/b8BTn3HSjBIx5IFHaXT+g5cglQ jqtmNDMQ5Q65p+ffG5WMQbeSgpf2es1pcJ32+LoMlk1n2pW5qOS4py77sb6mGLn1+fnY mDGvLmmJRnVqD74BbXuzYQQj9rs+WyGA7Cy7fGt6aHNYBn2j+gOxEahgvDAX6YH9keJB wqEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695892864; x=1696497664; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N+8cU6fa0dkOhujc4CdFNdtWDl3dgQeMzHDKVHwQ4Uk=; b=RPt+SG357Lik/EEYn9lVYxQjKaBpnYYiY0nD1eukwwT9/97hWfPlnXV3EmaN9o5BlE yyJHS8l2MGjY4Fn9eA3FSvy7AJTg/sNbpUVkjWaYNZYXjp1DYa0QWGibAV7kHoxD6eiO R8D2VDWz1UHHxGJRJ2S7rzSXv2Vc6xD2KVaSG37qfFtZ+RfGRF3iX4VKdGZfCO4RRE5Z X0XncEtF+Z2WhLc7BNNSQGexcgwkB48uhgANO+Cbx7tvlJM18IiMV3bPJi4nzh5fgYdH 8K3NoOyQGdW+SAO5DJ60kthz60CBjrP4o3Daf2ax8xoRuyd32l407uq86DlESnSz1oZg sTTw== X-Gm-Message-State: AOJu0Ywao//+BEPbMR1pU1f11CZ1CeVcqg/d0wcxqOUpal+m5W3rrbEh 9Z23StmCagjhrMmvD3H0yI9Klw== X-Received: by 2002:a5d:5265:0:b0:314:314e:fdda with SMTP id l5-20020a5d5265000000b00314314efddamr759882wrc.23.1695892864488; Thu, 28 Sep 2023 02:21:04 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:6e4c:e3c1:5cb8:b60e]) by smtp.gmail.com with ESMTPSA id e9-20020adfe7c9000000b003197efd1e7bsm5009156wrn.114.2023.09.28.02.21.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 02:21:03 -0700 (PDT) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Maximilian Luz , Krzysztof Kozlowski Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, kernel@quicinc.com, Bartosz Golaszewski Subject: [PATCH v2 04/11] firmware: qcom: scm: make qcom_scm_assign_mem() use the SCM allocator Date: Thu, 28 Sep 2023 11:20:33 +0200 Message-Id: <20230928092040.9420-5-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230928092040.9420-1-brgl@bgdev.pl> References: <20230928092040.9420-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 28 Sep 2023 02:21:21 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778292634042081769 X-GMAIL-MSGID: 1778292634042081769 From: Bartosz Golaszewski Let's use the new SCM memory allocator to obtain a buffer for this call instead of using dma_alloc_coherent(). Signed-off-by: Bartosz Golaszewski --- drivers/firmware/qcom/qcom_scm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 258aa0782754..0c532e794b92 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include @@ -980,14 +981,13 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz, struct qcom_scm_mem_map_info *mem_to_map; phys_addr_t mem_to_map_phys; phys_addr_t dest_phys; - dma_addr_t ptr_phys; + phys_addr_t ptr_phys; size_t mem_to_map_sz; size_t dest_sz; size_t src_sz; size_t ptr_sz; int next_vm; __le32 *src; - void *ptr; int ret, i, b; u64 srcvm_bits = *srcvm; @@ -997,10 +997,12 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz, ptr_sz = ALIGN(src_sz, SZ_64) + ALIGN(mem_to_map_sz, SZ_64) + ALIGN(dest_sz, SZ_64); - ptr = dma_alloc_coherent(__scm->dev, ptr_sz, &ptr_phys, GFP_KERNEL); + void *ptr __free(qcom_scm_mem) = qcom_scm_mem_alloc(ptr_sz, GFP_KERNEL); if (!ptr) return -ENOMEM; + ptr_phys = qcom_scm_mem_to_phys(ptr); + /* Fill source vmid detail */ src = ptr; i = 0; @@ -1029,7 +1031,6 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz, ret = __qcom_scm_assign_mem(__scm->dev, mem_to_map_phys, mem_to_map_sz, ptr_phys, src_sz, dest_phys, dest_sz); - dma_free_coherent(__scm->dev, ptr_sz, ptr, ptr_phys); if (ret) { dev_err(__scm->dev, "Assign memory protection call failed %d\n", ret);