Commit c7b6bac9 authored by Fenghua Yu's avatar Fenghua Yu Committed by Borislav Petkov
Browse files

drm, iommu: Change type of pasid to u32 



PASID is defined as a few different types in iommu including "int",
"u32", and "unsigned int". To be consistent and to match with uapi
definitions, define PASID and its variations (e.g. max PASID) as "u32".
"u32" is also shorter and a little more explicit than "unsigned int".

No PASID type change in uapi although it defines PASID as __u64 in
some places.

Suggested-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarTony Luck <tony.luck@intel.com>
Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Acked-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: default avatarJoerg Roedel <jroedel@suse.de>
Link: https://lkml.kernel.org/r/1600187413-163670-2-git-send-email-fenghua.yu@intel.com
parent 856deb86

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h

+2 −2
Original line number Diff line number Diff line
@@ -207,11 +207,11 @@ uint8_t amdgpu_amdkfd_get_xgmi_hops_count(struct kgd_dev *dst, struct kgd_dev *s 
	})



/* GPUVM API */

int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, unsigned int pasid,

int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, u32 pasid,

					void **vm, void **process_info,

					struct dma_fence **ef);

int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,

					struct file *filp, unsigned int pasid,

					struct file *filp, u32 pasid,

					void **vm, void **process_info,

					struct dma_fence **ef);

void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev,

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static void kgd_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid, 
	unlock_srbm(kgd);

}



static int kgd_set_pasid_vmid_mapping(struct kgd_dev *kgd, unsigned int pasid,

static int kgd_set_pasid_vmid_mapping(struct kgd_dev *kgd, u32 pasid,

					unsigned int vmid)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static void kgd_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid, 
	unlock_srbm(kgd);

}



static int kgd_set_pasid_vmid_mapping(struct kgd_dev *kgd, unsigned int pasid,

static int kgd_set_pasid_vmid_mapping(struct kgd_dev *kgd, u32 pasid,

					unsigned int vmid)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static void kgd_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid, 
	unlock_srbm(kgd);

}



static int kgd_set_pasid_vmid_mapping(struct kgd_dev *kgd, unsigned int pasid,

static int kgd_set_pasid_vmid_mapping(struct kgd_dev *kgd, u32 pasid,

					unsigned int vmid)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ void kgd_gfx_v9_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid, 
	unlock_srbm(kgd);

}



int kgd_gfx_v9_set_pasid_vmid_mapping(struct kgd_dev *kgd, unsigned int pasid,

int kgd_gfx_v9_set_pasid_vmid_mapping(struct kgd_dev *kgd, u32 pasid,

					unsigned int vmid)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);

CRA Git | Maintained and supported by SUSTech CRA and CCSE