| Message ID | 20240828023720.1596602-1-airlied@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | nouveau: fix the fwsec sb verification register. | expand |
On 28/8/24 12:37, Dave Airlie wrote: > From: Dave Airlie <airlied@redhat.com> > > 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") Reviewed-by: Ben Skeggs <bskeggs@nvidia.com> > --- > drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c > index 330d72b1a4af..52412965fac1 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c > @@ -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;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c index 330d72b1a4af..52412965fac1 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c @@ -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;
From: Dave Airlie <airlied@redhat.com> 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(-)