diff options
| -rw-r--r-- | include/sbi/sbi_dbtr.h | 3 | ||||
| -rw-r--r-- | lib/sbi/sbi_dbtr.c | 32 | ||||
| -rw-r--r-- | lib/sbi/sbi_ecall_dbtr.c | 2 |
3 files changed, 21 insertions, 16 deletions
diff --git a/include/sbi/sbi_dbtr.h b/include/sbi/sbi_dbtr.h index 9b879680..5e0bf84e 100644 --- a/include/sbi/sbi_dbtr.h +++ b/include/sbi/sbi_dbtr.h @@ -115,8 +115,7 @@ int sbi_dbtr_uninstall_trig(unsigned long trig_idx_base, int sbi_dbtr_enable_trig(unsigned long trig_idx_base, unsigned long trig_idx_mask); int sbi_dbtr_update_trig(unsigned long smode, - unsigned long trig_idx_base, - unsigned long trig_idx_mask); + unsigned long trig_count); int sbi_dbtr_disable_trig(unsigned long trig_idx_base, unsigned long trig_idx_mask); diff --git a/lib/sbi/sbi_dbtr.c b/lib/sbi/sbi_dbtr.c index 797cf256..a832c7f1 100644 --- a/lib/sbi/sbi_dbtr.c +++ b/lib/sbi/sbi_dbtr.c @@ -652,13 +652,9 @@ int sbi_dbtr_enable_trig(unsigned long trig_idx_base, } int sbi_dbtr_update_trig(unsigned long smode, - unsigned long trig_idx_base, - unsigned long trig_idx_mask) + unsigned long trig_count) { - unsigned long trig_mask = trig_idx_mask << trig_idx_base; - unsigned long idx = trig_idx_base; - struct sbi_dbtr_data_msg *recv; - unsigned long uidx = 0; + unsigned long trig_idx; struct sbi_dbtr_trigger *trig; union sbi_dbtr_shmem_entry *entry; void *shmem_base = NULL; @@ -673,18 +669,28 @@ int sbi_dbtr_update_trig(unsigned long smode, shmem_base = hart_shmem_base(hs); - for_each_set_bit_from(idx, &trig_mask, hs->total_trigs) { - trig = INDEX_TO_TRIGGER(idx); + if (trig_count >= hs->total_trigs) + return SBI_ERR_BAD_RANGE; - if (!(trig->state & RV_DBTR_BIT_MASK(TS, MAPPED))) + for_each_trig_entry(shmem_base, trig_count, typeof(*entry), entry) { + sbi_hart_map_saddr((unsigned long)entry, sizeof(*entry)); + trig_idx = entry->id.idx; + + if (trig_idx >= hs->total_trigs) { + sbi_hart_unmap_saddr(); return SBI_ERR_INVALID_PARAM; + } + + trig = INDEX_TO_TRIGGER(trig_idx); - entry = (shmem_base + uidx * sizeof(*entry)); - recv = &entry->data; + if (!(trig->state & RV_DBTR_BIT_MASK(TS, MAPPED))) { + sbi_hart_unmap_saddr(); + return SBI_ERR_FAILED; + } - trig->tdata2 = lle_to_cpu(recv->tdata2); + dbtr_trigger_setup(trig, &entry->data); + sbi_hart_unmap_saddr(); dbtr_trigger_enable(trig); - uidx++; } return SBI_SUCCESS; diff --git a/lib/sbi/sbi_ecall_dbtr.c b/lib/sbi/sbi_ecall_dbtr.c index 9c496c42..40a437ee 100644 --- a/lib/sbi/sbi_ecall_dbtr.c +++ b/lib/sbi/sbi_ecall_dbtr.c @@ -43,7 +43,7 @@ static int sbi_ecall_dbtr_handler(unsigned long extid, unsigned long funcid, ret = sbi_dbtr_enable_trig(regs->a0, regs->a1); break; case SBI_EXT_DBTR_TRIGGER_UPDATE: - ret = sbi_dbtr_update_trig(smode, regs->a0, regs->a1); + ret = sbi_dbtr_update_trig(smode, regs->a0); break; case SBI_EXT_DBTR_TRIGGER_DISABLE: ret = sbi_dbtr_disable_trig(regs->a0, regs->a1); |