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

Commit b94e4117 authored by Jiang Liu's avatar Jiang Liu Committed by Joerg Roedel
Browse files

iommu/vt-d: Move private structures and variables into intel-iommu.c 



Move private structures and variables into intel-iommu.c, which will
help to simplify locking policy for hotplug. Also delete redundant
declarations.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <joro@8bytes.org>
parent bb3a6b78

drivers/iommu/intel-iommu.c

+25 −6
Original line number Diff line number Diff line
@@ -380,6 +380,29 @@ struct device_domain_info { 
	struct dmar_domain *domain; /* pointer to domain */

};



struct dmar_rmrr_unit {

	struct list_head list;		/* list of rmrr units	*/

	struct acpi_dmar_header *hdr;	/* ACPI header		*/

	u64	base_address;		/* reserved base address*/

	u64	end_address;		/* reserved end address */

	struct pci_dev **devices;	/* target devices */

	int	devices_cnt;		/* target device count */

};



struct dmar_atsr_unit {

	struct list_head list;		/* list of ATSR units */

	struct acpi_dmar_header *hdr;	/* ACPI header */

	struct pci_dev **devices;	/* target devices */

	int devices_cnt;		/* target device count */

	u8 include_all:1;		/* include all ports */

};



static LIST_HEAD(dmar_atsr_units);

static LIST_HEAD(dmar_rmrr_units);



#define for_each_rmrr_units(rmrr) \

	list_for_each_entry(rmrr, &dmar_rmrr_units, list)



static void flush_unmaps_timeout(unsigned long data);



static DEFINE_TIMER(unmap_timer,  flush_unmaps_timeout, 0, 0);
@@ -403,6 +426,8 @@ static int timer_on; 
static long list_size;



static void domain_remove_dev_info(struct dmar_domain *domain);

static void domain_remove_one_dev_info(struct dmar_domain *domain,

				       struct pci_dev *pdev);



#ifdef CONFIG_INTEL_IOMMU_DEFAULT_ON

int dmar_disabled = 0;
@@ -2243,8 +2268,6 @@ static int __init si_domain_init(int hw) 
	return 0;

}



static void domain_remove_one_dev_info(struct dmar_domain *domain,

					  struct pci_dev *pdev);

static int identity_mapping(struct pci_dev *pdev)

{

	struct device_domain_info *info;
@@ -3432,8 +3455,6 @@ static void __init init_iommu_pm_ops(void) 
static inline void init_iommu_pm_ops(void) {}

#endif	/* CONFIG_PM */



LIST_HEAD(dmar_rmrr_units);



static void __init dmar_register_rmrr_unit(struct dmar_rmrr_unit *rmrr)

{

	list_add(&rmrr->list, &dmar_rmrr_units);
@@ -3470,8 +3491,6 @@ rmrr_parse_dev(struct dmar_rmrr_unit *rmrru) 
				    rmrr->segment);

}



static LIST_HEAD(dmar_atsr_units);



int __init dmar_parse_one_atsr(struct acpi_dmar_header *hdr)

{

	struct acpi_dmar_atsr *atsr;

include/linux/dmar.h

+1 −22
Original line number Diff line number Diff line
@@ -139,28 +139,7 @@ extern int arch_setup_dmar_msi(unsigned int irq); 


#ifdef CONFIG_INTEL_IOMMU

extern int iommu_detected, no_iommu;

extern struct list_head dmar_rmrr_units;

struct dmar_rmrr_unit {

	struct list_head list;		/* list of rmrr units	*/

	struct acpi_dmar_header *hdr;	/* ACPI header		*/

	u64	base_address;		/* reserved base address*/

	u64	end_address;		/* reserved end address */

	struct pci_dev **devices;	/* target devices */

	int	devices_cnt;		/* target device count */

};



#define for_each_rmrr_units(rmrr) \

	list_for_each_entry(rmrr, &dmar_rmrr_units, list)



struct dmar_atsr_unit {

	struct list_head list;		/* list of ATSR units */

	struct acpi_dmar_header *hdr;	/* ACPI header */

	struct pci_dev **devices;	/* target devices */

	int devices_cnt;		/* target device count */

	u8 include_all:1;		/* include all ports */

};



int dmar_parse_rmrr_atsr_dev(void);

extern int dmar_parse_rmrr_atsr_dev(void);

extern int dmar_parse_one_rmrr(struct acpi_dmar_header *header);

extern int dmar_parse_one_atsr(struct acpi_dmar_header *header);

extern int intel_iommu_init(void);