patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

watchdog: intel_adsp: fix num cpus

Browse source 
This will allow to init watchdog on HW's supporting different
number of cpus and watchdogs based on runtime arch_num_cpus

Signed-off-by: Adrian Bonislawski <adrian.bonislawski@intel.com>
This commit is contained in:
Adrian Bonislawski 2023-10-31 14:02:11 +01:00 committed by Anas Nashif
parent 153f38a412
commit 53df6efeb6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/watchdog/wdt_intel_adsp.c
View file

@ -72,7 +72,7 @@ static int intel_adsp_wdt_setup(const struct device *dev, uint8_t options)
return ret; return ret;
} }
for (i = 0; i < CONFIG_MP_MAX_NUM_CPUS; i++) { for (i = 0; i < arch_num_cpus(); i++) {
ret = dw_wdt_configure(dev_data->core_wdt[i], dev_data->period_cfg); ret = dw_wdt_configure(dev_data->core_wdt[i], dev_data->period_cfg);
if (ret) { if (ret) {
return ret; return ret;
@ -120,7 +120,7 @@ static int intel_adsp_wdt_feed(const struct device *dev, int channel_id)
{ {
struct intel_adsp_wdt_dev_data *const dev_data = dev->data; struct intel_adsp_wdt_dev_data *const dev_data = dev->data;
if (channel_id >= CONFIG_MP_MAX_NUM_CPUS) { if (channel_id >= arch_num_cpus()) {
return -EINVAL; return -EINVAL;
} }
@ -154,7 +154,7 @@ static int intel_adsp_wdt_init(const struct device *dev)
unsigned int i; unsigned int i;
int ret; int ret;
for (i = 0; i < CONFIG_MP_MAX_NUM_CPUS; i++) { for (i = 0; i < arch_num_cpus(); i++) {
dev_data->core_wdt[i] = intel_adsp_wdt_pointer_get(dev_config->base, i); dev_data->core_wdt[i] = intel_adsp_wdt_pointer_get(dev_config->base, i);
ret = dw_wdt_probe(dev_data->core_wdt[i], reset_pulse_length); ret = dw_wdt_probe(dev_data->core_wdt[i], reset_pulse_length);
if (ret) { if (ret) {
@ -183,7 +183,7 @@ int intel_adsp_watchdog_pause(const struct device *dev, const int channel_id)
{ {
const struct intel_adsp_wdt_dev_cfg *const dev_config = dev->config; const struct intel_adsp_wdt_dev_cfg *const dev_config = dev->config;
if (channel_id >= CONFIG_MP_MAX_NUM_CPUS) { if (channel_id >= arch_num_cpus()) {
return -EINVAL; return -EINVAL;
} }
@ -203,7 +203,7 @@ int intel_adsp_watchdog_resume(const struct device *dev, const int channel_id)
{ {
const struct intel_adsp_wdt_dev_cfg *const dev_config = dev->config; const struct intel_adsp_wdt_dev_cfg *const dev_config = dev->config;
if (channel_id >= CONFIG_MP_MAX_NUM_CPUS) { if (channel_id >= arch_num_cpus()) {
return -EINVAL; return -EINVAL;
} }