From 645064a59e7df2b34981a6c8c192f2658da019ec Mon Sep 17 00:00:00 2001 From: Pratik Prajapati Date: Tue, 2 Oct 2018 17:10:52 -0700 Subject: 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 Reviewed-on: https://review.coreboot.org/28888 Reviewed-by: Nico Huber Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- src/soc/intel/skylake/cpu.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src/soc/intel') 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; -- cgit v1.2.3