Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bf20f0d authored by David Woodhouse's avatar David Woodhouse
Browse files

intel-iommu: dump mappings but don't die on pte already set

parent 9051aa02
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -1673,7 +1673,16 @@ static int __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn,
		/* We don't need lock here, nobody else
		 * touches the iova range
		 */
		BUG_ON(dma_pte_addr(pte));
		if (unlikely(dma_pte_addr(pte))) {
			static int dumps = 5;
			printk(KERN_CRIT "ERROR: DMA PTE for vPFN 0x%lx already set (to %llx)\n",
			       iov_pfn, pte->val);
			if (dumps) {
				dumps--;
				debug_dma_dump_mappings(NULL);
			}
			WARN_ON(1);
		}
		pte->val = pteval;
		pte++;
		if (!nr_pages ||