merge the fix for driver node detection

JunjunGu1 · JunjunGu1 · commit c37095cf6ad2 · 2022-12-13T11:05:44.000+08:00
Signed-off-by: JunjunGu1 &lt;junjun.gu@intel.com&gt;
diff --git a/psw/urts/linux/edmm_utility.cpp b/psw/urts/linux/edmm_utility.cpp
@@ -101,6 +101,11 @@ bool get_driver_type(int *driver_type)
     
     int hdev = open("/dev/sgx/enclave", O_RDWR);    //attempt to open the in-kernel driver
     if (-1 == hdev)
+    {
+        //if /dev/sgx/enclave is not present, try to open /dev/sgx_enclave
+        hdev = open("/dev/sgx_enclave", O_RDWR);
+    }
+    if (-1 == hdev)
     {
         hdev = open("/dev/isgx", O_RDWR);    //attempt to open the out-of-tree driver
         if (-1 == hdev)
@@ -150,6 +155,11 @@ extern "C" bool open_se_device(int driver_type, int *hdevice)
     if (driver_type == SGX_DRIVER_IN_KERNEL)
     {
         *hdevice = open("/dev/sgx/enclave", O_RDWR);    //attempt to open the in-kernel driver
+        //if /dev/sgx/enclave is not present, try to open /dev/sgx_enclave
+        if(-1 == *hdevice)
+        {
+            *hdevice = open("/dev/sgx_enclave", O_RDWR);
+        }
     }
     else if (driver_type == SGX_DRIVER_DCAP)
     {

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,11 @@ bool get_driver_type(int *driver_type)`
`101`	`101`
`102`	`102`	`int hdev = open("/dev/sgx/enclave", O_RDWR); //attempt to open the in-kernel driver`
`103`	`103`	`if (-1 == hdev)`
	`104`	`+ {`
	`105`	`+ //if /dev/sgx/enclave is not present, try to open /dev/sgx_enclave`
	`106`	`+ hdev = open("/dev/sgx_enclave", O_RDWR);`
	`107`	`+ }`
	`108`	`+ if (-1 == hdev)`
`104`	`109`	`{`
`105`	`110`	`hdev = open("/dev/isgx", O_RDWR); //attempt to open the out-of-tree driver`
`106`	`111`	`if (-1 == hdev)`
`@@ -150,6 +155,11 @@ extern "C" bool open_se_device(int driver_type, int *hdevice)`
`150`	`155`	`if (driver_type == SGX_DRIVER_IN_KERNEL)`
`151`	`156`	`{`
`152`	`157`	`*hdevice = open("/dev/sgx/enclave", O_RDWR); //attempt to open the in-kernel driver`
	`158`	`+ //if /dev/sgx/enclave is not present, try to open /dev/sgx_enclave`
	`159`	`+ if(-1 == *hdevice)`
	`160`	`+ {`
	`161`	`+ *hdevice = open("/dev/sgx_enclave", O_RDWR);`
	`162`	`+ }`
`153`	`163`	`}`
`154`	`164`	`else if (driver_type == SGX_DRIVER_DCAP)`
`155`	`165`	`{`