<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26198">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nb/amd/agesa/family12: Get rid of device_t<br><br>Use of device_t has been abandoned in ramstage.<br><br>Change-Id: I265130532965c1655c34fd7dab6ca9ef0e27beca<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/northbridge/amd/agesa/family12/amdfam12_conf.c<br>M src/northbridge/amd/agesa/family12/northbridge.c<br>2 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/98/26198/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/northbridge/amd/agesa/family12/amdfam12_conf.c b/src/northbridge/amd/agesa/family12/amdfam12_conf.c</span><br><span>index 4c5ef19..c7d256a 100644</span><br><span>--- a/src/northbridge/amd/agesa/family12/amdfam12_conf.c</span><br><span>+++ b/src/northbridge/amd/agesa/family12/amdfam12_conf.c</span><br><span>@@ -24,7 +24,7 @@</span><br><span> </span><br><span> static struct dram_base_mask_t get_dram_base_mask(u32 nodeid)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   device_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev;</span><br><span>  struct dram_base_mask_t d;</span><br><span> #if defined(__PRE_RAM__)</span><br><span>       dev = PCI_DEV(CONFIG_CBB, CONFIG_CDB, 1);</span><br><span>@@ -50,7 +50,7 @@</span><br><span> {</span><br><span>   u32 i;</span><br><span>       u32 tempreg;</span><br><span style="color: hsl(0, 100%, 40%);">-    device_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev;</span><br><span> </span><br><span>      /* io range allocation */</span><br><span>    tempreg = (nodeid&0xf) | ((nodeid & 0x30)<<(8-4)) | (linkn << 4) |  ((io_max&0xf0)<<(12-4)); //limit</span><br><span>@@ -70,7 +70,7 @@</span><br><span>                                       u32 io_min, u32 io_max, u32 nodes)</span><br><span> {</span><br><span>      u32 i;</span><br><span style="color: hsl(0, 100%, 40%);">-  device_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev;</span><br><span> </span><br><span>       /* io range allocation */</span><br><span>   for (i = 0; i < nodes; i++) {</span><br><span>@@ -92,7 +92,7 @@</span><br><span>         return   0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,</span><br><span style="color: hsl(120, 100%, 40%);">+static void set_io_addr_reg(struct device *dev, u32 nodeid, u32 linkn, u32 reg,</span><br><span>                               u32 io_min, u32 io_max)</span><br><span> {</span><br><span> </span><br><span>diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c</span><br><span>index d77dbbb..41f600b 100644</span><br><span>--- a/src/northbridge/amd/agesa/family12/northbridge.c</span><br><span>+++ b/src/northbridge/amd/agesa/family12/northbridge.c</span><br><span>@@ -38,13 +38,13 @@</span><br><span> </span><br><span> #define FX_DEVS 1</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static device_t __f0_dev[FX_DEVS];</span><br><span style="color: hsl(0, 100%, 40%);">-static device_t __f1_dev[FX_DEVS];</span><br><span style="color: hsl(0, 100%, 40%);">-static device_t __f2_dev[FX_DEVS];</span><br><span style="color: hsl(0, 100%, 40%);">-static device_t __f4_dev[FX_DEVS];</span><br><span style="color: hsl(120, 100%, 40%);">+static struct device *__f0_dev[FX_DEVS];</span><br><span style="color: hsl(120, 100%, 40%);">+static struct device *__f1_dev[FX_DEVS];</span><br><span style="color: hsl(120, 100%, 40%);">+static struct device *__f2_dev[FX_DEVS];</span><br><span style="color: hsl(120, 100%, 40%);">+static struct device *__f4_dev[FX_DEVS];</span><br><span> static unsigned fx_devs = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static device_t get_node_pci(u32 nodeid, u32 fn)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct device *get_node_pci(u32 nodeid, u32 fn)</span><br><span> {</span><br><span>    if ((CONFIG_CDB + nodeid) < 32) {</span><br><span>                 return dev_find_slot(CONFIG_CBB, PCI_DEVFN(CONFIG_CDB + nodeid, fn));</span><br><span>@@ -83,14 +83,14 @@</span><br><span>  if (fx_devs == 0)</span><br><span>            get_fx_devs();</span><br><span>       for (i = 0; i < fx_devs; 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>            if (dev && dev->enabled) {</span><br><span>                        pci_write_config32(dev, reg, value);</span><br><span>                 }</span><br><span>    }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static u32 amdfam12_nodeid(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static u32 amdfam12_nodeid(struct device *dev)</span><br><span> {</span><br><span>      printk(BIOS_DEBUG, "Fam12h - northbridge.c - %s\n",__func__);</span><br><span>      return (dev->path.pci.devfn >> 3) - CONFIG_CDB;</span><br><span>@@ -98,7 +98,7 @@</span><br><span> </span><br><span> #include "amdfam12_conf.c"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void northbridge_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void northbridge_init(struct device *dev)</span><br><span> {</span><br><span>        printk(BIOS_DEBUG, "Northbridge init\n");</span><br><span> }</span><br><span>@@ -118,7 +118,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int reg_useable(unsigned reg, device_t goal_dev, unsigned goal_nodeid,</span><br><span style="color: hsl(120, 100%, 40%);">+static int reg_useable(unsigned reg, struct device *goal_dev, unsigned goal_nodeid,</span><br><span>             unsigned goal_link)</span><br><span> {</span><br><span>        struct resource *res;</span><br><span>@@ -127,7 +127,7 @@</span><br><span>  printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__);</span><br><span>   res = 0;</span><br><span>     for (nodeid = 0; !res && (nodeid < fx_devs); nodeid++) {</span><br><span style="color: hsl(0, 100%, 40%);">-             device_t dev = __f0_dev[nodeid];</span><br><span style="color: hsl(120, 100%, 40%);">+              struct device *dev = __f0_dev[nodeid];</span><br><span>               if (!dev)</span><br><span>                    continue;</span><br><span>            for (link = 0; !res && (link < 8); link++) {</span><br><span>@@ -147,7 +147,7 @@</span><br><span>        return result;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct resource *amdfam12_find_iopair(device_t dev, unsigned nodeid, unsigned link)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct resource *amdfam12_find_iopair(struct device *dev, unsigned nodeid, unsigned link)</span><br><span> {</span><br><span>     struct resource *resource;</span><br><span>   u32 result, reg;</span><br><span>@@ -171,7 +171,7 @@</span><br><span>       return resource;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct resource *amdfam12_find_mempair(device_t dev, u32 nodeid, u32 link)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct resource *amdfam12_find_mempair(struct device *dev, u32 nodeid, u32 link)</span><br><span> {</span><br><span>     struct resource *resource;</span><br><span>   u32 free_reg, reg;</span><br><span>@@ -207,7 +207,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void amdfam12_link_read_bases(device_t dev, u32 nodeid, u32 link)</span><br><span style="color: hsl(120, 100%, 40%);">+static void amdfam12_link_read_bases(struct device *dev, u32 nodeid, u32 link)</span><br><span> {</span><br><span>   struct resource *resource;</span><br><span> </span><br><span>@@ -289,7 +289,7 @@</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void read_resources(struct device *dev)</span><br><span> {</span><br><span>         u32 nodeid;</span><br><span>  struct bus *link;</span><br><span>@@ -314,7 +314,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void set_resource(device_t dev, struct resource *resource, u32 nodeid)</span><br><span style="color: hsl(120, 100%, 40%);">+static void set_resource(struct device *dev, struct resource *resource, u32 nodeid)</span><br><span> {</span><br><span>  resource_t rbase, rend;</span><br><span>      unsigned reg, link_num;</span><br><span>@@ -364,10 +364,10 @@</span><br><span> </span><br><span> </span><br><span> #if IS_ENABLED(CONFIG_CONSOLE_VGA_MULTI)</span><br><span style="color: hsl(0, 100%, 40%);">-extern device_t vga_pri;    // the primary vga device, defined in device.c</span><br><span style="color: hsl(120, 100%, 40%);">+extern struct device *vga_pri;    // the primary vga device, defined in device.c</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void create_vga_resource(device_t dev, unsigned nodeid)</span><br><span style="color: hsl(120, 100%, 40%);">+static void create_vga_resource(struct device *dev, unsigned nodeid)</span><br><span> {</span><br><span> struct bus *link;</span><br><span> </span><br><span>@@ -398,7 +398,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void set_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void set_resources(struct device *dev)</span><br><span> {</span><br><span>        unsigned nodeid;</span><br><span>     struct bus *bus;</span><br><span>@@ -425,7 +425,7 @@</span><br><span> </span><br><span> /* Domain/Root Complex related code */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void domain_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void domain_read_resources(struct device *dev)</span><br><span> {</span><br><span>  unsigned reg;</span><br><span> </span><br><span>@@ -440,7 +440,7 @@</span><br><span>              /* Is this register allocated? */</span><br><span>            if ((base & 3) != 0) {</span><br><span>                   unsigned nodeid, reg_link;</span><br><span style="color: hsl(0, 100%, 40%);">-                      device_t reg_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+                     struct device *reg_dev;</span><br><span>                      if (reg < 0xc0) { // mmio</span><br><span>                                 nodeid = (limit & 0xf) + (base&0x30);</span><br><span>                        } else { // io</span><br><span>@@ -480,7 +480,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void domain_set_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void domain_set_resources(struct device *dev)</span><br><span> {</span><br><span>   printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__);</span><br><span>   printk(BIOS_DEBUG, "  amsr - incoming dev = %p\n", dev);</span><br><span>@@ -598,7 +598,7 @@</span><br><span> </span><br><span> /* Bus related code */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void cpu_bus_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void cpu_bus_init(struct device *dev)</span><br><span> {</span><br><span>  printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__);</span><br><span>   initialize_cpus(dev->link_list);</span><br><span>@@ -629,7 +629,7 @@</span><br><span>    return (unsigned long)current;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void northbridge_fill_ssdt_generator(device_t device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void northbridge_fill_ssdt_generator(struct device *device)</span><br><span> {</span><br><span>         msr_t msr;</span><br><span>   char pscope[] = "\\_SB.PCI0";</span><br><span>@@ -650,7 +650,7 @@</span><br><span>        acpigen_pop_len();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static unsigned long agesa_write_acpi_tables(device_t device,</span><br><span style="color: hsl(120, 100%, 40%);">+static unsigned long agesa_write_acpi_tables(struct device *device,</span><br><span>                                             unsigned long current,</span><br><span>                                       acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26198">change 26198</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/26198"/><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: I265130532965c1655c34fd7dab6ca9ef0e27beca </div>
<div style="display:none"> Gerrit-Change-Number: 26198 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>