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

drm/amdgpu: change if condition for bad channel bitmap update 



The amdgpu_ras_eeprom_control.bad_channel_bitmap is u32 type, but the
channel index could be larger than 32. For the ASICs whose channel
number is more than 32, the amdgpu_dpm_send_hbm_bad_channel_flag
interface is not supported, so we simply bypass channel bitmap update under
this condition.

v2: replace sizeof with BITS_PER_TYPE, we should check bit number
instead of byte number.

Signed-off-by: default avatarTao Zhou <tao.zhou1@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6205b558

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

+4 −2
Original line number Diff line number Diff line
@@ -616,7 +616,8 @@ amdgpu_ras_eeprom_append_table(struct amdgpu_ras_eeprom_control *control, 
		__encode_table_record_to_buf(control, &record[i], pp);



		/* update bad channel bitmap */

		if (!(control->bad_channel_bitmap & (1 << record[i].mem_channel))) {

		if ((record[i].mem_channel < BITS_PER_TYPE(control->bad_channel_bitmap)) &&

		    !(control->bad_channel_bitmap & (1 << record[i].mem_channel))) {

			control->bad_channel_bitmap |= 1 << record[i].mem_channel;

			con->update_channel_flag = true;

		}
@@ -969,7 +970,8 @@ int amdgpu_ras_eeprom_read(struct amdgpu_ras_eeprom_control *control, 
		__decode_table_record_from_buf(control, &record[i], pp);



		/* update bad channel bitmap */

		if (!(control->bad_channel_bitmap & (1 << record[i].mem_channel))) {

		if ((record[i].mem_channel < BITS_PER_TYPE(control->bad_channel_bitmap)) &&

		    !(control->bad_channel_bitmap & (1 << record[i].mem_channel))) {

			control->bad_channel_bitmap |= 1 << record[i].mem_channel;

			con->update_channel_flag = true;

		}