nouveau: don't attempt fwsec on sb on newer platforms.
Subsystems (4)
Dave Airlie
maintainerPATCH 1/1 nouveau: don't attempt fwsec on sb on newer platforms.
From: Dave Airlie <[email protected]>
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.
--- .../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(-)
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c +3 -0
@@ -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,
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c +3 -9
@@ -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
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c +3 -0
@@ -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,
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c +3 -0
@@ -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,
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h +21 -2
@@ -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
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c +15 -0
@@ -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,
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c +3 -0
@@ -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,
Signature · 1 line
2.52.0
Quoted 8 lines · Dave Airlie
From: Dave Airlie <[email protected]>
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")
Thanks,
Matt
Quoted 182 lines
Cc <[email protected]> # v6.16+Cc Lyude Paul <[email protected]>Cc Timur Tabi <[email protected]>Signed-off-by Dave Airlie <[email protected]>--- .../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(-)drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c +3
-0@@ -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,drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c +3
-9@@ -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 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c +3
-0@@ -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,drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c +3
-0@@ -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,drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h +21
-2@@ -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 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c +15
-0@@ -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,drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c +3
-0@@ -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,
Christopher Snowhill
Tested-byQuoted 8 lines · Matthew Schwartz
Quoted 7 lines · Dave Airlie
From: Dave Airlie <[email protected]>
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.
Quoted 7 lines
Quoted 1 line
Fixes da67179e5538 ("drm/nouveau/gsp: Allocate fwsec-sb at boot")Tested-by Matthew Schwartz <[email protected]>Thanks,
Matt
Closes:
https://lore.kernel.org/all/176682185563.8256.115798774340102079@copycat/
My thanks as well,
Christopher
Quoted 184 lines
Quoted 183 lines
Cc <[email protected]> # v6.16+Cc Lyude Paul <[email protected]>Cc Timur Tabi <[email protected]>Signed-off-by Dave Airlie <[email protected]>--- .../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(-)drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c +3
-0@@ -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,drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c +3
-9@@ -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 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c +3
-0@@ -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,drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c +3
-0@@ -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,drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h +21
-2@@ -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 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c +15
-0@@ -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,drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c +3
-0@@ -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,
Quoted 19 lines · Christopher Snowhill
Quoted 8 lines · Matthew Schwartz
Quoted 7 lines · Dave Airlie
From: Dave Airlie <[email protected]>
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.
Quoted 7 lines
Quoted 1 line
Fixes da67179e5538 ("drm/nouveau/gsp: Allocate fwsec-sb at boot")Tested-by Matthew Schwartz <[email protected]>Thanks,
Matt
Quoted 6 lines
Closes:
https://lore.kernel.org/all/176682185563.8256.115798774340102079@copycat/Tested-by Christopher Snowhill <[email protected]>My thanks as well,
Christopher
Oh, dang it, it didn't auto pick the address the list sent it to as the sending account.
Quoted 185 lines
Quoted 185 lines
Quoted 184 lines
Cc <[email protected]> # v6.16+Cc Lyude Paul <[email protected]>Cc Timur Tabi <[email protected]>Signed-off-by Dave Airlie <[email protected]>--- .../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(-)drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c +3
-0@@ -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,drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c +3
-9@@ -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 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c +3
-0@@ -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,drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c +3
-0@@ -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,drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h +21
-2@@ -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 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c +15
-0@@ -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,drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c +3
-0@@ -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,