drm/nouveau/secboot: support for loading LS PMU firmware

Allow secboot to load a LS PMU firmware. LS PMU is one instance of
firmwares based on the message queue mechanism, which is also used for
other firmwares like SEC, so name its source file accordingly.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/Kbuild
index 5076d1500f47f442ecde1b03a60764110cc15563..4e0c671e19dd0a1833def39b1bbe9bc47ef3b559 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/Kbuild
@@ -1,5 +1,6 @@
 nvkm-y += nvkm/subdev/secboot/base.o
 nvkm-y += nvkm/subdev/secboot/ls_ucode_gr.o
+nvkm-y += nvkm/subdev/secboot/ls_ucode_msgqueue.o
 nvkm-y += nvkm/subdev/secboot/acr.o
 nvkm-y += nvkm/subdev/secboot/acr_r352.o
 nvkm-y += nvkm/subdev/secboot/acr_r361.o

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode.h b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode.h
index 181c0d80d194aef65413dd8c3f4da37d245d31ad..9ea295d4186102bc9f23591f4510ca682fdcd163 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode.h
@@ -27,6 +27,7 @@
 #include <core/subdev.h>
 #include <subdev/secboot.h>
 
+struct nvkm_acr;
 
 /**
  * struct ls_ucode_img_desc - descriptor of firmware image
@@ -148,6 +149,7 @@ struct fw_bl_desc {
 
 int acr_ls_ucode_load_fecs(const struct nvkm_subdev *, struct ls_ucode_img *);
 int acr_ls_ucode_load_gpccs(const struct nvkm_subdev *, struct ls_ucode_img *);
-
+int acr_ls_ucode_load_pmu(const struct nvkm_subdev *, struct ls_ucode_img *);
+void acr_ls_pmu_post_run(const struct nvkm_acr *, const struct nvkm_secboot *);
 
 #endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_msgqueue.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_msgqueue.c
new file mode 100644 (file)
index 0000000..333dd20
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_msgqueue.c
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "ls_ucode.h"
+#include "acr.h"
+
+#include <core/firmware.h>
+#include <core/msgqueue.h>
+#include <subdev/pmu.h>
+
+/**
+ * acr_ls_ucode_load_msgqueue - load and prepare a ucode img for a msgqueue fw
+ *
+ * Load the LS microcode, desc and signature and pack them into a single
+ * blob.
+ */
+static int
+acr_ls_ucode_load_msgqueue(const struct nvkm_subdev *subdev, const char *name,
+                          struct ls_ucode_img *img)
+{
+       const struct firmware *image, *desc, *sig;
+       char f[64];
+       int ret;
+
+       snprintf(f, sizeof(f), "%s/image", name);
+       ret = nvkm_firmware_get(subdev->device, f, &image);
+       if (ret)
+               return ret;
+       img->ucode_data = kmemdup(image->data, image->size, GFP_KERNEL);
+       nvkm_firmware_put(image);
+       if (!img->ucode_data)
+               return -ENOMEM;
+
+       snprintf(f, sizeof(f), "%s/desc", name);
+       ret = nvkm_firmware_get(subdev->device, f, &desc);
+       if (ret)
+               return ret;
+       memcpy(&img->ucode_desc, desc->data, sizeof(img->ucode_desc));
+       img->ucode_size = ALIGN(img->ucode_desc.app_start_offset + img->ucode_desc.app_size, 256);
+       nvkm_firmware_put(desc);
+
+       snprintf(f, sizeof(f), "%s/sig", name);
+       ret = nvkm_firmware_get(subdev->device, f, &sig);
+       if (ret)
+               return ret;
+       img->sig_size = sig->size;
+       img->sig = kmemdup(sig->data, sig->size, GFP_KERNEL);
+       nvkm_firmware_put(sig);
+       if (!img->sig)
+               return -ENOMEM;
+
+       return 0;
+}
+
+static void
+acr_ls_msgqueue_post_run(struct nvkm_msgqueue *queue,
+                        struct nvkm_falcon *falcon, u32 addr_args)
+{
+       u32 cmdline_size = NVKM_MSGQUEUE_CMDLINE_SIZE;
+       u8 buf[cmdline_size];
+
+       memset(buf, 0, cmdline_size);
+       nvkm_msgqueue_write_cmdline(queue, buf);
+       nvkm_falcon_load_dmem(falcon, buf, addr_args, cmdline_size, 0);
+       /* rearm the queue so it will wait for the init message */
+       nvkm_msgqueue_reinit(queue);
+}
+
+int
+acr_ls_ucode_load_pmu(const struct nvkm_subdev *subdev,
+                     struct ls_ucode_img *img)
+{
+       struct nvkm_pmu *pmu = subdev->device->pmu;
+       int ret;
+
+       ret = acr_ls_ucode_load_msgqueue(subdev, "pmu", img);
+       if (ret)
+               return ret;
+
+       /* Allocate the PMU queue corresponding to the FW version */
+       ret = nvkm_msgqueue_new(img->ucode_desc.app_version, pmu->falcon,
+                               &pmu->queue);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+void
+acr_ls_pmu_post_run(const struct nvkm_acr *acr, const struct nvkm_secboot *sb)
+{
+       struct nvkm_device *device = sb->subdev.device;
+       struct nvkm_pmu *pmu = device->pmu;
+       u32 addr_args = pmu->falcon->data.limit - NVKM_MSGQUEUE_CMDLINE_SIZE;
+
+       acr_ls_msgqueue_post_run(pmu->queue, pmu->falcon, addr_args);
+}