From patchwork Mon Nov 20 13:21:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 13461309 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EA0D3C54E76 for ; Mon, 20 Nov 2023 13:23:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nsYm+nQcy7Pzv+g/umqEUR/5w3KFXjFQl1I6fg3q1WU=; b=r6W4ZtGGUmMfyW ITLavgQuFvbZDMszXb/6+n9l8tp35/266iHr+SGm1tviE47RB5Yv2v8lVxCkVYWAlldGfJ9+epimx Bu8Dud5uWEOTuf+WXhKk9Az+IwmLgrWKdMU+bkIzlfeJdI3xPTGUAPIwxFtK133UUJpXm6+cZPHWQ f3sOEVm7kidGHwExO0EblXpRoRvXFMdZAv9BPcrDKy9uG3dSAT1SiQS0DhVbV9KIPP4c9UHW71kXC 5I076y3Z/scpi2WKJ9VURFWHD03kbOR7PMvhqFhwC/AC8LxREStGhwKm9KE/bXmekuV2J2Ezm58q8 gVf1fNfSAXxqI9uKQSJg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r54Ex-00C8Um-1T; Mon, 20 Nov 2023 13:23:03 +0000 Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r54DX-00C86C-1P for linux-arm-kernel@lists.infradead.org; Mon, 20 Nov 2023 13:21:52 +0000 Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2c87903d314so19441951fa.1 for ; Mon, 20 Nov 2023 05:21:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1700486490; x=1701091290; darn=lists.infradead.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=eVNRTBYkQ35refPua6fnWM3rCBTplvWDVxVAY6Q7+Wo=; b=SD24nkYCNlBS2yQBuoSC+T5DNg0sfPnLqGp+l8jBAR0o3k/aO/v7XkOWeJYNg6EXNj FiLSRMjKjW84sf2Bn86z4/jO28Cp33NSxtFTTnZsJPfMjmh1Gux1Wg3AgcRBKDXgRWoR X5Ho/LI9PuaaHBtgDdBYvvTx8YgEwldLtf8rLeLTjggeQzopNPpJlIhx0UDQ5468Uo/N A717+J5T8+Xwga4QJ+cNISsgWeLlLZYlOlwuFRtufwrmzLm1PxADOTleZVo64B/HMJ+O BzsuYNEx9MFItZbX2i2n4j2xkXyPxqi/3DFBVPuHsRZr2XYkr2UhrcSJ+bSInk6ETA+c mIyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700486490; x=1701091290; 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=eVNRTBYkQ35refPua6fnWM3rCBTplvWDVxVAY6Q7+Wo=; b=KCzz7L+lDTxt7qyfbu4RXvMI4P4zjhGan5ZCPputBede+gTvZ/qVrBjY5kWmENp6JZ Gq1m2ssm5GQR3aV+L4RPwm6ZflmPTw3cG8AjbhIZdvFHRxNuXT4YBAcPSzG/lUpkSBu7 5iVe5uoNZWmPkwg2MfeNP7+ZM863SUt5F47sYwtPZ4g2darh9gW24sK3wh51HcgTfECP gcOTUh3z0TRPS7CA4jQ0qKqbgE2DvdV1VEivkEb2e8LxHDxHLyozl5qvRGvhwFJk34hG rlQ0GiiGG/w3v245uOLJFjRl8jxoAy0LvCAIAD1wH3ybC53OZJ7xfWZZZl0IONEXkT6P bjCQ== X-Gm-Message-State: AOJu0YwXBXt3aPtsqxqx9NTrScliVpzpP9YXWamyPYjYTcZ8BAJMdsPf KkREaG4YOCs0F+mQ+3dgmLzhuQ== X-Google-Smtp-Source: AGHT+IGZVi5PIyt/naysMy/l3CCxHilzq5RzodgjAfHGRQrkpAQX3VzFLsaHZFvcAI1N+W9PdBBvUg== X-Received: by 2002:a2e:5314:0:b0:2c2:8efd:a52b with SMTP id h20-20020a2e5314000000b002c28efda52bmr4357960ljb.36.1700486490289; Mon, 20 Nov 2023 05:21:30 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:c590:a7ce:883:eba3]) by smtp.gmail.com with ESMTPSA id k18-20020a05600c0b5200b004065e235417sm17329192wmr.21.2023.11.20.05.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 05:21:29 -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 Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@quicinc.com, Bartosz Golaszewski Subject: [RESEND PATCH v5 06/12] firmware: qcom: scm: make qcom_scm_lmh_dcvsh() use the TZ allocator Date: Mon, 20 Nov 2023 14:21:12 +0100 Message-Id: <20231120132118.30473-7-brgl@bgdev.pl> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231120132118.30473-1-brgl@bgdev.pl> References: <20231120132118.30473-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231120_052135_510920_AA86480C X-CRM114-Status: GOOD ( 11.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Bartosz Golaszewski Let's use the new TZ memory allocator to obtain a buffer for this call instead of using dma_alloc_coherent(). Signed-off-by: Bartosz Golaszewski Reviewed-by: Andrew Halaney Tested-by: Andrew Halaney # sc8280xp-lenovo-thinkpad-x13s --- drivers/firmware/qcom/qcom_scm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 31071a714cf1..11638daa2fe5 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -1340,8 +1340,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 = { @@ -1356,7 +1354,9 @@ 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_tzmem) = qcom_tzmem_alloc(__scm->mempool, + payload_size, + GFP_KERNEL); if (!payload_buf) return -ENOMEM; @@ -1366,11 +1366,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_tzmem_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);