From patchwork Thu Sep 28 09:20:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 146041 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3245494vqu; Thu, 28 Sep 2023 04:42:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEsg4w54qnpRNqwqQkN4zCWGDqhiJqD0QNh6hrlAOM/SyMEC+cyDo9VjjYZOQDT5dGIlJyl X-Received: by 2002:a17:90b:1297:b0:279:104d:1473 with SMTP id fw23-20020a17090b129700b00279104d1473mr737689pjb.45.1695901368719; Thu, 28 Sep 2023 04:42:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695901368; cv=none; d=google.com; s=arc-20160816; b=wWQcXgtBZ6RSGvv2IXpBO4LJInv20woDMxbHS2sViUGtSwo9HsiSHwM+sAx4dQ2zIl WBsI4b7B+JpxDkqyhx4gR0VLlPVZNlVah6cX8K2MLV7yUTRzZoi3oxAMBQKyf+nrU+Mr XKAfQTBmkTI/3mrnUaeoACHUna5aG9SKFu3uueTRF9C2facq0qkXXbbtpr5SWmYjhGAo 87k7bLdtT4Blf6SPQcFfx1gtTUQLZG+XbNDs0+LZApGEZXs0AkBKORHEfsY6ITwI8PDH NnCLyezcpZnoEWCZVcCoG9ELZkwRf8RePuLX48NF1A7wqF/9tYkiCs60XKXAMovw2PdO CHjg== 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=K7e3uVvAU/9XxRD0WWB/UR6KH+g5Ytg3FZjMRpb3BmQ=; fh=qciho/xsTxNUsKJZ3hehiaQZTIzl+I3IMsnaV40iMRE=; b=mC+mw8cevPoIlD20PuUeBEF7AdR8oyQjUnC4rVmpXh2l/juzjKz93D+FosiRzlJQtv XLqYJmOXeboIF4S/zK8hfOrvJPIIVqGGRDgy7mTycAIU9mlzOwavSqVLEUzIIi44U4If kRt1pS2ZkbXliFpQdAQZn9cGJq2dm8D96HJcWp5DKZ583+HoHeG2BBefWO0MFGuLqJab iMZ2oEVgioOBSrkBA18Ykyq7x+fnvdo+AlwxKSDc6aRjZG36EQM9LF/rzZWVBn01ZPXx 3IqK3Oz4qUOo4zn36M9uBzoUHRzefPqGki77h3Ty0jowInus6BZ9NO7SQrVd5B+q5xHP K8lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=W9T4z9ZQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id t24-20020a17090ad51800b002776e57a5d5si8991244pju.94.2023.09.28.04.42.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 04:42:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=W9T4z9ZQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 D5DF282E53C3; Thu, 28 Sep 2023 02:21:48 -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 S231620AbjI1JVh (ORCPT + 21 others); Thu, 28 Sep 2023 05:21:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231617AbjI1JVM (ORCPT ); Thu, 28 Sep 2023 05:21:12 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9ADA180 for ; Thu, 28 Sep 2023 02:21:09 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-405361bba99so124787445e9.2 for ; Thu, 28 Sep 2023 02:21:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1695892868; x=1696497668; 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=K7e3uVvAU/9XxRD0WWB/UR6KH+g5Ytg3FZjMRpb3BmQ=; b=W9T4z9ZQ+Qcn35oxemG3I1bDWjfrEMLol/kezXmKOKgPMscV43tFkENsSp1gEgUVuU FUAP2hVvYqPn3ptc/4699PpDsG+btbJMlAEVQ1UdcoB5V6w53/S2KZDsb1Nl4i9vaWy2 lgEL7ajqywW5RwL3uUnHC0XjyT1nhQQfnDJ5/ACnc+b1ljnJpb+tInkhXvDQLagWZOzO QfT3YAaqJoVUGbupp6lYyyNuExhhqvJHSJrzXhmaTD9FMTyIWGvGRcFy9CvVZll+57or tYE8l43JKlvPMYyvsHfkNSstQwM+jd8Ec26jabqxZ9pauQwTyWt1NUhmPYcYvO1ghjfb N20A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695892868; x=1696497668; 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=K7e3uVvAU/9XxRD0WWB/UR6KH+g5Ytg3FZjMRpb3BmQ=; b=GgR+HHa9GAR1e2gcsklE2ZCcxGpRifooCjvzWDwWIPc9JwPEHTphwXTECrSy6nWVMI LcXuHWVsswBX8ZSaBpR8WdPZMb7h+xr3RNMOlTjw5QJG5oRH+1eItDMOmatKx+tOF4OM fIOAlgOORh8Nb+EBacDiLNHOfnpx1NELH7/aYQFbfNj7grOLyPxOS14YXhTAWt6m0Jyc Rl938JnQZDvv0ZNCxuuqvvTf717Q3Hwb6EIdPdgSiGl3jTA/mhfmE/mSRtIojzBoMX9N jUs0ObGMQXxMiXq8dK9arRiup3ocE2ROvCXeRajgiUQ/9NAzRkVXyIEFoTa0yKgPxYUi IpyA== X-Gm-Message-State: AOJu0Yyd5vyJMXVbEqdJ6xB8+UeWvkIoMntcqtiqxf4ZuE8eYy3agXKV v0kFEYpdjawA9hlX6hAYPOPy0Q== X-Received: by 2002:a5d:6188:0:b0:321:707a:8ca5 with SMTP id j8-20020a5d6188000000b00321707a8ca5mr681117wru.38.1695892868485; Thu, 28 Sep 2023 02:21:08 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 02:21:08 -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: [RFT PATCH v2 08/11] firmware: qcom: scm: make qcom_scm_qseecom_app_get_id() use the SCM allocator Date: Thu, 28 Sep 2023 11:20:37 +0200 Message-Id: <20230928092040.9420-9-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=unavailable 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:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778281473351716111 X-GMAIL-MSGID: 1778281473351716111 From: Bartosz Golaszewski Let's use the new SCM memory allocator to obtain a buffer for this call instead of manually kmalloc()ing it and then mapping to physical space. Signed-off-by: Bartosz Golaszewski --- drivers/firmware/qcom/qcom_scm.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 41095bf1d4d7..37e876437a3e 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -1498,37 +1498,26 @@ int qcom_scm_qseecom_app_get_id(const char *app_name, u32 *app_id) unsigned long app_name_len = strlen(app_name); struct qcom_scm_desc desc = {}; struct qcom_scm_qseecom_resp res = {}; - dma_addr_t name_buf_phys; - char *name_buf; int status; if (app_name_len >= name_buf_size) return -EINVAL; - name_buf = kzalloc(name_buf_size, GFP_KERNEL); + char *name_buf __free(qcom_scm_mem) = qcom_scm_mem_alloc(name_buf_size, + GFP_KERNEL); if (!name_buf) return -ENOMEM; memcpy(name_buf, app_name, app_name_len); - name_buf_phys = dma_map_single(__scm->dev, name_buf, name_buf_size, DMA_TO_DEVICE); - status = dma_mapping_error(__scm->dev, name_buf_phys); - if (status) { - kfree(name_buf); - dev_err(__scm->dev, "qseecom: failed to map dma address\n"); - return status; - } - desc.owner = QSEECOM_TZ_OWNER_QSEE_OS; desc.svc = QSEECOM_TZ_SVC_APP_MGR; desc.cmd = QSEECOM_TZ_CMD_APP_LOOKUP; desc.arginfo = QCOM_SCM_ARGS(2, QCOM_SCM_RW, QCOM_SCM_VAL); - desc.args[0] = name_buf_phys; + desc.args[0] = qcom_scm_mem_to_phys(name_buf); desc.args[1] = app_name_len; status = qcom_scm_qseecom_call(&desc, &res); - dma_unmap_single(__scm->dev, name_buf_phys, name_buf_size, DMA_TO_DEVICE); - kfree(name_buf); if (status) return status;