<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26996">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nb/amd/amdfam10: Get rid of device_t<br><br>Use of device_t has been abandoned in ramstage.<br><br>Change-Id: Ie9d59f5f23982ebf2750fbacb577cdf11875fba7<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/northbridge/amd/amdfam10/acpi.c<br>M src/northbridge/amd/amdfam10/amdfam10.h<br>M src/northbridge/amd/amdfam10/ht_config.c<br>M src/northbridge/amd/amdfam10/ht_config.h<br>M src/northbridge/amd/amdfam10/misc_control.c<br>M src/northbridge/amd/amdfam10/northbridge.h<br>M src/northbridge/amd/amdfam10/util.c<br>7 files changed, 28 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/26996/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/northbridge/amd/amdfam10/acpi.c b/src/northbridge/amd/amdfam10/acpi.c</span><br><span>index e67a127..eaea725 100644</span><br><span>--- a/src/northbridge/amd/amdfam10/acpi.c</span><br><span>+++ b/src/northbridge/amd/amdfam10/acpi.c</span><br><span>@@ -28,7 +28,7 @@</span><br><span> </span><br><span> unsigned long acpi_create_madt_lapic_nmis(unsigned long current, u16 flags, u8 lint)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  device_t cpu;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *cpu;</span><br><span>  int cpu_index = 0;</span><br><span> </span><br><span>       for (cpu = all_devices; cpu; cpu = cpu->next) {</span><br><span>@@ -47,7 +47,7 @@</span><br><span> </span><br><span> unsigned long acpi_create_srat_lapics(unsigned long current)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t cpu;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *cpu;</span><br><span>  int cpu_index = 0;</span><br><span> </span><br><span>       for (cpu = all_devices; cpu; cpu = cpu->next) {</span><br><span>@@ -193,7 +193,7 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void northbridge_acpi_write_vars(device_t device)</span><br><span style="color: hsl(120, 100%, 40%);">+void northbridge_acpi_write_vars(struct device *device)</span><br><span> {</span><br><span>         /*</span><br><span>    * If more than one physical CPU is installed, northbridge_acpi_write_vars()</span><br><span>@@ -326,7 +326,7 @@</span><br><span>   acpigen_pop_len();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long northbridge_write_acpi_tables(device_t device,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long northbridge_write_acpi_tables(struct device *device,</span><br><span>                                      unsigned long current,</span><br><span>                                       struct acpi_rsdp *rsdp)</span><br><span> {</span><br><span>diff --git a/src/northbridge/amd/amdfam10/amdfam10.h b/src/northbridge/amd/amdfam10/amdfam10.h</span><br><span>index 3e34a25..b744e96 100644</span><br><span>--- a/src/northbridge/amd/amdfam10/amdfam10.h</span><br><span>+++ b/src/northbridge/amd/amdfam10/amdfam10.h</span><br><span>@@ -987,7 +987,7 @@</span><br><span> #endif</span><br><span> */</span><br><span> #ifndef __PRE_RAM__</span><br><span style="color: hsl(0, 100%, 40%);">-device_t get_node_pci(u32 nodeid, u32 fn);</span><br><span style="color: hsl(120, 100%, 40%);">+struct device *get_node_pci(u32 nodeid, u32 fn);</span><br><span> #endif</span><br><span> </span><br><span> #ifdef __PRE_RAM__</span><br><span>@@ -1021,10 +1021,10 @@</span><br><span> struct acpi_rsdp;</span><br><span> </span><br><span> #ifndef __SIMPLE_DEVICE__</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long northbridge_write_acpi_tables(device_t device,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long northbridge_write_acpi_tables(struct device *device,</span><br><span>                                           unsigned long start,</span><br><span>                                         struct acpi_rsdp *rsdp);</span><br><span style="color: hsl(0, 100%, 40%);">-void northbridge_acpi_write_vars(device_t device);</span><br><span style="color: hsl(120, 100%, 40%);">+void northbridge_acpi_write_vars(struct device *device);</span><br><span> #endif</span><br><span> </span><br><span> #endif /* AMDFAM10_H */</span><br><span>diff --git a/src/northbridge/amd/amdfam10/ht_config.c b/src/northbridge/amd/amdfam10/ht_config.c</span><br><span>index 916111c..37b1492 100644</span><br><span>--- a/src/northbridge/amd/amdfam10/ht_config.c</span><br><span>+++ b/src/northbridge/amd/amdfam10/ht_config.c</span><br><span>@@ -26,7 +26,7 @@</span><br><span> struct dram_base_mask_t get_dram_base_mask(u32 nodeid)</span><br><span> {</span><br><span>    struct dram_base_mask_t d;</span><br><span style="color: hsl(0, 100%, 40%);">-      device_t dev = __f1_dev[0];</span><br><span style="color: hsl(120, 100%, 40%);">+   struct device *dev = __f1_dev[0];</span><br><span> </span><br><span>        u32 temp;</span><br><span>    temp = pci_read_config32(dev, 0x44 + (nodeid << 3)); //[39:24] at [31:16]</span><br><span>@@ -57,7 +57,7 @@</span><br><span>  tempreg |= (busn_max << 24)|(busn_min << 16)|(linkn << 8);</span><br><span> </span><br><span>     for (i = 0; i < sysconf.nodes; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-                device_t dev = __f1_dev[i];</span><br><span style="color: hsl(120, 100%, 40%);">+           struct device *dev = __f1_dev[i];</span><br><span>            pci_write_config32(dev, 0xe0 + ht_c_index * 4, tempreg);</span><br><span>     }</span><br><span> }</span><br><span>@@ -68,7 +68,7 @@</span><br><span>   u32 ht_c_index = get_ht_c_index(link);</span><br><span> </span><br><span>   for (i = 0; i < sysconf.nodes; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-                device_t dev = __f1_dev[i];</span><br><span style="color: hsl(120, 100%, 40%);">+           struct device *dev = __f1_dev[i];</span><br><span>            pci_write_config32(dev, 0xe0 + ht_c_index * 4, 0);</span><br><span>   }</span><br><span> }</span><br><span>@@ -190,8 +190,8 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,</span><br><span style="color: hsl(0, 100%, 40%);">-                             u32 io_min, u32 io_max)</span><br><span style="color: hsl(120, 100%, 40%);">+void set_io_addr_reg(struct device *dev, u32 nodeid, u32 linkn, u32 reg,</span><br><span style="color: hsl(120, 100%, 40%);">+                  u32 io_min, u32 io_max)</span><br><span> {</span><br><span>    u32 i;</span><br><span>       u32 tempreg;</span><br><span>diff --git a/src/northbridge/amd/amdfam10/ht_config.h b/src/northbridge/amd/amdfam10/ht_config.h</span><br><span>index 75626fa..748a981 100644</span><br><span>--- a/src/northbridge/amd/amdfam10/ht_config.h</span><br><span>+++ b/src/northbridge/amd/amdfam10/ht_config.h</span><br><span>@@ -19,8 +19,8 @@</span><br><span> typedef struct amdfam10_sysconf_t sys_info_conf_t;</span><br><span> </span><br><span> /* FIXME */</span><br><span style="color: hsl(0, 100%, 40%);">-u32 amdfam10_nodeid(device_t dev);</span><br><span style="color: hsl(0, 100%, 40%);">-extern device_t __f1_dev[];</span><br><span style="color: hsl(120, 100%, 40%);">+u32 amdfam10_nodeid(struct device *dev);</span><br><span style="color: hsl(120, 100%, 40%);">+extern struct device *__f1_dev[];</span><br><span> </span><br><span> struct dram_base_mask_t {</span><br><span>    u32 base; //[47:27] at [28:8]</span><br><span>@@ -46,8 +46,8 @@</span><br><span> u32 get_io_addr_index(u32 nodeid, u32 linkn);</span><br><span> u32 get_mmio_addr_index(u32 nodeid, u32 linkn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,</span><br><span style="color: hsl(0, 100%, 40%);">-                             u32 io_min, u32 io_max);</span><br><span style="color: hsl(120, 100%, 40%);">+void set_io_addr_reg(struct device *dev, u32 nodeid, u32 linkn, u32 reg,</span><br><span style="color: hsl(120, 100%, 40%);">+                 u32 io_min, u32 io_max);</span><br><span> </span><br><span> void set_mmio_addr_reg(u32 nodeid, u32 linkn, u32 reg, u32 index, u32 mmio_min, u32 mmio_max, u32 nodes);</span><br><span> </span><br><span>diff --git a/src/northbridge/amd/amdfam10/misc_control.c b/src/northbridge/amd/amdfam10/misc_control.c</span><br><span>index 7cd9bff..028f6af 100644</span><br><span>--- a/src/northbridge/amd/amdfam10/misc_control.c</span><br><span>+++ b/src/northbridge/amd/amdfam10/misc_control.c</span><br><span>@@ -49,7 +49,7 @@</span><br><span>  * implemented in a way to NOT DOING legacy VGA resource allocation on</span><br><span>  * purpose :-(.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void mcf3_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mcf3_read_resources(struct device *dev)</span><br><span> {</span><br><span>   struct resource *resource;</span><br><span>   unsigned char gart;</span><br><span>@@ -75,14 +75,14 @@</span><br><span>    }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void set_agp_aperture(device_t dev, uint32_t pci_id)</span><br><span style="color: hsl(120, 100%, 40%);">+static void set_agp_aperture(struct device *dev, uint32_t pci_id)</span><br><span> {</span><br><span>        uint32_t dword;</span><br><span>      struct resource *resource;</span><br><span> </span><br><span>       resource = probe_resource(dev, 0x94);</span><br><span>        if (resource) {</span><br><span style="color: hsl(0, 100%, 40%);">-         device_t pdev;</span><br><span style="color: hsl(120, 100%, 40%);">+                struct device *pdev;</span><br><span>                 u32 gart_base, gart_acr;</span><br><span> </span><br><span>                 /* Remember this resource has been stored */</span><br><span>@@ -117,7 +117,7 @@</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mcf3_set_resources_fam10h(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mcf3_set_resources_fam10h(struct device *dev)</span><br><span> {</span><br><span>        /* Set the gart aperture */</span><br><span>  set_agp_aperture(dev, 0x1203);</span><br><span>@@ -126,7 +126,7 @@</span><br><span>         pci_dev_set_resources(dev);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mcf3_set_resources_fam15h_model10(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mcf3_set_resources_fam15h_model10(struct device *dev)</span><br><span> {</span><br><span>      /* Set the gart aperture */</span><br><span>  set_agp_aperture(dev, 0x1403);</span><br><span>@@ -135,7 +135,7 @@</span><br><span>         pci_dev_set_resources(dev);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mcf3_set_resources_fam15h(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mcf3_set_resources_fam15h(struct device *dev)</span><br><span> {</span><br><span>      /* Set the gart aperture */</span><br><span>  set_agp_aperture(dev, 0x1603);</span><br><span>diff --git a/src/northbridge/amd/amdfam10/northbridge.h b/src/northbridge/amd/amdfam10/northbridge.h</span><br><span>index 68b3f1d..69d7415 100644</span><br><span>--- a/src/northbridge/amd/amdfam10/northbridge.h</span><br><span>+++ b/src/northbridge/amd/amdfam10/northbridge.h</span><br><span>@@ -16,7 +16,7 @@</span><br><span> #ifndef NORTHBRIDGE_AMD_AMDFAM10_H</span><br><span> #define NORTHBRIDGE_AMD_AMDFAM10_H</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-u32 amdfam10_scan_root_bus(device_t root, u32 max);</span><br><span style="color: hsl(120, 100%, 40%);">+u32 amdfam10_scan_root_bus(struct device *root, u32 max);</span><br><span> void get_pci1234(void);</span><br><span> </span><br><span> #endif /* NORTHBRIDGE_AMD_AMDFAM10_H */</span><br><span>diff --git a/src/northbridge/amd/amdfam10/util.c b/src/northbridge/amd/amdfam10/util.c</span><br><span>index 4cce7f8..4bcb11d 100644</span><br><span>--- a/src/northbridge/amd/amdfam10/util.c</span><br><span>+++ b/src/northbridge/amd/amdfam10/util.c</span><br><span>@@ -189,7 +189,7 @@</span><br><span>  * @param dev A 32-bit number in the standard bus/dev/fn format which is used</span><br><span>  *            raw config space.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void showalldram(int level, device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void showalldram(int level, struct device *dev)</span><br><span> {</span><br><span>       u8 reg;</span><br><span>      for (reg = DRAM_ROUTE_START; reg <= DRAM_ROUTE_END; reg += 8) {</span><br><span>@@ -207,7 +207,7 @@</span><br><span>  * @param dev A 32-bit number in the standard bus/dev/fn format which is used</span><br><span>  *            raw config space.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void showallmmio(int level, device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void showallmmio(int level, struct device *dev)</span><br><span> {</span><br><span>     u8 reg;</span><br><span>      for (reg = MMIO_ROUTE_START; reg <= MMIO_ROUTE_END; reg += 8) {</span><br><span>@@ -225,7 +225,7 @@</span><br><span>  * @param dev A 32-bit number in the standard bus/dev/fn format which is used</span><br><span>  *            raw config space.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void showallpciio(int level, device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void showallpciio(int level, struct device *dev)</span><br><span> {</span><br><span>   u8 reg;</span><br><span>      for (reg = PCIIO_ROUTE_START; reg <= PCIIO_ROUTE_END; reg += 8) {</span><br><span>@@ -243,7 +243,7 @@</span><br><span>  * @param dev A 32-bit number in the standard bus/dev/fn format which is used</span><br><span>  *            raw config space.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void showallconfig(int level, device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void showallconfig(int level, struct device *dev)</span><br><span> {</span><br><span>       u8 reg;</span><br><span>      for (reg = CONFIG_ROUTE_START; reg <= CONFIG_ROUTE_END; reg += 4) {</span><br><span>@@ -260,7 +260,7 @@</span><br><span>  * @param dev A 32-bit number in the standard bus/dev/fn format which is used</span><br><span>  *            raw config space.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-void showallroutes(int level, device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void showallroutes(int level, struct device *dev)</span><br><span> {</span><br><span>   showalldram(level, dev);</span><br><span>     showallmmio(level, dev);</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26996">change 26996</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/26996"/><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: Ie9d59f5f23982ebf2750fbacb577cdf11875fba7 </div>
<div style="display:none"> Gerrit-Change-Number: 26996 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>