From nobody Thu Dec 25 03:26:15 2025 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7755F3A8C9 for ; Mon, 22 Jan 2024 10:22:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705918933; cv=none; b=SflXD33kLdTC86w0f6a9e1diJXLmRzcA3IKj63znC9OTrrokmbgWJXqmaIiymEm5pjrdqf3q/4TA8F5ZA2q3/Fq6IBf0PL/Psxt3Tzv8ke0u99VdkQAL4FZCczRaiI6E43RyyJ/bq1xvi5N3whrXW2Vf6Yl2sPfNlnkpd1FpKg4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705918933; c=relaxed/simple; bh=ZpGV2VJFHUgG8JkEU54hepfIDRO8lwBoWxz2kXXXit4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=B9INwZZUb23oqzjTFAbrap1BA/vLRAyns6rJ+pL4MOm3f3myCkOW27HKZyNAir3M94eueGoFIGR4Pq9MFWLKaKMvwd1WIvklEDGwcCRFw1+aCowDZrDqRw3DSSE84jt1a6g8q4fqvXl2AEhY96jd1Y4ik116GCMzid9KfmdZJlc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=3SQDngBz; arc=none smtp.client-ip=209.85.221.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="3SQDngBz" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-336c5b5c163so1745890f8f.1 for ; Mon, 22 Jan 2024 02:22:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1705918928; x=1706523728; 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=4erhe8goMZDE7TLr/dsCJoHJXktIjwgA8fkMwhmJPgI=; b=3SQDngBzLpWU07rNpxIA7tHzs3CbCYCKGR13BB9InaUyra5RXNHcTeOB4K+Hs+0fbA xQiuEhCjlmo9xP0IDA1Zs5DAPbj2XjGYgBFoB6JEKaQs8nbM5+NdZqW++FHePpwwvqax JqDz65kxaeUEhglWpM3VwccBRgBD6oeoDyUa0hRqY7SDwx38dK93SsuFonR3Kapp2/3K c/mNvg8S633PFRvC2PB3GSrF42k3rAkjpkXeoHtZH0WCnlBSBiodlC05WgEBEbfecOz/ 6DHIJyXRaftmb7i367sLfKJgLryS9d1rIem+FbEh0n+pHCKAsZ7K123A1HxMp3P1IAxx ZTUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705918928; x=1706523728; 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=4erhe8goMZDE7TLr/dsCJoHJXktIjwgA8fkMwhmJPgI=; b=XSeCTJmAxvb3TOHS4/bGIkGUNCEkoc+mWjMJ6GJmqgHGM6mGaI7vM+LOJSH75DfT6d ZwBzK94SKtb0BGXhN3c6N3HbJxMELqQZ5K9EMc4++ymXWamxpECQXTea2ImIZRt91slh v5LRHJ/4PYMYGjaU1aPEv9l63KtamCdQx+IcS9XnIhZANxxQ8qotwbzbAMzaXKE6UF/z 9Cgwrte/Yk/Ho/YS/8Zk4vPt2bdUEXwT0Z+TWNTvmwc2p+kTaVNtm9IFuEmNraWur41j JbppdKrUOn6bBIY3SfBKacin3rmIV5/nKzLSQCn2TVTCT8FGMoKOJ4++W2xxgsMStdSq BEfA== X-Gm-Message-State: AOJu0YyqoVNDgYDRkMqzNH1b/qxfFL4p7LW/D1o1DVtRDlcTk5Fy3pM2 4WWPCcHujwMb35Cmr4JD5FUGKXc0un1+vPn7tD4Ftij6b6VstBMVctibRbfLfaI= X-Google-Smtp-Source: AGHT+IFusWT3dEKKX+8JJzIRFia8fYzUDtxg5UHIaV1PDrRe6DyXcIQleAtb9CO7z0Dksq1Ls11GFw== X-Received: by 2002:a5d:5049:0:b0:337:420e:36f2 with SMTP id h9-20020a5d5049000000b00337420e36f2mr2004788wrt.17.1705918928754; Mon, 22 Jan 2024 02:22:08 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:92a0:6172:d229:1898]) by smtp.gmail.com with ESMTPSA id q7-20020adffec7000000b0033926505eafsm6377904wrs.32.2024.01.22.02.22.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 02:22:08 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Elliot Berman , Krzysztof Kozlowski , Guru Das Srinagesh , Andrew Halaney , Maximilian Luz , Alex Elder , Srini Kandagatla , Catalin Marinas , Will Deacon , Arnd Bergmann Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@quicinc.com, Bartosz Golaszewski , Deepti Jaggi Subject: [RESEND PATCH v6 03/12] firmware: qcom: scm: smc: switch to using the SCM allocator Date: Mon, 22 Jan 2024 11:21:48 +0100 Message-Id: <20240122102157.22761-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240122102157.22761-1-brgl@bgdev.pl> References: <20240122102157.22761-1-brgl@bgdev.pl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski We need to allocate, map and pass a buffer to the trustzone if we have more than 4 arguments for a given SCM calls. Let's use the new TrustZone allocator for that memory and shrink the code in process. As this code lives in a different compilation unit than the rest of the SCM code, we need to provide a helper in the form of qcom_scm_get_tzmem_pool() that allows the SMC low-level routines to access the SCM memory pool. Signed-off-by: Bartosz Golaszewski Reviewed-by: Andrew Halaney Tested-by: Andrew Halaney # sc8280xp-lenovo-thinkpad-= x13s Tested-by: Deepti Jaggi #sa8775p-ride Reviewed-by: Elliot Berman --- drivers/firmware/qcom/qcom_scm-smc.c | 30 ++++++++-------------------- drivers/firmware/qcom/qcom_scm.c | 5 +++++ drivers/firmware/qcom/qcom_scm.h | 3 +++ 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm-smc.c b/drivers/firmware/qcom/q= com_scm-smc.c index 16cf88acfa8e..dca5f3f1883b 100644 --- a/drivers/firmware/qcom/qcom_scm-smc.c +++ b/drivers/firmware/qcom/qcom_scm-smc.c @@ -2,6 +2,7 @@ /* Copyright (c) 2015,2019 The Linux Foundation. All rights reserved. */ =20 +#include #include #include #include @@ -9,6 +10,7 @@ #include #include #include +#include #include #include =20 @@ -150,11 +152,10 @@ int __scm_smc_call(struct device *dev, const struct q= com_scm_desc *desc, enum qcom_scm_convention qcom_convention, struct qcom_scm_res *res, bool atomic) { + struct qcom_tzmem_pool *mempool =3D qcom_scm_get_tzmem_pool(); int arglen =3D desc->arginfo & 0xf; int i, ret; - dma_addr_t args_phys =3D 0; - void *args_virt =3D NULL; - size_t alloc_len; + void *args_virt __free(qcom_tzmem) =3D NULL; gfp_t flag =3D atomic ? GFP_ATOMIC : GFP_KERNEL; u32 smccc_call_type =3D atomic ? ARM_SMCCC_FAST_CALL : ARM_SMCCC_STD_CALL; u32 qcom_smccc_convention =3D (qcom_convention =3D=3D SMC_CONVENTION_ARM_= 32) ? @@ -172,9 +173,9 @@ int __scm_smc_call(struct device *dev, const struct qco= m_scm_desc *desc, smc.args[i + SCM_SMC_FIRST_REG_IDX] =3D desc->args[i]; =20 if (unlikely(arglen > SCM_SMC_N_REG_ARGS)) { - alloc_len =3D SCM_SMC_N_EXT_ARGS * sizeof(u64); - args_virt =3D kzalloc(PAGE_ALIGN(alloc_len), flag); - + args_virt =3D qcom_tzmem_alloc(mempool, + SCM_SMC_N_EXT_ARGS * sizeof(u64), + flag); if (!args_virt) return -ENOMEM; =20 @@ -192,25 +193,10 @@ int __scm_smc_call(struct device *dev, const struct q= com_scm_desc *desc, SCM_SMC_FIRST_EXT_IDX]); } =20 - args_phys =3D dma_map_single(dev, args_virt, alloc_len, - DMA_TO_DEVICE); - - if (dma_mapping_error(dev, args_phys)) { - kfree(args_virt); - return -ENOMEM; - } - - smc.args[SCM_SMC_LAST_REG_IDX] =3D args_phys; + smc.args[SCM_SMC_LAST_REG_IDX] =3D qcom_tzmem_to_phys(args_virt); } =20 - /* ret error check follows after args_virt cleanup*/ ret =3D __scm_smc_do(dev, &smc, &smc_res, atomic); - - if (args_virt) { - dma_unmap_single(dev, args_phys, alloc_len, DMA_TO_DEVICE); - kfree(args_virt); - } - if (ret) return ret; =20 diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_= scm.c index 0d4c028be0c1..71e98b666391 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -201,6 +201,11 @@ static void qcom_scm_bw_disable(void) enum qcom_scm_convention qcom_scm_convention =3D SMC_CONVENTION_UNKNOWN; static DEFINE_SPINLOCK(scm_query_lock); =20 +struct qcom_tzmem_pool *qcom_scm_get_tzmem_pool(void) +{ + return __scm->mempool; +} + static enum qcom_scm_convention __get_convention(void) { unsigned long flags; diff --git a/drivers/firmware/qcom/qcom_scm.h b/drivers/firmware/qcom/qcom_= scm.h index 4532907e8489..aa7d06939f8e 100644 --- a/drivers/firmware/qcom/qcom_scm.h +++ b/drivers/firmware/qcom/qcom_scm.h @@ -5,6 +5,7 @@ #define __QCOM_SCM_INT_H =20 struct device; +struct qcom_tzmem_pool; =20 enum qcom_scm_convention { SMC_CONVENTION_UNKNOWN, @@ -78,6 +79,8 @@ int scm_legacy_call_atomic(struct device *dev, const stru= ct qcom_scm_desc *desc, int scm_legacy_call(struct device *dev, const struct qcom_scm_desc *desc, struct qcom_scm_res *res); =20 +struct qcom_tzmem_pool *qcom_scm_get_tzmem_pool(void); + #define QCOM_SCM_SVC_BOOT 0x01 #define QCOM_SCM_BOOT_SET_ADDR 0x01 #define QCOM_SCM_BOOT_TERMINATE_PC 0x02 --=20 2.40.1