summaryrefslogtreecommitdiff
path: root/src/soc/intel
diff options
context:
space:
mode:
authorPratik Prajapati <pratikkumar.v.prajapati@intel.com>2018-10-02 17:10:52 -0700
committerNico Huber <nico.h@gmx.de>2018-10-05 20:32:24 +0000
commit645064a59e7df2b34981a6c8c192f2658da019ec (patch)
treeb17e7e6656de63897df3115c7e637f636132199f /src/soc/intel
parent4f6eccdcac841f48a6a4bac846840e2cb79a4ff3 (diff)
downloadcoreboot-645064a59e7df2b34981a6c8c192f2658da019ec.tar.xz
soc/intel/skylake: check for NULL with if condition
This patch removes assert() and checks if the dev is NULL with "if" condition only. Found-by: klockwork Change-Id: Icd2c8490c8bda14ecd752437d463a7110fe40aea Signed-off-by: Pratik Prajapati <pratikkumar.v.prajapati@intel.com> Reviewed-on: https://review.coreboot.org/28888 Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel')
-rw-r--r--src/soc/intel/skylake/cpu.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index 417c4bcdb1..3733fe000c 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -547,9 +547,14 @@ void cpu_lock_sgx_memory(void)
int soc_fill_sgx_param(struct sgx_param *sgx_param)
{
struct device *dev = SA_DEV_ROOT;
- assert(dev != NULL);
- config_t *conf = dev->chip_info;
+ config_t *conf;
+
+ if (!dev) {
+ printk(BIOS_ERR, "Failed to get root dev for checking SGX param\n");
+ return -1;
+ }
+ conf = dev->chip_info;
if (!conf) {
printk(BIOS_ERR, "Failed to get chip_info for SGX param\n");
return -1;
@@ -561,9 +566,14 @@ int soc_fill_sgx_param(struct sgx_param *sgx_param)
int soc_fill_vmx_param(struct vmx_param *vmx_param)
{
struct device *dev = SA_DEV_ROOT;
- assert(dev != NULL);
- config_t *conf = dev->chip_info;
+ config_t *conf;
+
+ if (!dev) {
+ printk(BIOS_ERR, "Failed to get root dev for checking VMX param\n");
+ return -1;
+ }
+ conf = dev->chip_info;
if (!conf) {
printk(BIOS_ERR, "Failed to get chip_info for VMX param\n");
return -1;