Re: [RESEND PATCH v6 00/12] arm64: qcom: add and enable SHM Bridge support

Bartosz Golaszewski
2024-02-01T15:07:00Z

On Mon, Jan 22, 2024 at 11:22 AM Bartosz Golaszewski <brgl@bgdev.pl> wrote:
>
> From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>
> Resending after the merge window. I dropped the first patch which was a
> fix and was picked up last release cycle.
>
> We've established the need for using separate secured memory 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).
>
> 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 (12):
> 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
>
> MAINTAINERS | 8 +
> arch/arm64/configs/defconfig | 1 +
> drivers/firmware/qcom/Kconfig | 30 ++
> drivers/firmware/qcom/Makefile | 1 +
> .../firmware/qcom/qcom_qseecom_uefisecapp.c | 281 +++++---------
> 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 ++
> 13 files changed, 684 insertions(+), 268 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
>
> --
> 2.40.1
>

Bjorn,

I tested it on db410c as well so let me gently ping you about picking
it up into your tree.

Bartosz