<p>Pratikkumar V Prajapati has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28888">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/skylake: check for NULL with if condition<br><br>To make klockwork happy, this patch removes assert() and checks<br>if the dev is NULL with if condition only.<br><br>Change-Id: Icd2c8490c8bda14ecd752437d463a7110fe40aea<br>Signed-off-by: Pratik Prajapati <pratikkumar.v.prajapati@intel.com><br>---<br>M src/soc/intel/skylake/cpu.c<br>1 file changed, 14 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/28888/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c</span><br><span>index 417c4bc..3733fe0 100644</span><br><span>--- a/src/soc/intel/skylake/cpu.c</span><br><span>+++ b/src/soc/intel/skylake/cpu.c</span><br><span>@@ -547,9 +547,14 @@</span><br><span> int soc_fill_sgx_param(struct sgx_param *sgx_param)</span><br><span> {</span><br><span>      struct device *dev = SA_DEV_ROOT;</span><br><span style="color: hsl(0, 100%, 40%);">-       assert(dev != NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-    config_t *conf = dev->chip_info;</span><br><span style="color: hsl(120, 100%, 40%);">+   config_t *conf;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+   if (!dev) {</span><br><span style="color: hsl(120, 100%, 40%);">+           printk(BIOS_ERR, "Failed to get root dev for checking SGX param\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   conf = dev->chip_info;</span><br><span>    if (!conf) {</span><br><span>                 printk(BIOS_ERR, "Failed to get chip_info for SGX param\n");</span><br><span>               return -1;</span><br><span>@@ -561,9 +566,14 @@</span><br><span> int soc_fill_vmx_param(struct vmx_param *vmx_param)</span><br><span> {</span><br><span>        struct device *dev = SA_DEV_ROOT;</span><br><span style="color: hsl(0, 100%, 40%);">-       assert(dev != NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-    config_t *conf = dev->chip_info;</span><br><span style="color: hsl(120, 100%, 40%);">+   config_t *conf;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+   if (!dev) {</span><br><span style="color: hsl(120, 100%, 40%);">+           printk(BIOS_ERR, "Failed to get root dev for checking VMX param\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   conf = dev->chip_info;</span><br><span>    if (!conf) {</span><br><span>                 printk(BIOS_ERR, "Failed to get chip_info for VMX param\n");</span><br><span>               return -1;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28888">change 28888</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/28888"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Icd2c8490c8bda14ecd752437d463a7110fe40aea </div>
<div style="display:none"> Gerrit-Change-Number: 28888 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pratikkumar V Prajapati <pratikkumar.v.prajapati@intel.com> </div>