Commit 73bce7a4 authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Use flexible array member 

Use flexible array member in ip discovery struct as recommended[1].

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays



v2: squash in struct_size fixes

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 25faeddc

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

+4 −4
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static void amdgpu_discovery_read_harvest_bit_per_ip(struct amdgpu_device *adev, 
                                }

                        }

next_ip:

			ip_offset += sizeof(*ip) + 4 * (ip->num_base_address - 1);

			ip_offset += struct_size(ip, base_address, ip->num_base_address);

		}

	}

}
@@ -798,7 +798,7 @@ static int amdgpu_discovery_sysfs_ips(struct amdgpu_device *adev, 
			res = kobject_add(&ip_hw_instance->kobj, NULL,

					  "%d", ip_hw_instance->num_instance);

next_ip:

			ip_offset += sizeof(*ip) + 4 * (ip->num_base_address - 1);

			ip_offset += struct_size(ip, base_address, ip->num_base_address);

		}

	}
@@ -1063,7 +1063,7 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev) 
			}



next_ip:

			ip_offset += sizeof(*ip) + 4 * (ip->num_base_address - 1);

			ip_offset += struct_size(ip, base_address, ip->num_base_address);

		}

	}
@@ -1113,7 +1113,7 @@ int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id, int n 
					*revision = ip->revision;

				return 0;

			}

			ip_offset += sizeof(*ip) + 4 * (ip->num_base_address - 1);

			ip_offset += struct_size(ip, base_address, ip->num_base_address);

		}

	}

drivers/gpu/drm/amd/include/discovery.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ typedef struct ip 
	uint8_t harvest : 4;      /* Harvest */

	uint8_t reserved : 4;     /* Placeholder field */

#endif

	uint32_t base_address[1]; /* variable number of Addresses */

	uint32_t base_address[]; /* variable number of Addresses */

} ip;



typedef struct die_header