From: Joanna Farley <joanna.farley@arm.com>
Date: Tue, 4 Apr 2023 14:16:04 +0000 (+0200)
Subject: Merge changes from topic "ethos-n" into integration
X-Git-Tag: baikal/aarch64/sdk5.10~1^2~111
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=42fb812a7525682362096d651a3749787b3bd555;p=arm-tf.git

Merge changes from topic "ethos-n" into integration

* changes:
  docs(maintainers): update NPU driver files
  docs(ethos-n): update porting-guide.rst for NPU
  feat(ethos-n): add separate RO and RW NSAIDs
  feat(ethos-n)!: add protected NPU firmware setup
  feat(ethos-n): add stream extends and attr support
  feat(ethos-n): add reserved memory address support
  feat(ethos-n): add event and aux control support
  feat(ethos-n): add SMC call to get FW properties
  refactor(ethos-n): split up SMC call handling
  feat(ethos-n): add NPU firmware validation
  feat(ethos-n): add check for NPU in SiP setup
  feat(ethos-n)!: load NPU firmware at BL2
  feat(juno): support ARM_IO_IN_DTB option for Juno
  fix(fconf): fix FCONF_ARM_IO_UUID_NUMBER value
  fix(fvp): incorrect UUID name in FVP tb_fw_config
  fix(ethos-n): add workaround for erratum 2838783
  feat(ethos-n): add support for NPU to cert_create
  feat(ethos-n): add NPU support in fiptool
  feat(ethos-n): add support to set up NSAID
  build(fiptool): add object dependency generation
  feat(ethos-n): add NPU sleeping SMC call
  feat(ethos-n): add multiple asset allocators
  feat(ethos-n): add reset type to reset SMC calls
  feat(ethos-n): add protected NPU TZMP1 regions
  build(ethos-n): add TZMP1 build flag
---

42fb812a7525682362096d651a3749787b3bd555
diff --cc docs/about/maintainers.rst
index 2ae32447f,f36865ada..bffca722f
--- a/docs/about/maintainers.rst
+++ b/docs/about/maintainers.rst
@@@ -175,10 -175,14 +175,14 @@@ Arm® Ethos™-N NPU drive
  ^^^^^^^^^^^^^^^^^^^^^^^^
  :|M|: Joshua Slater <joshua.slater@arm.com>
  :|G|: `jslater8`_
 -:|M|: Mikael Olsson <mikael.olsson@arm.com>
 -:|G|: `mikaelolsson-arm`_
 +:|M|: Ştefana Simion <stefana.simion@arm.com>
 +:|G|: `stefanasimion`_
  :|F|: drivers/arm/ethosn/
  :|F|: include/drivers/arm/ethosn.h
+ :|F|: include/drivers/arm/ethosn_cert.h
+ :|F|: include/drivers/arm/ethosn_fip.h
+ :|F|: include/drivers/arm/ethosn_oid.h
+ :|F|: plat/arm/board/juno/juno_ethosn_tzmp1_def.h
  :|F|: plat/arm/common/fconf/fconf_ethosn_getter.c
  :|F|: include/plat/arm/common/fconf_ethosn_getter.h
  :|F|: fdts/juno-ethosn.dtsi