Support DOE Discovery Version

DOE Discovery Version is first introduced in PCIE Spec 6.1 Section 6.30.1.1. After libspdm support this feature, spdm-emu shall be updated as well. Signed-off-by: Min M Xu <[email protected]>
Wenxing-hou · Aug 1, 2024 · 88bcf09 · 88bcf09
1 parent 60b033b
commit 88bcf09
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/include/library/pci_doe_requester_lib.h b/include/library/pci_doe_requester_lib.h
@@ -11,7 +11,8 @@
 
 libspdm_return_t pci_doe_discovery (const void *pci_doe_context,
                                     pci_doe_data_object_protocol_t *data_object_protocol,
-                                    size_t *data_object_protocol_size);
+                                    size_t *data_object_protocol_size,
+                                    uint8_t version);
 
 /* external provided function */
 

diff --git a/library/pci_doe_requester_lib/pci_doe_req_discovery.c b/library/pci_doe_requester_lib/pci_doe_req_discovery.c
@@ -34,7 +34,8 @@ typedef struct {
 
 libspdm_return_t pci_doe_discovery (const void *pci_doe_context,
                                     pci_doe_data_object_protocol_t *data_object_protocol,
-                                    size_t *data_object_protocol_size)
+                                    size_t *data_object_protocol_size,
+                                    uint8_t version)
 {
     doe_discovery_request_mine_t doe_request;
     doe_discovery_response_mine_t doe_response;
@@ -52,6 +53,7 @@ libspdm_return_t pci_doe_discovery (const void *pci_doe_context,
     doe_request.doe_header.data_object_type = PCI_DOE_DATA_OBJECT_TYPE_DOE_DISCOVERY;
     doe_request.doe_header.length = sizeof(doe_discovery_request_mine_t) / sizeof(uint32_t);
     doe_request.doe_discovery_request.index = 0;
+    doe_request.doe_discovery_request.version = version;
 
     do {
         if (total_index <

diff --git a/spdm_emu/spdm_device_attester_sample/spdm_device_attester_pci_doe.c b/spdm_emu/spdm_device_attester_sample/spdm_device_attester_pci_doe.c
@@ -7,6 +7,7 @@
 #include "spdm_device_attester_sample.h"
 
 void *m_pci_doe_context;
+#define DOE_DISCOVERY_VERSION 0
 
 libspdm_return_t pci_doe_init_request()
 {
@@ -17,7 +18,7 @@ libspdm_return_t pci_doe_init_request()
 
     data_object_protocol_size = sizeof(data_object_protocol);
     status =
-        pci_doe_discovery (m_pci_doe_context, data_object_protocol, &data_object_protocol_size);
+        pci_doe_discovery (m_pci_doe_context, data_object_protocol, &data_object_protocol_size, DOE_DISCOVERY_VERSION);
     if (LIBSPDM_STATUS_IS_ERROR(status)) {
         return status;
     }

diff --git a/spdm_emu/spdm_device_validator_sample/spdm_device_validator_pci_doe.c b/spdm_emu/spdm_device_validator_sample/spdm_device_validator_pci_doe.c
@@ -7,6 +7,7 @@
 #include "spdm_device_validator_sample.h"
 
 void *m_pci_doe_context;
+#define DOE_DISCOVERY_VERSION 0
 
 libspdm_return_t pci_doe_init_request()
 {
@@ -17,7 +18,7 @@ libspdm_return_t pci_doe_init_request()
 
     data_object_protocol_size = sizeof(data_object_protocol);
     status =
-        pci_doe_discovery (m_pci_doe_context, data_object_protocol, &data_object_protocol_size);
+        pci_doe_discovery (m_pci_doe_context, data_object_protocol, &data_object_protocol_size, DOE_DISCOVERY_VERSION);
     if (LIBSPDM_STATUS_IS_ERROR(status)) {
         return status;
     }

diff --git a/spdm_emu/spdm_requester_emu/spdm_requester_pci_doe.c b/spdm_emu/spdm_requester_emu/spdm_requester_pci_doe.c
@@ -7,6 +7,7 @@
 #include "spdm_requester_emu.h"
 
 void *m_pci_doe_context;
+#define DOE_DISCOVERY_VERSION 0
 
 libspdm_return_t pci_doe_init_requester()
 {
@@ -17,7 +18,7 @@ libspdm_return_t pci_doe_init_requester()
 
     data_object_protocol_size = sizeof(data_object_protocol);
     status =
-        pci_doe_discovery (m_pci_doe_context, data_object_protocol, &data_object_protocol_size);
+        pci_doe_discovery (m_pci_doe_context, data_object_protocol, &data_object_protocol_size, DOE_DISCOVERY_VERSION);
     if (LIBSPDM_STATUS_IS_ERROR(status)) {
         return status;
     }