aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPer Åstrand <per.astrand@arm.com>2020-11-24 07:39:55 +0100
committerPer Åstrand <per.astrand@arm.com>2020-11-24 11:57:55 +0100
commit849cf69b01a6d226238882e28281c4285f0ddfbb (patch)
tree5ec6b617e95999cbe20b51b376c365f6dd86edcb /src
parente6498f0aa2e51b652a40b5f27e5991bd65422326 (diff)
downloadethos-u-core-driver-849cf69b01a6d226238882e28281c4285f0ddfbb.tar.gz
Restore default init values as init_v2
The addition of init_v3 accidentely changed default values for soft resetting Ethos-U. Restore the default parameters to non-secure, user mode for init_v1 and init_v2 and also make sure to check return value from ethosu_soft_reset. Change-Id: If7377f11ad1db7ff988fdcba03320a54e6e0c0c1
Diffstat (limited to 'src')
-rw-r--r--src/ethosu_driver.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/ethosu_driver.c b/src/ethosu_driver.c
index fcb3fbb..3c9c55b 100644
--- a/src/ethosu_driver.c
+++ b/src/ethosu_driver.c
@@ -179,7 +179,7 @@ void ethosu_irq_handler(void)
if (ethosu_status_has_error(&ethosu_drv.dev))
{
- ethosu_soft_reset(&ethosu_drv.dev);
+ (void)ethosu_soft_reset(&ethosu_drv.dev);
ethosu_drv.status_error = true;
}
}
@@ -264,7 +264,10 @@ int ethosu_init_v3(const void *base_address,
return -1;
}
- ethosu_soft_reset(&ethosu_drv.dev);
+ if (ETHOSU_SUCCESS != ethosu_soft_reset(&ethosu_drv.dev))
+ {
+ return -1;
+ }
if (ETHOSU_SUCCESS != ethosu_wait_for_reset(&ethosu_drv.dev))
{
@@ -355,7 +358,10 @@ int ethosu_invoke_v2(const void *custom_data_ptr,
if (ethosu_drv.dev.reset != ethosu_read_reg(&ethosu_drv.dev, NPU_REG_PROT))
{
- ethosu_soft_reset(&ethosu_drv.dev);
+ if (ETHOSU_SUCCESS != ethosu_soft_reset(&ethosu_drv.dev))
+ {
+ return -1;
+ }
}
ethosu_drv.status_error = false;
ethosu_set_clock_and_power(&ethosu_drv.dev, ETHOSU_CLOCK_Q_ENABLE, ETHOSU_POWER_Q_DISABLE);