iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu/discovery: refactor ip list traversal

Browse Source 
for each ip, check whether it is needed by amdgpu driver,
if yes, record its base addresses

v2: change some DRM_INFO to DRM_DEBUG
v3: remove unused variable (Alex)

Signed-off-by: Xiaojie Yuan <xiaojie.yuan@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Xiaojie Yuan 2019-03-27 17:58:25 +08:00 committed by Alex Deucher
parent a190d1c75c
commit 437298b833
1 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
View File

@ -266,7 +266,6 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev)
uint16_t num_ips; uint16_t num_ips;
uint8_t num_base_address; uint8_t num_base_address;
int hw_ip; int hw_ip;
int hw_id;
int i, j, k; int i, j, k;
if (!adev->discovery) { if (!adev->discovery) {
@ -279,40 +278,54 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev)
le16_to_cpu(bhdr->table_list[IP_DISCOVERY].offset)); le16_to_cpu(bhdr->table_list[IP_DISCOVERY].offset));
num_dies = le16_to_cpu(ihdr->num_dies); num_dies = le16_to_cpu(ihdr->num_dies);
for (hw_ip = 0; hw_ip < MAX_HWIP; hw_ip++) { DRM_DEBUG("number of dies: %d\n", num_dies);
hw_id = hw_id_map[hw_ip];
for (i = 0; i < num_dies; i++) { for (i = 0; i < num_dies; i++) {
die_offset = le16_to_cpu(ihdr->die_info[i].die_offset); die_offset = le16_to_cpu(ihdr->die_info[i].die_offset);
dhdr = (struct die_header *)(adev->discovery + die_offset); dhdr = (struct die_header *)(adev->discovery + die_offset);
num_ips = le16_to_cpu(dhdr->num_ips); num_ips = le16_to_cpu(dhdr->num_ips);
ip_offset = die_offset + sizeof(*dhdr); ip_offset = die_offset + sizeof(*dhdr);
for (j = 0; j < num_ips; j++) { if (le16_to_cpu(dhdr->die_id) != i) {
ip = (struct ip *)(adev->discovery + ip_offset); DRM_ERROR("invalid die id %d, expected %d\n",
num_base_address = ip->num_base_address; le16_to_cpu(dhdr->die_id), i);
return -EINVAL;
}
if (le16_to_cpu(ip->hw_id) == hw_id) { DRM_DEBUG("number of hardware IPs on die%d: %d\n",
DRM_DEBUG("%s(%d) v%d.%d.%d:\n", le16_to_cpu(dhdr->die_id), num_ips);
hw_id_names[hw_id], hw_id,
ip->major, ip->minor,
ip->revision);
for (k = 0; k < num_base_address; k++) { for (j = 0; j < num_ips; j++) {
/* ip = (struct ip *)(adev->discovery + ip_offset);
* convert the endianness of base addresses in place, num_base_address = ip->num_base_address;
* so that we don't need to convert them when accessing adev->reg_offset.
*/
ip->base_address[k] = le32_to_cpu(ip->base_address[k]);
DRM_DEBUG("\t0x%08x\n", ip->base_address[k]);
}
DRM_DEBUG("%s(%d) #%d v%d.%d.%d:\n",
hw_id_names[le16_to_cpu(ip->hw_id)],
le16_to_cpu(ip->hw_id),
ip->number_instance,
ip->major, ip->minor,
ip->revision);
for (k = 0; k < num_base_address; k++) {
/*
* convert the endianness of base addresses in place,
* so that we don't need to convert them when accessing adev->reg_offset.
*/
ip->base_address[k] = le32_to_cpu(ip->base_address[k]);
DRM_DEBUG("\t0x%08x\n", ip->base_address[k]);
}
for (hw_ip = 0; hw_ip < MAX_HWIP; hw_ip++) {
if (hw_id_map[hw_ip] == le16_to_cpu(ip->hw_id)) {
DRM_INFO("set register base offset for %s\n",
hw_id_names[le16_to_cpu(ip->hw_id)]);
adev->reg_offset[hw_ip][ip->number_instance] = adev->reg_offset[hw_ip][ip->number_instance] =
ip->base_address; ip->base_address;
} }
ip_offset += sizeof(*ip) + 4 * (ip->num_base_address - 1);
} }
ip_offset += sizeof(*ip) + 4 * (ip->num_base_address - 1);
} }
} }