From 92074230b340fa5b6f09ea2d0550cf414c03aeef Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 9 Aug 2023 23:17:36 +0800 Subject: [PATCH] cleanup spurious error on abort ack path when the target aborts the transaction, we don't get an abort_done interrupt, because we explicitly acknowledge the abort by asserting it on our side (I mean, we could modify the protocol to generate an interrupt but it would be redundant). --- services/cram-mbox1/src/main.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/cram-mbox1/src/main.rs b/services/cram-mbox1/src/main.rs index a5885606d..d62dc3e19 100644 --- a/services/cram-mbox1/src/main.rs +++ b/services/cram-mbox1/src/main.rs @@ -261,6 +261,7 @@ fn main() { unsafe{mailbox.send_unguarded(&test_array[0..2])}; } 8 => { + abort_init_seen = false; test_array[0] = 0x4_0008; // 4 words sent, test sequence 8 for t in test_array[1..4].iter_mut() { *t = generator; @@ -272,11 +273,7 @@ fn main() { if !abort_init_seen { log::error!("We did not see the other side initiate an abort"); } - if !abort_done_seen { - log::error!("We didn't ack the abort"); - } abort_init_seen = false; - abort_done_seen = false; test_array[0] = 0x3_0009; // 3 words sent, test sequence 9 for t in test_array[1..3].iter_mut() { @@ -332,6 +329,7 @@ fn main() { abort_init_seen = true; mailbox.abort_pending = false; log::info!("test peer initiated abort!"); + // acknowledge the abort mailbox.csr.wfo(utra::mailbox::CONTROL_ABORT, 1); // initiate the next test in the sequence let last_seq_no = test_array[0] & 0xffff;