Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-11 07:39:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

agp/intel: Use CPU physical address, not bus address, for ioremap()

Browse Source 
In i810_setup(), i830_setup(), and i9xx_setup(), we use the result of
pci_bus_address() as an argument to ioremap() and to compute gtt_phys_addr.
These should use pci_resource_start() instead because we want the CPU
physical address, not the bus address.

If there were an AGP device behind a host bridge that translated addresses,
e.g., a PNP0A08 device with _TRA != 0, this would fix a bug.  I'm not aware
of any of those, but they are possible.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Bjorn Helgaas 2014-01-06 14:43:13 -07:00
parent b5e350f919
commit d357253299
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/char/agp/intel-gtt.c
View File

@ -172,7 +172,7 @@ static void i8xx_destroy_pages(struct page *page)
#define I810_GTT_ORDER 4 #define I810_GTT_ORDER 4
static int i810_setup(void) static int i810_setup(void)
{ {
u32 reg_addr; phys_addr_t reg_addr;
char *gtt_table; char *gtt_table;
/* i81x does not preallocate the gtt. It's always 64kb in size. */ /* i81x does not preallocate the gtt. It's always 64kb in size. */
@ -181,7 +181,7 @@ static int i810_setup(void)
return -ENOMEM; return -ENOMEM;
intel_private.i81x_gtt_table = gtt_table; intel_private.i81x_gtt_table = gtt_table;
reg_addr = pci_bus_address(intel_private.pcidev, I810_MMADR_BAR); reg_addr = pci_resource_start(intel_private.pcidev, I810_MMADR_BAR);
intel_private.registers = ioremap(reg_addr, KB(64)); intel_private.registers = ioremap(reg_addr, KB(64));
if (!intel_private.registers) if (!intel_private.registers)
@ -782,9 +782,9 @@ EXPORT_SYMBOL(intel_enable_gtt);
static int i830_setup(void) static int i830_setup(void)
{ {
u32 reg_addr; phys_addr_t reg_addr;
reg_addr = pci_bus_address(intel_private.pcidev, I810_MMADR_BAR); reg_addr = pci_resource_start(intel_private.pcidev, I810_MMADR_BAR);
intel_private.registers = ioremap(reg_addr, KB(64)); intel_private.registers = ioremap(reg_addr, KB(64));
if (!intel_private.registers) if (!intel_private.registers)
@ -1102,10 +1102,10 @@ static void i965_write_entry(dma_addr_t addr,
static int i9xx_setup(void) static int i9xx_setup(void)
{ {
u32 reg_addr; phys_addr_t reg_addr;
int size = KB(512); int size = KB(512);
reg_addr = pci_bus_address(intel_private.pcidev, I915_MMADR_BAR); reg_addr = pci_resource_start(intel_private.pcidev, I915_MMADR_BAR);
intel_private.registers = ioremap(reg_addr, size); intel_private.registers = ioremap(reg_addr, size);
if (!intel_private.registers) if (!intel_private.registers)
@ -1114,7 +1114,7 @@ static int i9xx_setup(void)
switch (INTEL_GTT_GEN) { switch (INTEL_GTT_GEN) {
case 3: case 3:
intel_private.gtt_phys_addr = intel_private.gtt_phys_addr =
pci_bus_address(intel_private.pcidev, I915_PTE_BAR); pci_resource_start(intel_private.pcidev, I915_PTE_BAR);
break; break;
case 5: case 5:
intel_private.gtt_phys_addr = reg_addr + MB(2); intel_private.gtt_phys_addr = reg_addr + MB(2);