Commit e113a725 authored by Suravee Suthikulpanit's avatar Suravee Suthikulpanit Committed by Joerg Roedel
Browse files

iommu/amd: Introduce struct amd_iommu_viommu 



Which stores reference to nested parent domain assigned during the call to
struct iommu_ops.viommu_init(). Information in the nest parent is needed
when setting up the nested translation.

Note that the viommu initialization will be introduced in subsequent
commit.

Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent b43a29de

drivers/iommu/amd/amd_iommu_types.h

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/list.h>

#include <linux/spinlock.h>

#include <linux/pci.h>

#include <linux/iommufd.h>

#include <linux/irqreturn.h>

#include <linux/generic_pt/iommu.h>
@@ -495,6 +496,11 @@ struct pdom_iommu_info { 
	u32 refcnt;	/* Count of attached dev/pasid per domain/IOMMU */

};



struct amd_iommu_viommu {

	struct iommufd_viommu core;

	struct protection_domain *parent; /* nest parent domain for this viommu */

};



/*

 * This structure contains generic data for  IOMMU protection domains

 * independent of their use.

drivers/iommu/amd/iommu.c

+2 −0
Original line number Diff line number Diff line
@@ -3120,6 +3120,8 @@ const struct iommu_ops amd_iommu_ops = { 
	.is_attach_deferred = amd_iommu_is_attach_deferred,

	.def_domain_type = amd_iommu_def_domain_type,

	.page_response = amd_iommu_page_response,

	.get_viommu_size = amd_iommufd_get_viommu_size,

	.viommu_init = amd_iommufd_viommu_init,

};



#ifdef CONFIG_IRQ_REMAP

drivers/iommu/amd/iommufd.c

+16 −0
Original line number Diff line number Diff line
@@ -29,3 +29,19 @@ void *amd_iommufd_hw_info(struct device *dev, u32 *length, u32 *type) 


	return hwinfo;

}



size_t amd_iommufd_get_viommu_size(struct device *dev, enum iommu_viommu_type viommu_type)

{

	return VIOMMU_STRUCT_SIZE(struct amd_iommu_viommu, core);

}



int amd_iommufd_viommu_init(struct iommufd_viommu *viommu, struct iommu_domain *parent,

			    const struct iommu_user_data *user_data)

{

	struct protection_domain *pdom = to_pdomain(parent);

	struct amd_iommu_viommu *aviommu = container_of(viommu, struct amd_iommu_viommu, core);



	aviommu->parent = pdom;



	return 0;

}

drivers/iommu/amd/iommufd.h

+5 −0
Original line number Diff line number Diff line
@@ -8,8 +8,13 @@ 


#if IS_ENABLED(CONFIG_AMD_IOMMU_IOMMUFD)

void *amd_iommufd_hw_info(struct device *dev, u32 *length, u32 *type);

size_t amd_iommufd_get_viommu_size(struct device *dev, enum iommu_viommu_type viommu_type);

int amd_iommufd_viommu_init(struct iommufd_viommu *viommu, struct iommu_domain *parent,

			    const struct iommu_user_data *user_data);

#else

#define amd_iommufd_hw_info NULL

#define amd_iommufd_viommu_init NULL

#define amd_iommufd_get_viommu_size NULL

#endif /* CONFIG_AMD_IOMMU_IOMMUFD */



#endif /* AMD_IOMMUFD_H */