bk://linux-dj.bkbits.net/agpgart
davej@redhat.com|ChangeSet|20040914235450|15212 davej
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/09/15 12:18:56-07:00 akpm@bix.(none)
# Merge bk://linux-dj.bkbits.net/agpgart
# into bix.(none):/usr/src/bk-agpgart
#
# drivers/char/agp/intel-mch-agp.c
# 2004/09/15 12:18:52-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/char/agp/intel-agp.c
# 2004/09/15 12:18:52-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/09/15 00:54:50+01:00 davej@redhat.com
# [AGPGART] Fix up sparse iomem warnings in Serverworks driver.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/sworks-agp.c
# 2004/09/15 00:54:16+01:00 davej@redhat.com +17 -26
# [AGPGART] Fix up sparse iomem warnings in Serverworks driver.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# ChangeSet
# 2004/09/15 00:52:14+01:00 davej@redhat.com
# [AGPGART] Fix up sparse iomem warnings in NVidia driver.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/nvidia-agp.c
# 2004/09/15 00:51:20+01:00 davej@redhat.com +11 -14
# [AGPGART] Fix up sparse iomem warnings in NVidia driver.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# ChangeSet
# 2004/09/15 00:48:28+01:00 davej@redhat.com
# [AGPGART] Fix sparse iomem warnings in Intel MCH driver.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/intel-mch-agp.c
# 2004/09/15 00:47:50+01:00 davej@redhat.com +3 -3
# [AGPGART] Fix sparse iomem warnings in Intel MCH driver.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# ChangeSet
# 2004/09/15 00:44:58+01:00 davej@redhat.com
# [AGPGART] Fix up sparse iomem warning in Intel driver.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/intel-agp.c
# 2004/09/15 00:43:57+01:00 davej@redhat.com +1 -1
# [AGPGART] Fix up sparse iomem warning in Intel driver.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# ChangeSet
# 2004/09/15 00:35:14+01:00 davej@redhat.com
# [AGPGART] Fix up sparse iomem warnings in generic agp code.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/generic.c
# 2004/09/15 00:34:01+01:00 davej@redhat.com +6 -10
# [AGPGART] Fix up sparse iomem warnings in generic agp code.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# ChangeSet
# 2004/09/15 00:28:10+01:00 davej@redhat.com
# [AGPGART] Fix up sparse iomem warnings in ati driver.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/ati-agp.c
# 2004/09/15 00:26:57+01:00 davej@redhat.com +14 -17
# [AGPGART] Fix up sparse iomem warnings in ati driver.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# ChangeSet
# 2004/09/15 00:22:47+01:00 davej@redhat.com
# [AGPGART] Fix up sparse iomem warnings of amd64 driver.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/amd64-agp.c
# 2004/09/15 00:22:03+01:00 davej@redhat.com +2 -2
# [AGPGART] Fix up sparse iomem warnings of amd64 driver.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# ChangeSet
# 2004/09/15 00:05:26+01:00 davej@redhat.com
# [AGPGART] Fix up sparse iomem warnings for amd-k7 driver.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/amd-k7-agp.c
# 2004/09/15 00:03:52+01:00 davej@redhat.com +14 -17
# [AGPGART] Fix up sparse iomem warnings for amd-k7 driver.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# ChangeSet
# 2004/09/11 14:55:59-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart
#
# drivers/char/agp/intel-agp.c
# 2004/09/11 14:55:52-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/28 16:13:58-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart
#
# include/linux/pci_ids.h
# 2004/08/28 16:13:54-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/27 14:50:58-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart
#
# include/linux/pci_ids.h
# 2004/08/27 14:50:54-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/27 13:06:31-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart
#
# include/linux/pci_ids.h
# 2004/08/27 13:06:28-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/24 18:04:28+01:00 davej@redhat.com
# [AGPGART] via-agp.c resume/suspend support
#
# From: Arkadiusz Miskiewicz <arekm@pld-linux.org>
#
# With this patch I'm able to suspend to disk (well, works even without
# patch) and resume (without it my laptop hangs (even sysrq is not working)
# while resuming).
#
# Signed-off-by: Arkadiusz Miskiewicz <arekm@pld-linux.org>
# Signed-off-by: Andrew Morton <akpm@osdl.org>
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/via-agp.c
# 2004/08/24 18:04:15+01:00 davej@redhat.com +31 -0
# [AGPGART] via-agp.c resume/suspend support
#
# From: Arkadiusz Miskiewicz <arekm@pld-linux.org>
#
# With this patch I'm able to suspend to disk (well, works even without
# patch) and resume (without it my laptop hangs (even sysrq is not working)
# while resuming).
#
# Signed-off-by: Arkadiusz Miskiewicz <arekm@pld-linux.org>
# Signed-off-by: Andrew Morton <akpm@osdl.org>
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# ChangeSet
# 2004/08/23 21:23:08-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart
#
# ChangeSet
# 2004/08/23 16:27:14-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart
#
# drivers/char/agp/intel-mch-agp.c
# 2004/08/23 21:23:03-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/char/agp/intel-agp.c
# 2004/08/23 21:23:03-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# include/linux/pci_ids.h
# 2004/08/23 16:27:09-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/23 13:42:56-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart
#
# include/linux/pci_ids.h
# 2004/08/23 13:42:52-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/22 21:03:23-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart
#
# include/linux/pci_ids.h
# 2004/08/22 21:03:19-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/05 12:39:41-07:00 akpm@bix.(none)
# Merge bk://linux-dj.bkbits.net/agpgart
# into bix.(none):/usr/src/bk-agpgart
#
# drivers/char/agp/intel-agp.c
# 2004/08/05 12:39:37-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/04 02:37:29-07:00 akpm@bix.(none)
# Merge bk://linux-dj.bkbits.net/agpgart
# into bix.(none):/usr/src/bk-agpgart
#
# drivers/char/agp/intel-mch-agp.c
# 2004/08/04 02:37:25-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/char/agp/intel-agp.c
# 2004/08/04 02:37:25-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/07/31 23:52:37-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart
#
# include/linux/pci_ids.h
# 2004/07/31 23:52:34-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/07/30 22:16:17-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart
#
# include/linux/pci_ids.h
# 2004/07/30 22:16:14-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/char/agp/intel-agp.c
# 2004/07/30 22:16:14-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/07/27 13:18:37-07:00 akpm@bix.(none)
# Merge bk://linux-dj.bkbits.net/agpgart
# into bix.(none):/usr/src/bk-agpgart
#
# include/linux/pci_ids.h
# 2004/07/27 13:18:32-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/char/agp/intel-agp.c
# 2004/07/27 13:18:32-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
diff -Nru a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
--- a/drivers/char/agp/amd-k7-agp.c 2004-09-26 10:54:24 -07:00
+++ b/drivers/char/agp/amd-k7-agp.c 2004-09-26 10:54:24 -07:00
@@ -24,11 +24,11 @@
struct amd_page_map {
unsigned long *real;
- unsigned long *remapped;
+ unsigned long __iomem *remapped;
};
static struct _amd_irongate_private {
- volatile u8 *registers;
+ volatile u8 __iomem *registers;
struct amd_page_map **gatt_pages;
int num_tables;
} amd_irongate_private;
@@ -54,7 +54,7 @@
global_cache_flush();
for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++)
- page_map->remapped[i] = agp_bridge->scratch_page;
+ writel(agp_bridge->scratch_page, page_map->remapped+i);
return 0;
}
@@ -151,7 +151,7 @@
}
agp_bridge->gatt_table_real = (u32 *)page_dir.real;
- agp_bridge->gatt_table = (u32 *)page_dir.remapped;
+ agp_bridge->gatt_table = (u32 __iomem *)page_dir.remapped;
agp_bridge->gatt_bus_addr = virt_to_phys(page_dir.real);
/* Get the address for the gart region.
@@ -165,9 +165,8 @@
/* Calculate the agp offset */
for (i = 0; i < value->num_entries / 1024; i++, addr += 0x00400000) {
- page_dir.remapped[GET_PAGE_DIR_OFF(addr)] =
- virt_to_phys(amd_irongate_private.gatt_pages[i]->real);
- page_dir.remapped[GET_PAGE_DIR_OFF(addr)] |= 0x00000001;
+ writel(virt_to_phys(amd_irongate_private.gatt_pages[i]->real) | 1,
+ page_dir.remapped+GET_PAGE_DIR_OFF(addr));
}
return 0;
@@ -178,7 +177,7 @@
struct amd_page_map page_dir;
page_dir.real = (unsigned long *)agp_bridge->gatt_table_real;
- page_dir.remapped = (unsigned long *)agp_bridge->gatt_table;
+ page_dir.remapped = (unsigned long __iomem *)agp_bridge->gatt_table;
amd_free_gatt_pages();
amd_free_page_map(&page_dir);
@@ -218,7 +217,7 @@
/* Get the memory mapped registers */
pci_read_config_dword(agp_bridge->dev, AMD_MMBASE, &temp);
temp = (temp & PCI_BASE_ADDRESS_MEM_MASK);
- amd_irongate_private.registers = (volatile u8 *) ioremap(temp, 4096);
+ amd_irongate_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);
/* Write out the address of the gatt table */
OUTREG32(amd_irongate_private.registers, AMD_ATTBASE,
@@ -263,7 +262,7 @@
pci_read_config_dword(agp_bridge->dev, AMD_APSIZE, &temp);
temp = ((temp & ~(0x0000000f)) | previous_size->size_value);
pci_write_config_dword(agp_bridge->dev, AMD_APSIZE, temp);
- iounmap((void *) amd_irongate_private.registers);
+ iounmap((void __iomem *) amd_irongate_private.registers);
}
/*
@@ -282,7 +281,7 @@
static int amd_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
{
int i, j, num_entries;
- unsigned long *cur_gatt;
+ unsigned long __iomem *cur_gatt;
unsigned long addr;
num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries;
@@ -297,7 +296,7 @@
while (j < (pg_start + mem->page_count)) {
addr = (j * PAGE_SIZE) + agp_bridge->gart_bus_addr;
cur_gatt = GET_GATT(addr);
- if (!PGE_EMPTY(agp_bridge, cur_gatt[GET_GATT_OFF(addr)]))
+ if (!PGE_EMPTY(agp_bridge, readl(cur_gatt+GET_GATT_OFF(addr))))
return -EBUSY;
j++;
}
@@ -310,8 +309,7 @@
for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
addr = (j * PAGE_SIZE) + agp_bridge->gart_bus_addr;
cur_gatt = GET_GATT(addr);
- cur_gatt[GET_GATT_OFF(addr)] =
- agp_generic_mask_memory(mem->memory[i], mem->type);
+ writel(agp_generic_mask_memory(mem->memory[i], mem->type), cur_gatt+GET_GATT_OFF(addr));
}
amd_irongate_tlbflush(mem);
return 0;
@@ -320,7 +318,7 @@
static int amd_remove_memory(struct agp_memory *mem, off_t pg_start, int type)
{
int i;
- unsigned long *cur_gatt;
+ unsigned long __iomem *cur_gatt;
unsigned long addr;
if (type != 0 || mem->type != 0)
@@ -329,8 +327,7 @@
for (i = pg_start; i < (mem->page_count + pg_start); i++) {
addr = (i * PAGE_SIZE) + agp_bridge->gart_bus_addr;
cur_gatt = GET_GATT(addr);
- cur_gatt[GET_GATT_OFF(addr)] =
- (unsigned long) agp_bridge->scratch_page;
+ writel(agp_bridge->scratch_page, cur_gatt+GET_GATT_OFF(addr));
}
amd_irongate_tlbflush(mem);
diff -Nru a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
--- a/drivers/char/agp/amd64-agp.c 2004-09-26 10:54:24 -07:00
+++ b/drivers/char/agp/amd64-agp.c 2004-09-26 10:54:24 -07:00
@@ -90,7 +90,7 @@
/* gatt table should be empty. */
while (j < (pg_start + mem->page_count)) {
- if (!PGE_EMPTY(agp_bridge, agp_bridge->gatt_table[j]))
+ if (!PGE_EMPTY(agp_bridge, readl(agp_bridge->gatt_table+j)))
return -EBUSY;
j++;
}
@@ -108,7 +108,7 @@
pte |=(tmp & 0x00000000fffff000ULL);
pte |= GPTE_VALID | GPTE_COHERENT;
- agp_bridge->gatt_table[j] = pte;
+ writel(pte, agp_bridge->gatt_table+j);
}
amd64_tlbflush(mem);
return 0;
diff -Nru a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
--- a/drivers/char/agp/ati-agp.c 2004-09-26 10:54:24 -07:00
+++ b/drivers/char/agp/ati-agp.c 2004-09-26 10:54:24 -07:00
@@ -42,11 +42,11 @@
typedef struct _ati_page_map {
unsigned long *real;
- unsigned long *remapped;
+ unsigned long __iomem *remapped;
} ati_page_map;
static struct _ati_generic_private {
- volatile u8 *registers;
+ volatile u8 __iomem *registers;
ati_page_map **gatt_pages;
int num_tables;
} ati_generic_private;
@@ -76,7 +76,7 @@
global_cache_flush();
for(i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++)
- page_map->remapped[i] = agp_bridge->scratch_page;
+ writel(agp_bridge->scratch_page, page_map->remapped+i);
return 0;
}
@@ -206,7 +206,7 @@
temp = ((temp & ~(0x0000000f)) | previous_size->size_value);
pci_write_config_dword(agp_bridge->dev, ATI_RS300_APSIZE, temp);
}
- iounmap((void *) ati_generic_private.registers);
+ iounmap((volatile u8 __iomem *)ati_generic_private.registers);
}
@@ -217,7 +217,7 @@
/* Get the memory mapped registers */
pci_read_config_dword(agp_bridge->dev, ATI_GART_MMBASE_ADDR, &temp);
temp = (temp & 0xfffff000);
- ati_generic_private.registers = (volatile u8 *) ioremap(temp, 4096);
+ ati_generic_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);
if (is_r200())
pci_write_config_dword(agp_bridge->dev, ATI_RS100_IG_AGPMODE, 0x20000);
@@ -261,7 +261,7 @@
off_t pg_start, int type)
{
int i, j, num_entries;
- unsigned long *cur_gatt;
+ unsigned long __iomem *cur_gatt;
unsigned long addr;
num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries;
@@ -276,7 +276,7 @@
while (j < (pg_start + mem->page_count)) {
addr = (j * PAGE_SIZE) + agp_bridge->gart_bus_addr;
cur_gatt = GET_GATT(addr);
- if (!PGE_EMPTY(agp_bridge,cur_gatt[GET_GATT_OFF(addr)]))
+ if (!PGE_EMPTY(agp_bridge,readl(cur_gatt+GET_GATT_OFF(addr))))
return -EBUSY;
j++;
}
@@ -290,8 +290,7 @@
for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
addr = (j * PAGE_SIZE) + agp_bridge->gart_bus_addr;
cur_gatt = GET_GATT(addr);
- cur_gatt[GET_GATT_OFF(addr)] =
- agp_bridge->driver->mask_memory(mem->memory[i], mem->type);
+ writel(agp_bridge->driver->mask_memory(mem->memory[i], mem->type), cur_gatt+GET_GATT_OFF(addr));
}
agp_bridge->driver->tlb_flush(mem);
return 0;
@@ -301,7 +300,7 @@
int type)
{
int i;
- unsigned long *cur_gatt;
+ unsigned long __iomem *cur_gatt;
unsigned long addr;
if (type != 0 || mem->type != 0) {
@@ -310,8 +309,7 @@
for (i = pg_start; i < (mem->page_count + pg_start); i++) {
addr = (i * PAGE_SIZE) + agp_bridge->gart_bus_addr;
cur_gatt = GET_GATT(addr);
- cur_gatt[GET_GATT_OFF(addr)] =
- (unsigned long) agp_bridge->scratch_page;
+ writel(agp_bridge->scratch_page, cur_gatt+GET_GATT_OFF(addr));
}
agp_bridge->driver->tlb_flush(mem);
@@ -340,7 +338,7 @@
}
agp_bridge->gatt_table_real = (u32 *)page_dir.real;
- agp_bridge->gatt_table = (u32 *)page_dir.remapped;
+ agp_bridge->gatt_table = (u32 __iomem *) page_dir.remapped;
agp_bridge->gatt_bus_addr = virt_to_bus(page_dir.real);
/* Write out the size register */
@@ -371,9 +369,8 @@
/* Calculate the agp offset */
for(i = 0; i < value->num_entries / 1024; i++, addr += 0x00400000) {
- page_dir.remapped[GET_PAGE_DIR_OFF(addr)] =
- virt_to_bus(ati_generic_private.gatt_pages[i]->real);
- page_dir.remapped[GET_PAGE_DIR_OFF(addr)] |= 0x00000001;
+ writel(virt_to_bus(ati_generic_private.gatt_pages[i]->real) | 1,
+ page_dir.remapped+GET_PAGE_DIR_OFF(addr));
}
return 0;
@@ -384,7 +381,7 @@
ati_page_map page_dir;
page_dir.real = (unsigned long *)agp_bridge->gatt_table_real;
- page_dir.remapped = (unsigned long *)agp_bridge->gatt_table;
+ page_dir.remapped = (unsigned long __iomem *)agp_bridge->gatt_table;
ati_free_gatt_pages();
ati_free_page_map(&page_dir);
diff -Nru a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
--- a/drivers/char/agp/generic.c 2004-09-26 10:54:24 -07:00
+++ b/drivers/char/agp/generic.c 2004-09-26 10:54:24 -07:00
@@ -35,6 +35,7 @@
#include <linux/pm.h>
#include <linux/agp_backend.h>
#include <linux/vmalloc.h>
+#include <asm/io.h>
#include "agp.h"
__u32 *agp_gatt_table;
@@ -737,7 +738,7 @@
/* AK: bogus, should encode addresses > 4GB */
for (i = 0; i < num_entries; i++)
- agp_bridge->gatt_table[i] = (unsigned long) agp_bridge->scratch_page;
+ writel(agp_bridge->scratch_page, agp_bridge->gatt_table+i);
return 0;
}
@@ -843,9 +844,8 @@
j = pg_start;
while (j < (pg_start + mem->page_count)) {
- if (!PGE_EMPTY(agp_bridge, agp_bridge->gatt_table[j])) {
+ if (!PGE_EMPTY(agp_bridge, readl(agp_bridge->gatt_table+j)))
return -EBUSY;
- }
j++;
}
@@ -855,9 +855,7 @@
}
for (i = 0, j = pg_start; i < mem->page_count; i++, j++)
- agp_bridge->gatt_table[j] =
- agp_bridge->driver->mask_memory(
- mem->memory[i], mem->type);
+ writel(agp_bridge->driver->mask_memory(mem->memory[i], mem->type), agp_bridge->gatt_table+j);
agp_bridge->driver->tlb_flush(mem);
return 0;
@@ -875,10 +873,8 @@
}
/* AK: bogus, should encode addresses > 4GB */
- for (i = pg_start; i < (mem->page_count + pg_start); i++) {
- agp_bridge->gatt_table[i] =
- (unsigned long) agp_bridge->scratch_page;
- }
+ for (i = pg_start; i < (mem->page_count + pg_start); i++)
+ writel(agp_bridge->scratch_page, agp_bridge->gatt_table+i);
agp_bridge->driver->tlb_flush(mem);
return 0;
diff -Nru a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
--- a/drivers/char/agp/intel-agp.c 2004-09-26 10:54:24 -07:00
+++ b/drivers/char/agp/intel-agp.c 2004-09-26 10:54:24 -07:00
@@ -202,7 +202,7 @@
return -EINVAL;
}
for (j = pg_start; j < (pg_start + mem->page_count); j++) {
- if (!PGE_EMPTY(agp_bridge, agp_bridge->gatt_table[j]))
+ if (!PGE_EMPTY(agp_bridge, readl(agp_bridge->gatt_table+j)))
return -EBUSY;
}
diff -Nru a/drivers/char/agp/intel-mch-agp.c b/drivers/char/agp/intel-mch-agp.c
--- a/drivers/char/agp/intel-mch-agp.c 2004-09-26 10:54:24 -07:00
+++ b/drivers/char/agp/intel-mch-agp.c 2004-09-26 10:54:24 -07:00
@@ -84,7 +84,7 @@
static struct _intel_i830_private {
struct pci_dev *i830_dev; /* device one */
- volatile u8 *registers;
+ volatile u8 __iomem *registers;
int gtt_entries;
} intel_i830_private;
@@ -172,7 +172,7 @@
pci_read_config_dword(intel_i830_private.i830_dev,I810_MMADDR,&temp);
temp &= 0xfff80000;
- intel_i830_private.registers = (volatile u8 *) ioremap(temp,128 * 4096);
+ intel_i830_private.registers = (volatile u8 __iomem*) ioremap(temp,128 * 4096);
if (!intel_i830_private.registers)
return (-ENOMEM);
@@ -255,7 +255,7 @@
static void intel_i830_cleanup(void)
{
- iounmap((void *) intel_i830_private.registers);
+ iounmap((void __iomem *) intel_i830_private.registers);
}
static int intel_i830_insert_entries(struct agp_memory *mem,off_t pg_start,
diff -Nru a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
--- a/drivers/char/agp/nvidia-agp.c 2004-09-26 10:54:24 -07:00
+++ b/drivers/char/agp/nvidia-agp.c 2004-09-26 10:54:24 -07:00
@@ -28,7 +28,7 @@
struct pci_dev *dev_1;
struct pci_dev *dev_2;
struct pci_dev *dev_3;
- volatile u32 *aperture;
+ volatile u32 __iomem *aperture;
int num_active_entries;
off_t pg_offset;
u32 wbc_mask;
@@ -154,7 +154,7 @@
/* map aperture */
nvidia_private.aperture =
- (volatile u32 *) ioremap(apbase, 33 * PAGE_SIZE);
+ (volatile u32 __iomem *) ioremap(apbase, 33 * PAGE_SIZE);
return 0;
}
@@ -173,7 +173,7 @@
pci_write_config_dword(nvidia_private.dev_2, NVIDIA_2_GARTCTRL, temp & ~(0x11));
/* unmap aperture */
- iounmap((void *) nvidia_private.aperture);
+ iounmap((void __iomem *) nvidia_private.aperture);
/* restore previous aperture size */
previous_size = A_SIZE_8(agp_bridge->previous_size);
@@ -206,7 +206,7 @@
return -EINVAL;
for(j = pg_start; j < (pg_start + mem->page_count); j++) {
- if (!PGE_EMPTY(agp_bridge, agp_bridge->gatt_table[nvidia_private.pg_offset + j]))
+ if (!PGE_EMPTY(agp_bridge, readl(agp_bridge->gatt_table+nvidia_private.pg_offset+j)))
return -EBUSY;
}
@@ -215,9 +215,8 @@
mem->is_flushed = TRUE;
}
for (i = 0, j = pg_start; i < mem->page_count; i++, j++)
- agp_bridge->gatt_table[nvidia_private.pg_offset + j] =
- agp_bridge->driver->mask_memory(mem->memory[i], mem->type);
-
+ writel(agp_bridge->driver->mask_memory(mem->memory[i], mem->type),
+ agp_bridge->gatt_table+nvidia_private.pg_offset+j);
agp_bridge->driver->tlb_flush(mem);
return 0;
}
@@ -229,11 +228,9 @@
if ((type != 0) || (mem->type != 0))
return -EINVAL;
-
- for (i = pg_start; i < (mem->page_count + pg_start); i++) {
- agp_bridge->gatt_table[nvidia_private.pg_offset + i] =
- (unsigned long) agp_bridge->scratch_page;
- }
+
+ for (i = pg_start; i < (mem->page_count + pg_start); i++)
+ writel(agp_bridge->scratch_page, agp_bridge->gatt_table+nvidia_private.pg_offset+i);
agp_bridge->driver->tlb_flush(mem);
return 0;
@@ -265,9 +262,9 @@
/* flush TLB entries */
for(i = 0; i < 32 + 1; i++)
- temp = nvidia_private.aperture[i * PAGE_SIZE / sizeof(u32)];
+ temp = readl(nvidia_private.aperture+(i * PAGE_SIZE / sizeof(u32)));
for(i = 0; i < 32 + 1; i++)
- temp = nvidia_private.aperture[i * PAGE_SIZE / sizeof(u32)];
+ temp = readl(nvidia_private.aperture+(i * PAGE_SIZE / sizeof(u32)));
}
diff -Nru a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
--- a/drivers/char/agp/sworks-agp.c 2004-09-26 10:54:24 -07:00
+++ b/drivers/char/agp/sworks-agp.c 2004-09-26 10:54:24 -07:00
@@ -27,12 +27,12 @@
struct serverworks_page_map {
unsigned long *real;
- unsigned long *remapped;
+ unsigned long __iomem *remapped;
};
static struct _serverworks_private {
struct pci_dev *svrwrks_dev; /* device one */
- volatile u8 *registers;
+ volatile u8 __iomem *registers;
struct serverworks_page_map **gatt_pages;
int num_tables;
struct serverworks_page_map scratch_dir;
@@ -61,9 +61,8 @@
}
global_cache_flush();
- for(i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) {
- page_map->remapped[i] = agp_bridge->scratch_page;
- }
+ for(i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++)
+ writel(agp_bridge->scratch_page, page_map->remapped+i);
return 0;
}
@@ -162,10 +161,8 @@
}
/* Create a fake scratch directory */
for(i = 0; i < 1024; i++) {
- serverworks_private.scratch_dir.remapped[i] = (unsigned long) agp_bridge->scratch_page;
- page_dir.remapped[i] =
- virt_to_phys(serverworks_private.scratch_dir.real);
- page_dir.remapped[i] |= 0x00000001;
+ writel(agp_bridge->scratch_page, serverworks_private.scratch_dir.remapped+i);
+ writel(virt_to_phys(serverworks_private.scratch_dir.real) | 1, page_dir.remapped+i);
}
retval = serverworks_create_gatt_pages(value->num_entries / 1024);
@@ -176,7 +173,7 @@
}
agp_bridge->gatt_table_real = (u32 *)page_dir.real;
- agp_bridge->gatt_table = (u32 *)page_dir.remapped;
+ agp_bridge->gatt_table = (u32 __iomem *)page_dir.remapped;
agp_bridge->gatt_bus_addr = virt_to_phys(page_dir.real);
/* Get the address for the gart region.
@@ -189,11 +186,8 @@
/* Calculate the agp offset */
- for(i = 0; i < value->num_entries / 1024; i++) {
- page_dir.remapped[i] =
- virt_to_phys(serverworks_private.gatt_pages[i]->real);
- page_dir.remapped[i] |= 0x00000001;
- }
+ for(i = 0; i < value->num_entries / 1024; i++)
+ writel(virt_to_phys(serverworks_private.gatt_pages[i]->real)|1, page_dir.remapped+i);
return 0;
}
@@ -203,7 +197,7 @@
struct serverworks_page_map page_dir;
page_dir.real = (unsigned long *)agp_bridge->gatt_table_real;
- page_dir.remapped = (unsigned long *)agp_bridge->gatt_table;
+ page_dir.remapped = (unsigned long __iomem *)agp_bridge->gatt_table;
serverworks_free_gatt_pages();
serverworks_free_page_map(&page_dir);
@@ -269,7 +263,7 @@
/* Get the memory mapped registers */
pci_read_config_dword(agp_bridge->dev, serverworks_private.mm_addr_ofs, &temp);
temp = (temp & PCI_BASE_ADDRESS_MEM_MASK);
- serverworks_private.registers = (volatile u8 *) ioremap(temp, 4096);
+ serverworks_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);
if (!serverworks_private.registers) {
printk (KERN_ERR PFX "Unable to ioremap() memory.\n");
return -ENOMEM;
@@ -311,14 +305,14 @@
static void serverworks_cleanup(void)
{
- iounmap((void *) serverworks_private.registers);
+ iounmap((void __iomem *) serverworks_private.registers);
}
static int serverworks_insert_memory(struct agp_memory *mem,
off_t pg_start, int type)
{
int i, j, num_entries;
- unsigned long *cur_gatt;
+ unsigned long __iomem *cur_gatt;
unsigned long addr;
num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries;
@@ -334,9 +328,8 @@
while (j < (pg_start + mem->page_count)) {
addr = (j * PAGE_SIZE) + agp_bridge->gart_bus_addr;
cur_gatt = SVRWRKS_GET_GATT(addr);
- if (!PGE_EMPTY(agp_bridge, cur_gatt[GET_GATT_OFF(addr)])) {
+ if (!PGE_EMPTY(agp_bridge, readl(cur_gatt+GET_GATT_OFF(addr))))
return -EBUSY;
- }
j++;
}
@@ -348,8 +341,7 @@
for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
addr = (j * PAGE_SIZE) + agp_bridge->gart_bus_addr;
cur_gatt = SVRWRKS_GET_GATT(addr);
- cur_gatt[GET_GATT_OFF(addr)] =
- agp_bridge->driver->mask_memory(mem->memory[i], mem->type);
+ writel(agp_bridge->driver->mask_memory(mem->memory[i], mem->type), cur_gatt+GET_GATT_OFF(addr));
}
serverworks_tlbflush(mem);
return 0;
@@ -359,7 +351,7 @@
int type)
{
int i;
- unsigned long *cur_gatt;
+ unsigned long __iomem *cur_gatt;
unsigned long addr;
if (type != 0 || mem->type != 0) {
@@ -372,8 +364,7 @@
for (i = pg_start; i < (mem->page_count + pg_start); i++) {
addr = (i * PAGE_SIZE) + agp_bridge->gart_bus_addr;
cur_gatt = SVRWRKS_GET_GATT(addr);
- cur_gatt[GET_GATT_OFF(addr)] =
- (unsigned long) agp_bridge->scratch_page;
+ writel(agp_bridge->scratch_page, cur_gatt+GET_GATT_OFF(addr));
}
serverworks_tlbflush(mem);
diff -Nru a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
--- a/drivers/char/agp/via-agp.c 2004-09-26 10:54:24 -07:00
+++ b/drivers/char/agp/via-agp.c 2004-09-26 10:54:24 -07:00
@@ -438,6 +438,33 @@
agp_put_bridge(bridge);
}
+#ifdef CONFIG_PM
+
+static int agp_via_suspend(struct pci_dev *pdev, u32 state)
+{
+ pci_save_state (pdev, pdev->saved_config_space);
+ pci_set_power_state (pdev, 3);
+
+ return 0;
+}
+
+static int agp_via_resume(struct pci_dev *pdev)
+{
+ struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
+
+ pci_set_power_state (pdev, 0);
+ pci_restore_state(pdev, pdev->saved_config_space);
+
+ if (bridge->driver == &via_agp3_driver)
+ return via_configure_agp3();
+ else if (bridge->driver == &via_driver)
+ return via_configure();
+
+ return 0;
+}
+
+#endif /* CONFIG_PM */
+
/* must be the same order as name table above */
static struct pci_device_id agp_via_pci_table[] = {
#define ID(x) \
@@ -487,6 +514,10 @@
.id_table = agp_via_pci_table,
.probe = agp_via_probe,
.remove = agp_via_remove,
+#ifdef CONFIG_PM
+ .suspend = agp_via_suspend,
+ .resume = agp_via_resume,
+#endif
};