Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 414 insertions, 0 deletions

diff --git a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c
new file mode 100644
index 000000000000..c86a22c5499b
--- /dev/null
+++ b/drivers/char/agp/ali-agp.c
@@ -0,0 +1,414 @@
+/*
+ * ALi AGPGART routines.
+ */
+
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/agp_backend.h>
+#include "agp.h"
+
+#define ALI_AGPCTRL     0xb8
+#define ALI_ATTBASE     0xbc
+#define ALI_TLBCTRL     0xc0
+#define ALI_TAGCTRL     0xc4
+#define ALI_CACHE_FLUSH_CTRL    0xD0
+#define ALI_CACHE_FLUSH_ADDR_MASK       0xFFFFF000
+#define ALI_CACHE_FLUSH_EN      0x100
+
+static int ali_fetch_size(void)
+{
+        int i;
+        u32 temp;
+        struct aper_size_info_32 *values;
+
+        pci_read_config_dword(agp_bridge->dev, ALI_ATTBASE, &temp);
+        temp &= ~(0xfffffff0);
+        values = A_SIZE_32(agp_bridge->driver->aperture_sizes);
+
+        for (i = 0; i < agp_bridge->driver->num_aperture_sizes; i++) {
+                if (temp == values[i].size_value) {
+                        agp_bridge->previous_size =
+                            agp_bridge->current_size = (void *) (values + i);
+                        agp_bridge->aperture_size_idx = i;
+                        return values[i].size;
+                }
+        }
+
+        return 0;
+}
+
+static void ali_tlbflush(struct agp_memory *mem)
+{
+        u32 temp;
+
+        pci_read_config_dword(agp_bridge->dev, ALI_TLBCTRL, &temp);
+        temp &= 0xfffffff0;
+        temp |= (1<<0 | 1<<1);
+        pci_write_config_dword(agp_bridge->dev, ALI_TAGCTRL, temp);
+}
+
+static void ali_cleanup(void)
+{
+        struct aper_size_info_32 *previous_size;
+        u32 temp;
+
+        previous_size = A_SIZE_32(agp_bridge->previous_size);
+
+        pci_read_config_dword(agp_bridge->dev, ALI_TLBCTRL, &temp);
+// clear tag
+        pci_write_config_dword(agp_bridge->dev, ALI_TAGCTRL,
+                        ((temp & 0xffffff00) | 0x00000001|0x00000002));
+
+        pci_read_config_dword(agp_bridge->dev,  ALI_ATTBASE, &temp);
+        pci_write_config_dword(agp_bridge->dev, ALI_ATTBASE,
+                        ((temp & 0x00000ff0) | previous_size->size_value));
+}
+
+static int ali_configure(void)
+{
+        u32 temp;
+        struct aper_size_info_32 *current_size;
+
+        current_size = A_SIZE_32(agp_bridge->current_size);
+
+        /* aperture size and gatt addr */
+        pci_read_config_dword(agp_bridge->dev, ALI_ATTBASE, &temp);
+        temp = (((temp & 0x00000ff0) | (agp_bridge->gatt_bus_addr & 0xfffff000))
+                        | (current_size->size_value & 0xf));
+        pci_write_config_dword(agp_bridge->dev, ALI_ATTBASE, temp);
+
+        /* tlb control */
+        pci_read_config_dword(agp_bridge->dev, ALI_TLBCTRL, &temp);
+        pci_write_config_dword(agp_bridge->dev, ALI_TLBCTRL, ((temp & 0xffffff00) | 0x00000010));
+
+        /* address to map to */
+        pci_read_config_dword(agp_bridge->dev, AGP_APBASE, &temp);
+        agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
+
+#if 0
+        if (agp_bridge->type == ALI_M1541) {
+                u32 nlvm_addr = 0;
+
+                switch (current_size->size_value) {
+                        case 0:  break;
+                        case 1:  nlvm_addr = 0x100000;break;
+                        case 2:  nlvm_addr = 0x200000;break;
+                        case 3:  nlvm_addr = 0x400000;break;
+                        case 4:  nlvm_addr = 0x800000;break;
+                        case 6:  nlvm_addr = 0x1000000;break;
+                        case 7:  nlvm_addr = 0x2000000;break;
+                        case 8:  nlvm_addr = 0x4000000;break;
+                        case 9:  nlvm_addr = 0x8000000;break;
+                        case 10: nlvm_addr = 0x10000000;break;
+                        default: break;
+                }
+                nlvm_addr--;
+                nlvm_addr&=0xfff00000;
+
+                nlvm_addr+= agp_bridge->gart_bus_addr;
+                nlvm_addr|=(agp_bridge->gart_bus_addr>>12);
+                printk(KERN_INFO PFX "nlvm top &base = %8x\n",nlvm_addr);
+        }
+#endif
+
+        pci_read_config_dword(agp_bridge->dev, ALI_TLBCTRL, &temp);
+        temp &= 0xffffff7f;             //enable TLB
+        pci_write_config_dword(agp_bridge->dev, ALI_TLBCTRL, temp);
+
+        return 0;
+}
+
+
+static void m1541_cache_flush(void)
+{
+        int i, page_count;
+        u32 temp;
+
+        global_cache_flush();
+
+        page_count = 1 << A_SIZE_32(agp_bridge->current_size)->page_order;
+        for (i = 0; i < PAGE_SIZE * page_count; i += PAGE_SIZE) {
+                pci_read_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL,
+                                &temp);
+                pci_write_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL,
+                                (((temp & ALI_CACHE_FLUSH_ADDR_MASK) |
+                                  (agp_bridge->gatt_bus_addr + i)) |
+                                 ALI_CACHE_FLUSH_EN));
+        }
+}
+
+static void *m1541_alloc_page(struct agp_bridge_data *bridge)
+{
+        void *addr = agp_generic_alloc_page(agp_bridge);
+        u32 temp;
+
+        if (!addr)
+                return NULL;
+        
+        pci_read_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL, &temp);
+        pci_write_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL,
+                        (((temp & ALI_CACHE_FLUSH_ADDR_MASK) |
+                          virt_to_phys(addr)) | ALI_CACHE_FLUSH_EN ));
+        return addr;
+}
+
+static void ali_destroy_page(void * addr)
+{
+        if (addr) {
+                global_cache_flush();   /* is this really needed?  --hch */
+                agp_generic_destroy_page(addr);
+        }
+}
+
+static void m1541_destroy_page(void * addr)
+{
+        u32 temp;
+
+        if (addr == NULL)
+                return;
+
+        global_cache_flush();
+
+        pci_read_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL, &temp);
+        pci_write_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL,
+                        (((temp & ALI_CACHE_FLUSH_ADDR_MASK) |
+                          virt_to_phys(addr)) | ALI_CACHE_FLUSH_EN));
+        agp_generic_destroy_page(addr);
+}
+
+
+/* Setup function */
+
+static struct aper_size_info_32 ali_generic_sizes[7] =
+{
+        {256, 65536, 6, 10},
+        {128, 32768, 5, 9},
+        {64, 16384, 4, 8},
+        {32, 8192, 3, 7},
+        {16, 4096, 2, 6},
+        {8, 2048, 1, 4},
+        {4, 1024, 0, 3}
+};
+
+struct agp_bridge_driver ali_generic_bridge = {
+        .owner                  = THIS_MODULE,
+        .aperture_sizes         = ali_generic_sizes,
+        .size_type              = U32_APER_SIZE,
+        .num_aperture_sizes     = 7,
+        .configure              = ali_configure,
+        .fetch_size             = ali_fetch_size,
+        .cleanup                = ali_cleanup,
+        .tlb_flush              = ali_tlbflush,
+        .mask_memory            = agp_generic_mask_memory,
+        .masks                  = NULL,
+        .agp_enable             = agp_generic_enable,
+        .cache_flush            = global_cache_flush,
+        .create_gatt_table      = agp_generic_create_gatt_table,
+        .free_gatt_table        = agp_generic_free_gatt_table,
+        .insert_memory          = agp_generic_insert_memory,
+        .remove_memory          = agp_generic_remove_memory,
+        .alloc_by_type          = agp_generic_alloc_by_type,
+        .free_by_type           = agp_generic_free_by_type,
+        .agp_alloc_page         = agp_generic_alloc_page,
+        .agp_destroy_page       = ali_destroy_page,
+};
+
+struct agp_bridge_driver ali_m1541_bridge = {
+        .owner                  = THIS_MODULE,
+        .aperture_sizes         = ali_generic_sizes,
+        .size_type              = U32_APER_SIZE,
+        .num_aperture_sizes     = 7,
+        .configure              = ali_configure,
+        .fetch_size             = ali_fetch_size,
+        .cleanup                = ali_cleanup,
+        .tlb_flush              = ali_tlbflush,
+        .mask_memory            = agp_generic_mask_memory,
+        .masks                  = NULL,
+        .agp_enable             = agp_generic_enable,
+        .cache_flush            = m1541_cache_flush,
+        .create_gatt_table      = agp_generic_create_gatt_table,
+        .free_gatt_table        = agp_generic_free_gatt_table,
+        .insert_memory          = agp_generic_insert_memory,
+        .remove_memory          = agp_generic_remove_memory,
+        .alloc_by_type          = agp_generic_alloc_by_type,
+        .free_by_type           = agp_generic_free_by_type,
+        .agp_alloc_page         = m1541_alloc_page,
+        .agp_destroy_page       = m1541_destroy_page,
+};
+
+
+static struct agp_device_ids ali_agp_device_ids[] __devinitdata =
+{
+        {
+                .device_id      = PCI_DEVICE_ID_AL_M1541,
+                .chipset_name   = "M1541",
+        },
+        {
+                .device_id      = PCI_DEVICE_ID_AL_M1621,
+                .chipset_name   = "M1621",
+        },
+        {
+                .device_id      = PCI_DEVICE_ID_AL_M1631,
+                .chipset_name   = "M1631",
+        },
+        {
+                .device_id      = PCI_DEVICE_ID_AL_M1632,
+                .chipset_name   = "M1632",
+        },
+        {
+                .device_id      = PCI_DEVICE_ID_AL_M1641,
+                .chipset_name   = "M1641",
+        },
+        {
+                .device_id      = PCI_DEVICE_ID_AL_M1644,
+                .chipset_name   = "M1644",
+        },
+        {
+                .device_id      = PCI_DEVICE_ID_AL_M1647,
+                .chipset_name   = "M1647",
+        },
+        {
+                .device_id      = PCI_DEVICE_ID_AL_M1651,
+                .chipset_name   = "M1651",
+        },
+        {
+                .device_id      = PCI_DEVICE_ID_AL_M1671,
+                .chipset_name   = "M1671",
+        },
+        {
+                .device_id      = PCI_DEVICE_ID_AL_M1681,
+                .chipset_name   = "M1681",
+        },
+        {
+                .device_id      = PCI_DEVICE_ID_AL_M1683,
+                .chipset_name   = "M1683",
+        },
+
+        { }, /* dummy final entry, always present */
+};
+
+static int __devinit agp_ali_probe(struct pci_dev *pdev,
+                                const struct pci_device_id *ent)
+{
+        struct agp_device_ids *devs = ali_agp_device_ids;
+        struct agp_bridge_data *bridge;
+        u8 hidden_1621_id, cap_ptr;
+        int j;
+
+        cap_ptr = pci_find_capability(pdev, PCI_CAP_ID_AGP);
+        if (!cap_ptr)
+                return -ENODEV;
+
+        /* probe for known chipsets */
+        for (j = 0; devs[j].chipset_name; j++) {
+                if (pdev->device == devs[j].device_id)
+                        goto found;
+        }
+
+        printk(KERN_ERR PFX "Unsupported ALi chipset (device id: %04x)\n",
+             pdev->device);
+        return -ENODEV;
+
+
+found:
+        bridge = agp_alloc_bridge();
+        if (!bridge)
+                return -ENOMEM;
+
+        bridge->dev = pdev;
+        bridge->capndx = cap_ptr;
+
+        switch (pdev->device) {
+        case PCI_DEVICE_ID_AL_M1541:
+                bridge->driver = &ali_m1541_bridge;
+                break;
+        case PCI_DEVICE_ID_AL_M1621:
+                pci_read_config_byte(pdev, 0xFB, &hidden_1621_id);
+                switch (hidden_1621_id) {
+                case 0x31:
+                        devs[j].chipset_name = "M1631";
+                        break;
+                case 0x32:
+                        devs[j].chipset_name = "M1632";
+                        break;
+                case 0x41:
+                        devs[j].chipset_name = "M1641";
+                        break;
+                case 0x43:
+                        devs[j].chipset_name = "M????";
+                        break;
+                case 0x47:
+                        devs[j].chipset_name = "M1647";
+                        break;
+                case 0x51:
+                        devs[j].chipset_name = "M1651";
+                        break;
+                default:
+                        break;
+                }
+                /*FALLTHROUGH*/
+        default:
+                bridge->driver = &ali_generic_bridge;
+        }
+
+        printk(KERN_INFO PFX "Detected ALi %s chipset\n",
+                        devs[j].chipset_name);
+
+        /* Fill in the mode register */
+        pci_read_config_dword(pdev,
+                        bridge->capndx+PCI_AGP_STATUS,
+                        &bridge->mode);
+
+        pci_set_drvdata(pdev, bridge);
+        return agp_add_bridge(bridge);
+}
+
+static void __devexit agp_ali_remove(struct pci_dev *pdev)
+{
+        struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
+
+        agp_remove_bridge(bridge);
+        agp_put_bridge(bridge);
+}
+
+static struct pci_device_id agp_ali_pci_table[] = {
+        {
+        .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+        .class_mask     = ~0,
+        .vendor         = PCI_VENDOR_ID_AL,
+        .device         = PCI_ANY_ID,
+        .subvendor      = PCI_ANY_ID,
+        .subdevice      = PCI_ANY_ID,
+        },
+        { }
+};
+
+MODULE_DEVICE_TABLE(pci, agp_ali_pci_table);
+
+static struct pci_driver agp_ali_pci_driver = {
+        .name           = "agpgart-ali",
+        .id_table       = agp_ali_pci_table,
+        .probe          = agp_ali_probe,
+        .remove         = agp_ali_remove,
+};
+
+static int __init agp_ali_init(void)
+{
+        if (agp_off)
+                return -EINVAL;
+        return pci_register_driver(&agp_ali_pci_driver);
+}
+
+static void __exit agp_ali_cleanup(void)
+{
+        pci_unregister_driver(&agp_ali_pci_driver);
+}
+
+module_init(agp_ali_init);
+module_exit(agp_ali_cleanup);
+
+MODULE_AUTHOR("Dave Jones <davej@codemonkey.org.uk>");
+MODULE_LICENSE("GPL and additional rights");
+