Merge branch 'xiaomi-beryllium' into 'main'

Draft: qcom: add firmware for the Xiaomi Poco F1 onboard WiFi on sdm845 See merge request kernel-firmware/linux-firmware!780
Merge branch 'amd-staging' into 'main'
2025-12-10 07:44:48 +01:00 · 2025-12-04 09:55:45 +01:00 · 2025-12-03 21:05:40 +00:00 · 2025-12-03 21:03:09 +00:00 · 2025-12-03 19:38:53 +00:00 · 2025-12-03 10:49:16 -06:00
7 changed files with 13 additions and 12 deletions
--- a/LICENSE.amd-ucode
+++ b/LICENSE.amd-ucode
@ -1,4 +1,4 @@
-Copyright (C) 2010-2022 Advanced Micro Devices, Inc., All rights reserved.
+Copyright (C) 2010-2025 Advanced Micro Devices, Inc., All rights reserved.

 Permission is hereby granted by Advanced Micro Devices, Inc. ("AMD"),
 free of any license fees, to any person obtaining a copy of this
--- a/3
+++ b/3
@ -3828,6 +3828,7 @@ File: ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp

 Licence: Redistributable. See LICENSE.QualcommAtheros_ath10k for details

+File: ath10k/WCN3990/hw1.0/sdm845/Xiaomi/beryllium/firmware-5.bin
 File: ath10k/WCN3990/hw1.0/qcm2290/wlanmdsp.mbn
 Version: WLAN.HL.3.3.7.c2-00931-QCAHLSWMTPLZ-1
 Link: ath10k/WCN3990/hw1.0/qrb4210/wlanmdsp.mbn -> ../qcm2290/wlanmdsp.mbn
@ -4406,7 +4407,7 @@ Version: 2024-11-21
 RawFile: amd-ucode/microcode_amd_fam19h.bin
 Version: 2025-10-27
 RawFile: amd-ucode/microcode_amd_fam1ah.bin
-Version: 2025-11-13
+Version: 2025-12-02
 File: amd-ucode/README

 License: Redistributable. See LICENSE.amd-ucode for details
--- a/amd-ucode/README
+++ b/amd-ucode/README
@ -70,11 +70,11 @@ Microcode patches in microcode_amd_fam19h.bin:
    Minimum base ucode version for loading: 0x0aa00218

 Microcode patches in microcode_amd_fam1ah.bin:
-  Family=0x1a Model=0x02 Stepping=0x01: Patch=0x0b00215a Length=14368 bytes
+  Family=0x1a Model=0x02 Stepping=0x01: Patch=0x0b002161 Length=14368 bytes
    Minimum base ucode version for loading: 0x0b002140
  Family=0x1a Model=0x08 Stepping=0x01: Patch=0x0b008121 Length=14368 bytes
    Minimum base ucode version for loading: 0x0b008112
-  Family=0x1a Model=0x11 Stepping=0x00: Patch=0x0b101054 Length=14368 bytes
+  Family=0x1a Model=0x11 Stepping=0x00: Patch=0x0b101058 Length=14368 bytes
    Minimum base ucode version for loading: 0x0b101040
  Family=0x1a Model=0x24 Stepping=0x00: Patch=0x0b204037 Length=14368 bytes
    Minimum base ucode version for loading: 0x0b204032
--- a/amd-ucode/microcode_amd_fam1ah.bin
+++ b/amd-ucode/microcode_amd_fam1ah.bin
--- a/amd-ucode/microcode_amd_fam1ah.bin.asc
+++ b/amd-ucode/microcode_amd_fam1ah.bin.asc
@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----

-iQEzBAABCgAdFiEE/HxsUF2vzBRxg1fK5L5TOfMornMFAmkWTzYACgkQ5L5TOfMo
-rnNaFAgAgxZm1VrjyiQ3QuZs1mh3cqbm+n6abWuBZX6Bk74hfDZ2R6bpyAVwxTyT
-NLPSshKGLIW7KI2GnQjT1KiZzjGgfEe+HdoKqNMuN80krXDoYrY4JEjVQMV4if3H
-VFASZ4ZxOawX2vm82jifMBs+pMx4mIzi5UlODusZzBTjEKqDy4hh1kSpGZ46YDMy
-sqYbh3fDeE0O7iuXi3AVUjAR6XTN/DaghDfd6NvH5rxNpxQ8IpSG2purO/qnw1dn
-yGNBWbV3x1taxH8vJrGtybIurmeUI+uv9yvXIRDF4O5Fq0GIXWmx6pThhS+9D3EZ
-uf7hRMpp136iSFdbqN7fqG1m+A18tg==
-=5ZCg
+iQEzBAABCgAdFiEE/HxsUF2vzBRxg1fK5L5TOfMornMFAmkvhcIACgkQ5L5TOfMo
+rnMHnQf/VMb4t4zk3y/XtMaff219LqrPsthI3z821nrv7L6Hg4Hy6bQRBH+7JkzF
+p/+jdZkbkp2dKN05RqRTg/vL+jXK9IbmSZoacTjkVtaEwRLyiU3IQz+gWThuBqwj
+ptsAUf+YH7YHpwJ8Xb8KfY43YVMaOnDbsFcWrnxxzdkEfOEKNOwxJMJvpZtzKW0
+HoIxeHfNjIDmpFBGui0ojTxShpH1JNi/ujWHfyHqauIdO/HcHkLhtQIrBjXFDxeg
+3UvS/uzwwu3/xhdzygyvBAoHOMSnrKByjfC6TeFrnPEhmfAiTV32qberDZr4LKAi
+INUNC4I/DDDEG0nYqeJw1O2cdmTrdg==
+=gKQm
 -----END PGP SIGNATURE-----
--- a/amdgpu/gc_11_5_0_mes_2.bin
+++ b/amdgpu/gc_11_5_0_mes_2.bin
--- a/ath10k/WCN3990/hw1.0/sdm845/Xiaomi/beryllium/firmware-5.bin
+++ b/ath10k/WCN3990/hw1.0/sdm845/Xiaomi/beryllium/firmware-5.bin
Author	SHA1	Message	Date
David Heidelberg	9cc17d91f8	Merge branch 'xiaomi-beryllium' into 'main' Draft: qcom: add firmware for the Xiaomi Poco F1 onboard WiFi on sdm845 See merge request kernel-firmware/linux-firmware!780	2025-12-04 09:55:45 +01:00
Mario Limonciello	a0f0e52138	Merge branch 'amd-staging' into 'main' Revert "amdgpu: update GC 11.5.0 firmware" See merge request kernel-firmware/linux-firmware!817	2025-12-03 21:05:40 +00:00
Mario Limonciello (AMD)	3d5c813520	Revert "amdgpu: update GC 11.5.0 firmware" The 0x83 MES SCH firmware causes problems with ROCm on GC 11.5.0. This reverts commit `1c5716794a`. Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4751 Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>	2025-12-03 21:03:09 +00:00
Mario Limonciello	e9d859f280	Merge branch 'amd-ucode' into 'main' linux-firmware: Update AMD cpu microcode See merge request kernel-firmware/linux-firmware!816	2025-12-03 19:38:53 +00:00
John Allen	e399bb332b	linux-firmware: Update amd-ucode copyright information Signed-off-by: John Allen <john.allen@amd.com>	2025-12-03 10:49:16 -06:00
John Allen	2b318c8e41	linux-firmware: Update AMD cpu microcode * Update AMD cpu microcode for processor family 1ah Key Name = AMD Microcode Signing Key (for signing microcode container files only) Key ID = F328AE73 Key Fingerprint = FC7C 6C50 5DAF CC14 7183 57CA E4BE 5339 F328 AE73 Signed-off-by: John Allen <john.allen@amd.com>	2025-12-02 19:56:28 -06:00
David Heidelberg	69cd9d9c46	qcom: add firmware for the Xiaomi Poco F1 onboard WiFi on sdm845 Xiaomi Poco F1 (beryllium) needs specific firmware quirk, so let's put it here. Firmware version imported: V12.0.3.0.QEJMIXM $ cp ../../../firmware-5.bin ./ $ ath10k-fwencoder --modify --features wowlan,mgmt-tx-by-ref,non-bmi,no-host-cap-qmi-req firmware-5.bin firmware-5.bin modified: 60 B $ ath10k-fwencoder --info firmware-5.bin FileSize: 60 FileCRC32: bc6b1edb FileMD5: 479c90d813b775bb02bbae809cbfe456 Timestamp: 2025-11-11 12:15:08 Features: wowlan,mgmt-tx-by-ref,non-bmi,no-host-cap-qmi-req WMIOpVersion: tlv HTTOpVersion: tlv Signed-off-by: David Heidelberg <david@ixit.cz>	2025-11-11 15:32:39 +01:00