iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel-iommu: Restore DMAR_BROKEN_GFX_WA option for broken graphics drivers

Browse Source 
We need to give people a little more time to fix the broken drivers.
Re-introduce this, but tied in properly with the 'iommu=pt' support this
time. Change the config option name and make it default to 'no' too.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
David Woodhouse 2009-07-04 10:59:46 +01:00
parent 40e4aa3432
commit 62edf5dc4a
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/Kconfig
View File

@ -1913,6 +1913,18 @@ config DMAR_DEFAULT_ON
recommended you say N here while the DMAR code remains recommended you say N here while the DMAR code remains
experimental. experimental.
config DMAR_BROKEN_GFX_WA
def_bool n
prompt "Workaround broken graphics drivers (going away soon)"
depends on DMAR
---help---
Current Graphics drivers tend to use physical address
for DMA and avoid using DMA APIs. Setting this config
option permits the IOMMU driver to set a unity map for
all the OS-visible memory. Hence the driver can continue
to use physical addresses for DMA, at least until this
option is removed in the 2.6.32 kernel.
config DMAR_FLOPPY_WA config DMAR_FLOPPY_WA
def_bool y def_bool y
depends on DMAR depends on DMAR

29
drivers/pci/intel-iommu.c
View File

@ -2127,16 +2127,18 @@ static int iommu_prepare_static_identity_mapping(void)
return -EFAULT; return -EFAULT;
for_each_pci_dev(pdev) { for_each_pci_dev(pdev) {
printk(KERN_INFO "IOMMU: identity mapping for device %s\n", if (iommu_identity_mapping == 1 || IS_GFX_DEVICE(pdev)) {
pci_name(pdev)); printk(KERN_INFO "IOMMU: identity mapping for device %s\n",
pci_name(pdev));
ret = domain_context_mapping(si_domain, pdev, ret = domain_context_mapping(si_domain, pdev,
CONTEXT_TT_MULTI_LEVEL); CONTEXT_TT_MULTI_LEVEL);
if (ret) if (ret)
return ret; return ret;
ret = domain_add_dev_info(si_domain, pdev); ret = domain_add_dev_info(si_domain, pdev);
if (ret) if (ret)
return ret; return ret;
}
} }
return 0; return 0;
@ -2291,6 +2293,10 @@ int __init init_dmars(void)
* identity mapping if iommu_identity_mapping is set. * identity mapping if iommu_identity_mapping is set.
*/ */
if (!iommu_pass_through) { if (!iommu_pass_through) {
#ifdef CONFIG_DMAR_BROKEN_GFX_WA
if (!iommu_identity_mapping)
iommu_identity_mapping = 2;
#endif
if (iommu_identity_mapping) if (iommu_identity_mapping)
iommu_prepare_static_identity_mapping(); iommu_prepare_static_identity_mapping();
/* /*
@ -2444,7 +2450,10 @@ static int iommu_dummy(struct pci_dev *pdev)
static int iommu_should_identity_map(struct pci_dev *pdev) static int iommu_should_identity_map(struct pci_dev *pdev)
{ {
return pdev->dma_mask > DMA_BIT_MASK(32); if (iommu_identity_mapping == 2)
return IS_GFX_DEVICE(pdev);
else
return pdev->dma_mask > DMA_BIT_MASK(32);
} }
/* Check if the pdev needs to go through non-identity map and unmap process.*/ /* Check if the pdev needs to go through non-identity map and unmap process.*/