<p>HAOUAS Elyes has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/c/coreboot/+/30046">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/northbridge: Get rid of device_t<br><br>Use of device_t is deprecated.<br><br>Change-Id: I862bad4e889af3d25a771637a9ffc4f9d0b26d33<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/northbridge/amd/amdmct/mct_ddr3/s3utils.c<br>M src/northbridge/via/vx900/pci_util.c<br>2 files changed, 54 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/30046/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c</span><br><span>index eb39c81..46bfdd0 100644</span><br><span>--- a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c</span><br><span>+++ b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c</span><br><span>@@ -67,7 +67,14 @@</span><br><span> return s3nv_region.region.offset;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static uint32_t read_config32_dct(device_t dev, uint8_t node, uint8_t dct, uint32_t reg) {</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __SIMPLE_DEVICE__</span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t read_config32_dct(pci_devfn_t dev, uint8_t node, uint8_t dct,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t reg)</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t read_config32_dct(struct device *dev, uint8_t node, uint8_t dct,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t reg)</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> if (is_fam15h()) {</span><br><span> uint32_t dword;</span><br><span> #ifdef __PRE_RAM__</span><br><span>@@ -89,7 +96,14 @@</span><br><span> return pci_read_config32(dev, reg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void write_config32_dct(device_t dev, uint8_t node, uint8_t dct, uint32_t reg, uint32_t value) {</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __SIMPLE_DEVICE__</span><br><span style="color: hsl(120, 100%, 40%);">+static void write_config32_dct(pci_devfn_t dev, uint8_t node, uint8_t dct,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t reg, uint32_t value)</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+static void write_config32_dct(struct device *dev, uint8_t node, uint8_t dct,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t reg, uint32_t value)</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> if (is_fam15h()) {</span><br><span> uint32_t dword;</span><br><span> #ifdef __PRE_RAM__</span><br><span>@@ -111,7 +125,13 @@</span><br><span> pci_write_config32(dev, reg, value);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static uint32_t read_amd_dct_index_register(device_t dev, uint32_t index_ctl_reg, uint32_t index)</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __SIMPLE_DEVICE__</span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t read_amd_dct_index_register(pci_devfn_t dev,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t index_ctl_reg, uint32_t index)</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t read_amd_dct_index_register(struct device *dev,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t index_ctl_reg, uint32_t index)</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> {</span><br><span> uint32_t dword;</span><br><span> </span><br><span>@@ -125,7 +145,13 @@</span><br><span> return dword;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static uint32_t read_amd_dct_index_register_dct(device_t dev, uint8_t node, uint8_t dct, uint32_t index_ctl_reg, uint32_t index)</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __SIMPLE_DEVICE__</span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t read_amd_dct_index_register_dct(pci_devfn_t dev, uint8_t node,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t dct, uint32_t index_ctl_reg, uint32_t index)</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t read_amd_dct_index_register_dct(struct device *dev, uint8_t node,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t dct, uint32_t index_ctl_reg, uint32_t index)</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> {</span><br><span> if (is_fam15h()) {</span><br><span> uint32_t dword;</span><br><span>diff --git a/src/northbridge/via/vx900/pci_util.c b/src/northbridge/via/vx900/pci_util.c</span><br><span>index 1674e85..08e2b54 100644</span><br><span>--- a/src/northbridge/via/vx900/pci_util.c</span><br><span>+++ b/src/northbridge/via/vx900/pci_util.c</span><br><span>@@ -16,7 +16,11 @@</span><br><span> </span><br><span> #include "vx900.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void dump_pci_device(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __SIMPLE_DEVICE__</span><br><span style="color: hsl(120, 100%, 40%);">+void dump_pci_device(pci_devfn_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+void dump_pci_device(struct device *dev)</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> {</span><br><span> int i;</span><br><span> for (i = 0; i <= 0xff; i++) {</span><br><span>@@ -35,8 +39,13 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pci_mod_config8(device_t dev, unsigned int where,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t clr_mask, uint8_t set_mask)</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __SIMPLE_DEVICE__</span><br><span style="color: hsl(120, 100%, 40%);">+void pci_mod_config8(pci_devfn_t dev, unsigned int where, uint8_t clr_mask,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t set_mask)</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+void pci_mod_config8(struct device *dev, unsigned int where, uint8_t clr_mask,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t set_mask)</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> {</span><br><span> uint8_t reg8 = pci_read_config8(dev, where);</span><br><span> reg8 &= ~clr_mask;</span><br><span>@@ -44,8 +53,13 @@</span><br><span> pci_write_config8(dev, where, reg8);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pci_mod_config16(device_t dev, unsigned int where,</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __SIMPLE_DEVICE__</span><br><span style="color: hsl(120, 100%, 40%);">+void pci_mod_config16(pci_devfn_t dev, unsigned int where,</span><br><span> uint16_t clr_mask, uint16_t set_mask)</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+void pci_mod_config16(struct device *dev, unsigned int where,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t clr_mask, uint16_t set_mask)</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> {</span><br><span> uint16_t reg16 = pci_read_config16(dev, where);</span><br><span> reg16 &= ~clr_mask;</span><br><span>@@ -53,8 +67,13 @@</span><br><span> pci_write_config16(dev, where, reg16);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pci_mod_config32(device_t dev, unsigned int where,</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __SIMPLE_DEVICE__</span><br><span style="color: hsl(120, 100%, 40%);">+void pci_mod_config32(pci_devfn_t dev, unsigned int where,</span><br><span> uint32_t clr_mask, uint32_t set_mask)</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+void pci_mod_config32(struct device *dev, unsigned int where,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t clr_mask, uint32_t set_mask)</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> {</span><br><span> uint32_t reg32 = pci_read_config32(dev, where);</span><br><span> reg32 &= ~clr_mask;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/30046">change 30046</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/+/30046"/><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: I862bad4e889af3d25a771637a9ffc4f9d0b26d33 </div>
<div style="display:none"> Gerrit-Change-Number: 30046 </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-Reviewer: HAOUAS Elyes <ehaouas@noos.fr> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>