[coreboot-gerrit] Change in coreboot[master]: nb/amd/agesa/family12: Get rid of device_t
Elyes HAOUAS (Code Review)
gerrit at coreboot.org
Wed May 9 17:56:34 CEST 2018
Elyes HAOUAS has uploaded this change for review. ( https://review.coreboot.org/26198
Change subject: nb/amd/agesa/family12: Get rid of device_t
......................................................................
nb/amd/agesa/family12: Get rid of device_t
Use of device_t has been abandoned in ramstage.
Change-Id: I265130532965c1655c34fd7dab6ca9ef0e27beca
Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
---
M src/northbridge/amd/agesa/family12/amdfam12_conf.c
M src/northbridge/amd/agesa/family12/northbridge.c
2 files changed, 28 insertions(+), 28 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/26198/1
diff --git a/src/northbridge/amd/agesa/family12/amdfam12_conf.c b/src/northbridge/amd/agesa/family12/amdfam12_conf.c
index 4c5ef19..c7d256a 100644
--- a/src/northbridge/amd/agesa/family12/amdfam12_conf.c
+++ b/src/northbridge/amd/agesa/family12/amdfam12_conf.c
@@ -24,7 +24,7 @@
static struct dram_base_mask_t get_dram_base_mask(u32 nodeid)
{
- device_t dev;
+ struct device *dev;
struct dram_base_mask_t d;
#if defined(__PRE_RAM__)
dev = PCI_DEV(CONFIG_CBB, CONFIG_CDB, 1);
@@ -50,7 +50,7 @@
{
u32 i;
u32 tempreg;
- device_t dev;
+ struct device *dev;
/* io range allocation */
tempreg = (nodeid&0xf) | ((nodeid & 0x30)<<(8-4)) | (linkn << 4) | ((io_max&0xf0)<<(12-4)); //limit
@@ -70,7 +70,7 @@
u32 io_min, u32 io_max, u32 nodes)
{
u32 i;
- device_t dev;
+ struct device *dev;
/* io range allocation */
for (i = 0; i < nodes; i++) {
@@ -92,7 +92,7 @@
return 0;
}
-static void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,
+static void set_io_addr_reg(struct device *dev, u32 nodeid, u32 linkn, u32 reg,
u32 io_min, u32 io_max)
{
diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c
index d77dbbb..41f600b 100644
--- a/src/northbridge/amd/agesa/family12/northbridge.c
+++ b/src/northbridge/amd/agesa/family12/northbridge.c
@@ -38,13 +38,13 @@
#define FX_DEVS 1
-static device_t __f0_dev[FX_DEVS];
-static device_t __f1_dev[FX_DEVS];
-static device_t __f2_dev[FX_DEVS];
-static device_t __f4_dev[FX_DEVS];
+static struct device *__f0_dev[FX_DEVS];
+static struct device *__f1_dev[FX_DEVS];
+static struct device *__f2_dev[FX_DEVS];
+static struct device *__f4_dev[FX_DEVS];
static unsigned fx_devs = 0;
-static device_t get_node_pci(u32 nodeid, u32 fn)
+static struct device *get_node_pci(u32 nodeid, u32 fn)
{
if ((CONFIG_CDB + nodeid) < 32) {
return dev_find_slot(CONFIG_CBB, PCI_DEVFN(CONFIG_CDB + nodeid, fn));
@@ -83,14 +83,14 @@
if (fx_devs == 0)
get_fx_devs();
for (i = 0; i < fx_devs; i++) {
- device_t dev = __f1_dev[i];
+ struct device *dev = __f1_dev[i];
if (dev && dev->enabled) {
pci_write_config32(dev, reg, value);
}
}
}
-static u32 amdfam12_nodeid(device_t dev)
+static u32 amdfam12_nodeid(struct device *dev)
{
printk(BIOS_DEBUG, "Fam12h - northbridge.c - %s\n",__func__);
return (dev->path.pci.devfn >> 3) - CONFIG_CDB;
@@ -98,7 +98,7 @@
#include "amdfam12_conf.c"
-static void northbridge_init(device_t dev)
+static void northbridge_init(struct device *dev)
{
printk(BIOS_DEBUG, "Northbridge init\n");
}
@@ -118,7 +118,7 @@
}
-static int reg_useable(unsigned reg, device_t goal_dev, unsigned goal_nodeid,
+static int reg_useable(unsigned reg, struct device *goal_dev, unsigned goal_nodeid,
unsigned goal_link)
{
struct resource *res;
@@ -127,7 +127,7 @@
printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__);
res = 0;
for (nodeid = 0; !res && (nodeid < fx_devs); nodeid++) {
- device_t dev = __f0_dev[nodeid];
+ struct device *dev = __f0_dev[nodeid];
if (!dev)
continue;
for (link = 0; !res && (link < 8); link++) {
@@ -147,7 +147,7 @@
return result;
}
-static struct resource *amdfam12_find_iopair(device_t dev, unsigned nodeid, unsigned link)
+static struct resource *amdfam12_find_iopair(struct device *dev, unsigned nodeid, unsigned link)
{
struct resource *resource;
u32 result, reg;
@@ -171,7 +171,7 @@
return resource;
}
-static struct resource *amdfam12_find_mempair(device_t dev, u32 nodeid, u32 link)
+static struct resource *amdfam12_find_mempair(struct device *dev, u32 nodeid, u32 link)
{
struct resource *resource;
u32 free_reg, reg;
@@ -207,7 +207,7 @@
}
-static void amdfam12_link_read_bases(device_t dev, u32 nodeid, u32 link)
+static void amdfam12_link_read_bases(struct device *dev, u32 nodeid, u32 link)
{
struct resource *resource;
@@ -289,7 +289,7 @@
}
#endif
-static void read_resources(device_t dev)
+static void read_resources(struct device *dev)
{
u32 nodeid;
struct bus *link;
@@ -314,7 +314,7 @@
}
-static void set_resource(device_t dev, struct resource *resource, u32 nodeid)
+static void set_resource(struct device *dev, struct resource *resource, u32 nodeid)
{
resource_t rbase, rend;
unsigned reg, link_num;
@@ -364,10 +364,10 @@
#if IS_ENABLED(CONFIG_CONSOLE_VGA_MULTI)
-extern device_t vga_pri; // the primary vga device, defined in device.c
+extern struct device *vga_pri; // the primary vga device, defined in device.c
#endif
-static void create_vga_resource(device_t dev, unsigned nodeid)
+static void create_vga_resource(struct device *dev, unsigned nodeid)
{
struct bus *link;
@@ -398,7 +398,7 @@
}
-static void set_resources(device_t dev)
+static void set_resources(struct device *dev)
{
unsigned nodeid;
struct bus *bus;
@@ -425,7 +425,7 @@
/* Domain/Root Complex related code */
-static void domain_read_resources(device_t dev)
+static void domain_read_resources(struct device *dev)
{
unsigned reg;
@@ -440,7 +440,7 @@
/* Is this register allocated? */
if ((base & 3) != 0) {
unsigned nodeid, reg_link;
- device_t reg_dev;
+ struct device *reg_dev;
if (reg < 0xc0) { // mmio
nodeid = (limit & 0xf) + (base&0x30);
} else { // io
@@ -480,7 +480,7 @@
}
-static void domain_set_resources(device_t dev)
+static void domain_set_resources(struct device *dev)
{
printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__);
printk(BIOS_DEBUG, " amsr - incoming dev = %p\n", dev);
@@ -598,7 +598,7 @@
/* Bus related code */
-static void cpu_bus_init(device_t dev)
+static void cpu_bus_init(struct device *dev)
{
printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__);
initialize_cpus(dev->link_list);
@@ -629,7 +629,7 @@
return (unsigned long)current;
}
-static void northbridge_fill_ssdt_generator(device_t device)
+static void northbridge_fill_ssdt_generator(struct device *device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
@@ -650,7 +650,7 @@
acpigen_pop_len();
}
-static unsigned long agesa_write_acpi_tables(device_t device,
+static unsigned long agesa_write_acpi_tables(struct device *device,
unsigned long current,
acpi_rsdp_t *rsdp)
{
--
To view, visit https://review.coreboot.org/26198
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I265130532965c1655c34fd7dab6ca9ef0e27beca
Gerrit-Change-Number: 26198
Gerrit-PatchSet: 1
Gerrit-Owner: Elyes HAOUAS <ehaouas at noos.fr>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180509/c96a2aea/attachment-0001.html>
More information about the coreboot-gerrit
mailing list