Skip to contentSkip to conversation

nouveau: fix the fwsec sb verification register.

PATCH In review Dave Airlie 2 participants 2 messages Aug 28, 2024

Subsystems (3)
lore
Share & tools
lore

Dave Airlie

author maintainer
#0 lore raw

PATCH 1/1 nouveau: fix the fwsec sb verification register.

From: Dave Airlie <[email protected]>

This aligns with what open gpu does, the 0x15 hex is just to trick you.

Fixes 176fdcbddfd2 ("drm/nouveau/gsp/r535: add support for booting GSP-RM")
---
 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c +1 -1
index 330d72b1a4af..52412965fac1 100644
@@ -324,7 +324,7 @@ nvkm_gsp_fwsec_sb(struct nvkm_gsp *gsp)
 		return ret;
 
 	/* Verify. */
-	err = nvkm_rd32(device, 0x001400 + (0xf * 4)) & 0x0000ffff;
+	err = nvkm_rd32(device, 0x001400 + (0x15 * 4)) & 0x0000ffff;
 	if (err) {
 		nvkm_error(subdev, "fwsec-sb: 0x%04x\n", err);
 		return -EIO;
Signature · 1 line
2.45.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Dave Airlie

From: Dave Airlie <[email protected]>

This aligns with what open gpu does, the 0x15 hex is just to trick you.

Fixes 176fdcbddfd2 ("drm/nouveau/gsp/r535: add support for booting GSP-RM")
Quoted 17 lines
---
  drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c +1 -1
index 330d72b1a4af..52412965fac1 100644
@@ -324,7 +324,7 @@ nvkm_gsp_fwsec_sb(struct nvkm_gsp *gsp)
  		return ret;
 
  	/* Verify. */
-	err = nvkm_rd32(device, 0x001400 + (0xf * 4)) & 0x0000ffff;
+	err = nvkm_rd32(device, 0x001400 + (0x15 * 4)) & 0x0000ffff;
  	if (err) {
  		nvkm_error(subdev, "fwsec-sb: 0x%04x\n", err);
  		return -EIO;