Commit af2ba368 authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: convert logical instance mask to physical one 



Convert instance mask for the convenience of RAS TA.

Signed-off-by: default avatarTao Zhou <tao.zhou1@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarStanley.Yang <Stanley.Yang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 40b832aa

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

+4 −2
Original line number Diff line number Diff line
@@ -677,12 +677,14 @@ enum amd_hw_ip_block_type { 
#define IP_VERSION_REV(ver) ((ver) & 0xFF)



struct amdgpu_ip_map_info {

	/* Map of logical to actual dev instances */

	/* Map of logical to actual dev instances/mask */

	uint32_t 		dev_inst[MAX_HWIP][HWIP_MAX_INSTANCE];

	int8_t (*logical_to_dev_inst)(struct amdgpu_device *adev,

				      enum amd_hw_ip_block_type block,

				      int8_t inst);



	uint32_t (*logical_to_dev_mask)(struct amdgpu_device *adev,

					enum amd_hw_ip_block_type block,

					uint32_t mask);

};



struct amd_powerplay {

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

+18 −0
Original line number Diff line number Diff line
@@ -229,6 +229,23 @@ static int8_t aqua_vanjaram_logical_to_dev_inst(struct amdgpu_device *adev, 
	return dev_inst;

}



static uint32_t aqua_vanjaram_logical_to_dev_mask(struct amdgpu_device *adev,

					 enum amd_hw_ip_block_type block,

					 uint32_t mask)

{

	uint32_t dev_mask = 0;

	int8_t log_inst, dev_inst;



	while (mask) {

		log_inst = ffs(mask) - 1;

		dev_inst = aqua_vanjaram_logical_to_dev_inst(adev, block, log_inst);

		dev_mask |= (1 << dev_inst);

		mask &= ~(1 << log_inst);

	}



	return dev_mask;

}



static void aqua_vanjaram_populate_ip_map(struct amdgpu_device *adev,

					  enum amd_hw_ip_block_type ip_block,

					  uint32_t inst_mask)
@@ -257,6 +274,7 @@ void aqua_vanjaram_ip_map_init(struct amdgpu_device *adev) 
		aqua_vanjaram_populate_ip_map(adev, ip_map[i][0], ip_map[i][1]);



	adev->ip_map.logical_to_dev_inst = aqua_vanjaram_logical_to_dev_inst;

	adev->ip_map.logical_to_dev_mask = aqua_vanjaram_logical_to_dev_mask;

}



/* Fixed pattern for smn addressing on different AIDs:

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

+6 −1
Original line number Diff line number Diff line
@@ -25,7 +25,12 @@ 
#define __SOC15_COMMON_H__



/* GET_INST returns the physical instance corresponding to a logical instance */

#define GET_INST(ip, inst) (adev->ip_map.logical_to_dev_inst? adev->ip_map.logical_to_dev_inst(adev, ip##_HWIP, inst): inst)

#define GET_INST(ip, inst) \

	(adev->ip_map.logical_to_dev_inst ? \

	adev->ip_map.logical_to_dev_inst(adev, ip##_HWIP, inst) : inst)

#define GET_MASK(ip, mask) \

	(adev->ip_map.logical_to_dev_mask ? \

	adev->ip_map.logical_to_dev_mask(adev, ip##_HWIP, mask) : mask)



/* Register Access Macros */

#define SOC15_REG_OFFSET(ip, inst, reg)	(adev->reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg)