From 4b3c9a3d082edf39b4868008c2b61a6144e11434 Mon Sep 17 00:00:00 2001
From: mwojcik <mw@m-labs.hk>
Date: Wed, 6 Sep 2023 17:12:22 +0800
Subject: [PATCH] rtio_mgt: remove support for async messages

---
 src/runtime/src/rtio_mgt.rs | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/runtime/src/rtio_mgt.rs b/src/runtime/src/rtio_mgt.rs
index 75d69f63..ee8d79c7 100644
--- a/src/runtime/src/rtio_mgt.rs
+++ b/src/runtime/src/rtio_mgt.rs
@@ -45,7 +45,7 @@ pub mod drtio {
         unsafe { (csr::DRTIO[linkno].rx_up_read)() == 1 }
     }
 
-    async fn process_async_packets(linkno: u8, packet: Packet) -> Option<Packet> {
+    async fn process_async_packets(aux_mutex: &Mutex<bool>, linkno: u8, packet: Packet) -> Option<Packet> {
         // returns None if an async packet has been consumed
         match packet {
             Packet::DmaPlaybackStatus {
@@ -71,6 +71,7 @@ pub mod drtio {
             } => {
                 subkernel::message_handle_incoming(id, last, length as usize, &data).await;
                 // acknowledge receiving part of the message
+                let _lock = aux_mutex.async_lock().await;
                 drtioaux_async::send(linkno, &Packet::SubkernelMessageAck { destination: from })
                     .await
                     .unwrap();
@@ -212,7 +213,7 @@ pub mod drtio {
         let _lock = aux_mutex.async_lock().await;
         match drtioaux_async::recv(linkno).await {
             Ok(Some(packet)) => {
-                if let Some(packet) = process_async_packets(linkno, packet).await {
+                if let Some(packet) = process_async_packets(aux_mutex, linkno, packet).await {
                     warn!("[LINK#{}] unsolicited aux packet: {:?}", linkno, packet);
                 }
             }
@@ -297,22 +298,10 @@ pub mod drtio {
                             match reply {
                                 Ok(Packet::DestinationDownReply) => {
                                     destination_set_up(routing_table, up_destinations, destination, false).await;
-                                    remote_dma::destination_changed(
-                                        aux_mutex,
-                                        routing_table,
-                                        timer,
-                                        destination,
-                                        false,
-                                    )
-                                    .await;
-                                    subkernel::destination_changed(
-                                        aux_mutex,
-                                        routing_table,
-                                        timer,
-                                        destination,
-                                        false,
-                                    )
-                                    .await;
+                                    remote_dma::destination_changed(aux_mutex, routing_table, timer, destination, false)
+                                        .await;
+                                    subkernel::destination_changed(aux_mutex, routing_table, timer, destination, false)
+                                        .await;
                                 }
                                 Ok(Packet::DestinationOkReply) => (),
                                 Ok(Packet::DestinationSequenceErrorReply { channel }) => {
@@ -342,11 +331,11 @@ pub mod drtio {
                                     );
                                     unsafe { SEEN_ASYNC_ERRORS |= ASYNC_ERROR_BUSY };
                                 }
-                                Ok(packet) => match process_async_packets(packet).await {
-                                    Some(packet) => {
-                                        error!("[DEST#{}] received unexpected aux packet: {:?}", destination, packet)
+                                Ok(packet) => {
+                                    match process_async_packets(aux_mutex, linkno, packet).await {
+                                        Some(packet) => error!("[DEST#{}] received unexpected aux packet: {:?}", destination, packet),
+                                        None => continue
                                     }
-                                    None => continue,
                                 },
                                 Err(e) => error!("[DEST#{}] communication failed ({})", destination, e),
                             }