From patchwork Thu Sep 28 09:20:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 146223 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3468486vqu; Thu, 28 Sep 2023 10:11:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFSd45puddmDLuOYmKFbzV8NiVBIKrwdtWq6tk/NwTOCrRGtVwiJyNY5h6JPWU/1zMBtC3H X-Received: by 2002:a17:902:db0c:b0:1c6:2dbb:e5fa with SMTP id m12-20020a170902db0c00b001c62dbbe5famr1903851plx.44.1695921102601; Thu, 28 Sep 2023 10:11:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695921102; cv=none; d=google.com; s=arc-20160816; b=XVCYxKC+WpyqDEasW3YkTkjuJ8ORt1oQsSs4Z7J0zzQecyOU3pYpjy4wJEg2UJ47ih /qK14QnW2ZzG5JIHbCl7w4z2IWX3SeY0KXhd2nXj/uhRSZJu/vEh4CIYXgxGvceyfrJa awQeS7t3USnOnIoLXv2VQlUhPCna2o5Zie77sGhV/hKu4UpJWY24AWyirCIHgVodJyf+ aA9hqu4NpJreFI80CUhF52PoY0scBcStIZ71lo69yVRf5+Myc9D7WwTlxFzme1mYrAau CGqV6icUMXzvUOxE7oobbQT3qn+iVbEIuVmyJhuvZiohdiyeHNedhm+iUq1xrGdEWnXv 3Qpw== 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=9ZW43V/v3JWndTZOC7qgio7lrKv8+8C3I99C3oqf4j4=; fh=qciho/xsTxNUsKJZ3hehiaQZTIzl+I3IMsnaV40iMRE=; b=pmhpvm2UYaOP3rEOScxpOHTYzd22Z3WihVMxPYPo+uZY2wC2EQct6UbDFEwCW3eG9o Csp8nR/kv7opIOOdhPAqqKsF5Yyi+xEiExiZBt9t4RS7d3JtHfAsq++ASnq88J4eqmte CzkP20YAHeHv0v3yXPoeYgsdNVi2xOISZ+F4akvwhG/9Mac5E5kUfu4/9uly2rI74KzJ 2myrL49AwOmirlm9OeUwY/JaUx8qLlL4QkqP4pG5q4QeoC9/hh+GC/AIw1enM9RE/YhZ o6C9ghO9SH34j88d4E9r+I+pnYx3OhNY+QhQ3TK0IWvShwV6A/9WYcm32ZWT7LZjRsaT 2zvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=aPvgkqbs; 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 x9-20020a170902ec8900b001bf0b29d935si14567356plg.34.2023.09.28.10.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 10:11:42 -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=aPvgkqbs; 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 81D9E8269F24; Thu, 28 Sep 2023 02:22:22 -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 S231710AbjI1JVm (ORCPT + 21 others); Thu, 28 Sep 2023 05:21:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231618AbjI1JVM (ORCPT ); Thu, 28 Sep 2023 05:21:12 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E20D719C for ; Thu, 28 Sep 2023 02:21:06 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40566f8a093so96296105e9.3 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=1695892865; x=1696497665; 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=9ZW43V/v3JWndTZOC7qgio7lrKv8+8C3I99C3oqf4j4=; b=aPvgkqbsvfVwIlxZ5kifPEF6X1I6p/Ui9LLR1DB0nUyIlD6CVGUI1GzbWmV3GYOQ2i z0iY41FSlTPuDhyzTOit1BDfZ6cQRNe9/71fYVQLO6ehGP+NIxxPeEfVzF+xGcT2BDvJ XScbx0+yazklQ3oAzmpQrZzGq8zY8GbjKNAxaLnP8D38xt9/mOvWxOgcSK8Fj6c4gGX5 hwFfPQjCdWpew9HnghopB9QpPCXwNkbjjfb5nXtP5UhT8YHoFZXgsWcbkV0CiG4DGAsl tVNpe0FCNZeQi/x9hNjRzL7EBaqlBT4oCJP76OX26Udcax/ExwHlxUZBY/WH+x2N4vwm rnmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695892865; x=1696497665; 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=9ZW43V/v3JWndTZOC7qgio7lrKv8+8C3I99C3oqf4j4=; b=nAlArbigb6huCwJ1FeIBORBsIftl/FN5yn0MTYswepfivtFFEQ8DxfKJKO1mnkkNHf uqT3ZlEzgGJGbMh4BdRCuJ4QyC0SPbhFhj3mh/JSTss/iDibjlWthVw96mTvig6qZhj2 OUfpf2TuzoiO/+chFdB5I78gfKSJidi234L1CbUxVFRDxrNB+PLyMrslSbCKw5bSfRCt wolZ9DKlvG1Wit85RHBuZ23oacvzB4OaDd3bm/WKp2kjZ51lHx6HR+YITGdECD66vnBB bHUKwXS2p/0ZZzYkCaovcn/aYeQDj12r5DcF8dQJeK7oLxmoL1cgnGNYt2VPVnUhVkTI tcFg== X-Gm-Message-State: AOJu0Yxm6Mlc3Qo8NSmWLB26tOJhLBSOVUEwO89YOzdiaoDDMqElxhlb RdSG0e0kL+cUjpliA7CgKmWM9A== X-Received: by 2002:adf:e912:0:b0:31a:d8c0:cb8b with SMTP id f18-20020adfe912000000b0031ad8c0cb8bmr517938wrm.25.1695892865407; Thu, 28 Sep 2023 02:21:05 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 02:21:04 -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 05/11] firmware: qcom: scm: make qcom_scm_ice_set_key() use the SCM allocator Date: Thu, 28 Sep 2023 11:20:34 +0200 Message-Id: <20230928092040.9420-6-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:22:23 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778302166262547356 X-GMAIL-MSGID: 1778302166262547356 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 | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 0c532e794b92..02a773ba1383 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -1178,32 +1178,20 @@ int qcom_scm_ice_set_key(u32 index, const u8 *key, u32 key_size, .args[4] = data_unit_size, .owner = ARM_SMCCC_OWNER_SIP, }; - void *keybuf; - dma_addr_t key_phys; + int ret; - /* - * 'key' may point to vmalloc()'ed memory, but we need to pass a - * physical address that's been properly flushed. The sanctioned way to - * do this is by using the DMA API. But as is best practice for crypto - * keys, we also must wipe the key after use. This makes kmemdup() + - * dma_map_single() not clearly correct, since the DMA API can use - * bounce buffers. Instead, just use dma_alloc_coherent(). Programming - * keys is normally rare and thus not performance-critical. - */ - - keybuf = dma_alloc_coherent(__scm->dev, key_size, &key_phys, - GFP_KERNEL); + void *keybuf __free(qcom_scm_mem) = qcom_scm_mem_alloc(key_size, + GFP_KERNEL); if (!keybuf) return -ENOMEM; memcpy(keybuf, key, key_size); - desc.args[1] = key_phys; + desc.args[1] = qcom_scm_mem_to_phys(keybuf); ret = qcom_scm_call(__scm->dev, &desc, NULL); memzero_explicit(keybuf, key_size); - dma_free_coherent(__scm->dev, key_size, keybuf, key_phys); return ret; } EXPORT_SYMBOL_GPL(qcom_scm_ice_set_key);