summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2014-01-02 10:10:14 +0100
committerVladimir Serbinenko <phcoder@gmail.com>2014-01-23 19:39:45 +0100
commitbd89699516a26f698b967167f72d6bf2d84280be (patch)
tree637028699ca43db0a4387ac7862fd4c3097896f1
parent517406aac7d9c7efb12f5e419213cd1b2d8f01a5 (diff)
downloadcoreboot-bd89699516a26f698b967167f72d6bf2d84280be.tar.xz
nehalem: Simplify acpi.c by using __SIMPLE_DEVICE__
Change-Id: I93351a2716cd58c2006400cecca1390b1704e94b Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/4603 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
-rw-r--r--src/northbridge/intel/nehalem/acpi.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/northbridge/intel/nehalem/acpi.c b/src/northbridge/intel/nehalem/acpi.c
index df6cc1a48f..077cedaa95 100644
--- a/src/northbridge/intel/nehalem/acpi.c
+++ b/src/northbridge/intel/nehalem/acpi.c
@@ -21,6 +21,8 @@
* MA 02110-1301 USA
*/
+#define __SIMPLE_DEVICE__
+
#include <types.h>
#include <string.h>
#include <console/console.h>
@@ -38,10 +40,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
u32 pciexbar_reg;
int max_buses;
- /* Quickpath bus is not in standard coreboot device tree,
- so read register directly. */
- pciexbar_reg = read32(DEFAULT_PCIEXBAR
- | (QUICKPATH_BUS << 20) | 0x1050);
+ pciexbar_reg = pci_read_config32(PCI_DEV(QUICKPATH_BUS, 0, 1), 0x50);
// MMCFG not supported or not enabled.
if (!(pciexbar_reg & (1 << 0)))
@@ -173,7 +172,7 @@ int init_igd_opregion(igd_opregion_t * opregion)
/* TODO This needs to happen in S3 resume, too.
* Maybe it should move to the finalize handler
*/
- igd = dev_find_slot(0, PCI_DEVFN(0x2, 0));
+ igd = PCI_DEV(0, 0x2, 0);
pci_write_config32(igd, ASLS, (u32) opregion);
reg16 = pci_read_config16(igd, SWSCI);