Commit 622ba12a authored by Mark McLoughlin's avatar Mark McLoughlin Committed by Joerg Roedel
Browse files

intel-iommu: move DMA PTE defs out of dma_remapping.h 



DMA_PTE_READ/WRITE are needed by kvm.

Signed-off-by: default avatarMark McLoughlin <markmc@redhat.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 7a8fc25e

drivers/pci/intel-iommu.c

+22 −0
Original line number Diff line number Diff line
@@ -128,6 +128,28 @@ struct context_entry { 
	do {(c).hi |= ((val) & ((1 << 16) - 1)) << 8;} while (0)

#define context_clear_entry(c) do {(c).lo = 0; (c).hi = 0;} while (0)



/*

 * 0: readable

 * 1: writable

 * 2-6: reserved

 * 7: super page

 * 8-11: available

 * 12-63: Host physcial address

 */

struct dma_pte {

	u64 val;

};

#define dma_clear_pte(p)	do {(p).val = 0;} while (0)



#define dma_set_pte_readable(p) do {(p).val |= DMA_PTE_READ;} while (0)

#define dma_set_pte_writable(p) do {(p).val |= DMA_PTE_WRITE;} while (0)

#define dma_set_pte_prot(p, prot) \

		do {(p).val = ((p).val & ~3) | ((prot) & 3); } while (0)

#define dma_pte_addr(p) ((p).val & VTD_PAGE_MASK)

#define dma_set_pte_addr(p, addr) do {\

		(p).val |= ((addr) & VTD_PAGE_MASK); } while (0)

#define dma_pte_present(p) (((p).val & 3) != 0)



static void flush_unmaps_timeout(unsigned long data);



DEFINE_TIMER(unmap_timer,  flush_unmaps_timeout, 0, 0);

include/linux/dma_remapping.h

+0 −22
Original line number Diff line number Diff line
@@ -11,31 +11,9 @@ 


struct root_entry;



/*

 * 0: readable

 * 1: writable

 * 2-6: reserved

 * 7: super page

 * 8-11: available

 * 12-63: Host physcial address

 */

struct dma_pte {

	u64 val;

};

#define dma_clear_pte(p)	do {(p).val = 0;} while (0)



#define DMA_PTE_READ (1)

#define DMA_PTE_WRITE (2)



#define dma_set_pte_readable(p) do {(p).val |= DMA_PTE_READ;} while (0)

#define dma_set_pte_writable(p) do {(p).val |= DMA_PTE_WRITE;} while (0)

#define dma_set_pte_prot(p, prot) \

		do {(p).val = ((p).val & ~3) | ((prot) & 3); } while (0)

#define dma_pte_addr(p) ((p).val & VTD_PAGE_MASK)

#define dma_set_pte_addr(p, addr) do {\

		(p).val |= ((addr) & VTD_PAGE_MASK); } while (0)

#define dma_pte_present(p) (((p).val & 3) != 0)



struct intel_iommu;



struct dmar_domain {