drm/nouveau/secboot: enable loading of versioned LS PMU/SEC2 ACR msgqueue FW

Some chipsets will be switching to updated SEC2 LS firmware, so we need to
plumb that through.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

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
index 5a7a55e831a46f4f7d2a9c90a49b109dcd1a9ca4..77c13b096a67833b6b8c945554df370994d5a1d8 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_msgqueue.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_msgqueue.c
@@ -43,28 +43,28 @@ acr_ls_ucode_load_msgqueue(const struct nvkm_subdev *subdev, const char *name,
 {
        const struct firmware *image, *desc, *sig;
        char f[64];
-       int ret;
+       int ver, ret;
 
        snprintf(f, sizeof(f), "%s/image", name);
-       ret = nvkm_firmware_get(subdev, f, &image);
-       if (ret)
-               return ret;
+       ver = nvkm_firmware_get_version(subdev, f, 0, maxver, &image);
+       if (ver < 0)
+               return ver;
        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, f, &desc);
-       if (ret)
+       ret = nvkm_firmware_get_version(subdev, f, ver, ver, &desc);
+       if (ret < 0)
                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, f, &sig);
-       if (ret)
+       ret = nvkm_firmware_get_version(subdev, f, ver, ver, &sig);
+       if (ret < 0)
                return ret;
        img->sig_size = sig->size;
        img->sig = kmemdup(sig->data, sig->size, GFP_KERNEL);
@@ -72,7 +72,7 @@ acr_ls_ucode_load_msgqueue(const struct nvkm_subdev *subdev, const char *name,
        if (!img->sig)
                return -ENOMEM;
 
-       return 0;
+       return ver;
 }
 
 static int
@@ -141,11 +141,11 @@ acr_ls_ucode_load_sec2(const struct nvkm_secboot *sb, int maxver,
                       struct ls_ucode_img *img)
 {
        struct nvkm_sec2 *sec = sb->subdev.device->sec2;
-       int ret;
+       int ver, ret;
 
-       ret = acr_ls_ucode_load_msgqueue(&sb->subdev, "sec2", maxver, img);
-       if (ret)
-               return ret;
+       ver = acr_ls_ucode_load_msgqueue(&sb->subdev, "sec2", maxver, img);
+       if (ver < 0)
+               return ver;
 
        /* Allocate the PMU queue corresponding to the FW version */
        ret = nvkm_msgqueue_new(img->ucode_desc.app_version, sec->falcon,
@@ -153,7 +153,7 @@ acr_ls_ucode_load_sec2(const struct nvkm_secboot *sb, int maxver,
        if (ret)
                return ret;
 
-       return 0;
+       return ver;
 }
 
 int