vserver 1.9.5.x5

[linux-2.6.git] / drivers / char / agp / ati-agp.c

diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index bc88d69..ab17cfd 100644 (file)
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -42,11 +42,11 @@ static struct gatt_mask ati_generic_masks[] =
 
 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;
@@ -61,9 +61,6 @@ static int ati_create_page_map(ati_page_map *page_map)
 
        SetPageReserved(virt_to_page(page_map->real));
        err = map_page_into_agp(virt_to_page(page_map->real));
-
-       /* CACHE_FLUSH(); */
-       global_cache_flush();
        page_map->remapped = ioremap_nocache(virt_to_phys(page_map->real),
                                            PAGE_SIZE);
        if (page_map->remapped == NULL || err) {
@@ -75,8 +72,10 @@ static int ati_create_page_map(ati_page_map *page_map)
        /*CACHE_FLUSH();*/
        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);
+               readl(page_map->remapped+i);    /* PCI Posting. */
+       }
 
        return 0;
 }
@@ -186,7 +185,8 @@ static int ati_fetch_size(void)
 
 static void ati_tlbflush(struct agp_memory * mem)
 {
-       OUTREG32(ati_generic_private.registers, ATI_GART_CACHE_CNTRL, 1);
+       writel(1, ati_generic_private.registers+ATI_GART_CACHE_CNTRL);
+       readl(ati_generic_private.registers+ATI_GART_CACHE_CNTRL);      /* PCI Posting. */
 }
 
 static void ati_cleanup(void)
@@ -206,7 +206,7 @@ static void ati_cleanup(void)
                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 @@ static int ati_configure(void)
        /* 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);
@@ -230,15 +230,16 @@ static int ati_configure(void)
        agp_bridge.gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
        printk(KERN_INFO PFX "IGP320 gart_bus_addr: %x\n", agp_bridge.gart_bus_addr);
         */
-       OUTREG32(ati_generic_private.registers, ATI_GART_FEATURE_ID, 0x60000);
+       writel(0x60000, ati_generic_private.registers+ATI_GART_FEATURE_ID);
+       readl(ati_generic_private.registers+ATI_GART_FEATURE_ID);       /* PCI Posting.*/
 
        /* SIGNALED_SYSTEM_ERROR @ NB_STATUS */
        pci_read_config_dword(agp_bridge->dev, 4, &temp);
        pci_write_config_dword(agp_bridge->dev, 4, temp | (1<<14));
 
        /* Write out the address of the gatt table */
-       OUTREG32(ati_generic_private.registers, ATI_GART_BASE,
-                agp_bridge->gatt_bus_addr);
+       writel(agp_bridge->gatt_bus_addr, ati_generic_private.registers+ATI_GART_BASE);
+       readl(ati_generic_private.registers+ATI_GART_BASE);     /* PCI Posting. */
 
        return 0;
 }
@@ -261,7 +262,7 @@ static int ati_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;
@@ -276,7 +277,7 @@ static int ati_insert_memory(struct agp_memory * mem,
        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 +291,8 @@ static int ati_insert_memory(struct agp_memory * mem,
        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));
+               readl(cur_gatt+GET_GATT_OFF(addr));     /* PCI Posting. */
        }
        agp_bridge->driver->tlb_flush(mem);
        return 0;
@@ -301,7 +302,7 @@ static int ati_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) {
@@ -310,8 +311,8 @@ static int ati_remove_memory(struct agp_memory * mem, off_t pg_start,
        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));
+               readl(cur_gatt+GET_GATT_OFF(addr)); /* PCI Posting. */
        }
 
        agp_bridge->driver->tlb_flush(mem);
@@ -340,7 +341,7 @@ static int ati_create_gatt_table(void)
        }
 
        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 +372,9 @@ static int ati_create_gatt_table(void)
 
        /* 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));
+               readl(page_dir.remapped+GET_PAGE_DIR_OFF(addr));        /* PCI Posting. */
        }
 
        return 0;
@@ -384,7 +385,7 @@ static int ati_free_gatt_table(void)
        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);
@@ -528,6 +529,8 @@ static struct pci_driver agp_ati_pci_driver = {
 
 static int __init agp_ati_init(void)
 {
+       if (agp_off)
+               return -EINVAL;
        return pci_module_init(&agp_ati_pci_driver);
 }