Commit 26b86092 authored by Sohil Mehta's avatar Sohil Mehta Committed by Joerg Roedel
Browse files

iommu/vt-d: Relocate struct/function declarations to its header files 



To reuse the static functions and the struct declarations, move them to
corresponding header files and export the needed functions.

Cc: Lu Baolu <baolu.lu@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarGayatri Kammela <gayatri.kammela@intel.com>
Signed-off-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 6bf4ca7f

arch/x86/include/asm/irq_remapping.h

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ struct vcpu_data { 


#ifdef CONFIG_IRQ_REMAP



extern raw_spinlock_t irq_2_ir_lock;



extern bool irq_remapping_cap(enum irq_remap_cap cap);

extern void set_irq_remapping_broken(void);

extern int irq_remapping_prepare(void);

drivers/iommu/intel-iommu.c

+3 −28
Original line number Diff line number Diff line
@@ -185,16 +185,6 @@ static int rwbf_quirk; 
static int force_on = 0;

int intel_iommu_tboot_noforce;



/*

 * 0: Present

 * 1-11: Reserved

 * 12-63: Context Ptr (12 - (haw-1))

 * 64-127: Reserved

 */

struct root_entry {

	u64	lo;

	u64	hi;

};

#define ROOT_ENTRY_NR (VTD_PAGE_SIZE/sizeof(struct root_entry))



/*
@@ -220,21 +210,6 @@ static phys_addr_t root_entry_uctp(struct root_entry *re) 


	return re->hi & VTD_PAGE_MASK;

}

/*

 * low 64 bits:

 * 0: present

 * 1: fault processing disable

 * 2-3: translation type

 * 12-63: address space root

 * high 64 bits:

 * 0-2: address width

 * 3-6: aval

 * 8-23: domain id

 */

struct context_entry {

	u64 lo;

	u64 hi;

};



static inline void context_clear_pasid_enable(struct context_entry *context)

{
@@ -261,7 +236,7 @@ static inline bool __context_present(struct context_entry *context) 
	return (context->lo & 1);

}



static inline bool context_present(struct context_entry *context)

bool context_present(struct context_entry *context)

{

	return context_pasid_enabled(context) ?

	     __context_present(context) :
@@ -788,8 +763,8 @@ static void domain_update_iommu_cap(struct dmar_domain *domain) 
	domain->iommu_superpage = domain_update_iommu_superpage(NULL);

}



static inline struct context_entry *iommu_context_addr(struct intel_iommu *iommu,

						       u8 bus, u8 devfn, int alloc)

struct context_entry *iommu_context_addr(struct intel_iommu *iommu, u8 bus,

					 u8 devfn, int alloc)

{

	struct root_entry *root = &iommu->root_entry[bus];

	struct context_entry *context;

drivers/iommu/intel_irq_remapping.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static struct hpet_scope ir_hpet[MAX_HPET_TBS]; 
 * in single-threaded environment with interrupt disabled, so no need to tabke

 * the dmar_global_lock.

 */

static DEFINE_RAW_SPINLOCK(irq_2_ir_lock);

DEFINE_RAW_SPINLOCK(irq_2_ir_lock);

static const struct irq_domain_ops intel_ir_domain_ops;



static void iommu_disable_irq_remapping(struct intel_iommu *iommu);

include/linux/intel-iommu.h

+30 −0
Original line number Diff line number Diff line
@@ -389,6 +389,33 @@ struct pasid_entry; 
struct pasid_state_entry;

struct page_req_dsc;



/*

 * 0: Present

 * 1-11: Reserved

 * 12-63: Context Ptr (12 - (haw-1))

 * 64-127: Reserved

 */

struct root_entry {

	u64     lo;

	u64     hi;

};



/*

 * low 64 bits:

 * 0: present

 * 1: fault processing disable

 * 2-3: translation type

 * 12-63: address space root

 * high 64 bits:

 * 0-2: address width

 * 3-6: aval

 * 8-23: domain id

 */

struct context_entry {

	u64 lo;

	u64 hi;

};



struct dmar_domain {

	int	nid;			/* node id */
@@ -559,5 +586,8 @@ extern struct intel_iommu *intel_svm_device_to_iommu(struct device *dev); 
#endif



extern const struct attribute_group *intel_iommu_groups[];

bool context_present(struct context_entry *context);

struct context_entry *iommu_context_addr(struct intel_iommu *iommu, u8 bus,

					 u8 devfn, int alloc);



#endif