Commit b4789aac authored by Akhil P Oommen's avatar Akhil P Oommen Committed by Rob Clark
Browse files

drm/msm/a6xx: Fix GMU firmware parser 



Current parser logic for GMU firmware assumes a dword aligned payload
size for every block. This is not true for all GMU firmwares. So, fix
this by using correct 'size' value in the calculation for the offset
for the next block's header.

Fixes: c6ed04f8 ("drm/msm/a6xx: A640/A650 GMU firmware path")
Signed-off-by: default avatarAkhil P Oommen <akhilpo@oss.qualcomm.com>
Acked-by: default avatarKonrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/674040/


Message-ID: <20250911-assorted-sept-1-v2-2-a8bf1ee20792@oss.qualcomm.com>
Signed-off-by: default avatarRob Clark <robin.clark@oss.qualcomm.com>
parent 830d68f2

drivers/gpu/drm/msm/adreno/a6xx_gmu.c

+4 −1
Original line number Diff line number Diff line
@@ -780,6 +780,9 @@ static bool fw_block_mem(struct a6xx_gmu_bo *bo, const struct block_header *blk) 
	return true;

}



#define NEXT_BLK(blk) \

	((const struct block_header *)((const char *)(blk) + sizeof(*(blk)) + (blk)->size))



static int a6xx_gmu_fw_load(struct a6xx_gmu *gmu)

{

	struct a6xx_gpu *a6xx_gpu = container_of(gmu, struct a6xx_gpu, gmu);
@@ -811,7 +814,7 @@ static int a6xx_gmu_fw_load(struct a6xx_gmu *gmu) 


	for (blk = (const struct block_header *) fw_image->data;

	     (const u8*) blk < fw_image->data + fw_image->size;

	     blk = (const struct block_header *) &blk->data[blk->size >> 2]) {

	     blk = NEXT_BLK(blk)) {

		if (blk->size == 0)

			continue;