mb/amd: Get rid of device_t

Use of device_t has been abandoned in ramstage.

Change-Id: I01270248bddf07df4c959f0c632e722728d0cd03
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/26072
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Elyes HAOUAS 2018-05-04 19:42:25 +02:00 committed by Patrick Georgi
parent 1943f3798d
commit 4b2c71f657
52 changed files with 70 additions and 70 deletions

View File

@ -80,7 +80,7 @@ static void pirq_setup(void)
/*************************************************
* enable the dedicated function in bettong board.
*************************************************/
static void bettong_enable(device_t dev)
static void bettong_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");

View File

@ -110,7 +110,7 @@ static void *smp_write_config_table(void *v)
/* on board NIC & Slot PCIE. */
/* PCI slots */
device_t dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
if (dev && dev->enabled) {
u8 bus_pci = dev->link_list->secondary;
/* PCI_SLOT 0. */

View File

@ -58,7 +58,7 @@ static u32 get_bus_conf_done = 0;
void get_bus_conf(void)
{
u32 apicid_base;
device_t dev;
struct device *dev;
int i;
if (get_bus_conf_done == 1)

View File

@ -81,7 +81,7 @@ u8 is_dev3_present(void)
* enable the dedicated function in bimini board.
* This function called early than rs780_enable.
*************************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard BIMINI Enable. dev=0x%p\n", dev);

View File

@ -114,7 +114,7 @@ static void pirq_setup(void)
/**********************************************
* enable the dedicated function in mainboard.
**********************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");

View File

@ -57,7 +57,7 @@ static u32 get_bus_conf_done = 0;
void get_bus_conf(void)
{
u32 apicid_base;
device_t dev;
struct device *dev;
int i;
if (get_bus_conf_done == 1)

View File

@ -115,7 +115,7 @@ static void set_thermal_config(void)
{
u8 byte;
u16 word;
device_t sm_dev;
struct device *sm_dev;
/* set ADT 7461 */
ADT7461_write_byte(0x0B, 0x50); /* Local Temperature Hight limit */
@ -176,7 +176,7 @@ static void set_thermal_config(void)
* enable the dedicated function in dbm690t board.
* This function called early than rs690_enable.
*************************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard DBM690T Enable. dev=0x%p\n", dev);

View File

@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v)
/* I/O APICs: APIC ID Version State Address */
{
device_t dev;
struct device *dev;
u32 dword;
u8 byte;

View File

@ -89,7 +89,7 @@ static void mainboard_init(void *chip_info)
/*************************************************
* enable the dedicated function in gardenia board.
*************************************************/
static void gardenia_enable(device_t dev)
static void gardenia_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard "
CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");

View File

@ -115,7 +115,7 @@ static void *smp_write_config_table(void *v)
/* on board NIC & Slot PCIE. */
/* PCI slots */
device_t dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
if (dev && dev->enabled) {
u8 bus_pci = dev->link_list->secondary;
/* PCI_SLOT 0. */

View File

@ -51,7 +51,7 @@ static void init_gpios(void)
/**********************************************
* Enable the dedicated functions of the board.
**********************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");

View File

@ -103,7 +103,7 @@ static void *smp_write_config_table(void *v)
/* on board NIC & Slot PCIE. */
/* PCI slots */
device_t dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
if (dev && dev->enabled) {
u8 bus_pci = dev->link_list->secondary;
/* PCI_SLOT 0. */

View File

@ -141,7 +141,7 @@ static void pirq_setup(void)
/*************************************************
* enable the dedicated function in lamar board.
*************************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");

View File

@ -57,7 +57,7 @@ static u32 get_bus_conf_done = 0;
void get_bus_conf(void)
{
u32 apicid_base;
device_t dev;
struct device *dev;
int i;
if (get_bus_conf_done == 1)

View File

@ -33,7 +33,7 @@ u8 is_dev3_present(void);
void set_pcie_dereset()
{
u16 word;
device_t sm_dev;
struct device *sm_dev;
/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
@ -46,7 +46,7 @@ void set_pcie_dereset()
void set_pcie_reset()
{
u16 word;
device_t sm_dev;
struct device *sm_dev;
/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
@ -64,7 +64,7 @@ u8 is_dev3_present(void)
* enable the dedicated function in mahogany board.
* This function called early than rs780_enable.
*************************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard MAHOGANY Enable. dev=0x%p\n", dev);

View File

@ -47,7 +47,7 @@ static void *smp_write_config_table(void *v)
/* I/O APICs: APIC ID Version State Address */
{
device_t dev;
struct device *dev;
u32 dword;
u8 byte;

View File

@ -57,7 +57,7 @@ static u32 get_bus_conf_done = 0;
void get_bus_conf(void)
{
u32 apicid_base;
device_t dev;
struct device *dev;
int i;
if (get_bus_conf_done == 1)

View File

@ -33,7 +33,7 @@ u8 is_dev3_present(void);
void set_pcie_dereset()
{
u16 word;
device_t sm_dev;
struct device *sm_dev;
/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
@ -46,7 +46,7 @@ void set_pcie_dereset()
void set_pcie_reset()
{
u16 word;
device_t sm_dev;
struct device *sm_dev;
/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
@ -66,7 +66,7 @@ static void get_ide_dma66(void)
{
u8 byte;
/*u32 sm_dev, ide_dev; */
device_t sm_dev, ide_dev;
struct device *sm_dev, ide_dev;
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
@ -94,7 +94,7 @@ u8 is_dev3_present(void)
* enable the dedicated function in mahogany board.
* This function called early than rs780_enable.
*************************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard MAHOGANY Enable. dev=0x%p\n", dev);

View File

@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v)
/* I/O APICs: APIC ID Version State Address */
{
device_t dev;
struct device *dev;
u32 dword;
u8 byte;

View File

@ -19,7 +19,7 @@
/**********************************************
* enable the dedicated function in mainboard.
**********************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
}

View File

@ -177,7 +177,7 @@ static void *smp_write_config_table(void *v)
/* on board NIC & Slot PCIE. */
/* PCI slots */
device_t dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
if (dev && dev->enabled) {
u8 bus_pci = dev->link_list->secondary;
/* PCI_SLOT 0. */

View File

@ -25,7 +25,7 @@
/**********************************************
* enable the dedicated function in mainboard.
**********************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
}

View File

@ -138,7 +138,7 @@ static void *smp_write_config_table(void *v)
/* on board NIC & Slot PCIE. */
/* PCI slots */
device_t dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
if (dev && dev->enabled) {
u8 bus_pci = dev->link_list->secondary;
/* PCI_SLOT 0. */

View File

@ -19,7 +19,7 @@
/*************************************************
* enable the dedicated function in parmer board.
*************************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
}

View File

@ -138,7 +138,7 @@ static void *smp_write_config_table(void *v)
/* on board NIC & Slot PCIE. */
/* PCI slots */
device_t dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
if (dev && dev->enabled) {
u8 bus_pci = dev->link_list->secondary;
/* PCI_SLOT 0. */

View File

@ -121,7 +121,7 @@ static void pirq_setup(void)
/**********************************************
* Enable the dedicated functions of the board.
**********************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");

View File

@ -108,7 +108,7 @@ static void *smp_write_config_table(void *v)
PCI_INT(0x2, 0x0, 0x0, intr_data_ptr[PIRQ_E]); /* Use INTE */
/* PCI slots */
device_t dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
if (dev && dev->enabled) {
u8 bus_pci = dev->link_list->secondary;
/* PCI_SLOT 0 */

View File

@ -57,7 +57,7 @@ static u32 get_bus_conf_done = 0;
void get_bus_conf(void)
{
u32 apicid_base;
device_t dev;
struct device *dev;
int i;
if (get_bus_conf_done == 1)

View File

@ -72,7 +72,7 @@ static void set_thermal_config(void)
u8 byte, byte2;
u16 word;
u32 dword;
device_t sm_dev;
struct device *sm_dev;
/* set adt7475 */
ADT7475_write_byte(0x40, 0x04);
@ -246,7 +246,7 @@ static void set_thermal_config(void)
* enable the dedicated function in pistachio board.
* This function called early than rs690_enable.
*************************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard Pistachio Enable. dev=0x%p\n", dev);

View File

@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v)
/* I/O APICs: APIC ID Version State Address */
{
device_t dev;
struct device *dev;
u32 dword;
u8 byte;

View File

@ -50,7 +50,7 @@ unsigned long acpi_fill_madt(unsigned long current)
/* Write all 8131 IOAPICs */
{
device_t dev;
struct device *dev;
struct resource *res;
dev = dev_find_slot(m->bus_8132_0, PCI_DEVFN((sysconf.hcdn[0]&0xff), 1));
if (dev) {
@ -131,7 +131,7 @@ unsigned long acpi_fill_madt(unsigned long current)
return current;
}
unsigned long mainboard_write_acpi_tables(device_t dev, unsigned long start, acpi_rsdp_t *rsdp)
unsigned long mainboard_write_acpi_tables(struct device *dev, unsigned long start, acpi_rsdp_t *rsdp)
{
unsigned long current;
acpi_header_t *ssdtx;

View File

@ -47,7 +47,7 @@ static unsigned get_hcid(unsigned i)
unsigned devn = sysconf.hcdn[i] & 0xff;
device_t dev;
struct device *dev;
dev = dev_find_slot(busn, PCI_DEVFN(devn, 0));
@ -75,7 +75,7 @@ void get_bus_conf(void)
unsigned apicid_base;
device_t dev;
struct device *dev;
int i, j;
struct mb_sysconf_t *m;

View File

@ -88,7 +88,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
slot_num = 0;
{
device_t dev;
struct device *dev;
dev =
dev_find_slot(m->bus_8111_0,
PCI_DEVFN(sysconf.sbdn + 1, 3));

View File

@ -18,7 +18,7 @@
#include <arch/acpigen.h>
#include "mainboard.h"
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
}

View File

@ -11,4 +11,4 @@
* GNU General Public License for more details.
*/
unsigned long mainboard_write_acpi_tables(device_t device, unsigned long start, acpi_rsdp_t *rsdp);
unsigned long mainboard_write_acpi_tables(struct device *device, unsigned long start, acpi_rsdp_t *rsdp);

View File

@ -44,7 +44,7 @@ static void *smp_write_config_table(void *v)
/* I/O APICs: APIC ID Version State Address*/
smp_write_ioapic(mc, m->apicid_8111, 0x11, VIO_APIC_VADDR); /* 8111 */
{
device_t dev;
struct device *dev;
struct resource *res;
dev = dev_find_slot(m->bus_8132_0, PCI_DEVFN(m->sbdn3, 1));
if (dev) {
@ -125,7 +125,7 @@ static void *smp_write_config_table(void *v)
if (!(sysconf.pci1234[i] & 0x1))
continue;
int ii;
device_t dev;
struct device *dev;
struct resource *res;
switch(sysconf.hcid[i]) {
case 1:

View File

@ -42,7 +42,7 @@ unsigned long acpi_fill_madt(unsigned long current)
/* Write all 8131 IOAPICs */
{
device_t dev;
struct device *dev;
struct resource *res;
dev = dev_find_slot(m->bus_8132_0, PCI_DEVFN((sysconf.hcdn[0]&0xff), 1));
if (dev) {
@ -119,7 +119,7 @@ unsigned long acpi_fill_madt(unsigned long current)
return current;
}
unsigned long mainboard_write_acpi_tables(device_t device,
unsigned long mainboard_write_acpi_tables(struct device *device,
unsigned long current,
acpi_rsdp_t *rsdp)
{

View File

@ -67,7 +67,7 @@ static u32 get_hcid(u32 i)
u32 id = 0;
u32 busn = (sysconf.pci1234[i] >> 12) & 0xff;
u32 devn = sysconf.hcdn[i] & 0xff;
device_t dev;
struct device *dev;
dev = dev_find_slot(busn, PCI_DEVFN(devn,0));
@ -91,7 +91,7 @@ void get_bus_conf(void)
{
u32 apicid_base;
device_t dev;
struct device *dev;
int i, j;
struct mb_sysconf_t *m;

View File

@ -18,7 +18,7 @@
#include <arch/acpigen.h>
#include "mainboard.h"
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
}

View File

@ -11,4 +11,4 @@
* GNU General Public License for more details.
*/
unsigned long mainboard_write_acpi_tables(device_t device, unsigned long start, acpi_rsdp_t *rsdp);
unsigned long mainboard_write_acpi_tables(struct device *device, unsigned long start, acpi_rsdp_t *rsdp);

View File

@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v)
/* I/O APICs: APIC ID Version State Address*/
smp_write_ioapic(mc, m->apicid_8111, 0x11, VIO_APIC_VADDR); /* 8111 */
{
device_t dev;
struct device *dev;
struct resource *res;
dev = dev_find_slot(m->bus_8132_0, PCI_DEVFN(m->sbdn3, 1));
if (dev) {
@ -134,7 +134,7 @@ static void *smp_write_config_table(void *v)
if(!(sysconf.pci1234[i] & 0x1) ) continue;
int ii;
int jj;
device_t dev;
struct device *dev;
struct resource *res;
switch(sysconf.hcid[i]) {
case 1:

View File

@ -49,7 +49,7 @@ static void southstation_led_init(void)
/**********************************************
* Enable the dedicated functions of the board.
**********************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
southstation_led_init();

View File

@ -100,7 +100,7 @@ static void *smp_write_config_table(void *v)
/* on board NIC & Slot PCIE. */
/* PCI slots */
device_t dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
if (dev && dev->enabled) {
u8 bus_pci = dev->link_list->secondary;
/* PCI_SLOT 0. */

View File

@ -20,7 +20,7 @@
/*************************************************
* enable the dedicated function in thatcher board.
*************************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
msr_t msr;

View File

@ -138,7 +138,7 @@ static void *smp_write_config_table(void *v)
/* on board NIC & Slot PCIE. */
/* PCI slots */
device_t dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
if (dev && dev->enabled) {
u8 bus_pci = dev->link_list->secondary;
/* PCI_SLOT 0. */

View File

@ -57,7 +57,7 @@ static u32 get_bus_conf_done = 0;
void get_bus_conf(void)
{
u32 apicid_base;
device_t dev;
struct device *dev;
int i;
if (get_bus_conf_done == 1)

View File

@ -41,7 +41,7 @@ void set_pcie_dereset()
{
u8 byte;
u16 word;
device_t sm_dev;
struct device *sm_dev;
/* set 0 to bit1 :disable GPM9 as SLP_S2 output */
/* set 0 to bit2 :disable GPM8 as AZ_RST output */
byte = pm_ioread(0x8d);
@ -66,7 +66,7 @@ void set_pcie_reset()
{
u8 byte;
u16 word;
device_t sm_dev;
struct device *sm_dev;
/* set 0 to bit1 :disable GPM9 as SLP_S2 output */
/* set 0 to bit2 :disable GPM8 as AZ_RST output */
@ -94,7 +94,7 @@ void set_pcie_reset()
u8 is_dev3_present(void)
{
u16 word;
device_t sm_dev;
struct device *sm_dev;
/* access the smbus extended register */
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
@ -124,7 +124,7 @@ static void set_gpio40_gfx(void)
{
u8 byte;
u32 dword;
device_t sm_dev;
struct device *sm_dev;
/* disable the GPIO40 as CLKREQ2# function */
byte = pm_ioread(0xd3);
byte &= ~(1 << 7);
@ -179,7 +179,7 @@ static void set_thermal_config(void)
{
u8 byte;
u16 word;
device_t sm_dev;
struct device *sm_dev;
/* set ADT 7461 */
ADT7461_write_byte(0x0B, 0x50); /* Local Temperature Hight limit */
@ -229,7 +229,7 @@ static void set_thermal_config(void)
* enable the dedicated function in tilapia board.
* This function called early than rs780_enable.
*************************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard TILAPIA Enable. dev=0x%p\n", dev);

View File

@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v)
/* I/O APICs: APIC ID Version State Address */
{
device_t dev;
struct device *dev;
u32 dword;
u8 byte;

View File

@ -23,7 +23,7 @@
/*************************************************
* enable the dedicated function in torpedo board.
*************************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable. dev=0x%p\n", dev);
}

View File

@ -181,7 +181,7 @@ static void *smp_write_config_table(void *v)
/* on board NIC & Slot PCIE. */
/* PCI slots */
device_t dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
if (dev && dev->enabled) {
u8 bus_pci = dev->link_list->secondary;

View File

@ -22,7 +22,7 @@
/**********************************************
* Enable the dedicated functions of the board.
**********************************************/
static void mainboard_enable(device_t dev)
static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");

View File

@ -100,7 +100,7 @@ static void *smp_write_config_table(void *v)
/* on board NIC & Slot PCIE. */
/* PCI slots */
device_t dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
struct device *dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
if (dev && dev->enabled) {
u8 bus_pci = dev->link_list->secondary;
/* PCI_SLOT 0. */