Merge pull request #133 from haitaohuang/master

haitaohuang · web-flow · commit 2d2b795890c0 · 2021-04-19T22:48:31.000-05:00
Use cpuid instead of boot_cpu_has to check cpu features
diff --git a/sgx_main.c b/sgx_main.c
@@ -313,7 +313,8 @@ static int sgx_drv_probe(struct platform_device *pdev)
 	if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
 		return -ENODEV;
 
-	if (!boot_cpu_has(X86_FEATURE_SGX)) {
+	cpuid(7, &eax, &ebx, &ecx, &edx);
+	if(!((ebx >> 2) & 0x1)){
 		pr_err("intel_sgx: the CPU is missing SGX\n");
 		return -ENODEV;
 	}

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,8 @@ static int sgx_drv_probe(struct platform_device *pdev)`
`313`	`313`	`if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)`
`314`	`314`	`return -ENODEV;`
`315`	`315`
`316`		`- if (!boot_cpu_has(X86_FEATURE_SGX)) {`
	`316`	`+ cpuid(7, &eax, &ebx, &ecx, &edx);`
	`317`	`+ if(!((ebx >> 2) & 0x1)){`
`317`	`318`	`pr_err("intel_sgx: the CPU is missing SGX\n");`
`318`	`319`	`return -ENODEV;`
`319`	`320`	`}`