drm/nouveau: fix error path in nvkm_gsp_fwsec_v2
Subsystems (4)
PATCH v3 1/3 drm/nouveau: fix error path in nvkm_gsp_fwsec_v2
Function nvkm_gsp_fwsec_v2() sets 'ret' if the kmemdup() call fails, but it never uses or returns 'ret' after that point. We always need to release the firmware regardless, so do that and then check for error.
--- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c +3 -2
@@ -209,11 +209,12 @@ nvkm_gsp_fwsec_v2(struct nvkm_gsp *gsp, const char *name, fw->boot_addr = bld->start_tag <<8 ; fw->boot_size = bld->code_size; fw->boot =kmemdup (bl->data + hdr->data_offset + bld->code_off, fw->boot_size,GFP_KERNEL ); -if (!fw->boot) - ret = -ENOMEM ;nvkm_firmware_put (bl); +if (!fw->boot) +return -ENOMEM ; +/* Patch in interface data. */ return nvkm_gsp_fwsec_patch (gsp, fw, desc->InterfaceOffset, init_cmd); }
Signature · 1 line
2.43.0
PATCH v3 2/3 drm/nouveau: remove unused increment in gm200_flcn_pio_imem_wr
The 'tag' parameter is passed by value and is not actually used after being incremented, so remove the increment. It's the function that calls gm200_flcn_pio_imem_wr that is supposed to (and does) increment 'tag'.
--- drivers/gpu/drm/nouveau/nvkm/falcon/gm200.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/falcon/gm200.c +1 -1
@@ -103,7 +103,7 @@ gm200_flcn_pio_imem_wr_init(struct nvkm_falcon *falcon, u8 port, bool sec, u32 istatic void gm200_flcn_pio_imem_wr (struct nvkm_falcon *falcon,u8 port,const u8 *img,int len,u16 tag) { -nvkm_falcon_wr32 (falcon,0x188 + (port *0x10 ), tag++); +nvkm_falcon_wr32 (falcon,0x188 + (port *0x10 ), tag);while (len >=4 ) {nvkm_falcon_wr32 (falcon,0x184 + (port *0x10 ), *(u32 *)img); img +=4 ;
Signature · 1 line
2.43.0
PATCH v3 3/3 drm/nouveau: remove unused memory target test
In reply to Timur TabiThe memory target check is a hold-over from a refactor. It's harmless but distracting, so just remove it.
--- drivers/gpu/drm/nouveau/nvkm/falcon/gm200.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/gpu/drm/nouveau/nvkm/falcon/gm200.c +3 -10
@@ -249,9 +249,11 @@ int gm200_flcn_fw_load(struct nvkm_falcon_fw *fw) {struct nvkm_falcon *falcon = fw->falcon; -int target, ret; +int ret;if (fw->inst) { +int target; +nvkm_falcon_mask (falcon,0x048 ,0x00000001 ,0x00000001 );switch (nvkm_memory_target (fw->inst)) {
@@ -285,15 +287,6 @@ gm200_flcn_fw_load(struct nvkm_falcon_fw *fw) }if (fw->boot) { -switch (nvkm_memory_target (&fw->fw.mem.memory)) { -case NVKM_MEM_TARGET_VRAM : target =4 ;break ; -case NVKM_MEM_TARGET_HOST : target =5 ;break ; -case NVKM_MEM_TARGET_NCOH : target =6 ;break ; -default : -WARN_ON (1 ); -return -EINVAL ; - } - ret =nvkm_falcon_pio_wr (falcon, fw->boot,0 ,0 ,IMEM , falcon->code.limit - fw->boot_size, fw->boot_size, fw->boot_addr >>8 , false);
Signature · 1 line
2.43.0
Quoted 7 lines · Timur Tabi
Function
nvkm_gsp_fwsec_v2()sets 'ret' if thekmemdup()call fails, but it never uses or returns 'ret' after that point. We always need to release the firmware regardless, so do that and then check for error.Fixes 176fdcbddfd2 ("drm/nouveau/gsp/r535: add support for booting GSP-RM")Cc [email protected] # v6.7+Signed-off-by Timur Tabi <[email protected]>
For this and patch 2 and 3:
Applied to drm-misc-fixes, thanks!