Received: from out-172.mta0.migadu.com (out-172.mta0.migadu.com [91.218.175.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4300A1C3F0C for ; Fri, 2 Jan 2026 05:21:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767331297; cv=none; b=atHZNXstgq+mlf8/nRrW8CanTHyGy6VTZjVXTWnvqGETCQgMhGFvB1RFW7eoTffxx4o+Pgktbi+RcB7PRzXf1Xuvx9aRBtp80eBf7CwAmw3I9CP6VSvwKvZkR8R7wV82ddAOEQRGoqmdisTTkgvXlFWTmME+sFRVJkF7HhHFXGI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767331297; c=relaxed/simple; bh=JiNyoUri+6NFl6AO7XVykYPrZjJ/x0+4DHPDkrGLPxY=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Y4BvMlduILA0FTgXW2v7dg0XF8BIA8yGogLf5qFSy7z0o4f5m0pjBXJ0huCaYgt9VQfCUnQiA62+oOwAEhqa87ArWvbRjea9EuPL2JTX9kdGvWWJ41/wuA0cMckYeiAir+7FuU9kWTwIu6x3nlaFYbfZHZLqRsGUm81cJqHY5p0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=NwDFmrWa; arc=none smtp.client-ip=91.218.175.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="NwDFmrWa" Message-ID: <4ba1b583-8ae3-4698-8fde-0084f7f9cbf9@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1767331291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=almuXI3SViusCUeHM6QvVMkIRXAb18JyRush9mjGRLY=; b=NwDFmrWa46mhH5e1xAQiK4ZhYU7J1Vu4vsMhpMlzZp+9NCKAfzNWmqFtHISypBi01UacBf De9IGVwsHvAnTxSXwvqh31GneA1XrCH95qjz0sVA5EmIrA6D+UYuCnLU9l3FtZf+qmarWh VL8axxhyJIJzJdTyH2TEyXCyomP/wJk= Date: Thu, 1 Jan 2026 21:21:26 -0800 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH] nouveau: don't attempt fwsec on sb on newer platforms. To: Dave Airlie , dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org, Dave Airlie , stable@vger.kernel.org, Lyude Paul , Timur Tabi References: <20260102041829.2748009-1-airlied@gmail.com> Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Matthew Schwartz In-Reply-To: <20260102041829.2748009-1-airlied@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT On 1/1/26 8:18 PM, Dave Airlie wrote: > From: Dave Airlie > > 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") Closes: https://lore.kernel.org/nouveau/59736756-d81b-41bb-84ba-a1b51057cdd4@linux.dev/ Tested-by: Matthew Schwartz Thanks, Matt > Cc: # v6.16+ > Cc: Lyude Paul > Cc: Timur Tabi > Signed-off-by: Dave Airlie > --- > .../gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c | 3 +++ > .../gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c | 12 +++------- > .../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, 51 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c > index 35d1fcef520bf..b3e994386334d 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c > @@ -29,6 +29,9 @@ ad102_gsp = { > .sig_section = ".fwsignature_ad10x", > > .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, > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c > index 5037602466604..8d4f40a443ce4 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c > @@ -337,16 +337,10 @@ 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); > + return nvkm_gsp_fwsec_init(gsp, &gsp->fws.falcon.sb, "fwsec-sb", > + NVFW_FALCON_APPIF_DMEMMAPPER_CMD_SB); > } > > int > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c > index d201e8697226b..27a13aeccd3cb 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 917f7e2f6c466..a59fb74ef6315 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 86bdd203bc107..9dd66a2e38017 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; > @@ -52,6 +51,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 *); > @@ -67,6 +71,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); > @@ -91,5 +97,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 81e56da0474a1..04b642a1f7305 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 > #include > > +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 97eb046c25d07..58cf258424218 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,