From patchwork Mon Nov 20 13:21:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 167122 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp2195489vqn; Mon, 20 Nov 2023 05:24:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IGOy/e6VKI4gsyoQcEmJfNSnnin2/8a69hVwtPhx8ZkZYHWfUX51eL3G6MdZvGEN4dA24V6 X-Received: by 2002:a05:6a00:4787:b0:6c4:d78d:498e with SMTP id dh7-20020a056a00478700b006c4d78d498emr15380831pfb.2.1700486666377; Mon, 20 Nov 2023 05:24:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700486666; cv=none; d=google.com; s=arc-20160816; b=dsw+psiZ/Vkifj3jaKRvGhMdP/+M3GJ4vZ27+eVIlQcIxbKBzysv80rKT1JPTzOihy 7MxFckL0/BTqLz3khM48bIr1fkDpFxat4nid1NPxcgtfzm7k2yQJWyMJy0rlI0qDsD0M kQWN0Lz/0c5rJyEl/0Z23w21F1VheV/qg3RRimwkuAgqWtlWYGxuASY8vjlwrHjpgFIU TDDcjsGPkkw0f4f5qHY7N5TKnbOZL4uBmhiuU3+lK2vX2p6QAvIN2xe/TGJ2E68tcQJx /IUAcbtDSa+dZQYDmiAtC09mBKZyuMO/Ppg5QcuBywNI9scD7tCUXTI+eDUoqiovpBcm 9gng== 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=L3T+Nz29XwJpeLbYrWkBbO8epnldil1IzN2t5jt5R90=; fh=lirm1ccAeXZZB1cIo+N1DqklpgcFmD/vJ7PCWNIL0HU=; b=Sv5t7mFGdoY+cHvxPDRQZe5MMHDIoo7OPGaAs10p1HvAufDeeHKOGzUwBQUH06KZwu FlBPMwIElaN4zOyOf22GWiXWJQ2uGI/KZM3HbUDQCvQr861buCHgwowCvlFFMQ5Z8woh lnXkTPaIEQdPqZeYVqy4nY/ff0vXbuSn/H7qjB4JdupTrP9sFlc0ReMtWhaDzYaFLJ2s kuMJE4OwJz5guiG+opt1+irGV7GWfGGhX2Ap5272AeC38mz7E3+LUZWN8BYhAjbYZm3W q4nidhoR4Snh0GlWaWmCg/c9+kIYAJX1c7cRLasvShahyulTdnTqTUGudks4lB7rl+ag OPKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=LDFugB4p; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id fi12-20020a056a00398c00b006be26c1be4bsi8035867pfb.73.2023.11.20.05.24.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 05:24:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=LDFugB4p; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 40414805EAD7; Mon, 20 Nov 2023 05:22:10 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232859AbjKTNVk (ORCPT + 27 others); Mon, 20 Nov 2023 08:21:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232541AbjKTNVd (ORCPT ); Mon, 20 Nov 2023 08:21:33 -0500 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7877194 for ; Mon, 20 Nov 2023 05:21:29 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40a48775c58so17078675e9.3 for ; Mon, 20 Nov 2023 05:21:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1700486488; x=1701091288; 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=L3T+Nz29XwJpeLbYrWkBbO8epnldil1IzN2t5jt5R90=; b=LDFugB4paiSlagxsN6rZsh3XxaKiE74dENjHWNTQB55eTwp73sG1DdfemiMAkOBtVB fBNT2huZp2e84BXG/zUwdfogViLJlTW+cuRmgdu0GAmsvAaGg9raBkv+QXw+LVw91KIo nwI1Oa4e3niRMx4R/eSlDlC0YUab73PltEGWvQvEAE5aAIGpdZMunrrIPW3zZC6UhLVV JSmyYcHdfKnmBlHZTvKLLUMtbrKGN7Q+Sbz9iaJHBjVLiUv9c8UrWsObM4Op8QHF3bSI ZQjwGG5VWAKNMxtD/yd4fIK6qjsVgKMcD0ngEn44C1Pz+AJym2GoT5NEiTwZo5xLBldy XdgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700486488; x=1701091288; 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=L3T+Nz29XwJpeLbYrWkBbO8epnldil1IzN2t5jt5R90=; b=ufuDbdbdVw/i7UWCzjH54cTYYasSBalTSixjrtSCVxJX6yK/LtvDqbw96sMEikNSzc t7uyJWsuV23Tk2TRZ0t+4gu5wxspqb627wSOw/ZhyV/bn/0HvNonwbLBDNx4IwXNupXX i1MmghNm1WpKhiGgd+ZGJk+rJy49VF1C4rJwpaHVjPuM32dSnMPp+Z5J7JNHP7oHtEus 6DuNe1Sz5l6RrH3Ml/PM4DuvLy3kKGXI8bsHDkB6/5CstKij9dnBz86cWbLWWxK07BFK CjRAt/1MWIYWBsQITrRzvNr216PLtVyyxDLDmQInmRZJNs9SFjgEXhtmKMskiikjWEEc /Jkg== X-Gm-Message-State: AOJu0Yz40uBo2pCquNfKivja8DGywfn1T/WAmd6FOGigj9Pp0ipGVKEs y+mBOaTe22Oc4av8wEKkI+V4xA== X-Received: by 2002:a05:600c:3d95:b0:40b:22de:b89a with SMTP id bi21-20020a05600c3d9500b0040b22deb89amr1639516wmb.31.1700486488069; Mon, 20 Nov 2023 05:21:28 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 05:21:27 -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 04/12] firmware: qcom: scm: make qcom_scm_assign_mem() use the TZ allocator Date: Mon, 20 Nov 2023 14:21:10 +0100 Message-Id: <20231120132118.30473-5-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-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,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Mon, 20 Nov 2023 05:22:10 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783089506942407818 X-GMAIL-MSGID: 1783089506942407818 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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 71e98b666391..754f6056b99f 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include @@ -998,14 +999,13 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz, struct qcom_scm_mem_map_info *mem_to_map; phys_addr_t mem_to_map_phys; phys_addr_t dest_phys; - dma_addr_t ptr_phys; + phys_addr_t ptr_phys; size_t mem_to_map_sz; size_t dest_sz; size_t src_sz; size_t ptr_sz; int next_vm; __le32 *src; - void *ptr; int ret, i, b; u64 srcvm_bits = *srcvm; @@ -1015,10 +1015,13 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz, ptr_sz = ALIGN(src_sz, SZ_64) + ALIGN(mem_to_map_sz, SZ_64) + ALIGN(dest_sz, SZ_64); - ptr = dma_alloc_coherent(__scm->dev, ptr_sz, &ptr_phys, GFP_KERNEL); + void *ptr __free(qcom_tzmem) = qcom_tzmem_alloc(__scm->mempool, + ptr_sz, GFP_KERNEL); if (!ptr) return -ENOMEM; + ptr_phys = qcom_tzmem_to_phys(ptr); + /* Fill source vmid detail */ src = ptr; i = 0; @@ -1047,7 +1050,6 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz, ret = __qcom_scm_assign_mem(__scm->dev, mem_to_map_phys, mem_to_map_sz, ptr_phys, src_sz, dest_phys, dest_sz); - dma_free_coherent(__scm->dev, ptr_sz, ptr, ptr_phys); if (ret) { dev_err(__scm->dev, "Assign memory protection call failed %d\n", ret);