From nobody Mon Feb 9 06:11:46 2026 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 0BE2B1A7F60 for ; Wed, 31 Jul 2024 07:45:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722411916; cv=none; b=N4nb6AJiFRLgOtT2XuAx3TRBEN8xDvS7JRnMmMUlVF0QgGckOCkVNHmV+5CvLkCo/kGHchyfOYgDf8YeSdRFX9nmD+r0JtqAu3Y+JojMLQjkqql2/ETYCiQxzwGZuwsuVP4Xaz1GeAZEdbd8YFH7AG/xx6iBxf+0sp+maFNVByo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722411916; c=relaxed/simple; bh=yKNBl2Ktp0gu6KA4Su7k3OuZ3Sd55/hO3UH0fIFPbXs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uo9G65NZ0+9HBJ1VYESQZR9aHdUGO2JcWpVpNTRxIvoUdlePc+AGFmLfawqXbgKJ+niklpQGJNsfqhrPzVlWzBxE3YLRqWAykdAuMFekAv+lKTdt4pz1P4BnPzBj1IBS0fVvRljWAKd3KXwuRPqUbtCZZNy56yrJzYSqibIQ7bY= 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=oHgCpHLZ; arc=none smtp.client-ip=209.85.221.54 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="oHgCpHLZ" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-36865a516f1so3771458f8f.0 for ; Wed, 31 Jul 2024 00:45:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1722411913; x=1723016713; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=6vHNBN/ufCdXcl7pdCh4RFeocbeeTwZ3+FK4L26OSDs=; b=oHgCpHLZBp3r7MSoayyE6J7kjcWTHqtnvzjDFLkO3rujhjwzIWTzxVMlggX+YyOUok TJxdbmWZqPerheL6veQvzYKUo8PdC0AqDrbF5r5ODAZG9adDKZlXHZVGZiXv0GeFPvFW /NpGZu5yWdC5cP3fzNlGyWTH7IeVZVmmNnlAgvfpQq/wpzRO78hWhU1B+Lk7p8u3xZp4 5djxgNpNQnQM61tIdBpu4ghjyTOrSJvsSayI6Scf0Mb6axn0l4ONCsVyBrcuC/ZbAUkm Bu09aJ3QCmvFt47FkR1EEA5/svV6DFUNDB36q+DTtpC4NLSAtXhSvvWUq32rk2MPCfWS U6MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722411913; x=1723016713; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6vHNBN/ufCdXcl7pdCh4RFeocbeeTwZ3+FK4L26OSDs=; b=QgYhrl5cReD0UUBDiM/q/Wy6hi62vjJAEr4mn3RYYBFajP3cLwe5rniByYw8UmES0E Y+Y0KQCOIzzJdMFSq4CqlX9s9EXefzVx0LIJuKHh6VK9UtbJjcCsqKXwhZzeJo84udnU Mtx8mdkDrjZsHMsR40CrpXCXXr+uwtN51MV8Nx60PMocgusMDT16OcBHhoB46kNHRZfQ SpQAwbW/29uLntkqI1lcMyOhhw1r4bzWKiG5Mliv6VrBL273DpTe0fXATwdOMBxlodvF FaTK+4xHxUlFcValQ7FU1Eq5oDPgbQjE81oM6SF9tjmBCtAxYr3nfLxQvPjcaVka8RhB rdQA== X-Forwarded-Encrypted: i=1; AJvYcCUjvFlQtU/XEZJokMc5RS8t4g7g4vZZ2XbFKZeOx8ieHa2F1eygizLiqLjWjXuDAgGiBXL/xZllAZMrcgW0aIViyaKU6gahOEZjb8aS X-Gm-Message-State: AOJu0YybiSk8O+AXhQJN0NnQhqR/IL/WOv5dg3kH9Y0UeyQh7A0uyaMY ZAbGAcVRFR6qt3zZsBwb5BaxsClWj/3Mu4929qPwoHtKlm33PUOdnDbDgdqHGD0bT4fMRVeqz7N f X-Google-Smtp-Source: AGHT+IGT0LdCk+C3EeslcKV3qT4fsUUqFk3w+JR1pHdpJa+ltDEXYxaFPmr1VLvVwt7VKmeJrtW85Q== X-Received: by 2002:a5d:5751:0:b0:366:ee01:30d6 with SMTP id ffacd0b85a97d-36b5d0d1076mr11141130f8f.49.1722411913302; Wed, 31 Jul 2024 00:45:13 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:9c3f:3dd8:b524:cb31]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36b36857dcesm16283104f8f.85.2024.07.31.00.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 00:45:13 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 31 Jul 2024 09:44:56 +0200 Subject: [PATCH v2 1/2] firmware: qcom: tzmem: fix virtual-to-physical address conversion Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240731-tzmem-efivars-fix-v2-1-f0e84071ec07@linaro.org> References: <20240731-tzmem-efivars-fix-v2-0-f0e84071ec07@linaro.org> In-Reply-To: <20240731-tzmem-efivars-fix-v2-0-f0e84071ec07@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Elliot Berman , Andrew Halaney , Amirreza Zarrabi Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Johan Hovold , Maximilian Luz X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3036; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=IDWyVF531XX7Pomw+3tmuIHewwA0ELgVAiQqvm9sn5E=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBmqeuHPzGm4C6NMoS6BXs7MujXbcOKc8pdbv4nL OjlHlDP5RyJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCZqnrhwAKCRARpy6gFHHX cslAEADFIgiQw4X5p+/fxMQ23Kz71NyOIwEmKfqA5t52onjL9V1hihOcLhe6Ju6uTUW+8sqGk7v qnbiibgzHqKkhdHqRh76XDmqD49QKEaxZ8WYYaltNtH4mp0/jiM9hE3ayho6GQImrV/5mYcww8r nwz3xxXAZ4/Wo+BA9Lvsn4gowuhcaR8KlNkOaGXrIAHYahuQqPSti7tQUaILpvYy4txwVZrYRWH F17/taCanh2RPfQobYkll9plswZ1ki/RHgjtedl6z7uM37ED7NO3cAejD+HqvtgOcEAXETO5udU r9cY+Tj7gRd9hsjXoIESbOb0hxxbMTmoStn1YpB9YcK81jEQAmuwBRRN9/HuZvzT4cftkGy/q7v Y/3y69XbBdYphcMIkx8CBE/JFsh6sNNqXOFKex+ru9VCBtRqWOCcFC7ZM+/syHzwPG7K3DHtqxD 9y9JjxQrSXBIdvqvPUHjtsvmZXoU3UeJsbnIM7nqWDf7zjVi0+aH8sSh4DUcFXpsOTRGzmuAkp6 XXCzYRI9PTCV+L6EFZRl+mCS2+Ke+CNYbfW+kduxjdNuR9eROT6IitM6kQgbT/DUYTYzIh8jUpw Ne5PKfdrshrJWJ1Opol3dZdRC/hVT5S52a4939FWNC82bBd6h01qAUu305ekDKPW60wNQuKsHNG ZAfgiMx8e7+eDdQ== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski We currently only correctly convert the virtual address passed by the caller to qcom_tzmem_to_phys() if it corresponds to the base address of the chunk. If the user wants to convert some pointer at an offset relative to that base address, we'll return 0. Let's change the implementation of qcom_tzmem_to_phys(): iterate over the chunks and try to call gen_pool_virt_to_phys() just-in-time instead of trying to call it only once when creating the chunk. Fixes: 84f5a7b67b61 ("firmware: qcom: add a dedicated TrustZone buffer allo= cator") Reported-by: Johan Hovold Closes: https://lore.kernel.org/lkml/20240729095542.21097-1-johan+linaro@ke= rnel.org/ Acked-by: Andrew Halaney Signed-off-by: Bartosz Golaszewski --- drivers/firmware/qcom/qcom_tzmem.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qco= m_tzmem.c index 17948cfc82e7..caedeef0059c 100644 --- a/drivers/firmware/qcom/qcom_tzmem.c +++ b/drivers/firmware/qcom/qcom_tzmem.c @@ -40,7 +40,6 @@ struct qcom_tzmem_pool { }; =20 struct qcom_tzmem_chunk { - phys_addr_t paddr; size_t size; struct qcom_tzmem_pool *owner; }; @@ -385,7 +384,6 @@ void *qcom_tzmem_alloc(struct qcom_tzmem_pool *pool, si= ze_t size, gfp_t gfp) return NULL; } =20 - chunk->paddr =3D gen_pool_virt_to_phys(pool->genpool, vaddr); chunk->size =3D size; chunk->owner =3D pool; =20 @@ -431,25 +429,37 @@ void qcom_tzmem_free(void *vaddr) EXPORT_SYMBOL_GPL(qcom_tzmem_free); =20 /** - * qcom_tzmem_to_phys() - Map the virtual address of a TZ buffer to physic= al. - * @vaddr: Virtual address of the buffer allocated from a TZ memory pool. + * qcom_tzmem_to_phys() - Map the virtual address of TZ memory to physical. + * @vaddr: Virtual address of memory allocated from a TZ memory pool. * - * Can be used in any context. The address must have been returned by a ca= ll - * to qcom_tzmem_alloc(). + * Can be used in any context. The address must point to memory allocated + * using qcom_tzmem_alloc(). * - * Returns: Physical address of the buffer. + * Returns: + * Physical address mapped from the virtual or 0 if the mapping failed. */ phys_addr_t qcom_tzmem_to_phys(void *vaddr) { struct qcom_tzmem_chunk *chunk; + struct radix_tree_iter iter; + void __rcu **slot; + phys_addr_t ret; =20 guard(spinlock_irqsave)(&qcom_tzmem_chunks_lock); =20 - chunk =3D radix_tree_lookup(&qcom_tzmem_chunks, (unsigned long)vaddr); - if (!chunk) - return 0; + radix_tree_for_each_slot(slot, &qcom_tzmem_chunks, &iter, 0) { + chunk =3D radix_tree_deref_slot_protected(slot, + &qcom_tzmem_chunks_lock); =20 - return chunk->paddr; + ret =3D gen_pool_virt_to_phys(chunk->owner->genpool, + (unsigned long)vaddr); + if (ret =3D=3D -1) + continue; + + return ret; + } + + return 0; } EXPORT_SYMBOL_GPL(qcom_tzmem_to_phys); =20 --=20 2.43.0 From nobody Mon Feb 9 06:11:46 2026 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 ED1261A7F7D for ; Wed, 31 Jul 2024 07:45:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722411918; cv=none; b=B8rHZWQg94tlVqp8MywqwrmsyJ4zS9XysF/0R5U+liUMfm/tQyFPEoALqcL+U6VOI7rdfSRVFTCAd7TyM1MPnnNiRQp2YYc43OjsXJTL0Nrmg+Ok9TRxMoSxFlQtP8C+UMfek668a8WWSS/RZNDl25mb8EiEe3CtuxnW/Sv5Wb4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722411918; c=relaxed/simple; bh=3YTeKq7Hhj9wWwiBgBNcp3zvJA1JlvWkmbWTXFd22dI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Jflpb3zT2yShqzeg2uox+CXd2o+MemaOCrUxpPOKr9zIonAfJsI9Nhpc5qDxEgOjN3UChKoYoVvwmCK4ACuR4kpV7vMn7D+JAg5idiMbQjrTgZTYY6eejdxM/LPjrpMS9FNpP/WYmdPdt79WeBJtU1AuB15TcJVcOSOQVbd7I+o= 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=UyiJyy1A; arc=none smtp.client-ip=209.85.128.46 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="UyiJyy1A" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4281ca54fd3so26138535e9.2 for ; Wed, 31 Jul 2024 00:45:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1722411915; x=1723016715; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=PDjPcViKZ7vA42Kh18gcoG8ctnOeMWODlMqSdJ8Mpeo=; b=UyiJyy1AlmI8dtQJWxvlH/MULzP+jJZulG1kSkhfQvK2AX4GJZX6S3sfppTIuILpAS a7mq40eu7fIFNJzQga96z4UWy9t1F5zdYT+J62uiLxg+pkfeJBICnmatHRgVDTdEdeAK 7U6fojaIO6GrLA/NmH2PlFeMULtOo+xCAzGKBXMjfacA5UbUbR4wdNwDjGOKlifs/OYx qmnSAAKl11vG1KC/2I9BcXi1L2CHHKXGQ5klwW1qVQ9KKUi5M0Uv5MdaN49OdWNAcyB9 fgHZOAfeUu96db+FzFA/ofvOwN16EEjLVgv4iks1Zn/GYCnWMycuA1fiKxW3Qu8ufjD8 //Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722411915; x=1723016715; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PDjPcViKZ7vA42Kh18gcoG8ctnOeMWODlMqSdJ8Mpeo=; b=N5ZDXzXquFgdR4YMgQ71cmkWfOg/hvSNd/Y+720DjPcBHb3EE0hN54U0c/czLDJce1 EB2pBIVEIU/iQWLlScfDJwJilSNNhf31BVxsjGFXUhS2ANrgtNbdMJiBvQqqtUA0w8I4 KSH0d/MH3LUyENncQVkw3J28c72S3z7KuSm/dt9CMwAATxt890Y8BnXbYFIkcAiYgNdr DMKhAjMdMMi3us7v94lat+u3H5UsLiZKpNsrWomn9loi9s86eHCt0WPCQSmLeukCgxJq 5ZD+LH6Tr37FCW4+FcdeHyx39wMOWHIfTProF24V80AwAvZJ75237N75Rq4xoPgw3+FV a+aA== X-Forwarded-Encrypted: i=1; AJvYcCWYDOcaZLenGQBgw9KrMaB58l2kXPeBwnAiaeqlZXDy9Zrplb+Q+qsFotHrG/ciWgcl3kA7J+epctAGbovEyoEkaO+HC4x01BE59xai X-Gm-Message-State: AOJu0YwsAieRYLdr5/dnSwmKD1ggFXjeH2a2ljpG4DUu2MTY//kBdXkn ci1NugDFsIO05hR5fClKMC0Zl/v45udaNFwt0OvwUNxOhWYTaie3G+OML+cEY5o= X-Google-Smtp-Source: AGHT+IF6LRgUjSn+1+ryTYGv3zfI7p6aOVRqBNrcU7ZN4NC5Up42c6AOJaSRuU2cqgX8xjMlZM8rZw== X-Received: by 2002:a05:600c:1c02:b0:428:387:79ac with SMTP id 5b1f17b1804b1-42811d8642bmr105856635e9.6.1722411915312; Wed, 31 Jul 2024 00:45:15 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:9c3f:3dd8:b524:cb31]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36b36857dcesm16283104f8f.85.2024.07.31.00.45.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 00:45:13 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 31 Jul 2024 09:44:57 +0200 Subject: [PATCH v2 2/2] firmware: qcom: qseecom: remove unused functions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240731-tzmem-efivars-fix-v2-2-f0e84071ec07@linaro.org> References: <20240731-tzmem-efivars-fix-v2-0-f0e84071ec07@linaro.org> In-Reply-To: <20240731-tzmem-efivars-fix-v2-0-f0e84071ec07@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Elliot Berman , Andrew Halaney , Amirreza Zarrabi Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Johan Hovold , Maximilian Luz X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2722; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=xeKpWG60jiq7TCX9/Uo6MbrLodxwHo60LreDVcIJbQI=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBmqeuHlT3tNcon3r0ZS0xEqE/0+fAfknt08bJEc IXdesAlmrKJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCZqnrhwAKCRARpy6gFHHX ctZDEADES4+nW5LF+WZWDvU8c6d3AQ2rk0PmXSSa2+fkh83LofqPhIdS5xc4TXw41RNI2I1XK5m +eOhlvAHQ/PsTt0OTq+NzEqqoctyfew8wbeXzKfWammnhQMy1UWvxWc2WMMH9qIhXc0DrgUVf3E XevBrmhc8HAGwjJDL8iuOVoBez/HOdGsynpSg2ULu05hg5v6nkxBlfTc/KiQw1WoHDEGkMpwowk 7emwM2JzhC3pPL1xpD8GcDpcma1wWMYwJ/qsMDzZu+5YdUBMCzLZ3KgSKqxSMrdeqlYqDt++wAO MO8eYNT0+KwOG7c0Gw5DHB26DKjciXGaq4tqTPhjSBigedsxED3V2+YoFXczRI8QuLb9N/XK/ml Dpc43w1BNDs8yFEx2kccvvGxvBxHBdauIjKVUy5UWaRdRgjRIf83HTNVl4FntdbQrjqFT6h9S1y ZGAvtFFXfddL0Tik0zEyrGTJK8UTxAEyHRjSStDu7BivkWVUfl8bospL6c6eatNoplA5hNErjrA rytrW1KsyhTMDSO0iozEMl375/q2Ydq7JkbXKKSgvsQW0WtS6oA02hO+sShogMiSCEqeG7dSHRt eIJkvfa5v86OW1lAZvXiIM5KqLvNKTyAe0pyCWGwWgpMpTCx2PMhyY9rcYc1uCW+aohz9sR3dAc 5L6E8pA24ESXAWg== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski qseecom_scm_dev(), qseecom_dma_alloc() and qseecom_dma_free() are no longer used following the conversion to using tzmem. Remove them. Fixes: 6612103ec35a ("firmware: qcom: qseecom: convert to using the TZ allo= cator") Reviewed-by: Andrew Halaney Signed-off-by: Bartosz Golaszewski --- include/linux/firmware/qcom/qcom_qseecom.h | 45 --------------------------= ---- 1 file changed, 45 deletions(-) diff --git a/include/linux/firmware/qcom/qcom_qseecom.h b/include/linux/fir= mware/qcom/qcom_qseecom.h index 1dc5b3b50aa9..3387897bf368 100644 --- a/include/linux/firmware/qcom/qcom_qseecom.h +++ b/include/linux/firmware/qcom/qcom_qseecom.h @@ -25,51 +25,6 @@ struct qseecom_client { u32 app_id; }; =20 -/** - * qseecom_scm_dev() - Get the SCM device associated with the QSEECOM clie= nt. - * @client: The QSEECOM client device. - * - * Returns the SCM device under which the provided QSEECOM client device - * operates. This function is intended to be used for DMA allocations. - */ -static inline struct device *qseecom_scm_dev(struct qseecom_client *client) -{ - return client->aux_dev.dev.parent->parent; -} - -/** - * qseecom_dma_alloc() - Allocate DMA memory for a QSEECOM client. - * @client: The QSEECOM client to allocate the memory for. - * @size: The number of bytes to allocate. - * @dma_handle: Pointer to where the DMA address should be stored. - * @gfp: Allocation flags. - * - * Wrapper function for dma_alloc_coherent(), allocating DMA memory usable= for - * TZ/QSEECOM communication. Refer to dma_alloc_coherent() for details. - */ -static inline void *qseecom_dma_alloc(struct qseecom_client *client, size_= t size, - dma_addr_t *dma_handle, gfp_t gfp) -{ - return dma_alloc_coherent(qseecom_scm_dev(client), size, dma_handle, gfp); -} - -/** - * dma_free_coherent() - Free QSEECOM DMA memory. - * @client: The QSEECOM client for which the memory has been allocated. - * @size: The number of bytes allocated. - * @cpu_addr: Virtual memory address to free. - * @dma_handle: DMA memory address to free. - * - * Wrapper function for dma_free_coherent(), freeing memory previously - * allocated with qseecom_dma_alloc(). Refer to dma_free_coherent() for - * details. - */ -static inline void qseecom_dma_free(struct qseecom_client *client, size_t = size, - void *cpu_addr, dma_addr_t dma_handle) -{ - return dma_free_coherent(qseecom_scm_dev(client), size, cpu_addr, dma_han= dle); -} - /** * qcom_qseecom_app_send() - Send to and receive data from a given QSEE ap= p. * @client: The QSEECOM client associated with the target app. --=20 2.43.0