[PATCH] nvidia: fix symlinks for tu104/tu106 acr unload firmware

[PATCH] nvidia: fix symlinks for tu104/tu106 acr unload firmware

[Ben Skeggs]

Bootloader and firmware proper got swapped, resulting in module unload,
suspend, and runtime suspend issues on affected chipsets.

Fixes: 1487a8abdbac ("linux-firmware: nvidia: move firmware symlinks to WHENCE")
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---
 WHENCE | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WHENCE b/WHENCE
index 24106a4..b6e573a 100644
--- a/WHENCE
+++ b/WHENCE
@@ -4722,8 +4722,8 @@ File: nvidia/tu102/sec2/sig.bin
 Link: nvidia/tu104/acr/bl.bin -> ../../tu102/acr/bl.bin
 Link: nvidia/tu104/acr/ucode_ahesasc.bin -> ../../tu102/acr/ucode_ahesasc.bin
 Link: nvidia/tu104/acr/ucode_asb.bin -> ../../tu102/acr/ucode_asb.bin
-Link: nvidia/tu104/acr/unload_bl.bin -> ../../tu102/acr/ucode_unload.bin
-Link: nvidia/tu104/acr/ucode_unload.bin -> ../../tu102/acr/unload_bl.bin
+Link: nvidia/tu104/acr/unload_bl.bin -> ../../tu102/acr/unload_bl.bin
+Link: nvidia/tu104/acr/ucode_unload.bin -> ../../tu102/acr/ucode_unload.bin
 Link: nvidia/tu104/gr/fecs_bl.bin -> ../../tu102/gr/fecs_bl.bin
 File: nvidia/tu104/gr/fecs_data.bin
 File: nvidia/tu104/gr/fecs_inst.bin
@@ -4744,8 +4744,8 @@ Link: nvidia/tu104/sec2/sig.bin -> ../../tu102/sec2/sig.bin
 Link: nvidia/tu106/acr/bl.bin -> ../../tu102/acr/bl.bin
 Link: nvidia/tu106/acr/ucode_ahesasc.bin -> ../../tu102/acr/ucode_ahesasc.bin
 Link: nvidia/tu106/acr/ucode_asb.bin -> ../../tu102/acr/ucode_asb.bin
-Link: nvidia/tu106/acr/unload_bl.bin -> ../../tu102/acr/ucode_unload.bin
-Link: nvidia/tu106/acr/ucode_unload.bin -> ../../tu102/acr/unload_bl.bin
+Link: nvidia/tu106/acr/unload_bl.bin -> ../../tu102/acr/unload_bl.bin
+Link: nvidia/tu106/acr/ucode_unload.bin -> ../../tu102/acr/ucode_unload.bin
 Link: nvidia/tu106/gr/fecs_bl.bin -> ../../tu102/gr/fecs_bl.bin
 File: nvidia/tu106/gr/fecs_data.bin
 File: nvidia/tu106/gr/fecs_inst.bin
-- 
2.31.1

Re: [PATCH] nvidia: fix symlinks for tu104/tu106 acr unload firmware

[Josh Boyer]

Applied and pushed out.

josh

On Tue, May 18, 2021 at 2:36 AM Ben Skeggs <bskeggs@redhat.com> wrote:
>
> Bootloader and firmware proper got swapped, resulting in module unload,
> suspend, and runtime suspend issues on affected chipsets.
>
> Fixes: 1487a8abdbac ("linux-firmware: nvidia: move firmware symlinks to WHENCE")
> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
> ---
>  WHENCE | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/WHENCE b/WHENCE
> index 24106a4..b6e573a 100644
> --- a/WHENCE
> +++ b/WHENCE
> @@ -4722,8 +4722,8 @@ File: nvidia/tu102/sec2/sig.bin
>  Link: nvidia/tu104/acr/bl.bin -> ../../tu102/acr/bl.bin
>  Link: nvidia/tu104/acr/ucode_ahesasc.bin -> ../../tu102/acr/ucode_ahesasc.bin
>  Link: nvidia/tu104/acr/ucode_asb.bin -> ../../tu102/acr/ucode_asb.bin
> -Link: nvidia/tu104/acr/unload_bl.bin -> ../../tu102/acr/ucode_unload.bin
> -Link: nvidia/tu104/acr/ucode_unload.bin -> ../../tu102/acr/unload_bl.bin
> +Link: nvidia/tu104/acr/unload_bl.bin -> ../../tu102/acr/unload_bl.bin
> +Link: nvidia/tu104/acr/ucode_unload.bin -> ../../tu102/acr/ucode_unload.bin
>  Link: nvidia/tu104/gr/fecs_bl.bin -> ../../tu102/gr/fecs_bl.bin
>  File: nvidia/tu104/gr/fecs_data.bin
>  File: nvidia/tu104/gr/fecs_inst.bin
> @@ -4744,8 +4744,8 @@ Link: nvidia/tu104/sec2/sig.bin -> ../../tu102/sec2/sig.bin
>  Link: nvidia/tu106/acr/bl.bin -> ../../tu102/acr/bl.bin
>  Link: nvidia/tu106/acr/ucode_ahesasc.bin -> ../../tu102/acr/ucode_ahesasc.bin
>  Link: nvidia/tu106/acr/ucode_asb.bin -> ../../tu102/acr/ucode_asb.bin
> -Link: nvidia/tu106/acr/unload_bl.bin -> ../../tu102/acr/ucode_unload.bin
> -Link: nvidia/tu106/acr/ucode_unload.bin -> ../../tu102/acr/unload_bl.bin
> +Link: nvidia/tu106/acr/unload_bl.bin -> ../../tu102/acr/unload_bl.bin
> +Link: nvidia/tu106/acr/ucode_unload.bin -> ../../tu102/acr/ucode_unload.bin
>  Link: nvidia/tu106/gr/fecs_bl.bin -> ../../tu102/gr/fecs_bl.bin
>  File: nvidia/tu106/gr/fecs_data.bin
>  File: nvidia/tu106/gr/fecs_inst.bin
> --
> 2.31.1
>