add tdisp test in emu.

Signed-off-by: Yang, Longlong <[email protected]>
intel · Nov 5, 2023 · 6e7d88a · 6e7d88a
1 parent 073fe7c
commit 6e7d88a
Show file tree

Hide file tree

Showing 8 changed files with 1,018 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tdisp/src/pci_tdisp_responder/pci_tdisp_rsp_device_interface_report.rs b/tdisp/src/pci_tdisp_responder/pci_tdisp_rsp_device_interface_report.rs
@@ -30,7 +30,7 @@ static PCI_TDISP_DEVICE_INTERFACE_REPORT_INSTANCE: OnceCell<PciTdispDeviceInterf
 #[allow(clippy::type_complexity)]
 pub struct PciTdispDeviceInterfaceReport {
     pub pci_tdisp_device_interface_report_cb: fn(
-        // INT
+        // IN
         vendor_context: usize,
         // OUT
         negotiated_version: &mut TdispVersion,
@@ -58,7 +58,7 @@ static UNIMPLETEMTED: PciTdispDeviceInterfaceReport = PciTdispDeviceInterfaceRep
 };
 
 pub(crate) fn pci_tdisp_device_interface_report(
-    // INT
+    // IN
     vendor_context: usize,
     // OUT
     negotiated_version: &mut TdispVersion,

diff --git a/tdisp/src/pci_tdisp_responder/pci_tdisp_rsp_dispatcher.rs b/tdisp/src/pci_tdisp_responder/pci_tdisp_rsp_dispatcher.rs
@@ -11,7 +11,7 @@ use spdmlib::{
     },
 };
 
-use crate::pci_tdisp::{TdispErrorCode, TdispRequestResponseCode};
+use crate::pci_tdisp::{TdispErrorCode, TdispRequestResponseCode, TDISP_PROTOCOL_ID};
 
 use super::{
     pci_tdisp_rsp_bind_p2p_stream_request::pci_tdisp_rsp_bind_p2p_stream,
@@ -31,7 +31,9 @@ pub fn pci_tdisp_rsp_dispatcher(
     vendor_context: usize,
     vendor_defined_req_payload_struct: &VendorDefinedReqPayloadStruct,
 ) -> SpdmResult<VendorDefinedRspPayloadStruct> {
-    if vendor_defined_req_payload_struct.req_length < 3 {
+    if vendor_defined_req_payload_struct.req_length < 3
+        || vendor_defined_req_payload_struct.vendor_defined_req_payload[0] != TDISP_PROTOCOL_ID
+    {
         return Err(SPDM_STATUS_INVALID_MSG_FIELD);
     }
 
@@ -69,9 +71,6 @@ pub fn pci_tdisp_rsp_dispatcher(
             TdispRequestResponseCode::UNBIND_P2P_STREAM_REQUEST => {
                 pci_tdisp_rsp_unbind_p2p_stream(vendor_context, vendor_defined_req_payload_struct)
             }
-            TdispRequestResponseCode::VDM_REQUEST => {
-                pci_tdisp_rsp_vdm_response(vendor_context, vendor_defined_req_payload_struct)
-            }
             _ => {
                 let mut vendor_defined_rsp_payload_struct = VendorDefinedRspPayloadStruct {
                     rsp_length: 0,
@@ -90,6 +89,6 @@ pub fn pci_tdisp_rsp_dispatcher(
             }
         }
     } else {
-        Err(SPDM_STATUS_INVALID_MSG_FIELD)
+        pci_tdisp_rsp_vdm_response(vendor_context, vendor_defined_req_payload_struct)
     }
 }
diff --git a/test/spdm-requester-emu/Cargo.toml b/test/spdm-requester-emu/Cargo.toml
@@ -10,6 +10,7 @@ edition = "2018"
 spdm-emu = { path = "../spdm-emu", default-features = false }
 spdmlib = { path = "../../spdmlib", default-features = false }
 idekm  = { path = "../../idekm", default-features = false }
+tdisp  = { path = "../../tdisp", default-features = false }
 codec = { path = "../../codec" }
 mctp_transport = { path = "../../mctp_transport" }
 pcidoe_transport = { path = "../../pcidoe_transport" }