Commit b712d7c2 authored by Yang Wang's avatar Yang Wang Committed by Alex Deucher
Browse files

drm/amdgpu: fix compiler 'side-effect' check issue for RAS_EVENT_LOG() 



create a new helper function to avoid compiler 'side-effect'
check about RAS_EVENT_LOG() macro.

Signed-off-by: default avatarYang Wang <kevinyang.wang@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d430e856

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

+18 −0
Original line number Diff line number Diff line
@@ -4494,3 +4494,21 @@ int amdgpu_ras_reserve_page(struct amdgpu_device *adev, uint64_t pfn) 


	return ret;

}



void amdgpu_ras_event_log_print(struct amdgpu_device *adev, u64 event_id,

				const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	va_start(args, fmt);

	vaf.fmt = fmt;

	vaf.va = &args;



	if (amdgpu_ras_event_id_is_valid(adev, event_id))

		dev_printk(KERN_INFO, adev->dev, "{%llu}%pV", event_id, &vaf);

	else

		dev_printk(KERN_INFO, adev->dev, "%pV", &vaf);



	va_end(args);

}

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

+6 −7
Original line number Diff line number Diff line
@@ -67,13 +67,8 @@ struct amdgpu_iv_entry; 
/* The high three bits indicates socketid */

#define AMDGPU_RAS_GET_FEATURES(val)  ((val) & ~AMDGPU_RAS_FEATURES_SOCKETID_MASK)



#define RAS_EVENT_LOG(_adev, _id, _fmt, ...)				\

do {									\

	if (amdgpu_ras_event_id_is_valid((_adev), (_id)))			\

	    dev_info((_adev)->dev, "{%llu}" _fmt, (_id), ##__VA_ARGS__);	\

	else								\

	    dev_info((_adev)->dev, _fmt, ##__VA_ARGS__);			\

} while (0)

#define RAS_EVENT_LOG(adev, id, fmt, ...)	\

	amdgpu_ras_event_log_print((adev), (id), (fmt), ##__VA_ARGS__);



enum amdgpu_ras_block {

	AMDGPU_RAS_BLOCK__UMC = 0,
@@ -956,4 +951,8 @@ int amdgpu_ras_put_poison_req(struct amdgpu_device *adev, 
		enum amdgpu_ras_block block, uint16_t pasid,

		pasid_notify pasid_fn, void *data, uint32_t reset);



__printf(3, 4)

void amdgpu_ras_event_log_print(struct amdgpu_device *adev, u64 event_id,

				const char *fmt, ...);



#endif