GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sb/amd/sb800: Get rid of device_t 

Use of device_t has been abandoned in ramstage.

Change-Id: Ie48b42cf2999df075e23dc8ba185934b4e600157
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/26405
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
Elyes HAOUAS 2018-05-19 12:33:01 +02:00 committed by Kyösti Mälkki
parent f29a6898ec
commit 315b239c35
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/southbridge/amd/sb800/lpc.c
View File

@ -28,11 +28,11 @@
#include <arch/acpi.h> #include <arch/acpi.h>
#include "sb800.h" #include "sb800.h"
static void lpc_init(device_t dev) static void lpc_init(struct device *dev)
{ {
u8 byte; u8 byte;
u32 dword; u32 dword;
device_t sm_dev; struct device *sm_dev;
/* Enable the LPC Controller */ /* Enable the LPC Controller */
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0)); sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
@ -73,7 +73,7 @@ static void lpc_init(device_t dev)
setup_i8254(); /* Initialize i8254 timers */ setup_i8254(); /* Initialize i8254 timers */
} }
static void sb800_lpc_read_resources(device_t dev) static void sb800_lpc_read_resources(struct device *dev)
{ {
struct resource *res; struct resource *res;
@ -121,7 +121,7 @@ static void sb800_lpc_set_resources(struct device *dev)
* @param dev the device whose children's resources are to be enabled * @param dev the device whose children's resources are to be enabled
* *
*/ */
static void sb800_lpc_enable_childrens_resources(device_t dev) static void sb800_lpc_enable_childrens_resources(struct device *dev)
{ {
struct bus *link; struct bus *link;
u32 reg, reg_x; u32 reg, reg_x;
@ -133,7 +133,7 @@ static void sb800_lpc_enable_childrens_resources(device_t dev)
reg_x = pci_read_config32(dev, 0x48); reg_x = pci_read_config32(dev, 0x48);
for (link = dev->link_list; link; link = link->next) { for (link = dev->link_list; link; link = link->next) {
device_t child; struct device *child;
for (child = link->children; child; for (child = link->children; child;
child = child->sibling) { child = child->sibling) {
if (child->enabled if (child->enabled
@ -232,7 +232,7 @@ static void sb800_lpc_enable_childrens_resources(device_t dev)
pci_write_config8(dev, 0x74, wiosize); pci_write_config8(dev, 0x74, wiosize);
} }
static void sb800_lpc_enable_resources(device_t dev) static void sb800_lpc_enable_resources(struct device *dev)
{ {
pci_dev_enable_resources(dev); pci_dev_enable_resources(dev);
sb800_lpc_enable_childrens_resources(dev); sb800_lpc_enable_childrens_resources(dev);

2
src/southbridge/amd/sb800/sata.c
View File

@ -85,7 +85,7 @@ static void sata_init(struct device *dev)
struct southbridge_ati_sb800_config *conf; struct southbridge_ati_sb800_config *conf;
conf = dev->chip_info; conf = dev->chip_info;
device_t sm_dev; struct device *sm_dev;
/* SATA SMBus Disable */ /* SATA SMBus Disable */
/* sm_dev = pci_locate_device(PCI_ID(0x1002, 0x4385), 0); */ /* sm_dev = pci_locate_device(PCI_ID(0x1002, 0x4385), 0); */
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0)); sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));

14
src/southbridge/amd/sb800/sb800.c
View File

@ -24,9 +24,9 @@
#include "sb800.h" #include "sb800.h"
#include "smbus.h" #include "smbus.h"
static device_t find_sm_dev(device_t dev, u32 devfn) static struct device *find_sm_dev(struct device *dev, u32 devfn)
{ {
device_t sm_dev; struct device *sm_dev;
sm_dev = dev_find_slot(dev->bus->secondary, devfn); sm_dev = dev_find_slot(dev->bus->secondary, devfn);
if (!sm_dev) if (!sm_dev)
@ -46,7 +46,7 @@ static device_t find_sm_dev(device_t dev, u32 devfn)
return sm_dev; return sm_dev;
} }
void set_sm_enable_bits(device_t sm_dev, u32 reg_pos, u32 mask, u32 val) void set_sm_enable_bits(struct device *sm_dev, u32 reg_pos, u32 mask, u32 val)
{ {
u32 reg_old, reg; u32 reg_old, reg;
reg = reg_old = pci_read_config32(sm_dev, reg_pos); reg = reg_old = pci_read_config32(sm_dev, reg_pos);
@ -140,7 +140,7 @@ u16 rx_convert_table[] = {
/* PCIe General Purpose Ports */ /* PCIe General Purpose Ports */
/* v:1814, d:3090. cp421A */ /* v:1814, d:3090. cp421A */
static void set_sb800_gpp(device_t dev) static void set_sb800_gpp(struct device *dev)
{ {
struct southbridge_amd_sb800_config *conf; struct southbridge_amd_sb800_config *conf;
u32 imp_rb, lc_status; u32 imp_rb, lc_status;
@ -224,10 +224,10 @@ static void set_sb800_gpp(device_t dev)
printk(BIOS_DEBUG, "lc_status=%x\n", lc_status); printk(BIOS_DEBUG, "lc_status=%x\n", lc_status);
} }
void sb800_enable(device_t dev) void sb800_enable(struct device *dev)
{ {
device_t sm_dev = 0; struct device *sm_dev = NULL;
device_t bus_dev = 0; struct device *bus_dev = NULL;
int index = -1; int index = -1;
u32 deviceid; u32 deviceid;
u32 vendorid; u32 vendorid;

4
src/southbridge/amd/sb800/sb800.h
View File

@ -44,7 +44,7 @@ void pm2_iowrite(u8 reg, u8 value);
u8 pm2_ioread(u8 reg); u8 pm2_ioread(u8 reg);
#ifndef __SIMPLE_DEVICE__ #ifndef __SIMPLE_DEVICE__
void set_sm_enable_bits(device_t sm_dev, u32 reg_pos, u32 mask, u32 val); void set_sm_enable_bits(struct device *sm_dev, u32 reg_pos, u32 mask, u32 val);
#endif #endif
#define REV_SB800_A11 0x11 #define REV_SB800_A11 0x11
@ -60,7 +60,7 @@ int s3_save_nvram_early(u32 dword, int size, int nvram_pos);
int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos); int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos);
#else #else
void sb800_enable(device_t dev); void sb800_enable(struct device *dev);
#endif #endif
#endif /* SB800_H */ #endif /* SB800_H */

12
src/southbridge/amd/sb800/sm.c
View File

@ -76,7 +76,7 @@
* SB800 enables SATA by default in SMBUS Control. * SB800 enables SATA by default in SMBUS Control.
*/ */
static void sm_init(device_t dev) static void sm_init(struct device *dev)
{ {
u8 byte; u8 byte;
@ -189,7 +189,7 @@ static void sm_init(device_t dev)
abcfg_reg(0x98, 0xFFFFFFFF, 0X01034700); abcfg_reg(0x98, 0xFFFFFFFF, 0X01034700);
} }
static int lsmbus_recv_byte(device_t dev) static int lsmbus_recv_byte(struct device *dev)
{ {
u32 device; u32 device;
struct resource *res; struct resource *res;
@ -203,7 +203,7 @@ static int lsmbus_recv_byte(device_t dev)
return do_smbus_recv_byte(res->base, device); return do_smbus_recv_byte(res->base, device);
} }
static int lsmbus_send_byte(device_t dev, u8 val) static int lsmbus_send_byte(struct device *dev, u8 val)
{ {
u32 device; u32 device;
struct resource *res; struct resource *res;
@ -217,7 +217,7 @@ static int lsmbus_send_byte(device_t dev, u8 val)
return do_smbus_send_byte(res->base, device, val); return do_smbus_send_byte(res->base, device, val);
} }
static int lsmbus_read_byte(device_t dev, u8 address) static int lsmbus_read_byte(struct device *dev, u8 address)
{ {
u32 device; u32 device;
struct resource *res; struct resource *res;
@ -231,7 +231,7 @@ static int lsmbus_read_byte(device_t dev, u8 address)
return do_smbus_read_byte(res->base, device, address); return do_smbus_read_byte(res->base, device, address);
} }
static int lsmbus_write_byte(device_t dev, u8 address, u8 val) static int lsmbus_write_byte(struct device *dev, u8 address, u8 val)
{ {
u32 device; u32 device;
struct resource *res; struct resource *res;
@ -251,7 +251,7 @@ static struct smbus_bus_operations lops_smbus_bus = {
.write_byte = lsmbus_write_byte, .write_byte = lsmbus_write_byte,
}; };
static void sb800_sm_read_resources(device_t dev) static void sb800_sm_read_resources(struct device *dev)
{ {
struct resource *res; struct resource *res;
u8 byte; u8 byte;

2
src/southbridge/amd/sb800/usb.c
View File

@ -55,7 +55,7 @@ static void usb_init2(struct device *dev)
{ {
u32 dword; u32 dword;
void *usb2_bar0; void *usb2_bar0;
device_t sm_dev; struct device *sm_dev;
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0)); sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
//rev = get_sb800_revision(sm_dev); //rev = get_sb800_revision(sm_dev);