[SRU] Revert amdgpu/renoir firmware

[Bin Li]

[Impact]
The USB-type-C port is useless when uplug the USB-type-C <-> DP/HDMI/VGA Dongle after the system resumed from S3.

[Fix]
Revert below change, this issue is gone.

commit a543b9c1bfd12e60d962acd48108234481a8581f
Author: Alex Deucher <email address hidden>
Date: Thu Jul 1 12:23:11 2021 +0800

    amdgpu: update renoir firmware from 21.20

    BugLink: https://bugs.launchpad.net/bugs/1934014

    From internal git commit:
    8b05e03570818d047d7ea0a7388c89c4192fd20b

    Signed-off-by: Alex Deucher <email address hidden>
    Signed-off-by: Josh Boyer <email address hidden>
    (backported from commit 56ef642160203f8be7e1334feca4a76852c74bc0)
    [khfeng: Squashed multiple updates into one commit]
    Signed-off-by: Kai-Heng Feng <email address hidden>
    Signed-off-by: Timo Aaltonen <email address hidden>

[Test]
Verify S3 on renoir's platforms.

[Where problems could occur]
Renoir based systems can't resume from s2idle.

[Bin Li (binli)]

Aaron helped confirm this issue is related to below change in firmware of upstream.

First bad commit:
commit 2542ba7a487ee42e36d0256718ed0fc4fef94f3d (HEAD)
Author: Alex Deucher <email address hidden>
Date: Thu Mar 18 16:55:17 2021 -0400

    amdgpu: update renoir firmware for 20.50

    from internal git commit:
    5a333628689f142376b8c5b7187f1cf0a8d5abac

[Timo Aaltonen (tjaalton)]

I don't think we should revert this from impish, lets keep that closer to upstream.

[Andy Whitcroft (apw)]

Hello Bin, or anyone else affected,

Accepted linux-firmware into focal-proposed. The package will build now and be available at https://launchpad.net/ubuntu/+source/linux-firmware/1.187.19 in a few hours, and then in the -proposed repository.

Please help us by testing this new package. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation on how to enable and use -proposed. Your feedback will aid us getting this update out to other Ubuntu users.

If this package fixes the bug for you, please add a comment to this bug, mentioning the version of the package you tested, what testing has been performed on the package and change the tag from verification-needed-focal to verification-done-focal. If it does not fix the bug for you, please add a comment stating that, and change the tag to verification-failed-focal. In either case, without details of your testing we will not be able to proceed.

Further information regarding the verification process can be found at https://wiki.ubuntu.com/QATeam/PerformingSRUVerification . Thank you in advance for helping!

N.B. The updated package will be released to -updates after the bug(s) fixed by this package have been verified and the package has been in -proposed for a minimum of 7 days.

[Bin Li (binli)]

On Thinkpad renoir platform, after upgraded the linux-firmware from 1.187.17 to 1.187.19, this issue is fixed.
kernel: 5.13.0-1014-oem

[Chris Halse Rogers (raof)]

The verification of the Stable Release Update for linux-firmware has completed successfully and the package is now being released to -updates. Subsequently, the Ubuntu Stable Release Updates Team is being unsubscribed and will not receive messages about this bug report. In the event that you encounter a regression using the package from -updates please report a new bug using ubuntu-bug and tag the bug report regression-update so we can easily find any regressions.

[Launchpad Janitor (janitor)]

This bug was fixed in the package linux-firmware - 1.187.19

---------------
linux-firmware (1.187.19) focal; urgency=medium

  * Add Intel WiFi/Bluetooth firmware for ADL-S/ADL-P (LP: #1933938)
    - iwlwifi: add FWs for new So device types with multiple RF modules
    - linux-firmware: Update firmware file for Intel Bluetooth AX211
    - linux-firmware: Update firmware file for Intel Bluetooth 9560
    - linux-firmware: Update firmware file for Intel Bluetooth AX201
    - linux-firmware: Update firmware file for Intel Bluetooth AX211
    - linux-firmware: Update firmware file for Intel Bluetooth 9462
  * Revert "amdgpu: update renoir firmware from 21.20" (LP: #1945565)
  * [Packaging] Add close-release helper script and debian rule
  * i915: Update ADLP DMC v2.12 (LP: #1945438)
  * amdgpu: add initial firmware for Yellow Carp (LP: #1945227)

 -- Timo Aaltonen <email address hidden> Thu, 30 Sep 2021 16:29:46 +0300

[Bin Li (binli)]

Mario Limonciello (superm1) wrote 8 hours ago:

Canonical team - I had some more review with internal guys about this. Here's a better solution:

https://patchwork.freedesktop.org/patch/462084/

This will drop the dependency on FW version for this variable by parsing the loaded FW. That will go into 5.16. You can backport that to your OEM kernel to remain compatible to all FW.

[Mario Limonciello (superm1)]

Here's the submission to stable: https://<email address hidden>/

[xalt7x (xalt7x)]

I tested 2 laptops with Ryzen 5 5500U (HP Pavilion & ASUS Zenbook). Both of them can't resume from s2idle with linux-firmware v1.187.20. With HP Pavilion I also tried v1.187.15 and v1.187.19. In all cases when you press button to resume laptop from s2idle, power button changes state from a "a slow blink" to constant lighting. But screen doesn't turn on, keyboard doesn't react, SSH doesn't work etc. The only way is to force shut down.
On the other hand linux-firmware v1.187.16 & v1.187.17 work fine (I didn't test typeC dongles).
Dear maintainers, could you please reintroduce "renoir firmware from 21.20" for Focal?

[Mario Limonciello (superm1)]

@xalt7x: Suggest that you adopt linux-oem-20.04d package which backports all the patches for s2idle from 5.15 or later.

@Binli,

5.14 and 5.15 stable queue has the patch I mentioned above:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-5.14/drm-amd-display-look-at-firmware-version-to-determine-using-dmub-on-dcn21.patch

Please take this further back to older kernel versions such as 5.13-oem so you can continue to adopt newer firmwares.

[Bin Li (binli)]

@mario,

 I checked the 5.14-oem kernel, your patch is not merged into 5.14-oem(linux-oem-20.04d) yet, so we need push your patch into oem kernel first. Thanks!

[Bin Li (binli)]

@xalt7x,

 Could you help open a new bug for your issue in #9? Thanks!

[Mario Limonciello (superm1)]

Bin,

Yeah it's going to either need separate SRU push or it will catch a future stable kernel release.

I added tasks for kernel.

[Ubuntu Kernel Bot (ubuntu-kernel-bot)]

This bug is missing log files that will aid in diagnosing the problem. While running an Ubuntu kernel (not a mainline or third-party kernel) please enter the following command in a terminal window:

apport-collect 1945565

and then change the status of the bug to 'Confirmed'.

If, due to the nature of the issue you have encountered, you are unable to run this command, please add a comment stating that fact and change the bug status to 'Confirmed'.

This change has been made by an automated script, maintained by the Ubuntu Kernel Team.

[xalt7x (xalt7x)]

@binli
There is a bug report by @superm already and most likely I have the same issue. Should I fill a new bug or maybe we could reopen #1934014 (https://bugs.launchpad.net/ubuntu/+source/linux-firmware/+bug/1934014) ?
@superm1
>>@xalt7x: Suggest that you adopt linux-oem-20.04d package which backports all the patches for s2idle from 5.15 or later.
I'm not familiar with OEM kernels but already tried to rebuild kernel 5.15.0-9.9+1 from Unstable PPA (https://launchpad.net/~canonical-kernel-team/+archive/ubuntu/unstable). Unfortunately resume from s2idle worked only with newer firmware from linux-firmware 1.187.16/1.187.17

[Mario Limonciello (superm1)]

For 5.14 and 5.15 it will come in as part of stable update process.

It is picked up in 5.15.3 for 5.15.y:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=bb7e50b476abb8fc94a9891bb7f08ab21801fec5

It's picked up in 5.14.19 for 5.14.y:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.14.y&id=af09862cb5661cfdedd114ae50c7aaed94bd185a

As there is no 5.13.y, Canonical will need to manually pull this in for 5.13 OEM kernel.
Please restore the new firmware once it's pulled in.

[Bin Li (binli)]

@aaron,

 Could you help backport the new patches into oem kernel and add the new firmware again? Thanks!

[AaronMa (mapengyu)]

@BinLi

This patch will be merged by stable updates in v5.14.19.

For 5.13, we didn't have plan to support s2idle in current projects.

[Mario Limonciello (superm1)]

What is the plan for 5.13 though? Will it stay for a while, or will there be a migration to 5.14? The new firmware needs to be in place no matter the kernel version or project. So for safety the suggestion would be to take that patch to all kernels so that you can put the new firmware back in place.

[AaronMa (mapengyu)]

@Mario
The 5.13 kernel will be replaced by 5.14 soon.
I will try to SRU it to 5.13 kernel if 5.13 lives long, let me double confirm.

[AaronMa (mapengyu)]

Hi Mario,

SRUed in Bug #1952817.

Thank you very much.

[Timo Aaltonen (tjaalton)]

doesn't look like anything left to do to the kernel here