--- /dev/null
+From 4570355f8eaa476164cfb7ca959fdbf0cebbc9eb Mon Sep 17 00:00:00 2001
+From: Zhi Wang <zhiw@nvidia.com>
+Date: Thu, 27 Feb 2025 01:35:53 +0000
+Subject: drm/nouveau/nvkm: factor out current GSP RPC command policies
+
+From: Zhi Wang <zhiw@nvidia.com>
+
+commit 4570355f8eaa476164cfb7ca959fdbf0cebbc9eb upstream.
+
+There can be multiple cases of handling the GSP RPC messages, which are
+the reply of GSP RPC commands according to the requirement of the
+callers and the nature of the GSP RPC commands.
+
+The current supported reply policies are "callers don't care" and "receive
+the entire message" according to the requirement of the callers. To
+introduce a new policy, factor out the current RPC command reply polices.
+Also, centralize the handling of the reply in a single function.
+
+Factor out NVKM_GSP_RPC_REPLY_NOWAIT as "callers don't care" and
+NVKM_GSP_RPC_REPLY_RECV as "receive the entire message". Introduce a
+kernel doc to document the policies. Factor out
+r535_gsp_rpc_handle_reply().
+
+No functional change is intended for small GSP RPC commands. For large GSP
+commands, the caller decides the policy of how to handle the returned GSP
+RPC message.
+
+Cc: Ben Skeggs <bskeggs@nvidia.com>
+Cc: Alexandre Courbot <acourbot@nvidia.com>
+Signed-off-by: Zhi Wang <zhiw@nvidia.com>
+Signed-off-by: Danilo Krummrich <dakr@kernel.org>
+Link: https://patchwork.freedesktop.org/patch/msgid/20250227013554.8269-2-zhiw@nvidia.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/gpu/nouveau.rst | 3
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 34 +++++++--
+ drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c | 2
+ drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 75 ++++++++++-----------
+ drivers/gpu/drm/nouveau/nvkm/subdev/instmem/r535.c | 2
+ 5 files changed, 72 insertions(+), 44 deletions(-)
+
+--- a/Documentation/gpu/nouveau.rst
++++ b/Documentation/gpu/nouveau.rst
+@@ -27,3 +27,6 @@ GSP Support
+
+ .. kernel-doc:: drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
+ :doc: GSP message queue element
++
++.. kernel-doc:: drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h
++ :doc: GSP message handling policy
+--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h
++++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h
+@@ -31,6 +31,25 @@ typedef int (*nvkm_gsp_msg_ntfy_func)(vo
+ struct nvkm_gsp_event;
+ typedef void (*nvkm_gsp_event_func)(struct nvkm_gsp_event *, void *repv, u32 repc);
+
++/**
++ * DOC: GSP message handling policy
++ *
++ * When sending a GSP RPC command, there can be multiple cases of handling
++ * the GSP RPC messages, which are the reply of GSP RPC commands, according
++ * to the requirement of the callers and the nature of the GSP RPC commands.
++ *
++ * NVKM_GSP_RPC_REPLY_NOWAIT - If specified, immediately return to the
++ * caller after the GSP RPC command is issued.
++ *
++ * NVKM_GSP_RPC_REPLY_RECV - If specified, wait and receive the entire GSP
++ * RPC message after the GSP RPC command is issued.
++ *
++ */
++enum nvkm_gsp_rpc_reply_policy {
++ NVKM_GSP_RPC_REPLY_NOWAIT = 0,
++ NVKM_GSP_RPC_REPLY_RECV,
++};
++
+ struct nvkm_gsp {
+ const struct nvkm_gsp_func *func;
+ struct nvkm_subdev subdev;
+@@ -188,7 +207,8 @@ struct nvkm_gsp {
+
+ const struct nvkm_gsp_rm {
+ void *(*rpc_get)(struct nvkm_gsp *, u32 fn, u32 argc);
+- void *(*rpc_push)(struct nvkm_gsp *, void *argv, bool wait, u32 repc);
++ void *(*rpc_push)(struct nvkm_gsp *gsp, void *argv,
++ enum nvkm_gsp_rpc_reply_policy policy, u32 repc);
+ void (*rpc_done)(struct nvkm_gsp *gsp, void *repv);
+
+ void *(*rm_ctrl_get)(struct nvkm_gsp_object *, u32 cmd, u32 argc);
+@@ -255,9 +275,10 @@ nvkm_gsp_rpc_get(struct nvkm_gsp *gsp, u
+ }
+
+ static inline void *
+-nvkm_gsp_rpc_push(struct nvkm_gsp *gsp, void *argv, bool wait, u32 repc)
++nvkm_gsp_rpc_push(struct nvkm_gsp *gsp, void *argv,
++ enum nvkm_gsp_rpc_reply_policy policy, u32 repc)
+ {
+- return gsp->rm->rpc_push(gsp, argv, wait, repc);
++ return gsp->rm->rpc_push(gsp, argv, policy, repc);
+ }
+
+ static inline void *
+@@ -268,13 +289,14 @@ nvkm_gsp_rpc_rd(struct nvkm_gsp *gsp, u3
+ if (IS_ERR_OR_NULL(argv))
+ return argv;
+
+- return nvkm_gsp_rpc_push(gsp, argv, true, argc);
++ return nvkm_gsp_rpc_push(gsp, argv, NVKM_GSP_RPC_REPLY_RECV, argc);
+ }
+
+ static inline int
+-nvkm_gsp_rpc_wr(struct nvkm_gsp *gsp, void *argv, bool wait)
++nvkm_gsp_rpc_wr(struct nvkm_gsp *gsp, void *argv,
++ enum nvkm_gsp_rpc_reply_policy policy)
+ {
+- void *repv = nvkm_gsp_rpc_push(gsp, argv, wait, 0);
++ void *repv = nvkm_gsp_rpc_push(gsp, argv, policy, 0);
+
+ if (IS_ERR(repv))
+ return PTR_ERR(repv);
+--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c
++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c
+@@ -56,7 +56,7 @@ r535_bar_bar2_update_pde(struct nvkm_gsp
+ rpc->info.entryValue = addr ? ((addr >> 4) | 2) : 0; /* PD3 entry format! */
+ rpc->info.entryLevelShift = 47; //XXX: probably fetch this from mmu!
+
+- return nvkm_gsp_rpc_wr(gsp, rpc, true);
++ return nvkm_gsp_rpc_wr(gsp, rpc, NVKM_GSP_RPC_REPLY_RECV);
+ }
+
+ static void
+--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
+@@ -585,13 +585,34 @@ r535_gsp_rpc_poll(struct nvkm_gsp *gsp,
+ }
+
+ static void *
+-r535_gsp_rpc_send(struct nvkm_gsp *gsp, void *payload, bool wait,
+- u32 gsp_rpc_len)
++r535_gsp_rpc_handle_reply(struct nvkm_gsp *gsp, u32 fn,
++ enum nvkm_gsp_rpc_reply_policy policy,
++ u32 gsp_rpc_len)
++{
++ struct nvfw_gsp_rpc *reply;
++ void *repv = NULL;
++
++ switch (policy) {
++ case NVKM_GSP_RPC_REPLY_NOWAIT:
++ break;
++ case NVKM_GSP_RPC_REPLY_RECV:
++ reply = r535_gsp_msg_recv(gsp, fn, gsp_rpc_len);
++ if (!IS_ERR_OR_NULL(reply))
++ repv = reply->data;
++ else
++ repv = reply;
++ break;
++ }
++
++ return repv;
++}
++
++static void *
++r535_gsp_rpc_send(struct nvkm_gsp *gsp, void *payload,
++ enum nvkm_gsp_rpc_reply_policy policy, u32 gsp_rpc_len)
+ {
+ struct nvfw_gsp_rpc *rpc = to_gsp_hdr(payload, rpc);
+- struct nvfw_gsp_rpc *msg;
+ u32 fn = rpc->function;
+- void *repv = NULL;
+ int ret;
+
+ if (gsp->subdev.debug >= NV_DBG_TRACE) {
+@@ -605,15 +626,7 @@ r535_gsp_rpc_send(struct nvkm_gsp *gsp,
+ if (ret)
+ return ERR_PTR(ret);
+
+- if (wait) {
+- msg = r535_gsp_msg_recv(gsp, fn, gsp_rpc_len);
+- if (!IS_ERR_OR_NULL(msg))
+- repv = msg->data;
+- else
+- repv = msg;
+- }
+-
+- return repv;
++ return r535_gsp_rpc_handle_reply(gsp, fn, policy, gsp_rpc_len);
+ }
+
+ static void
+@@ -797,7 +810,7 @@ r535_gsp_rpc_rm_free(struct nvkm_gsp_obj
+ rpc->params.hRoot = client->object.handle;
+ rpc->params.hObjectParent = 0;
+ rpc->params.hObjectOld = object->handle;
+- return nvkm_gsp_rpc_wr(gsp, rpc, true);
++ return nvkm_gsp_rpc_wr(gsp, rpc, NVKM_GSP_RPC_REPLY_RECV);
+ }
+
+ static void
+@@ -815,7 +828,7 @@ r535_gsp_rpc_rm_alloc_push(struct nvkm_g
+ struct nvkm_gsp *gsp = object->client->gsp;
+ void *ret = NULL;
+
+- rpc = nvkm_gsp_rpc_push(gsp, rpc, true, sizeof(*rpc));
++ rpc = nvkm_gsp_rpc_push(gsp, rpc, NVKM_GSP_RPC_REPLY_RECV, sizeof(*rpc));
+ if (IS_ERR_OR_NULL(rpc))
+ return rpc;
+
+@@ -876,7 +889,7 @@ r535_gsp_rpc_rm_ctrl_push(struct nvkm_gs
+ struct nvkm_gsp *gsp = object->client->gsp;
+ int ret = 0;
+
+- rpc = nvkm_gsp_rpc_push(gsp, rpc, true, repc);
++ rpc = nvkm_gsp_rpc_push(gsp, rpc, NVKM_GSP_RPC_REPLY_RECV, repc);
+ if (IS_ERR_OR_NULL(rpc)) {
+ *params = NULL;
+ return PTR_ERR(rpc);
+@@ -948,8 +961,8 @@ r535_gsp_rpc_get(struct nvkm_gsp *gsp, u
+ }
+
+ static void *
+-r535_gsp_rpc_push(struct nvkm_gsp *gsp, void *payload, bool wait,
+- u32 gsp_rpc_len)
++r535_gsp_rpc_push(struct nvkm_gsp *gsp, void *payload,
++ enum nvkm_gsp_rpc_reply_policy policy, u32 gsp_rpc_len)
+ {
+ struct nvfw_gsp_rpc *rpc = to_gsp_hdr(payload, rpc);
+ struct r535_gsp_msg *msg = to_gsp_hdr(rpc, msg);
+@@ -967,7 +980,7 @@ r535_gsp_rpc_push(struct nvkm_gsp *gsp,
+ rpc->length = sizeof(*rpc) + max_payload_size;
+ msg->checksum = rpc->length;
+
+- repv = r535_gsp_rpc_send(gsp, payload, false, 0);
++ repv = r535_gsp_rpc_send(gsp, payload, NVKM_GSP_RPC_REPLY_NOWAIT, 0);
+ if (IS_ERR(repv))
+ goto done;
+
+@@ -988,7 +1001,7 @@ r535_gsp_rpc_push(struct nvkm_gsp *gsp,
+
+ memcpy(next, payload, size);
+
+- repv = r535_gsp_rpc_send(gsp, next, false, 0);
++ repv = r535_gsp_rpc_send(gsp, next, NVKM_GSP_RPC_REPLY_NOWAIT, 0);
+ if (IS_ERR(repv))
+ goto done;
+
+@@ -997,20 +1010,10 @@ r535_gsp_rpc_push(struct nvkm_gsp *gsp,
+ }
+
+ /* Wait for reply. */
+- rpc = r535_gsp_msg_recv(gsp, fn, payload_size +
+- sizeof(*rpc));
+- if (!IS_ERR_OR_NULL(rpc)) {
+- if (wait) {
+- repv = rpc->data;
+- } else {
+- nvkm_gsp_rpc_done(gsp, rpc);
+- repv = NULL;
+- }
+- } else {
+- repv = wait ? rpc : NULL;
+- }
++ repv = r535_gsp_rpc_handle_reply(gsp, fn, policy, payload_size +
++ sizeof(*rpc));
+ } else {
+- repv = r535_gsp_rpc_send(gsp, payload, wait, gsp_rpc_len);
++ repv = r535_gsp_rpc_send(gsp, payload, policy, gsp_rpc_len);
+ }
+
+ done:
+@@ -1327,7 +1330,7 @@ r535_gsp_rpc_unloading_guest_driver(stru
+ rpc->newLevel = NV2080_CTRL_GPU_SET_POWER_STATE_GPU_LEVEL_0;
+ }
+
+- return nvkm_gsp_rpc_wr(gsp, rpc, true);
++ return nvkm_gsp_rpc_wr(gsp, rpc, NVKM_GSP_RPC_REPLY_RECV);
+ }
+
+ enum registry_type {
+@@ -1684,7 +1687,7 @@ r535_gsp_rpc_set_registry(struct nvkm_gs
+
+ build_registry(gsp, rpc);
+
+- return nvkm_gsp_rpc_wr(gsp, rpc, false);
++ return nvkm_gsp_rpc_wr(gsp, rpc, NVKM_GSP_RPC_REPLY_NOWAIT);
+
+ fail:
+ clean_registry(gsp);
+@@ -1893,7 +1896,7 @@ r535_gsp_rpc_set_system_info(struct nvkm
+ info->pciConfigMirrorSize = 0x001000;
+ r535_gsp_acpi_info(gsp, &info->acpiMethodData);
+
+- return nvkm_gsp_rpc_wr(gsp, info, false);
++ return nvkm_gsp_rpc_wr(gsp, info, NVKM_GSP_RPC_REPLY_NOWAIT);
+ }
+
+ static int
+--- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/r535.c
++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/r535.c
+@@ -105,7 +105,7 @@ fbsr_memlist(struct nvkm_gsp_device *dev
+ rpc->pteDesc.pte_pde[i].pte = (phys >> 12) + i;
+ }
+
+- ret = nvkm_gsp_rpc_wr(gsp, rpc, true);
++ ret = nvkm_gsp_rpc_wr(gsp, rpc, NVKM_GSP_RPC_REPLY_RECV);
+ if (ret)
+ return ret;
+
--- /dev/null
+From a738fa9105ac2897701ba4067c33e85faa27d1e2 Mon Sep 17 00:00:00 2001
+From: Zhi Wang <zhiw@nvidia.com>
+Date: Thu, 27 Feb 2025 01:35:54 +0000
+Subject: drm/nouveau/nvkm: introduce new GSP reply policy NVKM_GSP_RPC_REPLY_POLL
+
+From: Zhi Wang <zhiw@nvidia.com>
+
+commit a738fa9105ac2897701ba4067c33e85faa27d1e2 upstream.
+
+Some GSP RPC commands need a new reply policy: "caller don't care about
+the message content but want to make sure a reply is received". To
+support this case, a new reply policy is introduced.
+
+NV_VGPU_MSG_FUNCTION_ALLOC_MEMORY is a large GSP RPC command. The actual
+required policy is NVKM_GSP_RPC_REPLY_POLL. This can be observed from the
+dump of the GSP message queue. After the large GSP RPC command is issued,
+GSP will write only an empty RPC header in the queue as the reply.
+
+Without this change, the policy "receiving the entire message" is used
+for NV_VGPU_MSG_FUNCTION_ALLOC_MEMORY. This causes the timeout of receiving
+the returned GSP message in the suspend/resume path.
+
+Introduce the new reply policy NVKM_GSP_RPC_REPLY_POLL, which waits for
+the returned GSP message but discards it for the caller. Use the new policy
+NVKM_GSP_RPC_REPLY_POLL on the GSP RPC command
+NV_VGPU_MSG_FUNCTION_ALLOC_MEMORY.
+
+Fixes: 50f290053d79 ("drm/nouveau: support handling the return of large GSP message")
+Cc: Danilo Krummrich <dakr@kernel.org>
+Cc: Alexandre Courbot <acourbot@nvidia.com>
+Tested-by: Ben Skeggs <bskeggs@nvidia.com>
+Signed-off-by: Zhi Wang <zhiw@nvidia.com>
+Signed-off-by: Danilo Krummrich <dakr@kernel.org>
+Link: https://patchwork.freedesktop.org/patch/msgid/20250227013554.8269-3-zhiw@nvidia.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 4 ++++
+ drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 3 +++
+ drivers/gpu/drm/nouveau/nvkm/subdev/instmem/r535.c | 2 +-
+ 3 files changed, 8 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h
++++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h
+@@ -44,10 +44,14 @@ typedef void (*nvkm_gsp_event_func)(stru
+ * NVKM_GSP_RPC_REPLY_RECV - If specified, wait and receive the entire GSP
+ * RPC message after the GSP RPC command is issued.
+ *
++ * NVKM_GSP_RPC_REPLY_POLL - If specified, wait for the specific reply and
++ * discard the reply before returning to the caller.
++ *
+ */
+ enum nvkm_gsp_rpc_reply_policy {
+ NVKM_GSP_RPC_REPLY_NOWAIT = 0,
+ NVKM_GSP_RPC_REPLY_RECV,
++ NVKM_GSP_RPC_REPLY_POLL,
+ };
+
+ struct nvkm_gsp {
+--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
+@@ -602,6 +602,9 @@ r535_gsp_rpc_handle_reply(struct nvkm_gs
+ else
+ repv = reply;
+ break;
++ case NVKM_GSP_RPC_REPLY_POLL:
++ repv = r535_gsp_msg_recv(gsp, fn, 0);
++ break;
+ }
+
+ return repv;
+--- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/r535.c
++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/r535.c
+@@ -105,7 +105,7 @@ fbsr_memlist(struct nvkm_gsp_device *dev
+ rpc->pteDesc.pte_pde[i].pte = (phys >> 12) + i;
+ }
+
+- ret = nvkm_gsp_rpc_wr(gsp, rpc, NVKM_GSP_RPC_REPLY_RECV);
++ ret = nvkm_gsp_rpc_wr(gsp, rpc, NVKM_GSP_RPC_REPLY_POLL);
+ if (ret)
+ return ret;
+
projects / thirdparty / kernel / stable-queue.git / commitdiff
