sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sb/intel/ibexpeak: Get rid of device_t

Browse Source 
Use of device_t has been abandoned in ramstage.

Change-Id: I7d9d0a205f9a650eb87bc8f90f2a28a5c4b2891c
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/26259
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
This commit is contained in:
Elyes HAOUAS
2018-05-13 13:40:39 +02:00
committed by Patrick Georgi
parent 77f7a6e386
commit be841404cc
8 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/southbridge/intel/ibexpeak/azalia.c
View File

@ -314,7 +314,8 @@ static void azalia_init(struct device *dev)
pci_write_config8(dev, 0x43, reg8); pci_write_config8(dev, 0x43, reg8);
} }
static void azalia_set_subsystem(device_t dev, unsigned vendor, unsigned device) static void azalia_set_subsystem(struct device *dev, unsigned vendor,
unsigned device)
{ {
if (!vendor || !device) { if (!vendor || !device) {
pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID, pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,

27
src/southbridge/intel/ibexpeak/lpc.c
View File

@ -100,9 +100,9 @@ static void pch_enable_serial_irqs(struct device *dev)
* 0x80 - The PIRQ is not routed. * 0x80 - The PIRQ is not routed.
*/ */
static void pch_pirq_init(device_t dev) static void pch_pirq_init(struct device *dev)
{ {
device_t irq_dev; struct device *irq_dev;
/* Interrupt 11 is not used by legacy devices and so can always be used for /* Interrupt 11 is not used by legacy devices and so can always be used for
PCI interrupts. Full legacy IRQ routing is complicated and hard to PCI interrupts. Full legacy IRQ routing is complicated and hard to
get right. Fortunately all modern OS use MSI and so it's not that big of get right. Fortunately all modern OS use MSI and so it's not that big of
@ -137,7 +137,7 @@ static void pch_pirq_init(device_t dev)
} }
} }
static void pch_gpi_routing(device_t dev) static void pch_gpi_routing(struct device *dev)
{ {
/* Get the chip configuration */ /* Get the chip configuration */
config_t *config = dev->chip_info; config_t *config = dev->chip_info;
@ -166,7 +166,7 @@ static void pch_gpi_routing(device_t dev)
pci_write_config32(dev, GPIO_ROUT, reg32); pci_write_config32(dev, GPIO_ROUT, reg32);
} }
static void pch_power_options(device_t dev) static void pch_power_options(struct device *dev)
{ {
u8 reg8; u8 reg8;
u16 reg16, pmbase; u16 reg16, pmbase;
@ -394,7 +394,7 @@ static void enable_hpet(void)
write32((u32 *)0xfed00010, read32((u32 *)0xfed00010) | 1); write32((u32 *)0xfed00010, read32((u32 *)0xfed00010) | 1);
} }
static void enable_clock_gating(device_t dev) static void enable_clock_gating(struct device *dev)
{ {
u32 reg32; u32 reg32;
u16 reg16; u16 reg16;
@ -532,7 +532,7 @@ static void lpc_init(struct device *dev)
pch_fixups(dev); pch_fixups(dev);
} }
static void pch_lpc_read_resources(device_t dev) static void pch_lpc_read_resources(struct device *dev)
{ {
struct resource *res; struct resource *res;
config_t *config = dev->chip_info; config_t *config = dev->chip_info;
@ -593,13 +593,13 @@ static void pch_lpc_read_resources(device_t dev)
} }
} }
static void pch_lpc_enable_resources(device_t dev) static void pch_lpc_enable_resources(struct device *dev)
{ {
pch_decode_init(dev); pch_decode_init(dev);
return pci_dev_enable_resources(dev); return pci_dev_enable_resources(dev);
} }
static void pch_lpc_enable(device_t dev) static void pch_lpc_enable(struct device *dev)
{ {
/* Enable PCH Display Port */ /* Enable PCH Display Port */
RCBA16(DISPBDF) = 0x0010; RCBA16(DISPBDF) = 0x0010;
@ -608,7 +608,8 @@ static void pch_lpc_enable(device_t dev)
pch_enable(dev); pch_enable(dev);
} }
static void set_subsystem(device_t dev, unsigned vendor, unsigned device) static void set_subsystem(struct device *dev, unsigned vendor,
unsigned device)
{ {
if (!vendor || !device) { if (!vendor || !device) {
pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID, pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,
@ -619,7 +620,7 @@ static void set_subsystem(device_t dev, unsigned vendor, unsigned device)
} }
} }
static void southbridge_inject_dsdt(device_t dev) static void southbridge_inject_dsdt(struct device *dev)
{ {
global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof(*gnvs)); global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof(*gnvs));
@ -647,7 +648,7 @@ static void southbridge_inject_dsdt(device_t dev)
void acpi_fill_fadt(acpi_fadt_t *fadt) void acpi_fill_fadt(acpi_fadt_t *fadt)
{ {
device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0)); struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));
config_t *chip = dev->chip_info; config_t *chip = dev->chip_info;
u16 pmbase = pci_read_config16(dev, 0x40) & 0xfffe; u16 pmbase = pci_read_config16(dev, 0x40) & 0xfffe;
int c2_latency; int c2_latency;
@ -781,9 +782,9 @@ static const char *lpc_acpi_name(const struct device *dev)
return "LPCB"; return "LPCB";
} }
static void southbridge_fill_ssdt(device_t device) static void southbridge_fill_ssdt(struct device *device)
{ {
device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0)); struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));
config_t *chip = dev->chip_info; config_t *chip = dev->chip_info;
intel_acpi_pcie_hotplug_generator(chip->pcie_hotplug_map, 8); intel_acpi_pcie_hotplug_generator(chip->pcie_hotplug_map, 8);

16
src/southbridge/intel/ibexpeak/me.c
View File

@ -115,7 +115,8 @@ static inline void mei_write_dword_ptr(void *ptr, int offset)
} }
#ifndef __SMM__ #ifndef __SMM__
static inline void pci_read_dword_ptr(device_t dev, void *ptr, int offset) static inline void pci_read_dword_ptr(struct device *dev,void *ptr,
int offset)
{ {
u32 dword = pci_read_config32(dev, offset); u32 dword = pci_read_config32(dev, offset);
memcpy(ptr, &dword, sizeof(dword)); memcpy(ptr, &dword, sizeof(dword));
@ -425,7 +426,7 @@ void intel_me_finalize_smm(void)
#else /* !__SMM__ */ #else /* !__SMM__ */
/* Determine the path that we should take based on ME status */ /* Determine the path that we should take based on ME status */
static me_bios_path intel_me_path(device_t dev) static me_bios_path intel_me_path(struct device *dev)
{ {
me_bios_path path = ME_DISABLE_BIOS_PATH; me_bios_path path = ME_DISABLE_BIOS_PATH;
struct me_hfs hfs; struct me_hfs hfs;
@ -492,7 +493,7 @@ static me_bios_path intel_me_path(device_t dev)
} }
/* Prepare ME for MEI messages */ /* Prepare ME for MEI messages */
static int intel_mei_setup(device_t dev) static int intel_mei_setup(struct device *dev)
{ {
struct resource *res; struct resource *res;
struct mei_csr host; struct mei_csr host;
@ -522,7 +523,7 @@ static int intel_mei_setup(device_t dev)
} }
/* Read the Extend register hash of ME firmware */ /* Read the Extend register hash of ME firmware */
static int intel_me_extend_valid(device_t dev) static int intel_me_extend_valid(struct device *dev)
{ {
struct me_heres status; struct me_heres status;
u32 extend[8] = {0}; u32 extend[8] = {0};
@ -569,14 +570,14 @@ static int intel_me_extend_valid(device_t dev)
} }
/* Hide the ME virtual PCI devices */ /* Hide the ME virtual PCI devices */
static void intel_me_hide(device_t dev) static void intel_me_hide(struct device *dev)
{ {
dev->enabled = 0; dev->enabled = 0;
pch_enable(dev); pch_enable(dev);
} }
/* Check whether ME is present and do basic init */ /* Check whether ME is present and do basic init */
static void intel_me_init(device_t dev) static void intel_me_init(struct device *dev)
{ {
me_bios_path path = intel_me_path(dev); me_bios_path path = intel_me_path(dev);
@ -611,7 +612,8 @@ static void intel_me_init(device_t dev)
} }
} }
static void set_subsystem(device_t dev, unsigned vendor, unsigned device) static void set_subsystem(struct device *dev, unsigned vendor,
unsigned device)
{ {
if (!vendor || !device) { if (!vendor || !device) {
pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID, pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,

2
src/southbridge/intel/ibexpeak/pch.h
View File

@ -57,7 +57,7 @@ void intel_pch_finalize_smm(void);
#if !defined(__PRE_RAM__) #if !defined(__PRE_RAM__)
#if !defined(__SIMPLE_DEVICE__) #if !defined(__SIMPLE_DEVICE__)
#include "chip.h" #include "chip.h"
void pch_enable(device_t dev); void pch_enable(struct device *dev);
#endif #endif
int pch_silicon_revision(void); int pch_silicon_revision(void);
int pch_silicon_type(void); int pch_silicon_type(void);

7
src/southbridge/intel/ibexpeak/sata.c
View File

@ -209,7 +209,7 @@ static void sata_init(struct device *dev)
pch_iobp_update(0xea00408a, 0xfffffcff, 0x00000100); pch_iobp_update(0xea00408a, 0xfffffcff, 0x00000100);
} }
static void sata_enable(device_t dev) static void sata_enable(struct device *dev)
{ {
/* Get the chip configuration */ /* Get the chip configuration */
config_t *config = dev->chip_info; config_t *config = dev->chip_info;
@ -234,7 +234,8 @@ static void sata_enable(device_t dev)
pci_write_config16(dev, 0x90, map); pci_write_config16(dev, 0x90, map);
} }
static void sata_set_subsystem(device_t dev, unsigned vendor, unsigned device) static void sata_set_subsystem(struct device *dev, unsigned vendor,
unsigned device)
{ {
if (!vendor || !device) { if (!vendor || !device) {
pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID, pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,
@ -246,7 +247,7 @@ static void sata_set_subsystem(device_t dev, unsigned vendor, unsigned device)
} }
} }
static void sata_fill_ssdt(device_t dev) static void sata_fill_ssdt(struct device *dev)
{ {
config_t *config = dev->chip_info; config_t *config = dev->chip_info;
generate_sata_ssdt_ports("\\_SB_.PCI0.SATA", config->sata_port_map); generate_sata_ssdt_ports("\\_SB_.PCI0.SATA", config->sata_port_map);

11
src/southbridge/intel/ibexpeak/smbus.c
View File

@ -25,7 +25,7 @@
#include <southbridge/intel/common/smbus.h> #include <southbridge/intel/common/smbus.h>
#include "pch.h" #include "pch.h"
static void pch_smbus_init(device_t dev) static void pch_smbus_init(struct device *dev)
{ {
struct resource *res; struct resource *res;
u16 reg16; u16 reg16;
@ -41,7 +41,7 @@ static void pch_smbus_init(device_t dev)
outb(SMBUS_SLAVE_ADDR, res->base + SMB_RCV_SLVA); outb(SMBUS_SLAVE_ADDR, res->base + SMB_RCV_SLVA);
} }
static int lsmbus_read_byte(device_t dev, u8 address) static int lsmbus_read_byte(struct device *dev, u8 address)
{ {
u16 device; u16 device;
struct resource *res; struct resource *res;
@ -54,7 +54,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)
{ {
u16 device; u16 device;
struct resource *res; struct resource *res;
@ -72,7 +72,8 @@ static struct smbus_bus_operations lops_smbus_bus = {
.write_byte = lsmbus_write_byte, .write_byte = lsmbus_write_byte,
}; };
static void smbus_set_subsystem(device_t dev, unsigned vendor, unsigned device) static void smbus_set_subsystem(struct device *dev, unsigned vendor,
unsigned device)
{ {
if (!vendor || !device) { if (!vendor || !device) {
pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID, pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,
@ -87,7 +88,7 @@ static struct pci_operations smbus_pci_ops = {
.set_subsystem = smbus_set_subsystem, .set_subsystem = smbus_set_subsystem,
}; };
static void smbus_read_resources(device_t dev) static void smbus_read_resources(struct device *dev)
{ {
struct resource *res = new_resource(dev, PCI_BASE_ADDRESS_4); struct resource *res = new_resource(dev, PCI_BASE_ADDRESS_4);
res->base = SMBUS_IO_BASE; res->base = SMBUS_IO_BASE;

3
src/southbridge/intel/ibexpeak/thermal.c
View File

@ -44,7 +44,8 @@ static void thermal_init(struct device *dev)
printk(BIOS_DEBUG, "Thermal init done.\n"); printk(BIOS_DEBUG, "Thermal init done.\n");
} }
static void set_subsystem(device_t dev, unsigned vendor, unsigned device) static void set_subsystem(struct device *dev, unsigned vendor,
unsigned device)
{ {
if (!vendor || !device) { if (!vendor || !device) {
pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID, pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,

2
src/southbridge/intel/ibexpeak/usb_ehci.c
View File

@ -68,7 +68,7 @@ static void usb_ehci_init(struct device *dev)
printk(BIOS_DEBUG, "done.\n"); printk(BIOS_DEBUG, "done.\n");
} }
static void usb_ehci_set_subsystem(device_t dev, unsigned vendor, static void usb_ehci_set_subsystem(struct device *dev, unsigned vendor,
unsigned device) unsigned device)
{ {
u8 access_cntl; u8 access_cntl;