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

Commit 4c232a70 authored by Baoquan He's avatar Baoquan He Committed by Joerg Roedel
Browse files

iommu/amd: Detect pre enabled translation 



Add functions to check whether translation is already enabled in IOMMU.

Signed-off-by: default avatarBaoquan He <bhe@redhat.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent ef954844

drivers/iommu/amd_iommu_init.c

+24 −0
Original line number Original line Diff line number Diff line
@@ -258,6 +258,25 @@ static int amd_iommu_enable_interrupts(void); 
static int __init iommu_go_to_state(enum iommu_init_state state);

static int __init iommu_go_to_state(enum iommu_init_state state);

static void init_device_table_dma(void);

static void init_device_table_dma(void);





bool translation_pre_enabled(struct amd_iommu *iommu)

{

	return (iommu->flags & AMD_IOMMU_FLAG_TRANS_PRE_ENABLED);

}



static void clear_translation_pre_enabled(struct amd_iommu *iommu)

{

	iommu->flags &= ~AMD_IOMMU_FLAG_TRANS_PRE_ENABLED;

}



static void init_translation_status(struct amd_iommu *iommu)

{

	u32 ctrl;



	ctrl = readl(iommu->mmio_base + MMIO_CONTROL_OFFSET);

	if (ctrl & (1<<CONTROL_IOMMU_EN))

		iommu->flags |= AMD_IOMMU_FLAG_TRANS_PRE_ENABLED;

}



static inline void update_last_devid(u16 devid)

static inline void update_last_devid(u16 devid)

{

{

	if (devid > amd_iommu_last_bdf)

	if (devid > amd_iommu_last_bdf)
@@ -1399,6 +1418,11 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h) 




	iommu->int_enabled = false;

	iommu->int_enabled = false;





	init_translation_status(iommu);



	if (translation_pre_enabled(iommu))

		pr_warn("Translation is already enabled - trying to copy translation structures\n");



	ret = init_iommu_from_acpi(iommu, h);

	ret = init_iommu_from_acpi(iommu, h);

	if (ret)

	if (ret)

		return ret;

		return ret;

drivers/iommu/amd_iommu_proto.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -87,4 +87,5 @@ static inline bool iommu_feature(struct amd_iommu *iommu, u64 f) 
	return !!(iommu->features & f);

	return !!(iommu->features & f);

}

}





extern bool translation_pre_enabled(struct amd_iommu *iommu);

#endif /* _ASM_X86_AMD_IOMMU_PROTO_H  */
 
#endif /* _ASM_X86_AMD_IOMMU_PROTO_H  */

drivers/iommu/amd_iommu_types.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -435,6 +435,8 @@ struct iommu_domain; 
struct irq_domain;

struct irq_domain;

struct amd_irte_ops;

struct amd_irte_ops;





#define AMD_IOMMU_FLAG_TRANS_PRE_ENABLED      (1 << 0)



/*

/*

 * This structure contains generic data for  IOMMU protection domains

 * This structure contains generic data for  IOMMU protection domains

 * independent of their use.

 * independent of their use.
@@ -569,6 +571,7 @@ struct amd_iommu { 
	struct amd_irte_ops *irte_ops;

	struct amd_irte_ops *irte_ops;

#endif

#endif





	u32 flags;

	volatile u64 __aligned(8) cmd_sem;

	volatile u64 __aligned(8) cmd_sem;

};

};