agp: Support 64-bit APBASE

Per the AGP 3.0 spec, APBASE is a standard PCI BAR and may be either 32
bits or 64 bits wide.  Many drivers read APBASE directly, but they only
handled 32-bit BARs.

The PCI core reads APBASE at enumeration-time.  Use pci_bus_address()
instead of reading it again in the driver.  This works correctly for both
32-bit and 64-bit BARs.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index 779f0ab845a9..5f028cb1d6e8 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -126,7 +126,6 @@ static int amd_create_gatt_table(struct agp_bridge_data *bridge)
         unsigned long __iomem *cur_gatt;
         unsigned long addr;
         int retval;
-        u32 temp;
         int i;
 
         value = A_SIZE_LVL2(agp_bridge->current_size);
@@ -149,8 +148,7 @@ static int amd_create_gatt_table(struct agp_bridge_data *bridge)
          * used to program the agp master not the cpu
          */
 
-        pci_read_config_dword(agp_bridge->dev, AGP_APBASE, &temp);
-        addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
+        addr = pci_bus_address(agp_bridge->dev, AGP_APERTURE_BAR);
         agp_bridge->gart_bus_addr = addr;
 
         /* Calculate the agp offset */