<p>HAOUAS Elyes has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/c/coreboot/+/30004">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/denverton_ns/soc_util.c: Don't use device_t<br><br>Use of device_t is deprecated.<br><br>Change-Id: Ic29891d78514db3b7eed48414a14e4ff579436c0<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/soc/intel/denverton_ns/soc_util.c<br>1 file changed, 76 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/30004/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/denverton_ns/soc_util.c b/src/soc/intel/denverton_ns/soc_util.c</span><br><span>index 780695a..9fb2159 100644</span><br><span>--- a/src/soc/intel/denverton_ns/soc_util.c</span><br><span>+++ b/src/soc/intel/denverton_ns/soc_util.c</span><br><span>@@ -28,45 +28,61 @@</span><br><span> #include <soc/pci_devs.h></span><br><span> #include <soc/systemagent.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-device_t get_hostbridge_dev(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span> #if defined(__PRE_RAM__) || defined(__SMM__)</span><br><span style="color: hsl(120, 100%, 40%);">+pci_devfn_t get_hostbridge_dev(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> return PCI_DEV(0, SA_DEV, SA_FUNC);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> #else</span><br><span style="color: hsl(120, 100%, 40%);">+struct device *get_hostbridge_dev(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> return dev_find_slot(0, PCI_DEVFN(SA_DEV, SA_FUNC));</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-device_t get_lpc_dev(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span> #if defined(__PRE_RAM__) || defined(__SMM__)</span><br><span style="color: hsl(120, 100%, 40%);">+pci_devfn_t get_lpc_dev(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> return PCI_DEV(0, LPC_DEV, LPC_FUNC);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> #else</span><br><span style="color: hsl(120, 100%, 40%);">+struct device *get_lpc_dev(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> return dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC));</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-device_t get_pmc_dev(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span> #if defined(__PRE_RAM__) || defined(__SMM__)</span><br><span style="color: hsl(120, 100%, 40%);">+pci_devfn_t get_pmc_dev(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> return PCI_DEV(0, PMC_DEV, PMC_FUNC);</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">- return dev_find_slot(0, PCI_DEVFN(PMC_DEV, PMC_FUNC));</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-device_t get_smbus_dev(void)</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+struct device *get_pmc_dev(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-#if defined(__PRE_RAM__) || defined(__SMM__)</span><br><span style="color: hsl(0, 100%, 40%);">- return PCI_DEV(0, SMBUS_DEV, SMBUS_FUNC);</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">- return dev_find_slot(0, PCI_DEVFN(SMBUS_DEV, SMBUS_FUNC));</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ return dev_find_slot(0, PCI_DEVFN(PMC_DEV, PMC_FUNC));</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__PRE_RAM__) || defined(__SMM__)</span><br><span style="color: hsl(120, 100%, 40%);">+pci_devfn_t get_smbus_dev(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return PCI_DEV(0, SMBUS_DEV, SMBUS_FUNC);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+struct device *get_smbus_dev(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return dev_find_slot(0, PCI_DEVFN(SMBUS_DEV, SMBUS_FUNC));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> uint32_t get_pciebase(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__PRE_RAM__) || defined(__SMM__)</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_devfn_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> u32 pciexbar_reg;</span><br><span> </span><br><span> dev = get_hostbridge_dev();</span><br><span>@@ -98,7 +114,11 @@</span><br><span> </span><br><span> uint32_t get_pcielength(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__PRE_RAM__) || defined(__SMM__)</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_devfn_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> u32 pciexbar_reg;</span><br><span> </span><br><span> dev = get_hostbridge_dev();</span><br><span>@@ -130,7 +150,12 @@</span><br><span> </span><br><span> uint32_t get_tseg_memory(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev = get_hostbridge_dev();</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__PRE_RAM__) || defined(__SMM__)</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_devfn_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ dev = get_hostbridge_dev();</span><br><span> </span><br><span> if (!dev)</span><br><span> return 0;</span><br><span>@@ -140,7 +165,12 @@</span><br><span> </span><br><span> uint32_t get_top_of_low_memory(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev = get_hostbridge_dev();</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__PRE_RAM__) || defined(__SMM__)</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_devfn_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ dev = get_hostbridge_dev();</span><br><span> </span><br><span> if (!dev)</span><br><span> return 0;</span><br><span>@@ -150,7 +180,12 @@</span><br><span> </span><br><span> uint64_t get_top_of_upper_memory(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev = get_hostbridge_dev();</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__PRE_RAM__) || defined(__SMM__)</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_devfn_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ dev = get_hostbridge_dev();</span><br><span> </span><br><span> if (!dev)</span><br><span> return 0;</span><br><span>@@ -162,7 +197,12 @@</span><br><span> </span><br><span> uint16_t get_pmbase(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev = get_pmc_dev();</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__PRE_RAM__) || defined(__SMM__)</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_devfn_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ dev = get_pmc_dev();</span><br><span> </span><br><span> if (!dev)</span><br><span> return 0;</span><br><span>@@ -172,7 +212,12 @@</span><br><span> </span><br><span> uint16_t get_tcobase(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev = get_smbus_dev();</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__PRE_RAM__) || defined(__SMM__)</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_devfn_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ dev = get_smbus_dev();</span><br><span> </span><br><span> if (!dev)</span><br><span> return 0;</span><br><span>@@ -193,7 +238,12 @@</span><br><span> uint8_t silicon_stepping(void)</span><br><span> {</span><br><span> uint8_t revision_id;</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev = get_lpc_dev();</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__PRE_RAM__) || defined(__SMM__)</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_devfn_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ dev = get_lpc_dev();</span><br><span> </span><br><span> if (!dev)</span><br><span> return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/30004">change 30004</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/c/coreboot/+/30004"/><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-Change-Id: Ic29891d78514db3b7eed48414a14e4ff579436c0 </div>
<div style="display:none"> Gerrit-Change-Number: 30004 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: HAOUAS Elyes <ehaouas@noos.fr> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>