Aaron Durbin (adurbin@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4902
-gerrit
commit e45421b66ede1c5a8b7474f08d040ca4e96c53df Author: Aaron Durbin adurbin@chromium.org Date: Fri Oct 25 09:12:45 2013 -0500
baytrail: remove gfx read_resources() work around
Before the special PUNIT settings the GFX pci device had the same device id as the transaction router. This required a special case in the transaction router's driver to do the proper thing for read_resources(). However, that requirement is no longer needed as the PUNIT special message is now being done. Therefore, remove the work around.
BUG=None BRANCH=None TEST=Built and looked at resource allocation logs to confirm work around is no longer needed.
Change-Id: I90b155cb5560ca3291f146c2f586456e5529f6b2 Signed-off-by: Aaron Durbin adurbin@chromium.org Reviewed-on: https://chromium-review.googlesource.com/174652 Reviewed-by: Duncan Laurie dlaurie@chromium.org --- src/soc/intel/baytrail/northcluster.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/src/soc/intel/baytrail/northcluster.c b/src/soc/intel/baytrail/northcluster.c index 0616e5d..714d532 100644 --- a/src/soc/intel/baytrail/northcluster.c +++ b/src/soc/intel/baytrail/northcluster.c @@ -64,7 +64,7 @@ */ #define RES_IN_KiB(r) ((r) >> 10)
-static void soc_trans_router_read_resources(device_t dev) +static void nc_read_resources(device_t dev) { unsigned long mmconf; unsigned long bmbound; @@ -119,18 +119,6 @@ static void soc_trans_router_read_resources(device_t dev) bmbound_hi - four_gig_kib); }
-static void nc_read_resources(device_t dev) -{ - /* For some reason the graphics pci device (0, 2, 0) and the SoC - * transaction router are coming up with the same device id. */ - if (dev_find_slot(0, PCI_DEVFN(SOC_DEV, SOC_FUNC)) == dev) - return soc_trans_router_read_resources(dev); - else - /* Read standard PCI resources. */ - pci_dev_read_resources(dev); - -} - static struct device_operations nc_ops = { .read_resources = nc_read_resources, .set_resources = NULL,