feat(ethos-n): add reset type to reset SMC calls
Adds a reset type argument for the soft and hard reset SMC calls to
indicate whether to perform a full reset and setup or only halt the
Arm(R) Ethos(TM)-N NPU. For use in cases where the NPU will not be
used but must be put into a known state, such as suspending the NPU
as part of power management.
Signed-off-by: Joshua Pimm <joshua.pimm@arm.com>
Signed-off-by: Mikael Olsson <mikael.olsson@arm.com>
Change-Id: I6018af85a28b0e977166ec29d26f04739123140c
diff --git a/drivers/arm/ethosn/ethosn_smc.c b/drivers/arm/ethosn/ethosn_smc.c
index 915a0d8..c95c22c 100644
--- a/drivers/arm/ethosn/ethosn_smc.c
+++ b/drivers/arm/ethosn/ethosn_smc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2023, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -152,7 +152,7 @@
uintptr_t ethosn_smc_handler(uint32_t smc_fid,
u_register_t core_addr,
u_register_t asset_alloc_idx,
- u_register_t x3,
+ u_register_t reset_type,
u_register_t x4,
void *cookie,
void *handle,
@@ -173,7 +173,7 @@
if (GET_SMC_CC(smc_fid) == SMC_32) {
core_addr &= 0xFFFFFFFF;
asset_alloc_idx &= 0xFFFFFFFF;
- x3 &= 0xFFFFFFFF;
+ reset_type &= 0xFFFFFFFF;
x4 &= 0xFFFFFFFF;
}
@@ -205,7 +205,15 @@
SMC_RET1(handle, ETHOSN_UNKNOWN_ALLOCATOR_IDX);
}
- /* Commands that require a valid device, core and asset allocator */
+ if (reset_type > ETHOSN_RESET_TYPE_HALT) {
+ WARN("ETHOSN: Invalid reset type given to SMC call.\n");
+ SMC_RET1(handle, ETHOSN_INVALID_PARAMETER);
+ }
+
+ /*
+ * Commands that require a valid device, reset type,
+ * core and asset allocator
+ */
switch (fid) {
case ETHOSN_FNUM_HARD_RESET:
hard_reset = 1;
@@ -215,12 +223,14 @@
SMC_RET1(handle, ETHOSN_FAILURE);
}
- if (!device->has_reserved_memory) {
- ethosn_configure_smmu_streams(device, core,
- asset_alloc_idx);
- }
+ if (reset_type == ETHOSN_RESET_TYPE_FULL) {
+ if (!device->has_reserved_memory) {
+ ethosn_configure_smmu_streams(device, core,
+ asset_alloc_idx);
+ }
- ethosn_delegate_to_ns(core->addr);
+ ethosn_delegate_to_ns(core->addr);
+ }
SMC_RET1(handle, ETHOSN_SUCCESS);
default:
WARN("ETHOSN: Unimplemented SMC call: 0x%x\n", fid);