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

nb/intel/sandybridge: Get rid of device_t

Browse Source 
Use of `device_t` has been abandoned in ramstage.

Change-Id: I585aa48b99f4ef63905cab5d6d1502bfed0e6e42
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/23668
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Elyes HAOUAS
2018-02-09 08:21:40 +01:00
committed by Patrick Georgi
parent 706aabcd4c
commit ab8743c02e
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/northbridge/intel/sandybridge/gma.c
View File

@@ -662,7 +662,7 @@ static void gma_func0_init(struct device *dev)
intel_gma_restore_opregion(); intel_gma_restore_opregion();
} }
static void gma_set_subsystem(device_t dev, unsigned vendor, unsigned device) static void gma_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,
@@ -676,7 +676,7 @@ static void gma_set_subsystem(device_t dev, unsigned vendor, unsigned device)
const struct i915_gpu_controller_info * const struct i915_gpu_controller_info *
intel_gma_get_controller_info(void) intel_gma_get_controller_info(void)
{ {
device_t dev = dev_find_slot(0, PCI_DEVFN(0x2,0)); struct device *dev = dev_find_slot(0, PCI_DEVFN(0x2,0));
if (!dev) { if (!dev) {
return NULL; return NULL;
} }
@@ -684,7 +684,7 @@ intel_gma_get_controller_info(void)
return &chip->gfx; return &chip->gfx;
} }
static void gma_ssdt(device_t device) static void gma_ssdt(struct device *device)
{ {
const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info(); const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();
if (!gfx) { if (!gfx) {
@@ -729,7 +729,7 @@ static const char *gma_acpi_name(const struct device *dev)
static void gma_func0_disable(struct device *dev) static void gma_func0_disable(struct device *dev)
{ {
u16 reg16; u16 reg16;
device_t dev_host = dev_find_slot(0, PCI_DEVFN(0,0)); struct device *dev_host = dev_find_slot(0, PCI_DEVFN(0,0));
reg16 = pci_read_config16(dev_host, GGC); reg16 = pci_read_config16(dev_host, GGC);
reg16 |= (1 << 1); /* disable VGA decode */ reg16 |= (1 << 1); /* disable VGA decode */

16
src/northbridge/intel/sandybridge/northbridge.c
View File

@@ -62,7 +62,7 @@ static const int legacy_hole_size_k = 384;
static int get_pcie_bar(u32 *base) static int get_pcie_bar(u32 *base)
{ {
device_t dev; struct device *dev;
u32 pciexbar_reg; u32 pciexbar_reg;
*base = 0; *base = 0;
@@ -120,7 +120,7 @@ static void add_fixed_resources(struct device *dev, int index)
} }
} }
static void pci_domain_set_resources(device_t dev) static void pci_domain_set_resources(struct device *dev)
{ {
uint64_t tom, me_base, touud; uint64_t tom, me_base, touud;
uint32_t tseg_base, uma_size, tolud; uint32_t tseg_base, uma_size, tolud;
@@ -273,7 +273,7 @@ static struct device_operations pci_domain_ops = {
.acpi_name = northbridge_acpi_name, .acpi_name = northbridge_acpi_name,
}; };
static void mc_read_resources(device_t dev) static void mc_read_resources(struct device *dev)
{ {
u32 pcie_config_base; u32 pcie_config_base;
int buses; int buses;
@@ -287,7 +287,7 @@ static void mc_read_resources(device_t dev)
} }
} }
static void intel_set_subsystem(device_t dev, unsigned vendor, unsigned device) static void intel_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,
@@ -457,7 +457,7 @@ static void northbridge_init(struct device *dev)
MCHBAR32(0x5500) = 0x00100001; MCHBAR32(0x5500) = 0x00100001;
} }
static u32 northbridge_get_base_reg(device_t dev, int reg) static u32 northbridge_get_base_reg(struct device *dev, int reg)
{ {
u32 value; u32 value;
@@ -469,7 +469,7 @@ static u32 northbridge_get_base_reg(device_t dev, int reg)
u32 northbridge_get_tseg_base(void) u32 northbridge_get_tseg_base(void)
{ {
const device_t dev = dev_find_slot(0, PCI_DEVFN(0, 0)); struct device *dev = dev_find_slot(0, PCI_DEVFN(0, 0));
return northbridge_get_base_reg(dev, TSEG); return northbridge_get_base_reg(dev, TSEG);
} }
@@ -523,7 +523,7 @@ static const struct pci_driver mc_driver_158 __pci_driver = {
.device = 0x0158, /* Ivy bridge */ .device = 0x0158, /* Ivy bridge */
}; };
static void cpu_bus_init(device_t dev) static void cpu_bus_init(struct device *dev)
{ {
initialize_cpus(dev->link_list); initialize_cpus(dev->link_list);
} }
@@ -536,7 +536,7 @@ static struct device_operations cpu_bus_ops = {
.scan_bus = 0, .scan_bus = 0,
}; };
static void enable_dev(device_t dev) static void enable_dev(struct device *dev)
{ {
/* Set the operations if it is a special bus type */ /* Set the operations if it is a special bus type */
if (dev->path.type == DEVICE_PATH_DOMAIN) { if (dev->path.type == DEVICE_PATH_DOMAIN) {

2
src/northbridge/intel/sandybridge/sandybridge.h
View File

@@ -230,7 +230,7 @@ void perform_raminit(int s3resume);
#include <device/device.h> #include <device/device.h>
struct acpi_rsdp; struct acpi_rsdp;
unsigned long northbridge_write_acpi_tables(device_t device, unsigned long start, struct acpi_rsdp *rsdp); unsigned long northbridge_write_acpi_tables(struct device *device, unsigned long start, struct acpi_rsdp *rsdp);
#endif #endif
#endif #endif