From 11f8675ad60fbcc4e9705ca1ca80de49a9307353 Mon Sep 17 00:00:00 2001
From: occheung <dc@m-labs.hk>
Date: Wed, 15 Jan 2025 13:12:14 +0800
Subject: [PATCH] drtio: fix RTIO channel name resolution for remote channels

---
 src/runtime/src/rtio_mgt.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/runtime/src/rtio_mgt.rs b/src/runtime/src/rtio_mgt.rs
index 9a92751..6ab6601 100644
--- a/src/runtime/src/rtio_mgt.rs
+++ b/src/runtime/src/rtio_mgt.rs
@@ -411,29 +411,32 @@ pub mod drtio {
                             }
                             Ok(Packet::DestinationOkReply) => (),
                             Ok(Packet::DestinationSequenceErrorReply { channel }) => {
+                                let global_ch = ((destination as u32) << 16) | channel as u32;
                                 error!(
                                     "[DEST#{}] RTIO sequence error involving channel 0x{:04x}:{}",
                                     destination,
                                     channel,
-                                    resolve_channel_name(channel as u32)
+                                    resolve_channel_name(global_ch)
                                 );
                                 unsafe { SEEN_ASYNC_ERRORS |= ASYNC_ERROR_SEQUENCE_ERROR };
                             }
                             Ok(Packet::DestinationCollisionReply { channel }) => {
+                                let global_ch = ((destination as u32) << 16) | channel as u32;
                                 error!(
                                     "[DEST#{}] RTIO collision involving channel 0x{:04x}:{}",
                                     destination,
                                     channel,
-                                    resolve_channel_name(channel as u32)
+                                    resolve_channel_name(global_ch)
                                 );
                                 unsafe { SEEN_ASYNC_ERRORS |= ASYNC_ERROR_COLLISION };
                             }
                             Ok(Packet::DestinationBusyReply { channel }) => {
+                                let global_ch = ((destination as u32) << 16) | channel as u32;
                                 error!(
                                     "[DEST#{}] RTIO busy error involving channel 0x{:04x}:{}",
                                     destination,
                                     channel,
-                                    resolve_channel_name(channel as u32)
+                                    resolve_channel_name(global_ch)
                                 );
                                 unsafe { SEEN_ASYNC_ERRORS |= ASYNC_ERROR_BUSY };
                             }