From patchwork Mon Nov 27 14:15:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 13469719 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 8E2ADC07CB1 for ; Mon, 27 Nov 2023 14:17:20 +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: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:In-Reply-To:References: List-Owner; bh=wpag62+JUJxAaxb0K8z6tpfso5M7Rw94SVB8u4VKZbY=; b=VMgoF2tPAVMOUI /goy7XxwgdcGqfFMP6v7V3kLaek5mwjXBe3lIpqba7S2E+eGqOMzFqapoVvne4gpAReQ4cjoLroiB M+x3OwOaU1mIRuArsdieX63HhYSPBkZj/35eC8dQSIOcKssLFcJJABn0uteMdb2fEIBUm9uK8mw0q asTmNkfUU29r+SiAtIdMFyRAf/512NioM3Y5z+W9qm/p8feSb5NEl76m0mGchLTZX4PX23AyNACRn dlunulyNFDstxCgmoeHYWsxPxMJ84jDgBRUZJAuuVwTMqCJkKtc7l0iWMeydSFojWQysJOU1o1W7t FN/2inw6KcrEe0mQZP6Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r7cPt-002fSI-38; Mon, 27 Nov 2023 14:16:54 +0000 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r7cPK-002fHZ-0O for linux-arm-kernel@lists.infradead.org; Mon, 27 Nov 2023 14:16:22 +0000 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40b4023ea99so12482315e9.1 for ; Mon, 27 Nov 2023 06:16:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1701094569; x=1701699369; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tDfBn/A7cOmjON95tH3n6IWAPDyFmsYlwqjQ+7NABPM=; b=1JlPXo35KRgFEA/roohzoyUkiac6CRSMCwvcw1PcaSp7RzFAcvFCiYDbPTfwdSiC9m 1tKj3ncBNiO6PEg9ZStKjXLNDJ/qbe2VYmFgvtTIfcsyLjgcZ5aEo83RXqrkMy5aZHFx mIBJCkUrxj3LOTPzmK1IJ4pDZGQVVtsAOxhiBn8VR7LxU1gq3S8UhUG57c3OF0PquDAQ xFvr5Pa2ODv0GLjYQEJT7SIULcB6RXYrZIW/BY9x3rrN15iu2W4SD34GMaSUE8n6H166 rm3pRsQ+d568KfE7nv+cRSJkodrh3NLcb1kCico+goJPUnQ35jofN6fsQwnvtYLrdm6q Eqiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701094569; x=1701699369; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tDfBn/A7cOmjON95tH3n6IWAPDyFmsYlwqjQ+7NABPM=; b=GZJcCdaGYUfgbl8211xW6SebeDqB8v6O5jCg5zFMoVjesUWe/biU4G1jT5dofw29Eh WH2NVU/tB6fhtJ8vZoeDVSppuNu+tCy8REiBrNOEHHaF+ilvGPSpfkxy4gep28GvLRjp GY4aiXx7x7vaR40QXeqxODhtAvRFCIr+dYIrwy9+TzylFyQDyHhij9/X0mI8iX/MTVT0 7+FMnxbRCfd1rchLogVYo9SYOrPoSEUGWH6b7WD0LIiHWoO0OkB8lzHab4byvqIuAidc q3qayZ94zkF5uzlq6Le60Lutvsjp2yLUtmeBAdAW49A3CWdz2xMf1FJNt3VLAF1WgiMZ 4c6Q== X-Gm-Message-State: AOJu0Yxx60JRGWBw43wZOFGWOJomsU0XXuK2+7xAjPyHlodKzGnGrzPx nSq6q96QiIiZXFnEkGucp3ptEw== X-Google-Smtp-Source: AGHT+IHioO2VDXcRbLF8M2Dj1lfQPL9PmI+LheLivQXcuFkf2VMFWeG5ytNl/xhY5B/Pj4PzKp9zPA== X-Received: by 2002:a05:600c:35d5:b0:401:bcd9:4871 with SMTP id r21-20020a05600c35d500b00401bcd94871mr5182402wmq.21.1701094568325; Mon, 27 Nov 2023 06:16:08 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:bf33:77c7:8131:5e64]) by smtp.gmail.com with ESMTPSA id be7-20020a05600c1e8700b00405442edc69sm14658830wmb.14.2023.11.27.06.16.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 06:16:07 -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: [PATCH v6 00/13] arm64: qcom: add and enable SHM Bridge support Date: Mon, 27 Nov 2023 15:15:47 +0100 Message-Id: <20231127141600.20929-1-brgl@bgdev.pl> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231127_061618_396343_F237EBD3 X-CRM114-Status: GOOD ( 20.66 ) 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 This is pretty much another full rewrite of the SHM Bridge support series. After more on- and off-list discussions I think this time it will be close to the final thing though. We've established the need for using separate pools for SCM and QSEECOM as well as the upcoming scminvoke driver. It's also become clear that in order to be future-proof, the new allocator must be an abstraction layer of a higher level as the SHM Bridge will not be the only memory protection mechanism that we'll see upstream. Hence the rename to TrustZone Memory rather than SCM Memory allocator. Also to that end: the new allocator is its own module now and provides a Kconfig choice menu for selecting the mode of operation (currently default and SHM Bridge). Due to a high divergence from v2, I dropped all tags except for patch 1/15 which didn't change. Tested on sm8550 and sa8775p with the Inline Crypto Engine and remoteproc. v5 -> v6: Fixed two issues reported by autobuilders: - add a fix for memory leaks in the qseecom driver as the first patch for easier backporting to the v6.6.y branch - explicitly cast the bus address stored in a variable of type dma_addr_t to phys_addr_t expected by the genpool API v4 -> v5: - fix the return value from qcom_tzmem_init() if SHM Bridge is not supported - remove a comment that's no longer useful - collect tags v3 -> v4: - include linux/sizes.h for SZ_X macros - use dedicated RCU APIs to dereference radix tree slots - fix kerneldocs - fix the comment in patch 14/15: it's the hypervisor, not the TrustZone that creates the SHM bridge v2 -> v3: - restore pool management and use separate pools for different users - don't use the new allocator in qcom_scm_pas_init_image() as the TrustZone will create an SHM bridge for us here - rewrite the entire series again for most part v1 -> v2: - too many changes to list, it's a complete rewrite as explained above Bartosz Golaszewski (13): firmware: qcom: qseecom: fix memory leaks in error paths firmware: qcom: add a dedicated TrustZone buffer allocator firmware: qcom: scm: enable the TZ mem allocator firmware: qcom: scm: smc: switch to using the SCM allocator firmware: qcom: scm: make qcom_scm_assign_mem() use the TZ allocator firmware: qcom: scm: make qcom_scm_ice_set_key() use the TZ allocator firmware: qcom: scm: make qcom_scm_lmh_dcvsh() use the TZ allocator firmware: qcom: scm: make qcom_scm_qseecom_app_get_id() use the TZ allocator firmware: qcom: qseecom: convert to using the TZ allocator firmware: qcom: scm: add support for SHM bridge operations firmware: qcom: tzmem: enable SHM Bridge support firmware: qcom: scm: clarify the comment in qcom_scm_pas_init_image() arm64: defconfig: enable SHM Bridge support for the TZ memory allocator arch/arm64/configs/defconfig | 1 + drivers/firmware/qcom/Kconfig | 30 ++ drivers/firmware/qcom/Makefile | 1 + .../firmware/qcom/qcom_qseecom_uefisecapp.c | 261 +++++-------- drivers/firmware/qcom/qcom_scm-smc.c | 30 +- drivers/firmware/qcom/qcom_scm.c | 179 +++++---- drivers/firmware/qcom/qcom_scm.h | 6 + drivers/firmware/qcom/qcom_tzmem.c | 365 ++++++++++++++++++ drivers/firmware/qcom/qcom_tzmem.h | 13 + include/linux/firmware/qcom/qcom_qseecom.h | 4 +- include/linux/firmware/qcom/qcom_scm.h | 6 + include/linux/firmware/qcom/qcom_tzmem.h | 28 ++ 12 files changed, 669 insertions(+), 255 deletions(-) create mode 100644 drivers/firmware/qcom/qcom_tzmem.c create mode 100644 drivers/firmware/qcom/qcom_tzmem.h create mode 100644 include/linux/firmware/qcom/qcom_tzmem.h Tested-by: Deepti Jaggi #sa8775p-ride Reviewed-by: Elliot Berman