Attachment 295620 Details for Bug 433957 – Possible patch (agp aperture quirk)

[patch] Possible patch (agp aperture quirk)

amd64.diff (text/plain), 3.12 KB, created by Ermenegildo Fiorito on 2008-02-22 12:11:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ermenegildo Fiorito

Created: 2008-02-22 12:11:33 UTC

Size: 3.12 KB

patch

obsolete

>diff -U 3 -p -r -x .o drivers/char/agp/amd64-agp.c drivers/char/agp/amd64-agp.c
>--- drivers/char/agp/amd64-agp.c	2007-03-09 19:58:04.000000000 +0100
>+++ drivers/char/agp/amd64-agp.c	2007-04-12 15:01:38.000000000 +0200
>@@ -495,10 +495,11 @@ static int nforce3_agp_init(struct pci_d
> 
> 	/* if x86-64 aperture base is beyond 4G, exit here */
> 	if ( (apbase & 0x7fff) >> (32 - 25) ) {
>-		printk(KERN_INFO PFX "aperture base > 4G\n");
>+		printk(KERN_INFO PFX "aperture base > 4G (0x%08x)\n", apbase);
> 		return -ENODEV;
> 	}
> 
>+	printk(KERN_INFO PFX "aperture base is (0x%08x)\n", apbase);
> 	apbase = (apbase & 0x7fff) << 25;
> 
> 	pci_read_config_dword(pdev, NVIDIA_X86_64_0_APBASE, &apbar);
>diff -U 3 -p -r -x .o drivers/pci/quirks.c drivers/pci/quirks.c
>--- drivers/pci/quirks.c	2007-03-09 19:58:04.000000000 +0100
>+++ drivers/pci/quirks.c	2007-04-14 11:04:47.000000000 +0200
>@@ -23,6 +23,58 @@
> #include <linux/acpi.h>
> #include "pci.h"
> 
>+static const struct pci_device_id quirk_k8_agp_aperture_sbs[] = {
>+	{
>+		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x00e0),
>+		.subvendor = PCI_VENDOR_ID_ASROCK,
>+		.subdevice = 0x00e0,
>+	},
>+	{
>+		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x00e0),
>+		.subvendor = PCI_VENDOR_ID_ASUSTEK,
>+		.subdevice = 0x813f,
>+	},
>+	{
>+		PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237),
>+		.subvendor = PCI_VENDOR_ID_ASUSTEK,
>+		.subdevice = 0x80ed,
>+	},
>+	{
>+		NULL,
>+	},
>+};
>+
>+/* In certain situations the BIOS on some systems sets high bits in the K8
>+ * aperture base, which breaks agpgart. This quirk corrects the base value. */
>+static void quirk_k8_agp_aperture(struct pci_dev *dev)
>+{
>+	u32 aper_base, tmp;
>+
>+	/* The device we are quirking is the K8 northbridge, but this device
>+	 * has no subsystem ID's and running this quirk on all K8 northbridges
>+	 * would be silly. Instead, we use the subsystem ID's of the
>+	 * southbridge to limit the quirk to only the affected systems. */
>+	if (!pci_dev_present(quirk_k8_agp_aperture_sbs)) {
>+		printk (KERN_INFO "PCI: QUIRKed sbs for buggy board not found\n");
>+		/* return; */
>+	} else {
>+		printk (KERN_INFO "PCI: QUIRKed sbs for buggy board FOUND!\n");
>+	}
>+
>+	pci_read_config_dword(dev, 0x94, &aper_base);
>+	tmp = aper_base & 0x7f;
>+
>+	if (tmp != aper_base) {
>+		printk(KERN_INFO "PCI: QUIRKed buggY ASRock aperture base "
>+			"from %x to %x\n", aper_base, tmp);
>+		pci_write_config_dword(dev, 0x94, tmp);
>+	} else {
>+		printk(KERN_INFO "PCI: QUIRK   buggY ASRock aperture base "
>+			"from %x to %x\n", aper_base, tmp);
>+	}
>+}
>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1103, quirk_k8_agp_aperture);
>+
> /* The Mellanox Tavor device gives false positive parity errors
>  * Mark this device with a broken_parity_status, to allow
>  * PCI scanning code to "skip" this now blacklisted device.
>diff -U 3 -p -r -x .o include/linux/pci_ids.h include/linux/pci_ids.h
>--- include/linux/pci_ids.h	2007-03-09 19:58:04.000000000 +0100
>+++ include/linux/pci_ids.h	2007-04-13 20:21:32.000000000 +0200
>@@ -2062,6 +2062,8 @@
> #define PCI_VENDOR_ID_SITECOM		0x182d
> #define PCI_DEVICE_ID_SITECOM_DC105V2	0x3069
> 
>+#define PCI_VENDOR_ID_ASROCK		0x1849
>+
> #define PCI_VENDOR_ID_TOPSPIN		0x1867
> 
> #define PCI_VENDOR_ID_TDI               0x192E

Actions: View | Diff

Attachments on bug 433957: 295620