From: Nicolas Aspert <Nicolas.Aspert@epfl.ch>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Alessandro Morelli <alex@alphac.it>,
stilgar2k@wanadoo.fr, linux-kernel@vger.kernel.org
Subject: [PATCH,CFT] Tentative fix for agpgart (writing on 'reserved' bits)
Date: Mon, 27 May 2002 16:08:27 +0200 [thread overview]
Message-ID: <3CF23DDB.9060404@epfl.ch> (raw)
In-Reply-To: <fa.mm4ng1v.vmenaj@ifi.uio.no> <fa.gciunnv.cnaf99@ifi.uio.no> <3CF1EA3F.4070608@epfl.ch> <1022493086.11859.191.camel@irongate.swansea.linux.org.uk> <3CF1F4C0.5080201@epfl.ch> <1022494620.11859.207.camel@irongate.swansea.linux.org.uk> <3CF1FD4B.8060608@epfl.ch> <1022497386.11859.232.camel@irongate.swansea.linux.org.uk> <3CF205C1.6040408@epfl.ch> <1022498304.11859.239.camel@irongate.swansea.linux.org.uk> <3CF2144C.709@epfl.ch> <1022509981.11859.284.camel@irongate.swansea.linux.org.uk>
[-- Attachment #1: Type: text/plain, Size: 576 bytes --]
Alan Cox wrote:
>
> We ought to mask and copy the original yes. The number of times we've
> had Linux driver breakages by not masking and avoiding writes to
> reserved bits is small but it does happen occasionally.
That sounds reasonable. I attached a patch that should do this.
According to what was done before (i.e. writing on the reserved bits),
the 12 LSB of ATTBASE should be discarded...
The patch is against 2.4.19-pre8-ac5
Please test
Best regards
Nicolas.
--
Nicolas Aspert Signal Processing Institute (ITS)
Swiss Federal Institute of Technology (EPFL)
[-- Attachment #2: patch-agp_fix_attbase-2.4.19-pre8-ac5 --]
[-- Type: text/plain, Size: 8592 bytes --]
diff -u agp.orig/agp.h agp/agp.h
--- agp.orig/agp.h Fri May 24 15:08:37 2002
+++ agp/agp.h Mon May 27 16:06:09 2002
@@ -274,6 +274,9 @@
#define INTEL_NBXCFG 0x50
#define INTEL_ERRSTS 0x91
+/* mask to preserve the 12 LSB of the ATTBASE register */
+#define INTEL_ATTBASE_MASK 0x00000FFF
+
/* intel i830 registers */
#define I830_GMCH_CTRL 0x52
#define I830_GMCH_ENABLED 0x4
@@ -293,6 +296,10 @@
/* This one is for I830MP w. an external graphic card */
#define INTEL_I830_ERRSTS 0x92
+/* intel 815 register */
+#define INTEL_815_APCONT 0x51
+#define INTEL_815_ATTBASE_MASK 0xE0000FFF
+
/* intel i820 registers */
#define INTEL_I820_RDCR 0x51
#define INTEL_I820_ERRSTS 0xc8
diff -u agp.orig/agpgart_be.c agp/agpgart_be.c
--- agp.orig/agpgart_be.c Fri May 24 15:08:44 2002
+++ agp/agpgart_be.c Mon May 27 16:04:05 2002
@@ -1475,8 +1475,10 @@
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);
+ pci_read_config_dword(agp_bridge.dev, INTEL_ATTBASE, &temp);
+ temp &= INTEL_ATTBASE_MASK;
+ temp |= agp_bridge.gatt_bus_addr & (~ INTEL_ATTBASE_MASK);
+ pci_write_config_dword(agp_bridge.dev, INTEL_ATTBASE, temp);
/* agpctrl */
pci_write_config_dword(agp_bridge.dev, INTEL_AGPCTRL, 0x2280);
@@ -1490,6 +1492,46 @@
return 0;
}
+static int intel_815_configure(void)
+{
+ u32 temp;
+ u8 temp2;
+ 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 */
+ /* the Intel 815 chipset spec. says that bits 29-31 in the
+ * ATTBASE register are reserved -> try not to write them */
+ if ((agp_bridge.gatt_bus_addr & INTEL_815_ATTBASE_MASK) &
+ ~ INTEL_ATTBASE_MASK)
+ panic("gatt bus addr too high");
+ pci_read_config_dword(agp_bridge.dev, INTEL_ATTBASE, &temp);
+ temp &= INTEL_815_ATTBASE_MASK;
+ temp |= agp_bridge.gatt_bus_addr & (~ INTEL_815_ATTBASE_MASK);
+ pci_write_config_dword(agp_bridge.dev, INTEL_ATTBASE, temp);
+
+ /* agpctrl */
+ pci_write_config_dword(agp_bridge.dev, INTEL_AGPCTRL, 0x0000);
+
+ /* apcont */
+ pci_read_config_byte(agp_bridge.dev, INTEL_I815_APCONT, &temp2);
+ pci_write_config_byte(agp_bridge.dev, INTEL_I815_APCONT,
+ temp2 | (1 << 1));
+
+ /* clear any possible error conditions */
+ /* Oddness : this chipset seems to have no ERRSTS register ! */
+ return 0;
+}
+
static void intel_820_tlbflush(agp_memory * mem)
{
return;
@@ -1526,8 +1568,10 @@
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);
+ pci_read_config_dword(agp_bridge.dev, INTEL_ATTBASE, &temp);
+ temp &= INTEL_ATTBASE_MASK;
+ temp |= agp_bridge.gatt_bus_addr & (~ INTEL_ATTBASE_MASK);
+ pci_write_config_dword(agp_bridge.dev, INTEL_ATTBASE, temp);
/* agpctrl */
pci_write_config_dword(agp_bridge.dev, INTEL_AGPCTRL, 0x0000);
@@ -1560,8 +1604,10 @@
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);
+ pci_read_config_dword(agp_bridge.dev, INTEL_ATTBASE, &temp);
+ temp &= INTEL_ATTBASE_MASK;
+ temp |= agp_bridge.gatt_bus_addr & (~ INTEL_ATTBASE_MASK);
+ pci_write_config_dword(agp_bridge.dev, INTEL_ATTBASE, temp);
/* agpctrl */
pci_write_config_dword(agp_bridge.dev, INTEL_AGPCTRL, 0x0000);
@@ -1570,6 +1616,7 @@
pci_read_config_word(agp_bridge.dev, INTEL_NBXCFG, &temp2);
pci_write_config_word(agp_bridge.dev, INTEL_NBXCFG,
temp2 | (1 << 9));
+
/* clear any possible AGP-related error conditions */
pci_write_config_word(agp_bridge.dev, INTEL_I830_ERRSTS, 0x1c);
return 0;
@@ -1594,8 +1641,10 @@
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);
+ pci_read_config_dword(agp_bridge.dev, INTEL_ATTBASE, &temp);
+ temp &= INTEL_ATTBASE_MASK;
+ temp |= agp_bridge.gatt_bus_addr & (~ INTEL_ATTBASE_MASK);
+ pci_write_config_dword(agp_bridge.dev, INTEL_ATTBASE, temp);
/* agpctrl */
pci_write_config_dword(agp_bridge.dev, INTEL_AGPCTRL, 0x0000);
@@ -1604,6 +1653,7 @@
pci_read_config_word(agp_bridge.dev, INTEL_I840_MCHCFG, &temp2);
pci_write_config_word(agp_bridge.dev, INTEL_I840_MCHCFG,
temp2 | (1 << 9));
+
/* clear any possible error conditions */
pci_write_config_word(agp_bridge.dev, INTEL_I840_ERRSTS, 0xc000);
return 0;
@@ -1626,8 +1676,10 @@
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);
+ pci_read_config_dword(agp_bridge.dev, INTEL_ATTBASE, &temp);
+ temp &= INTEL_ATTBASE_MASK;
+ temp |= agp_bridge.gatt_bus_addr & (~ INTEL_ATTBASE_MASK);
+ pci_write_config_dword(agp_bridge.dev, INTEL_ATTBASE, temp);
/* agpctrl */
pci_write_config_dword(agp_bridge.dev, INTEL_AGPCTRL, 0x0000);
@@ -1658,8 +1710,10 @@
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);
+ pci_write_config_dword(agp_bridge.dev, INTEL_ATTBASE, &temp);
+ temp &= INTEL_ATTBASE_MASK;
+ temp |= agp_bridge.gatt_bus_addr & (~ INTEL_ATTBASE_MASK);
+ pci_write_config_dword(agp_bridge.dev, INTEL_ATTBASE, temp);
/* agpctrl */
pci_write_config_dword(agp_bridge.dev, INTEL_AGPCTRL, 0x0000);
@@ -1690,8 +1744,10 @@
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);
+ pci_write_config_dword(agp_bridge.dev, INTEL_ATTBASE, &temp);
+ temp &= INTEL_ATTBASE_MASK;
+ temp |= agp_bridge.gatt_bus_addr & (~ INTEL_ATTBASE_MASK);
+ pci_write_config_dword(agp_bridge.dev, INTEL_ATTBASE, temp);
/* agpctrl */
pci_write_config_dword(agp_bridge.dev, INTEL_AGPCTRL, 0x0000);
@@ -1724,6 +1780,12 @@
{0x00000017, 0}
};
+static aper_size_info_8 intel_815_sizes[2] =
+{
+ {64, 16384, 4, 0},
+ {32, 8192, 3, 8},
+};
+
static aper_size_info_8 intel_8xx_sizes[7] =
{
{256, 65536, 6, 0},
@@ -1787,7 +1849,38 @@
(void) pdev; /* unused */
}
+static int __init intel_815_setup (struct pci_dev *pdev)
+{
+ agp_bridge.masks = intel_generic_masks;
+ agp_bridge.num_of_masks = 1;
+ agp_bridge.aperture_sizes = (void *) intel_815_sizes;
+ agp_bridge.size_type = U8_APER_SIZE;
+ agp_bridge.num_aperture_sizes = 2;
+ agp_bridge.dev_private_data = NULL;
+ agp_bridge.needs_scratch_page = FALSE;
+ agp_bridge.configure = intel_815_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_agp_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;
+
+ (void) pdev; /* unused */
+}
static int __init intel_820_setup (struct pci_dev *pdev)
{
@@ -3929,7 +4022,7 @@
INTEL_I815,
"Intel",
"i815",
- intel_generic_setup },
+ intel_815_setup },
{ PCI_DEVICE_ID_INTEL_820_0,
PCI_VENDOR_ID_INTEL,
INTEL_I820,
next prev parent reply other threads:[~2002-05-27 14:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <fa.mm4ng1v.vmenaj@ifi.uio.no>
[not found] ` <fa.gciunnv.cnaf99@ifi.uio.no>
2002-05-27 8:11 ` PROBLEM: memory corruption with i815 chipset variant Nicolas Aspert
2002-05-27 9:51 ` Alan Cox
2002-05-27 8:56 ` Nicolas Aspert
2002-05-27 10:17 ` Alan Cox
2002-05-27 9:32 ` [PATCH,CFT] Tentative fix for mem. corruption caused by intel 815 AGP Nicolas Aspert
2002-05-27 11:03 ` Alan Cox
2002-05-27 10:09 ` Nicolas Aspert
[not found] ` <1022498304.11859.239.camel@irongate.swansea.linux.org.uk>
2002-05-27 11:11 ` Nicolas Aspert
2002-05-27 14:33 ` Alan Cox
2002-05-27 14:08 ` Nicolas Aspert [this message]
[not found] ` <5.1.0.14.0.20020528103408.02ab1260@shiva.intra.alphac.it>
[not found] ` <5.1.0.14.0.20020530110655.02afbb20@shiva.intra.alphac.it>
2002-05-30 9:41 ` [PATCH,CFT] Tentative fix for agpgart (writing on 'reserved' bits) Nicolas Aspert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3CF23DDB.9060404@epfl.ch \
--to=nicolas.aspert@epfl.ch \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=alex@alphac.it \
--cc=linux-kernel@vger.kernel.org \
--cc=stilgar2k@wanadoo.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).