ACK: [SRU][Q][PATCH v3 1/1] nouveau: don't attempt fwsec on sb on newer platforms.

[Vinicius Peixoto]

On Thu May 28, 2026 at 2:05 PM -03, Abdur Rahman wrote:
> From: Dave Airlie <airlied at redhat.com>
>
> BugLink: https://bugs.launchpad.net/bugs/2154481
>
> The changes to always loads fwsec sb causes problems on newer GPUs
> which don't use this path.
>
> Add hooks and pass through the device specific layers.
>
> Fixes: da67179e5538 ("drm/nouveau/gsp: Allocate fwsec-sb at boot")
> Cc: <stable at vger.kernel.org> # v6.16+
> Cc: Lyude Paul <lyude at redhat.com>
> Cc: Timur Tabi <ttabi at nvidia.com>
> Tested-by: Matthew Schwartz <matthew.schwartz at linux.dev>
> Tested-by: Christopher Snowhill <chris at kode54.net>
> Reviewed-by: Lyude Paul <lyude at redhat.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> Link: https://patch.msgid.link/20260102041829.2748009-1-airlied@gmail.com
> (cherry picked from commit e8b3627bec357698f2d4d6dbf27cdcfa0e9d8715)
> Signed-off-by: Abdur Rahman <abdur.rahman at canonical.com>
> ---
>  .../gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c   |  3 +++
>  .../gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c   |  8 +------
>  .../gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c   |  3 +++
>  .../gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c   |  3 +++
>  .../gpu/drm/nouveau/nvkm/subdev/gsp/priv.h    | 23 +++++++++++++++++--
>  .../gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c   | 15 ++++++++++++
>  .../gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c   |  3 +++
>  7 files changed, 49 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c
> index eb765da0876e..81f4fa50f214 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c
> @@ -30,6 +30,9 @@ ad102_gsp = {
>  
>  	.booter.ctor = ga102_gsp_booter_ctor,
>  
> +	.fwsec_sb.ctor = tu102_gsp_fwsec_sb_ctor,
> +	.fwsec_sb.dtor = tu102_gsp_fwsec_sb_dtor,
> +
>  	.dtor = r535_gsp_dtor,
>  	.oneinit = tu102_gsp_oneinit,
>  	.init = tu102_gsp_init,
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c
> index 503760246660..851140e80122 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c
> @@ -337,18 +337,12 @@ nvkm_gsp_fwsec_sb(struct nvkm_gsp *gsp)
>  }
>  
>  int
> -nvkm_gsp_fwsec_sb_ctor(struct nvkm_gsp *gsp)
> +nvkm_gsp_fwsec_sb_init(struct nvkm_gsp *gsp)
>  {
>  	return nvkm_gsp_fwsec_init(gsp, &gsp->fws.falcon.sb, "fwsec-sb",
>  				   NVFW_FALCON_APPIF_DMEMMAPPER_CMD_SB);
>  }
>  
> -void
> -nvkm_gsp_fwsec_sb_dtor(struct nvkm_gsp *gsp)
> -{
> -	nvkm_falcon_fw_dtor(&gsp->fws.falcon.sb);
> -}
> -
>  int
>  nvkm_gsp_fwsec_frts(struct nvkm_gsp *gsp)
>  {
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c
> index d201e8697226..27a13aeccd3c 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c
> @@ -47,6 +47,9 @@ ga100_gsp = {
>  
>  	.booter.ctor = tu102_gsp_booter_ctor,
>  
> +	.fwsec_sb.ctor = tu102_gsp_fwsec_sb_ctor,
> +	.fwsec_sb.dtor = tu102_gsp_fwsec_sb_dtor,
> +
>  	.dtor = r535_gsp_dtor,
>  	.oneinit = tu102_gsp_oneinit,
>  	.init = tu102_gsp_init,
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c
> index 917f7e2f6c46..b6b3eb6f4c00 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c
> @@ -158,6 +158,9 @@ ga102_gsp_r535 = {
>  
>  	.booter.ctor = ga102_gsp_booter_ctor,
>  
> +	.fwsec_sb.ctor = tu102_gsp_fwsec_sb_ctor,
> +	.fwsec_sb.dtor = tu102_gsp_fwsec_sb_dtor,
> +
>  	.dtor = r535_gsp_dtor,
>  	.oneinit = tu102_gsp_oneinit,
>  	.init = tu102_gsp_init,
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h
> index 1428f0d62969..252e9d386a1f 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h
> @@ -7,9 +7,8 @@ enum nvkm_acr_lsf_id;
>  
>  int nvkm_gsp_fwsec_frts(struct nvkm_gsp *);
>  
> -int nvkm_gsp_fwsec_sb_ctor(struct nvkm_gsp *);
>  int nvkm_gsp_fwsec_sb(struct nvkm_gsp *);
> -void nvkm_gsp_fwsec_sb_dtor(struct nvkm_gsp *);
> +int nvkm_gsp_fwsec_sb_init(struct nvkm_gsp *gsp);
>  
>  struct nvkm_gsp_fwif {
>  	int version;
> @@ -53,6 +52,11 @@ struct nvkm_gsp_func {
>  			    struct nvkm_falcon *, struct nvkm_falcon_fw *);
>  	} booter;
>  
> +	struct {
> +		int (*ctor)(struct nvkm_gsp *);
> +		void (*dtor)(struct nvkm_gsp *);
> +	} fwsec_sb;
> +
>  	void (*dtor)(struct nvkm_gsp *);
>  	int (*oneinit)(struct nvkm_gsp *);
>  	int (*init)(struct nvkm_gsp *);
> @@ -68,6 +72,8 @@ extern const struct nvkm_falcon_func tu102_gsp_flcn;
>  extern const struct nvkm_falcon_fw_func tu102_gsp_fwsec;
>  int tu102_gsp_booter_ctor(struct nvkm_gsp *, const char *, const struct firmware *,
>  			  struct nvkm_falcon *, struct nvkm_falcon_fw *);
> +int tu102_gsp_fwsec_sb_ctor(struct nvkm_gsp *);
> +void tu102_gsp_fwsec_sb_dtor(struct nvkm_gsp *);
>  int tu102_gsp_oneinit(struct nvkm_gsp *);
>  int tu102_gsp_init(struct nvkm_gsp *);
>  int tu102_gsp_fini(struct nvkm_gsp *, bool suspend);
> @@ -92,5 +98,18 @@ int r535_gsp_fini(struct nvkm_gsp *, bool suspend);
>  int nvkm_gsp_new_(const struct nvkm_gsp_fwif *, struct nvkm_device *, enum nvkm_subdev_type, int,
>  		  struct nvkm_gsp **);
>  
> +static inline int nvkm_gsp_fwsec_sb_ctor(struct nvkm_gsp *gsp)
> +{
> +	if (gsp->func->fwsec_sb.ctor)
> +		return gsp->func->fwsec_sb.ctor(gsp);
> +	return 0;
> +}
> +
> +static inline void nvkm_gsp_fwsec_sb_dtor(struct nvkm_gsp *gsp)
> +{
> +	if (gsp->func->fwsec_sb.dtor)
> +		gsp->func->fwsec_sb.dtor(gsp);
> +}
> +
>  extern const struct nvkm_gsp_func gv100_gsp;
>  #endif
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c
> index 58e233bc53b1..a9aef0ea7181 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c
> @@ -30,6 +30,18 @@
>  #include <nvfw/fw.h>
>  #include <nvfw/hs.h>
>  
> +int
> +tu102_gsp_fwsec_sb_ctor(struct nvkm_gsp *gsp)
> +{
> +	return nvkm_gsp_fwsec_sb_init(gsp);
> +}
> +
> +void
> +tu102_gsp_fwsec_sb_dtor(struct nvkm_gsp *gsp)
> +{
> +	nvkm_falcon_fw_dtor(&gsp->fws.falcon.sb);
> +}
> +
>  static int
>  tu102_gsp_booter_unload(struct nvkm_gsp *gsp, u32 mbox0, u32 mbox1)
>  {
> @@ -370,6 +382,9 @@ tu102_gsp = {
>  
>  	.booter.ctor = tu102_gsp_booter_ctor,
>  
> +	.fwsec_sb.ctor = tu102_gsp_fwsec_sb_ctor,
> +	.fwsec_sb.dtor = tu102_gsp_fwsec_sb_dtor,
> +
>  	.dtor = r535_gsp_dtor,
>  	.oneinit = tu102_gsp_oneinit,
>  	.init = tu102_gsp_init,
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c
> index 97eb046c25d0..58cf25842421 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c
> @@ -30,6 +30,9 @@ tu116_gsp = {
>  
>  	.booter.ctor = tu102_gsp_booter_ctor,
>  
> +	.fwsec_sb.ctor = tu102_gsp_fwsec_sb_ctor,
> +	.fwsec_sb.dtor = tu102_gsp_fwsec_sb_dtor,
> +
>  	.dtor = r535_gsp_dtor,
>  	.oneinit = tu102_gsp_oneinit,
>  	.init = tu102_gsp_init,

Acked-by: Vinicius Peixoto <vinicius.peixoto at canonical.com>