From: Timur Tabi Date: Fri, 10 Oct 2025 22:39:57 +0000 (-0500) Subject: drm/nouveau: fully define nvfw_hs_load_header_v2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de0d6e19d2ef33ba34be2467ffdf3595da5f5326;p=thirdparty%2Fkernel%2Flinux.git drm/nouveau: fully define nvfw_hs_load_header_v2 Add the missing fields of the nvfw_hs_load_header_v2 struct, so that the struct matches the actual contents of the firmware images. nvfw_hs_load_header_v2 is a struct that defines a header for some firmware images used by Nouveau. The current structure definition is incomplete; it omits the last two fields because they are unused. To maintain consistency between Nouveau, OpenRM, and Nova, and to make it easier to support possible future images, we should fully define the struct. Also add a __counted_by tag for the flex array. Signed-off-by: Timur Tabi Reviewed-by: Lyude Paul Signed-off-by: Lyude Paul Link: https://patch.msgid.link/20251010223957.1078525-1-ttabi@nvidia.com --- diff --git a/drivers/gpu/drm/nouveau/include/nvfw/hs.h b/drivers/gpu/drm/nouveau/include/nvfw/hs.h index 8b58b668fc0c4..c78ab11ec3ac6 100644 --- a/drivers/gpu/drm/nouveau/include/nvfw/hs.h +++ b/drivers/gpu/drm/nouveau/include/nvfw/hs.h @@ -52,7 +52,9 @@ struct nvfw_hs_load_header_v2 { struct { u32 offset; u32 size; - } app[]; + u32 data_offset; + u32 data_size; + } app[] __counted_by(num_apps); }; const struct nvfw_hs_load_header_v2 *nvfw_hs_load_header_v2(struct nvkm_subdev *, const void *);