diff for duplicates of <20081007000153.GA25089@linux-os.sc.intel.com> diff --git a/a/1.txt b/N1/1.txt index 45b7f81..b554b5c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -40,7 +40,7 @@ index 23882c4..6751f4c 100644 - -static __devinit void via_no_dac(struct pci_dev *dev) -{ -- if ((dev->class >> 8) = PCI_CLASS_BRIDGE_PCI && forbid_dac = 0) { +- if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI && forbid_dac == 0) { - printk(KERN_INFO "PCI: VIA PCI bridge detected." - "Disabling DAC.\n"); - forbid_dac = 1; @@ -136,8 +136,8 @@ index fc5f2db..973c7ae 100644 +#define ROOT_SIZE VTD_PAGE_SIZE +#define CONTEXT_SIZE VTD_PAGE_SIZE + - #define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) = PCI_BASE_CLASS_DISPLAY) - #define IS_ISA_DEVICE(pdev) ((pdev->class >> 8) = PCI_CLASS_BRIDGE_ISA) + #define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY) + #define IS_ISA_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA) @@ -199,7 +202,7 @@ static struct context_entry * device_to_context_entry(struct intel_iommu *iommu, spin_unlock_irqrestore(&iommu->lock, flags); @@ -199,7 +199,7 @@ index fc5f2db..973c7ae 100644 - BUG_ON(addr & (~PAGE_MASK_4K)); + BUG_ON(addr & (~VTD_PAGE_MASK)); - BUG_ON(pages = 0); + BUG_ON(pages == 0); /* Fallback to domain selective flush if no PSI support */ @@ -831,7 +835,7 @@ void dmar_msi_read(int irq, struct msi_msg *msg) @@ -249,7 +249,7 @@ index fc5f2db..973c7ae 100644 + + hpa &= (((u64)1) << addr_width) - 1; - if ((prot & (DMA_PTE_READ|DMA_PTE_WRITE)) = 0) + if ((prot & (DMA_PTE_READ|DMA_PTE_WRITE)) == 0) return -EINVAL; - iova &= PAGE_MASK_4K; - start_pfn = ((u64)hpa) >> PAGE_SHIFT_4K; @@ -333,8 +333,8 @@ index fc5f2db..973c7ae 100644 struct dmar_domain *domain; @@ -1825,7 +1834,7 @@ intel_map_single(struct device *hwdev, phys_addr_t paddr, size_t size, int dir) - BUG_ON(dir = DMA_NONE); - if (pdev->dev.archdata.iommu = DUMMY_DEVICE_DOMAIN_INFO) + BUG_ON(dir == DMA_NONE); + if (pdev->dev.archdata.iommu == DUMMY_DEVICE_DOMAIN_INFO) - return paddr; + return (dma_addr_t)paddr; @@ -486,7 +486,7 @@ index fc5f2db..973c7ae 100644 { void *addr; @@ -2112,14 +2122,14 @@ static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, - if (dir = DMA_FROM_DEVICE || dir = DMA_BIDIRECTIONAL) + if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) prot |= DMA_PTE_WRITE; - start_addr = iova->pfn_lo << PAGE_SHIFT_4K; @@ -568,7 +568,7 @@ index b7c2378..5c0ad61 100644 +/* Many VIA bridges seem to corrupt data for DAC. Disable it here */ +static __devinit void via_no_dac(struct pci_dev *dev) +{ -+ if ((dev->class >> 8) = PCI_CLASS_BRIDGE_PCI && forbid_dac = 0) { ++ if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI && forbid_dac == 0) { + dev_info(&dev->dev, + "VIA PCI bridge detected. Disabling DAC.\n"); + forbid_dac = 1; diff --git a/a/content_digest b/N1/content_digest index a03df40..f6f84fd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020081001165725.GA21559@linux-os.sc.intel.com\0" "From\0Fenghua Yu <fenghua.yu@intel.com>\0" "Subject\0[PATCH V2 1/2] Add Variable Page Size and IA64 Support in Intel IOMMU: Generic Part\0" - "Date\0Tue, 07 Oct 2008 00:01:53 +0000\0" + "Date\0Mon, 6 Oct 2008 17:01:53 -0700\0" "To\0Luck" Tony <tony.luck@intel.com> Jesse Barnes <jbarnes@virtuousgeek.org> @@ -59,7 +59,7 @@ "-\n" "-static __devinit void via_no_dac(struct pci_dev *dev)\n" "-{\n" - "-\tif ((dev->class >> 8) = PCI_CLASS_BRIDGE_PCI && forbid_dac = 0) {\n" + "-\tif ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI && forbid_dac == 0) {\n" "-\t\tprintk(KERN_INFO \"PCI: VIA PCI bridge detected.\"\n" "-\t\t\t\t \"Disabling DAC.\\n\");\n" "-\t\tforbid_dac = 1;\n" @@ -155,8 +155,8 @@ "+#define ROOT_SIZE\t\tVTD_PAGE_SIZE\n" "+#define CONTEXT_SIZE\t\tVTD_PAGE_SIZE\n" "+\n" - " #define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) = PCI_BASE_CLASS_DISPLAY)\n" - " #define IS_ISA_DEVICE(pdev) ((pdev->class >> 8) = PCI_CLASS_BRIDGE_ISA)\n" + " #define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY)\n" + " #define IS_ISA_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA)\n" " \n" "@@ -199,7 +202,7 @@ static struct context_entry * device_to_context_entry(struct intel_iommu *iommu,\n" " \t\t\tspin_unlock_irqrestore(&iommu->lock, flags);\n" @@ -218,7 +218,7 @@ " \n" "-\tBUG_ON(addr & (~PAGE_MASK_4K));\n" "+\tBUG_ON(addr & (~VTD_PAGE_MASK));\n" - " \tBUG_ON(pages = 0);\n" + " \tBUG_ON(pages == 0);\n" " \n" " \t/* Fallback to domain selective flush if no PSI support */\n" "@@ -831,7 +835,7 @@ void dmar_msi_read(int irq, struct msi_msg *msg)\n" @@ -268,7 +268,7 @@ "+\n" "+\thpa &= (((u64)1) << addr_width) - 1;\n" " \n" - " \tif ((prot & (DMA_PTE_READ|DMA_PTE_WRITE)) = 0)\n" + " \tif ((prot & (DMA_PTE_READ|DMA_PTE_WRITE)) == 0)\n" " \t\treturn -EINVAL;\n" "-\tiova &= PAGE_MASK_4K;\n" "-\tstart_pfn = ((u64)hpa) >> PAGE_SHIFT_4K;\n" @@ -352,8 +352,8 @@ " \tstruct dmar_domain *domain;\n" "@@ -1825,7 +1834,7 @@ intel_map_single(struct device *hwdev, phys_addr_t paddr, size_t size, int dir)\n" " \n" - " \tBUG_ON(dir = DMA_NONE);\n" - " \tif (pdev->dev.archdata.iommu = DUMMY_DEVICE_DOMAIN_INFO)\n" + " \tBUG_ON(dir == DMA_NONE);\n" + " \tif (pdev->dev.archdata.iommu == DUMMY_DEVICE_DOMAIN_INFO)\n" "-\t\treturn paddr;\n" "+\t\treturn (dma_addr_t)paddr;\n" " \n" @@ -505,7 +505,7 @@ " {\n" " \tvoid *addr;\n" "@@ -2112,14 +2122,14 @@ static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist,\n" - " \tif (dir = DMA_FROM_DEVICE || dir = DMA_BIDIRECTIONAL)\n" + " \tif (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL)\n" " \t\tprot |= DMA_PTE_WRITE;\n" " \n" "-\tstart_addr = iova->pfn_lo << PAGE_SHIFT_4K;\n" @@ -587,7 +587,7 @@ "+/* Many VIA bridges seem to corrupt data for DAC. Disable it here */\n" "+static __devinit void via_no_dac(struct pci_dev *dev)\n" "+{\n" - "+\tif ((dev->class >> 8) = PCI_CLASS_BRIDGE_PCI && forbid_dac = 0) {\n" + "+\tif ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI && forbid_dac == 0) {\n" "+\t\tdev_info(&dev->dev,\n" "+\t\t\t\"VIA PCI bridge detected. Disabling DAC.\\n\");\n" "+\t\tforbid_dac = 1;\n" @@ -764,4 +764,4 @@ "+\n" #endif -ac354253cb258e8d7bb17670aedff07188b1dc95534113c51f3eb1234a670b7f +eb076789b34bffaf4138bc7e4438e60cc1f770dbd5338cefb10e90a467952706
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.