From patchwork Thu Sep 28 09:20:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 146203 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3433025vqu; Thu, 28 Sep 2023 09:22:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH9nnjbi0J9VymhNfsP/1Bc28QNHK02nJiCQAui9UR+cgGwlt7X4xSCT1FStUoltn3imKlI X-Received: by 2002:a17:902:7008:b0:1bd:bbc3:c87b with SMTP id y8-20020a170902700800b001bdbbc3c87bmr1408649plk.41.1695918160784; Thu, 28 Sep 2023 09:22:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695918160; cv=none; d=google.com; s=arc-20160816; b=m38m3RYmAJiC9u/2dqfzoeNKIT1loH77rumaCfD50SIEMrmno3OJyQR62bQDv47ROw Y9Iof9dhC4dE1W/gTiVuXVhUMJD39yxouHk+UA5AQ8apuKQsLuNnsQ8+D8u8qPCHkLiJ ImVDZpPnWpmd+JWPTWxJAfyeUPOJrPzHiWxGHHtaznTi/MCt7LKRJkkXXyl0rrXo5hn4 FPr9d1GFkptIiA7SoFbCJDgnugGX4K5XznMd2SoIbmbWJ4gCARj1d5ioO2afRDej7a8h TLEinAfHqxBfd8EFuPvZmC+f1lLSQ9Bvjh/9AhBzPnNVXSKcDWebwPGkmBwLrAWDByWE 6dOA== 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=cMUOZtKJMrzKTINi50r8H43dxWG3CrCNn5eWPcC1U+s=; fh=qciho/xsTxNUsKJZ3hehiaQZTIzl+I3IMsnaV40iMRE=; b=aHbjwNHd/U7BLjwHAkDQCKmiSaZTdjMcywO7oxf5R0VPttOCbiV25ViEU6UTvoxWBa GXn1yinrbZHC1lWXFYb+HYFczgWA6iBPemuPSRlFm7K6iDdUHxQTxP63GGD7XB2cTj0b 9g0EexRyVeYN7R1SfWGnvup7F/4WrVbamvoJ47pHFSnr+ZH8JDqio2woZtEXy3qewtnX ZJwTofbBKZqUlOc7bNWITlvc/yBZk/GH5extcjt6TXCsM1qzc0BSjfnJv8DUzby0I51x HPcj7Qt0yRzXjX2JpPiUnNOuC2cfBwo7J+SCeiU61evRe/fSHpoqaaenhL8nwv5fqXkt Cd3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=V6KJhyv+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id b14-20020a170902d50e00b001c432da203asi5281567plg.270.2023.09.28.09.22.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 09:22:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=V6KJhyv+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id EEBD88269C60; Thu, 28 Sep 2023 02:21:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231642AbjI1JVZ (ORCPT + 21 others); Thu, 28 Sep 2023 05:21:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231607AbjI1JVK (ORCPT ); Thu, 28 Sep 2023 05:21:10 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFC0B18F for ; Thu, 28 Sep 2023 02:21:08 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4053cf48670so116704085e9.0 for ; Thu, 28 Sep 2023 02:21:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1695892867; x=1696497667; 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=cMUOZtKJMrzKTINi50r8H43dxWG3CrCNn5eWPcC1U+s=; b=V6KJhyv+CI1ywrMLPvGcD5Kg/O+5RBC9BjqQbRquufFGbdKhhYRWWMUFoLPQO5tKKi 1UjVua8wPZcqUHIvV5X1oOAprepfb9Er5C53j3R8u5mgANladoYEM9+N7b43ES8U7vEw Kjq6coVL6ZgScV3/0SetYdM+FtmRezxvMDn+KwlHoaD9nOBiPv256aI9GvZvwWZcPBnU Zkg2cNamY25VJJyzzOEv9nP7UPw0cdKEgVUzyIWcLyVOGV+S28RzHK0balzXcsalUDph ouq8diM+9uYwQrCCTv16AtJI7OvVDZi1KLUzp0a/k1mmJg1vtc3DaG1tpZdBV4o230Xx zy0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695892867; x=1696497667; 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=cMUOZtKJMrzKTINi50r8H43dxWG3CrCNn5eWPcC1U+s=; b=Nt11p2FQkdRO9A/8WvJ+1w+T8Q4xscDWanhxbZca2sSSbTPUC9oCtik1+jT9g1X7Mt BVBLyXPCr4L4uncJrUZraqE6HVbJqvXjTwRiLyowG/Nu/MMm8+EryxdHoZ2yc7j+nqwr uPfsFxUS4VmIV+JfaQ10B3UIWUuNvHZ8eq0ZNLAojPyNNms7juL3hMv1PK82x1uoMfvx yY1tSP7A0GSdHA6D+Vj7JlTgV6LOYD09i6tnQktWeBj2zr5CbeJR7kg143bMU+Kvq1v3 HyHK5yAUCWvTJg1HIe0c4EsDHJAEDN1rmomZCPfvRZZWR2j45x+aC5EjEghel7b6dXu+ UFXw== X-Gm-Message-State: AOJu0YxbX8KqXnOkusZCHJtd2FdUffYLH6EpkTg+oML0PsBXuuxekiQ7 vzY5KohbWK6kl7iiuwlwpe6cmw== X-Received: by 2002:a05:6000:109:b0:317:f70b:3156 with SMTP id o9-20020a056000010900b00317f70b3156mr674945wrx.28.1695892867487; Thu, 28 Sep 2023 02:21:07 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 02:21:07 -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 07/11] firmware: qcom: scm: make qcom_scm_lmh_dcvsh() use the SCM allocator Date: Thu, 28 Sep 2023 11:20:36 +0200 Message-Id: <20230928092040.9420-8-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=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email 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 (groat.vger.email [0.0.0.0]); Thu, 28 Sep 2023 02:21:51 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778299081405621835 X-GMAIL-MSGID: 1778299081405621835 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 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index c0eb81069847..41095bf1d4d7 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -1314,8 +1314,6 @@ EXPORT_SYMBOL_GPL(qcom_scm_lmh_profile_change); int qcom_scm_lmh_dcvsh(u32 payload_fn, u32 payload_reg, u32 payload_val, u64 limit_node, u32 node_id, u64 version) { - dma_addr_t payload_phys; - u32 *payload_buf; int ret, payload_size = 5 * sizeof(u32); struct qcom_scm_desc desc = { @@ -1330,7 +1328,8 @@ int qcom_scm_lmh_dcvsh(u32 payload_fn, u32 payload_reg, u32 payload_val, .owner = ARM_SMCCC_OWNER_SIP, }; - payload_buf = dma_alloc_coherent(__scm->dev, payload_size, &payload_phys, GFP_KERNEL); + u32 *payload_buf __free(qcom_scm_mem) = + qcom_scm_mem_alloc(payload_size, GFP_KERNEL); if (!payload_buf) return -ENOMEM; @@ -1340,11 +1339,10 @@ int qcom_scm_lmh_dcvsh(u32 payload_fn, u32 payload_reg, u32 payload_val, payload_buf[3] = 1; payload_buf[4] = payload_val; - desc.args[0] = payload_phys; + desc.args[0] = qcom_scm_mem_to_phys(payload_buf); ret = qcom_scm_call(__scm->dev, &desc, NULL); - dma_free_coherent(__scm->dev, payload_size, payload_buf, payload_phys); return ret; } EXPORT_SYMBOL_GPL(qcom_scm_lmh_dcvsh);