summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/char/agp/Makefile1
-rw-r--r--drivers/char/agp/agp.h1
-rw-r--r--drivers/char/agp/i7x05-agp.c240
-rw-r--r--drivers/char/agp/intel-agp.c68
-rw-r--r--include/linux/agp_backend.h2
5 files changed, 70 insertions, 242 deletions
diff --git a/drivers/char/agp/Makefile b/drivers/char/agp/Makefile
index 6ad2d3d4a911..150bc6c6bdd1 100644
--- a/drivers/char/agp/Makefile
+++ b/drivers/char/agp/Makefile
@@ -19,5 +19,4 @@ obj-$(CONFIG_AGP_HP_ZX1) += hp-agp.o
obj-$(CONFIG_AGP_AMD_8151) += amd-k8-agp.o
obj-$(CONFIG_AGP_ALPHA_CORE) += alpha-agp.o
-obj-$(CONFIG_AGP_I7x05) += i7x05-agp.o
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index fe79f0ddcd71..f38f5c7fc559 100644
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -281,6 +281,7 @@ struct agp_bridge_data {
#define INTEL_I7505_ATTBASE 0x78
#define INTEL_I7505_ERRSTS 0x42
#define INTEL_I7505_AGPCTRL 0x70
+#define INTEL_I7505_MCHCFG 0x50
/* VIA register */
#define VIA_APBASE 0x10
diff --git a/drivers/char/agp/i7x05-agp.c b/drivers/char/agp/i7x05-agp.c
deleted file mode 100644
index 141d06955cdb..000000000000
--- a/drivers/char/agp/i7x05-agp.c
+++ /dev/null
@@ -1,240 +0,0 @@
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/agp_backend.h>
-#include "agp.h"
-
-static int intel_7505_fetch_size(void)
-{
- int i;
- u16 tmp;
- struct aper_size_info_16 *values;
-
- /*
- * For AGP 3.0 APSIZE is now 16 bits
- */
- pci_read_config_word (agp_bridge->dev, INTEL_I7505_APSIZE, &tmp);
- tmp = (tmp & 0xfff);
-
- values = A_SIZE_16(agp_bridge->aperture_sizes);
-
- for (i=0; i < agp_bridge->num_aperture_sizes; i++) {
- if (tmp == 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 intel_7505_tlbflush(agp_memory *mem)
-{
- u32 temp;
- pci_read_config_dword(agp_bridge->dev, INTEL_I7505_AGPCTRL, &temp);
- pci_write_config_dword(agp_bridge->dev, INTEL_I7505_AGPCTRL, temp & ~(1 << 7));
- pci_read_config_dword(agp_bridge->dev, INTEL_I7505_AGPCTRL, &temp);
- pci_write_config_dword(agp_bridge->dev, INTEL_I7505_AGPCTRL, temp | (1 << 7));
-}
-
-static void intel_7505_cleanup(void)
-{
- struct aper_size_info_16 *previous_size;
-
- previous_size = A_SIZE_16(agp_bridge->previous_size);
- pci_write_config_byte(agp_bridge->dev, INTEL_I7505_APSIZE,
- previous_size->size_value);
-}
-
-
-static int intel_7505_configure(void)
-{
- u32 temp;
- struct aper_size_info_16 *current_size;
-
- current_size = A_SIZE_16(agp_bridge->current_size);
-
- /* aperture size */
- pci_write_config_word(agp_bridge->dev, INTEL_I7505_APSIZE,
- current_size->size_value);
-
- /* address to map to */
- pci_read_config_dword(agp_bridge->dev, INTEL_I7505_NAPBASELO, &temp);
- agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
-
- /* attbase */
- pci_write_config_dword(agp_bridge->dev, INTEL_I7505_ATTBASE,
- agp_bridge->gatt_bus_addr);
-
- /* agpctrl */
- pci_write_config_dword(agp_bridge->dev, INTEL_I7505_AGPCTRL, 0x0000);
-
- /* clear error registers */
- pci_write_config_byte(agp_bridge->dev, INTEL_I7505_ERRSTS, 0xff);
- return 0;
-}
-
-static struct aper_size_info_16 intel_7505_sizes[7] =
-{
- {256, 65536, 6, 0xf00},
- {128, 32768, 5, 0xf20},
- {64, 16384, 4, 0xf30},
- {32, 8192, 3, 0xf38},
- {16, 4096, 2, 0xf3c},
- {8, 2048, 1, 0xf3e},
- {4, 1024, 0, 0xf3f}
-};
-
-static unsigned long i7x05_mask_memory(unsigned long addr, int type)
-{
- /* Memory type is ignored */
- return addr | agp_bridge->masks[0].mask;
-}
-
-static struct gatt_mask i7x05_generic_masks[] =
-{
- {.mask = 0x00000017, .type = 0}
-};
-
-
-static int __init intel_7505_setup (struct pci_dev *pdev)
-{
- agp_bridge->masks = i7x05_generic_masks;
- agp_bridge->aperture_sizes = (void *) intel_7505_sizes;
- agp_bridge->size_type = U16_APER_SIZE;
- agp_bridge->num_aperture_sizes = 7;
- agp_bridge->dev_private_data = NULL;
- agp_bridge->needs_scratch_page = FALSE;
- agp_bridge->configure = intel_7505_configure;
- agp_bridge->fetch_size = intel_7505_fetch_size;
- agp_bridge->cleanup = intel_7505_cleanup;
- agp_bridge->tlb_flush = intel_7505_tlbflush;
- agp_bridge->mask_memory = i7x05_mask_memory;
- agp_bridge->agp_enable = agp_generic_enable;
- agp_bridge->cache_flush = global_cache_flush;
- agp_bridge->create_gatt_table = agp_generic_create_gatt_table;
- agp_bridge->free_gatt_table = agp_generic_free_gatt_table;
- agp_bridge->insert_memory = agp_generic_insert_memory;
- agp_bridge->remove_memory = agp_generic_remove_memory;
- agp_bridge->alloc_by_type = agp_generic_alloc_by_type;
- agp_bridge->free_by_type = agp_generic_free_by_type;
- agp_bridge->agp_alloc_page = agp_generic_alloc_page;
- agp_bridge->agp_destroy_page = agp_generic_destroy_page;
- agp_bridge->suspend = agp_generic_suspend;
- agp_bridge->resume = agp_generic_resume;
- agp_bridge->cant_use_aperture = 0;
- return 0;
-}
-
-struct agp_device_ids i7x05_agp_device_ids[] __initdata =
-{
- {
- .device_id = PCI_DEVICE_ID_INTEL_7505_0,
- .chipset = INTEL_I7505,
- .chipset_name = "i7505",
- },
- {
- .device_id = PCI_DEVICE_ID_INTEL_7205_0,
- .chipset = INTEL_I7505,
- .chipset_name = "i7205",
- },
- { }, /* dummy final entry, always present */
-};
-
-/* scan table above for supported devices */
-static int __init agp_lookup_host_bridge (struct pci_dev *pdev)
-{
- int j=0;
- struct agp_device_ids *devs;
-
- devs = i7x05_agp_device_ids;
-
- while (devs[j].chipset_name != NULL) {
- if (pdev->device == devs[j].device_id) {
- printk (KERN_INFO PFX "Detected Intel %s chipset\n",
- devs[j].chipset_name);
- agp_bridge->type = devs[j].chipset;
-
- if (devs[j].chipset_setup != NULL)
- return devs[j].chipset_setup(pdev);
- else
- return intel_7505_setup(pdev);
- }
- j++;
- }
-
- printk(KERN_ERR PFX "Unsupported Intel chipset (device id: %04x),",
- pdev->device);
- return -ENODEV;
-}
-
-static struct agp_driver i7x05_agp_driver = {
- .owner = THIS_MODULE,
-};
-
-static int __init agp_i7x05_probe (struct pci_dev *dev, const struct pci_device_id *ent)
-{
- u8 cap_ptr = 0;
-
- cap_ptr = pci_find_capability(dev, PCI_CAP_ID_AGP);
- if (cap_ptr == 0)
- return -ENODEV;
-
- if (agp_lookup_host_bridge(dev) != -ENODEV) {
- agp_bridge->dev = dev;
- agp_bridge->capndx = cap_ptr;
- /* Fill in the mode register */
- pci_read_config_dword(agp_bridge->dev, agp_bridge->capndx+PCI_AGP_STATUS, &agp_bridge->mode);
- i7x05_agp_driver.dev = dev;
- agp_register_driver(&i7x05_agp_driver);
- return 0;
- }
- return -ENODEV;
-}
-
-
-static struct pci_device_id agp_i7x05_pci_table[] __initdata = {
- {
- .class = (PCI_CLASS_BRIDGE_HOST << 8),
- .class_mask = ~0,
- .vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_ANY_ID,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- },
- { }
-};
-
-MODULE_DEVICE_TABLE(pci, agp_i7x05_pci_table);
-
-static struct __initdata pci_driver agp_i7x05_pci_driver = {
- .name = "agpgart-i7x05",
- .id_table = agp_i7x05_pci_table,
- .probe = agp_i7x05_probe,
-};
-
-int __init agp_i7x05_init(void)
-{
- int ret_val;
-
- ret_val = pci_module_init(&agp_i7x05_pci_driver);
- if (ret_val)
- agp_bridge->type = NOT_SUPPORTED;
-
- return ret_val;
-}
-
-static void __exit agp_i7x05_cleanup(void)
-{
- agp_unregister_driver(&i7x05_agp_driver);
- pci_unregister_driver(&agp_i7x05_pci_driver);
-}
-
-module_init(agp_i7x05_init);
-module_exit(agp_i7x05_cleanup);
-
-MODULE_AUTHOR("Matthew E Tolentino <matthew.e.tolentino@intel.com>");
-MODULE_LICENSE("GPL and additional rights");
-
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 8a1e22c0954e..0151a80c2364 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -960,6 +960,34 @@ static int intel_830mp_configure(void)
return 0;
}
+static int intel_7505_configure(void)
+{
+ u32 temp;
+ u16 temp2;
+ struct aper_size_info_8 *current_size;
+
+ current_size = A_SIZE_8(agp_bridge->current_size);
+
+ /* aperture size */
+ pci_write_config_byte(agp_bridge->dev, INTEL_APSIZE, current_size->size_value);
+
+ /* address to map to */
+ pci_read_config_dword(agp_bridge->dev, INTEL_APBASE, &temp);
+ agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
+
+ /* attbase - aperture base */
+ pci_write_config_dword(agp_bridge->dev, INTEL_ATTBASE, agp_bridge->gatt_bus_addr);
+
+ /* agpctrl */
+ pci_write_config_dword(agp_bridge->dev, INTEL_AGPCTRL, 0x0000);
+
+ /* mchcfg */
+ pci_read_config_word(agp_bridge->dev, INTEL_I7505_MCHCFG, &temp2);
+ pci_write_config_word(agp_bridge->dev, INTEL_I7505_MCHCFG, temp2 | (1 << 9));
+
+ return 0;
+}
+
static unsigned long intel_mask_memory(unsigned long addr, int type)
{
/* Memory type is ignored */
@@ -1246,6 +1274,34 @@ static int __init intel_860_setup (struct pci_dev *pdev)
return 0;
}
+static int __init intel_7505_setup (struct pci_dev *pdev)
+{
+ agp_bridge->masks = intel_generic_masks;
+ agp_bridge->aperture_sizes = (void *) intel_8xx_sizes;
+ agp_bridge->size_type = U8_APER_SIZE;
+ agp_bridge->num_aperture_sizes = 7;
+ agp_bridge->dev_private_data = NULL;
+ agp_bridge->needs_scratch_page = FALSE;
+ agp_bridge->configure = intel_7505_configure;
+ agp_bridge->fetch_size = intel_8xx_fetch_size;
+ agp_bridge->cleanup = intel_8xx_cleanup;
+ agp_bridge->tlb_flush = intel_8xx_tlbflush;
+ agp_bridge->mask_memory = intel_mask_memory;
+ agp_bridge->agp_enable = agp_generic_enable;
+ agp_bridge->cache_flush = global_cache_flush;
+ agp_bridge->create_gatt_table = agp_generic_create_gatt_table;
+ agp_bridge->free_gatt_table = agp_generic_free_gatt_table;
+ agp_bridge->insert_memory = agp_generic_insert_memory;
+ agp_bridge->remove_memory = agp_generic_remove_memory;
+ agp_bridge->alloc_by_type = agp_generic_alloc_by_type;
+ agp_bridge->free_by_type = agp_generic_free_by_type;
+ agp_bridge->agp_alloc_page = agp_generic_alloc_page;
+ agp_bridge->agp_destroy_page = agp_generic_destroy_page;
+ agp_bridge->suspend = agp_generic_suspend;
+ agp_bridge->resume = agp_generic_resume;
+ agp_bridge->cant_use_aperture = 0;
+ return 0;
+}
struct agp_device_ids intel_agp_device_ids[] __initdata =
{
{
@@ -1329,6 +1385,18 @@ struct agp_device_ids intel_agp_device_ids[] __initdata =
.chipset_name = "865G",
.chipset_setup = intel_845_setup
},
+ {
+ .device_id = PCI_DEVICE_ID_INTEL_7505_0,
+ .chipset = INTEL_E7505,
+ .chipset_name = "E7505",
+ .chipset_setup = intel_7505_setup
+ },
+ {
+ .device_id = PCI_DEVICE_ID_INTEL_7205_0,
+ .chipset = INTEL_E7505,
+ .chipset_name = "E7205",
+ .chipset_setup = intel_7505_setup
+ },
{ }, /* dummy final entry, always present */
};
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h
index 4ef3f220c8bc..5bb80a3731ad 100644
--- a/include/linux/agp_backend.h
+++ b/include/linux/agp_backend.h
@@ -53,7 +53,7 @@ enum chipset_type {
INTEL_I850,
INTEL_I860,
INTEL_460GX,
- INTEL_I7505,
+ INTEL_E7505,
VIA_GENERIC,
SIS_GENERIC,
AMD_GENERIC,
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-27 02:02:16 +0000