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

Commit f5d1b97b authored by Suresh Siddha's avatar Suresh Siddha Committed by Ingo Molnar
Browse files

iommu: Cleanup ifdefs in detect_intel_iommu() 



Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
Cc: yinghai@kernel.org
Cc: youquan.song@intel.com
Cc: joerg.roedel@amd.com
Cc: tony.luck@intel.com
Cc: dwmw2@infradead.org
Link: http://lkml.kernel.org/r/20110824001456.386003047@sbsiddha-desk.sc.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 80990c5b

arch/ia64/include/asm/iommu.h

+4 −2
Original line number Diff line number Diff line
@@ -7,12 +7,14 @@ 


extern void pci_iommu_shutdown(void);

extern void no_iommu_init(void);

extern int force_iommu, no_iommu;

extern int iommu_detected;

#ifdef	CONFIG_DMAR

extern int force_iommu, no_iommu;

extern int iommu_pass_through;

extern int iommu_detected;

#else

#define iommu_pass_through	(0)

#define no_iommu		(1)

#define iommu_detected		(0)

#endif

extern void iommu_dma_init(void);

extern void machvec_init(const char *name);

drivers/iommu/dmar.c

+6 −7
Original line number Diff line number Diff line
@@ -551,22 +551,21 @@ int __init detect_intel_iommu(void) 
	if (ret)

		ret = check_zero_address();

	{

#ifdef CONFIG_INTR_REMAP

		struct acpi_table_dmar *dmar;



		dmar = (struct acpi_table_dmar *) dmar_tbl;

		if (ret && cpu_has_x2apic && dmar->flags & 0x1)



		if (ret && intr_remapping_enabled && cpu_has_x2apic &&

		    dmar->flags & 0x1)

			printk(KERN_INFO

			       "Queued invalidation will be enabled to support "

			       "x2apic and Intr-remapping.\n");

#endif

#ifdef CONFIG_DMAR

			       "Queued invalidation will be enabled to support x2apic and Intr-remapping.\n");



		if (ret && !no_iommu && !iommu_detected && !dmar_disabled) {

			iommu_detected = 1;

			/* Make sure ACS will be enabled */

			pci_request_acs();

		}

#endif



#ifdef CONFIG_X86

		if (ret)

			x86_init.iommu.iommu_init = intel_iommu_init;

include/linux/dma_remapping.h

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ struct root_entry; 
extern void free_dmar_iommu(struct intel_iommu *iommu);

extern int iommu_calculate_agaw(struct intel_iommu *iommu);

extern int iommu_calculate_max_sagaw(struct intel_iommu *iommu);

extern int dmar_disabled;

#else

static inline int iommu_calculate_agaw(struct intel_iommu *iommu)

{
@@ -42,8 +43,8 @@ static inline int iommu_calculate_max_sagaw(struct intel_iommu *iommu) 
static inline void free_dmar_iommu(struct intel_iommu *iommu)

{

}

#define dmar_disabled	(1)

#endif



extern int dmar_disabled;



#endif