From: Danilo Krummrich <dakr@kernel.org>
To: Zhi Wang <zhiw@nvidia.com>
Cc: nouveau@lists.freedesktop.org, airlied@gmail.com,
daniel@ffwll.ch, bskeggs@nvidia.com, mtijanic@nvidia.com,
jgg@nvidia.com, acurrid@nvidia.com, cjia@nvidia.com,
smitra@nvidia.com, ankita@nvidia.com, aniketa@nvidia.com,
kwankhede@nvidia.com, targupta@nvidia.com, zhiwang@kernel.org
Subject: Re: [RFC 1/8] drm/nouveau: factor out nvkm_gsp_init_fw_heap()
Date: Fri, 17 Jan 2025 16:13:43 +0100 [thread overview]
Message-ID: <Z4pzp6lPPetvlyua@pollux> (raw)
In-Reply-To: <20241122125712.3653406-2-zhiw@nvidia.com>
On Fri, Nov 22, 2024 at 04:57:05AM -0800, Zhi Wang wrote:
> To support the per-SKU GSP WPR2 heap initialization, first, factor out the
> common routine for all the SKUs.
>
> Factor out nvkm_gsp_init_fw_heap(). Adjust some indent to make
> checkpatch.pl happy.
>
> No functional change is intended.
>
> Cc: Milos Tijanic <mtijanic@nvidia.com>
> Signed-off-by: Zhi Wang <zhiw@nvidia.com>
> ---
> .../gpu/drm/nouveau/nvkm/subdev/gsp/priv.h | 1 +
> .../gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 69 +++++++++++--------
> 2 files changed, 40 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h
> index 9f4a62375a27..579d83048164 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h
> @@ -58,6 +58,7 @@ int ga102_gsp_booter_ctor(struct nvkm_gsp *, const char *, const struct firmware
> int ga102_gsp_reset(struct nvkm_gsp *);
>
> void r535_gsp_dtor(struct nvkm_gsp *);
> +void nvkm_gsp_init_fw_heap(struct nvkm_gsp *gsp);
> int r535_gsp_oneinit(struct nvkm_gsp *);
> int r535_gsp_init(struct nvkm_gsp *);
> int r535_gsp_fini(struct nvkm_gsp *, bool suspend);
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
> index cf58f9da9139..6f2319845322 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
> @@ -2517,6 +2517,44 @@ r535_gsp_dtor(struct nvkm_gsp *gsp)
> nvkm_gsp_mem_dtor(gsp, &gsp->logrm);
> }
>
> +void nvkm_gsp_init_fw_heap(struct nvkm_gsp *gsp)
Is this really independent from the GSP version? Otherwise this should start
with r535.
> +{
> + /* Calculate FB layout. */
> + gsp->fb.wpr2.frts.size = 0x100000;
> + gsp->fb.wpr2.frts.addr = ALIGN_DOWN(gsp->fb.bios.addr, 0x20000) - gsp->fb.wpr2.frts.size;
> +
> + gsp->fb.wpr2.boot.size = gsp->boot.fw.size;
> + gsp->fb.wpr2.boot.addr = ALIGN_DOWN(gsp->fb.wpr2.frts.addr - gsp->fb.wpr2.boot.size,
> + 0x1000);
> +
> + gsp->fb.wpr2.elf.size = gsp->fw.len;
> + gsp->fb.wpr2.elf.addr = ALIGN_DOWN(gsp->fb.wpr2.boot.addr - gsp->fb.wpr2.elf.size,
> + 0x10000);
> +
> + {
> + u32 fb_size_gb = DIV_ROUND_UP_ULL(gsp->fb.size, 1 << 30);
> +
> + gsp->fb.wpr2.heap.size =
> + gsp->func->wpr_heap.os_carveout_size +
> + gsp->func->wpr_heap.base_size +
> + ALIGN(GSP_FW_HEAP_PARAM_SIZE_PER_GB_FB * fb_size_gb, 1 << 20) +
> + ALIGN(GSP_FW_HEAP_PARAM_CLIENT_ALLOC_SIZE, 1 << 20);
> +
> + gsp->fb.wpr2.heap.size = max(gsp->fb.wpr2.heap.size, gsp->func->wpr_heap.min_size);
> + }
> +
> + gsp->fb.wpr2.heap.addr = ALIGN_DOWN(gsp->fb.wpr2.elf.addr - gsp->fb.wpr2.heap.size,
> + 0x100000);
> + gsp->fb.wpr2.heap.size = ALIGN_DOWN(gsp->fb.wpr2.elf.addr - gsp->fb.wpr2.heap.addr,
> + 0x100000);
> +
> + gsp->fb.wpr2.addr = ALIGN_DOWN(gsp->fb.wpr2.heap.addr - sizeof(GspFwWprMeta), 0x100000);
> + gsp->fb.wpr2.size = gsp->fb.wpr2.frts.addr + gsp->fb.wpr2.frts.size - gsp->fb.wpr2.addr;
> +
> + gsp->fb.heap.size = 0x100000;
> + gsp->fb.heap.addr = gsp->fb.wpr2.addr - gsp->fb.heap.size;
> +}
> +
> int
> r535_gsp_oneinit(struct nvkm_gsp *gsp)
> {
> @@ -2581,36 +2619,7 @@ r535_gsp_oneinit(struct nvkm_gsp *gsp)
> /* Release FW images - we've copied them to DMA buffers now. */
> r535_gsp_dtor_fws(gsp);
>
> - /* Calculate FB layout. */
> - gsp->fb.wpr2.frts.size = 0x100000;
> - gsp->fb.wpr2.frts.addr = ALIGN_DOWN(gsp->fb.bios.addr, 0x20000) - gsp->fb.wpr2.frts.size;
> -
> - gsp->fb.wpr2.boot.size = gsp->boot.fw.size;
> - gsp->fb.wpr2.boot.addr = ALIGN_DOWN(gsp->fb.wpr2.frts.addr - gsp->fb.wpr2.boot.size, 0x1000);
> -
> - gsp->fb.wpr2.elf.size = gsp->fw.len;
> - gsp->fb.wpr2.elf.addr = ALIGN_DOWN(gsp->fb.wpr2.boot.addr - gsp->fb.wpr2.elf.size, 0x10000);
> -
> - {
> - u32 fb_size_gb = DIV_ROUND_UP_ULL(gsp->fb.size, 1 << 30);
> -
> - gsp->fb.wpr2.heap.size =
> - gsp->func->wpr_heap.os_carveout_size +
> - gsp->func->wpr_heap.base_size +
> - ALIGN(GSP_FW_HEAP_PARAM_SIZE_PER_GB_FB * fb_size_gb, 1 << 20) +
> - ALIGN(GSP_FW_HEAP_PARAM_CLIENT_ALLOC_SIZE, 1 << 20);
> -
> - gsp->fb.wpr2.heap.size = max(gsp->fb.wpr2.heap.size, gsp->func->wpr_heap.min_size);
> - }
> -
> - gsp->fb.wpr2.heap.addr = ALIGN_DOWN(gsp->fb.wpr2.elf.addr - gsp->fb.wpr2.heap.size, 0x100000);
> - gsp->fb.wpr2.heap.size = ALIGN_DOWN(gsp->fb.wpr2.elf.addr - gsp->fb.wpr2.heap.addr, 0x100000);
> -
> - gsp->fb.wpr2.addr = ALIGN_DOWN(gsp->fb.wpr2.heap.addr - sizeof(GspFwWprMeta), 0x100000);
> - gsp->fb.wpr2.size = gsp->fb.wpr2.frts.addr + gsp->fb.wpr2.frts.size - gsp->fb.wpr2.addr;
> -
> - gsp->fb.heap.size = 0x100000;
> - gsp->fb.heap.addr = gsp->fb.wpr2.addr - gsp->fb.heap.size;
> + nvkm_gsp_init_fw_heap(gsp);
>
> ret = nvkm_gsp_fwsec_frts(gsp);
> if (WARN_ON(ret))
> --
> 2.34.1
>
next prev parent reply other threads:[~2025-01-17 15:13 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-22 12:57 [RFC 0/8] drm/nouveau: scrubber ucode image support for vGPU Zhi Wang
2024-11-22 12:57 ` [RFC 1/8] drm/nouveau: factor out nvkm_gsp_init_fw_heap() Zhi Wang
2025-01-17 15:13 ` Danilo Krummrich [this message]
2024-11-22 12:57 ` [RFC 2/8] drm/nouveau: introduce tu102_gsp_init_fw_heap() Zhi Wang
2024-11-22 16:26 ` Timur Tabi
2025-01-31 11:00 ` Zhi Wang
2024-11-22 12:57 ` [RFC 3/8] drm/nouveau: load scrubber ucode image when WPR2 heap size > 256MB Zhi Wang
2025-01-17 15:04 ` Danilo Krummrich
2024-11-22 12:57 ` [RFC 4/8] drm/nouveau: scrub the FB memory when scrubber firmware is loaded Zhi Wang
2025-01-09 22:58 ` Timur Tabi
2025-01-17 14:54 ` Danilo Krummrich
2025-01-17 14:57 ` Danilo Krummrich
2024-11-22 12:57 ` [RFC 5/8] drm/nouveau: support WPR2 heap size override Zhi Wang
2025-01-17 15:19 ` Danilo Krummrich
2024-11-22 12:57 ` [RFC 6/8] drm/nouveau: override the WPR2 heap size when SRIOV is supported on Ada Zhi Wang
2025-01-17 15:19 ` Danilo Krummrich
2024-11-22 12:57 ` [RFC 7/8] drm/nouveau: set max supported vGPU count when SRIOV is supported Zhi Wang
2025-01-17 15:24 ` Danilo Krummrich
2024-11-22 12:57 ` [RFC 8/8] drm/nouveau: introduce the scrubber on Ada in a kernel doc Zhi Wang
2025-01-17 15:27 ` Danilo Krummrich
2024-11-22 16:37 ` [RFC 0/8] drm/nouveau: scrubber ucode image support for vGPU Timur Tabi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Z4pzp6lPPetvlyua@pollux \
--to=dakr@kernel.org \
--cc=acurrid@nvidia.com \
--cc=airlied@gmail.com \
--cc=aniketa@nvidia.com \
--cc=ankita@nvidia.com \
--cc=bskeggs@nvidia.com \
--cc=cjia@nvidia.com \
--cc=daniel@ffwll.ch \
--cc=jgg@nvidia.com \
--cc=kwankhede@nvidia.com \
--cc=mtijanic@nvidia.com \
--cc=nouveau@lists.freedesktop.org \
--cc=smitra@nvidia.com \
--cc=targupta@nvidia.com \
--cc=zhiw@nvidia.com \
--cc=zhiwang@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.