Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.infradead.org/iommu-2.6
* git://git.infradead.org/iommu-2.6:
intel-iommu: Use symbolic values instead of magic numbers in Lenovo w/a
intel-iommu: Abort IOMMU setup for igfx if BIOS gave no shadow GTT space
+27
+27
drivers/pci/intel-iommu.c
+27
drivers/pci/intel-iommu.c
···
3757
3757
3758
3758
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf);
3759
3759
3760
+
#define GGC 0x52
3761
+
#define GGC_MEMORY_SIZE_MASK (0xf << 8)
3762
+
#define GGC_MEMORY_SIZE_NONE (0x0 << 8)
3763
+
#define GGC_MEMORY_SIZE_1M (0x1 << 8)
3764
+
#define GGC_MEMORY_SIZE_2M (0x3 << 8)
3765
+
#define GGC_MEMORY_VT_ENABLED (0x8 << 8)
3766
+
#define GGC_MEMORY_SIZE_2M_VT (0x9 << 8)
3767
+
#define GGC_MEMORY_SIZE_3M_VT (0xa << 8)
3768
+
#define GGC_MEMORY_SIZE_4M_VT (0xb << 8)
3769
+
3770
+
static void __devinit quirk_calpella_no_shadow_gtt(struct pci_dev *dev)
3771
+
{
3772
+
unsigned short ggc;
3773
+
3774
+
if (pci_read_config_word(dev, GGC, &ggc))
3775
+
return;
3776
+
3777
+
if (!(ggc & GGC_MEMORY_VT_ENABLED)) {
3778
+
printk(KERN_INFO "DMAR: BIOS has allocated no shadow GTT; disabling IOMMU for graphics\n");
3779
+
dmar_map_gfx = 0;
3780
+
}
3781
+
}
3782
+
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0040, quirk_calpella_no_shadow_gtt);
3783
+
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0044, quirk_calpella_no_shadow_gtt);
3784
+
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0062, quirk_calpella_no_shadow_gtt);
3785
+
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x006a, quirk_calpella_no_shadow_gtt);
3786
+
3760
3787
/* On Tylersburg chipsets, some BIOSes have been known to enable the
3761
3788
ISOCH DMAR unit for the Azalia sound device, but not give it any
3762
3789
TLB entries, which causes it to deadlock. Check for that. We do