release 6.16.5

debian/.gitignore

@@ -27,6 +27,7 @@
 /rules.gen
 !/linux-bpf-dev.*
 !/linux-cpupower.*
+!/linux-misc-tools.*
 !/linux-perf.*
 
 # Ignore compiled Python files

debian/bin/gencontrol.py

@@ -62,7 +62,7 @@ class Gencontrol(Base):
         super().do_main_setup(config, vars, makeflags)
         makeflags.update({
             'VERSION': self.version.linux_version,
-            'UPSTREAMVERSION': self.version.linux_upstream,
+            'UPSTREAMVERSION': self.version.linux_upstream_full,
             'ABINAME': self.abiname,
             'SOURCEVERSION': self.version.complete,
         })
@@ -353,7 +353,7 @@ class Gencontrol(Base):
         self.abiname = f'{version.linux_upstream_full}'
 
         self.vars = {
-            'upstreamversion': self.version.linux_upstream,
+            'upstreamversion': self.version.linux_upstream_full,
             'version': self.version.linux_version,
             'version_complete': self.version.complete,
             'source_basename': re.sub(r'-[\d.]+$', '',

debian/bin/genpatch-pf

@@ -5,9 +5,9 @@ export GIT_OPTIONAL_LOCKS=0
 
 w=$(git rev-parse --path-format=absolute --show-toplevel) ; : "${w:?}" ; cd "$w"
 
-dst='debian/patches/pf-tmp'
+dst='debian/patches/tmp-pf'
 src='../linux-extras'
-branches='amd-pstate cpuidle crypto exfat fixes fuse invlpgb kbuild nfs smb zstd'
+branches='archlinux bbr3 cpuidle kbuild steady'
 
 if [ -d "${dst}" ] ; then rm -rf "${dst}" ; fi
 mkdir -p "${dst}"
@@ -34,19 +34,17 @@ for b in ${branches} ; do
 	git switch --detach "${ref}"
 	git switch -C "$r"
 
+	rm -rf "$w/${dst}/$b" ; mkdir -p "$w/${dst}/$b"
 	if git rebase "${from}" ; then
-		[ -d "$w/${dst}/$b/" ] || mkdir -p "$w/${dst}/$b"
-
-		set +e
-		env -C "$w" git ls-files -z | grep -zF "${dst}/$b/" | grep -zFv '/.' | env -C "$w" -u GIT_OPTIONAL_LOCKS xargs -r -0 git rm -f
-		find "$w/${dst}/$b/" -name '*.patch' -type f -exec rm -f {} +
-		set -e
-
 		git format-patch -N --subject-prefix='' --output-directory "$w/${dst}/$b" "${from}..$r"
 	else
 		echo >&2
 		git rebase --abort
-		echo >&2
+
+		touch "$w/${dst}/$b/0000-rebase-failed"
+
+		base=$(git merge-base "${from}" "${ref}")
+		git format-patch -N --subject-prefix='' --output-directory "$w/${dst}/$b" "${base}..${ref}"
 	fi
 
 	git switch -q --detach "${ref}"
@@ -57,6 +55,6 @@ done
 cd "$w" ; rm -rf "$t"
 
 echo >&2
-echo 'put in debian/patches/series' >&2
+echo 'output:' >&2
 echo >&2
 find "${dst}/" -type f -name '*.patch' | sed -E 's#^debian/patches/##' | sort -V

debian/bin/genpatch-zen

@@ -0,0 +1,60 @@
+#!/bin/sh
+set -ef
+
+export GIT_OPTIONAL_LOCKS=0
+
+w=$(git rev-parse --path-format=absolute --show-toplevel) ; : "${w:?}" ; cd "$w"
+
+dst='debian/patches/tmp-zen'
+src='../linux-extras'
+branches='bbr3 fixes zen-sauce'
+
+if [ -d "${dst}" ] ; then rm -rf "${dst}" ; fi
+mkdir -p "${dst}"
+
+kver=
+if [ -n "$1" ] ; then
+	kver="$1"
+else
+	kver=$(dpkg-parsechangelog --show-field=Version | sed -E 's/^[0-9]+://;s/-[^-]*$//' | cut -d. -f1-2)
+fi
+from="upstream/linux-${kver}.y"
+
+t=$(mktemp -d) ; : "${t:?}"
+
+cp -ar "${src}" "$t/"
+cd "$t/${src##*/}"
+
+git config advice.skippedCherryPicks false
+
+for b in ${branches} ; do
+	ref="zen/${kver}/$b"
+	r="tmp-rebase-$b"
+
+	git switch --detach "${ref}"
+	git switch -C "$r"
+
+	rm -rf "$w/${dst}/$b" ; mkdir -p "$w/${dst}/$b"
+	if git rebase "${from}" ; then
+		git format-patch -N --subject-prefix='' --output-directory "$w/${dst}/$b" "${from}..$r"
+	else
+		echo >&2
+		git rebase --abort
+
+		touch "$w/${dst}/$b/0000-rebase-failed"
+
+		base=$(git merge-base "${from}" "${ref}")
+		git format-patch -N --subject-prefix='' --output-directory "$w/${dst}/$b" "${base}..${ref}"
+	fi
+
+	git switch -q --detach "${ref}"
+	git branch -D "$r"
+	echo >&2
+done
+
+cd "$w" ; rm -rf "$t"
+
+echo >&2
+echo 'output:' >&2
+echo >&2
+find "${dst}/" -type f -name '*.patch' | sed -E 's#^debian/patches/##' | sort -V

debian/changelog

@@ -1,86 +1,23 @@
-linux (6.14.11-1) sid; urgency=medium
+linux (6.16.5-1) sid; urgency=medium
 
   * New upstream stable update:
-    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.14.11
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.16.5
 
- -- Konstantin Demin <rockdrilla@gmail.com>  Tue, 10 Jun 2025 15:40:46 +0300
+ -- Konstantin Demin <rockdrilla@gmail.com>  Thu, 04 Sep 2025 18:03:41 +0300
 
-linux (6.14.10-1) sid; urgency=medium
+linux (6.16.4-1) sid; urgency=medium
 
   * New upstream stable update:
-    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.14.10
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.16.4
 
- -- Konstantin Demin <rockdrilla@gmail.com>  Wed, 04 Jun 2025 16:09:02 +0300
+ -- Konstantin Demin <rockdrilla@gmail.com>  Thu, 28 Aug 2025 22:38:27 +0300
 
-linux (6.14.9-1) sid; urgency=medium
+linux (6.16.3-1) sid; urgency=medium
 
   * New upstream stable update:
-    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.14.9
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.16.1
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.16.2
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.16.3
+  * New upstream release: https://kernelnewbies.org/Linux_6.16
 
- -- Konstantin Demin <rockdrilla@gmail.com>  Thu, 29 May 2025 15:08:18 +0300
-
-linux (6.14.8-1) sid; urgency=medium
-
-  * New upstream stable update:
-    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.14.8
-
- -- Konstantin Demin <rockdrilla@gmail.com>  Thu, 22 May 2025 17:02:41 +0300
-
-linux (6.14.7-1) sid; urgency=medium
-
-  * New upstream stable update:
-    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.14.7
-
- -- Konstantin Demin <rockdrilla@gmail.com>  Sun, 18 May 2025 11:56:49 +0300
-
-linux (6.14.6-1) sid; urgency=medium
-
-  * New upstream stable update:
-    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.14.6
-
- -- Konstantin Demin <rockdrilla@gmail.com>  Fri, 09 May 2025 12:23:42 +0300
-
-linux (6.14.5-1) sid; urgency=medium
-
-  * New upstream stable update:
-    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.14.5
-
- -- Konstantin Demin <rockdrilla@gmail.com>  Fri, 02 May 2025 16:25:21 +0300
-
-linux (6.14.4-1) sid; urgency=medium
-
-  * New upstream stable update:
-    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.14.4
-
- -- Konstantin Demin <rockdrilla@gmail.com>  Fri, 25 Apr 2025 20:05:32 +0300
-
-linux (6.14.3-1) sid; urgency=medium
-
-  * New upstream stable update:
-    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.14.3
-
- -- Konstantin Demin <rockdrilla@gmail.com>  Mon, 21 Apr 2025 01:31:34 +0300
-
-linux (6.14.2-1) sid; urgency=medium
-
-  * New upstream stable update:
-    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.14.2
-
- -- Konstantin Demin <rockdrilla@gmail.com>  Fri, 11 Apr 2025 00:21:57 +0300
-
-linux (6.14.1-1) sid; urgency=medium
-
-  * New upstream stable update:
-    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.14.1
-
- -- Konstantin Demin <rockdrilla@gmail.com>  Mon, 07 Apr 2025 12:41:44 +0300
-
-linux (6.14-1) sid; urgency=medium
-
-  * Sync with Debian.
-  * Refresh patches.
-  * Refine configs.
-  * New upstream release: https://kernelnewbies.org/Linux_6.13
-  * New upstream release: https://kernelnewbies.org/Linux_6.14
-
- -- Konstantin Demin <rockdrilla@gmail.com>  Thu, 27 Mar 2025 01:51:03 +0300
+ -- Konstantin Demin <rockdrilla@gmail.com>  Sun, 24 Aug 2025 20:54:35 +0300

debian/config/amd64/config.cloud

@@ -91,9 +91,8 @@ CONFIG_IO_DELAY_NONE=y
 ##
 ## file: crypto/Kconfig
 ##
+# CONFIG_CRYPTO_BENCHMARK is not set
 CONFIG_CRYPTO_ECDH=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_XTS=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
@@ -133,7 +132,8 @@ CONFIG_CRYPTO_ZSTD=m
 CONFIG_ATA=m
 # CONFIG_ATA_ACPI is not set
 # CONFIG_SATA_PMP is not set
-# CONFIG_SATA_AHCI is not set
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=0
 # CONFIG_SATA_AHCI_PLATFORM is not set
 # CONFIG_AHCI_DWC is not set
 # CONFIG_SATA_ACARD_AHCI is not set
@@ -202,6 +202,7 @@ CONFIG_ATA=m
 ## file: drivers/block/Kconfig
 ##
 # CONFIG_ATA_OVER_ETH is not set
+# CONFIG_BLK_DEV_ZONED_LOOP is not set
 
 ##
 ## file: drivers/block/mtip32xx/Kconfig
@@ -296,6 +297,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
 # CONFIG_CRYPTO_DEV_QAT_C62X is not set
 # CONFIG_CRYPTO_DEV_QAT_4XXX is not set
 # CONFIG_CRYPTO_DEV_QAT_420XX is not set
+# CONFIG_CRYPTO_DEV_QAT_6XXX is not set
 # CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
 # CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
 # CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
@@ -305,6 +307,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
 ##
 CONFIG_CXL_BUS=y
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
+# CONFIG_CXL_FEATURES is not set
 
 ##
 ## file: drivers/devfreq/Kconfig
@@ -397,6 +400,11 @@ CONFIG_GOOGLE_COREBOOT_TABLE=m
 CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
 CONFIG_GOOGLE_VPD=m
 
+##
+## file: drivers/fwctl/Kconfig
+##
+# CONFIG_FWCTL is not set
+
 ##
 ## file: drivers/gnss/Kconfig
 ##
@@ -437,6 +445,11 @@ CONFIG_GOOGLE_VPD=m
 ##
 # CONFIG_HTE is not set
 
+##
+## file: drivers/hv/Kconfig
+##
+# CONFIG_MSHV_ROOT is not set
+
 ##
 ## file: drivers/hwmon/Kconfig
 ##
@@ -464,7 +477,6 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_NCT6683 is not set
 # CONFIG_SENSORS_NCT6775 is not set
 # CONFIG_SENSORS_NPCM7XX is not set
-# CONFIG_SENSORS_OXP is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -816,6 +828,7 @@ CONFIG_FUSION_FC=m
 ##
 ## file: drivers/net/Kconfig
 ##
+# CONFIG_OVPN is not set
 # CONFIG_FUJITSU_ES is not set
 
 ##
@@ -1213,6 +1226,7 @@ CONFIG_FBNIC=m
 ##
 ## file: drivers/net/phy/Kconfig
 ##
+# CONFIG_AS21XXX_PHY is not set
 # CONFIG_AIR_EN8811H_PHY is not set
 # CONFIG_AMD_PHY is not set
 # CONFIG_ADIN_PHY is not set
@@ -1235,6 +1249,7 @@ CONFIG_FBNIC=m
 # CONFIG_MARVELL_88Q2XXX_PHY is not set
 # CONFIG_MARVELL_88X2222_PHY is not set
 # CONFIG_MAXLINEAR_GPHY is not set
+# CONFIG_MAXLINEAR_86110_PHY is not set
 # CONFIG_MICREL_PHY is not set
 # CONFIG_MICROCHIP_T1S_PHY is not set
 # CONFIG_MICROCHIP_PHY is not set
@@ -1376,6 +1391,11 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 ## end choice
 
+##
+## file: drivers/pci/pwrctrl/Kconfig
+##
+# CONFIG_PCI_PWRCTRL_SLOT is not set
+
 ##
 ## file: drivers/pci/switch/Kconfig
 ##
@@ -1465,6 +1485,11 @@ CONFIG_PCIEASPM_DEFAULT=y
 ##
 CONFIG_PPS=m
 
+##
+## file: drivers/pps/generators/Kconfig
+##
+# CONFIG_PPS_GENERATOR_TIO is not set
+
 ##
 ## file: drivers/ptp/Kconfig
 ##
@@ -1655,6 +1680,7 @@ CONFIG_SCSI_MPI3MR=m
 # CONFIG_SERIAL_8250_RSA is not set
 # CONFIG_SERIAL_8250_RT288X is not set
 # CONFIG_SERIAL_8250_MID is not set
+# CONFIG_SERIAL_8250_NI is not set
 
 ##
 ## file: drivers/ufs/Kconfig
@@ -1721,6 +1747,7 @@ CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=m
 CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=m
 CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
 # CONFIG_LENOVO_SE10_WDT is not set
+# CONFIG_LENOVO_SE30_WDT is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_CADENCE_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
@@ -1740,6 +1767,7 @@ CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
 # CONFIG_IBMASR is not set
 # CONFIG_WAFER_WDT is not set
 # CONFIG_IE6XX_WDT is not set
+# CONFIG_INTEL_OC_WATCHDOG is not set
 # CONFIG_IT8712F_WDT is not set
 # CONFIG_IT87_WDT is not set
 # CONFIG_HP_WATCHDOG is not set
@@ -1810,6 +1838,11 @@ CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
 ##
 # CONFIG_EFS_FS is not set
 
+##
+## file: fs/erofs/Kconfig
+##
+# CONFIG_EROFS_FS_ZIP_ACCEL is not set
+
 ##
 ## file: fs/f2fs/Kconfig
 ##
@@ -1946,9 +1979,9 @@ CONFIG_PROC_VMCORE=y
 # CONFIG_CIFS is not set
 
 ##
-## file: fs/sysv/Kconfig
+## file: fs/squashfs/Kconfig
 ##
-# CONFIG_SYSV_FS is not set
+# CONFIG_SQUASHFS_COMP_CACHE_FULL is not set
 
 ##
 ## file: fs/ufs/Kconfig
@@ -1979,6 +2012,7 @@ CONFIG_KEXEC_SIG=y
 CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
 CONFIG_KEXEC_JUMP=y
 CONFIG_CRASH_DUMP=y
+# CONFIG_CRASH_DM_CRYPT is not set
 CONFIG_CRASH_HOTPLUG=y
 CONFIG_CRASH_MAX_MEMORY_RANGES=8192
 
@@ -2049,6 +2083,7 @@ CONFIG_PANIC_TIMEOUT=5
 ## file: mm/Kconfig
 ##
 # CONFIG_ZSWAP is not set
+CONFIG_ZSMALLOC=m
 # CONFIG_HWPOISON_INJECT is not set
 # CONFIG_NUMA_EMU is not set
 
@@ -2079,7 +2114,7 @@ CONFIG_MAX_SKB_FRAGS=19
 ##
 ## file: net/9p/Kconfig
 ##
-# CONFIG_NET_9P is not set
+CONFIG_NET_9P_RDMA=m
 
 ##
 ## file: net/appletalk/Kconfig
@@ -2117,17 +2152,6 @@ CONFIG_MAX_SKB_FRAGS=19
 ##
 # CONFIG_CAN is not set
 
-##
-## file: net/dccp/Kconfig
-##
-# CONFIG_IP_DCCP_DEBUG is not set
-
-##
-## file: net/dccp/ccids/Kconfig
-##
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-
 ##
 ## file: net/ieee802154/Kconfig
 ##
@@ -2310,6 +2334,7 @@ CONFIG_IPE_PROP_DM_VERITY_SIGNATURE=y
 ## file: security/keys/Kconfig
 ##
 # CONFIG_KEYS_REQUEST_CACHE is not set
+# CONFIG_BIG_KEYS is not set
 # CONFIG_TRUSTED_KEYS is not set
 # CONFIG_USER_DECRYPTED_DATA is not set
 
@@ -2327,7 +2352,13 @@ CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y
 CONFIG_ARCH_SELECTS_KEXEC_FILE=y
 CONFIG_BLK_DEV_RNBD=y
 CONFIG_CRASH_RESERVE=y
+CONFIG_CRYPTO_CHACHA20_X86_64=m
 CONFIG_CRYPTO_LIB_AESCFB=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_POLY1305_X86_64=m
 CONFIG_CXL_PORT=y
 CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
 CONFIG_INFINIBAND_RTRS=m
@@ -2345,8 +2376,8 @@ CONFIG_LZ4_COMPRESS=m
 CONFIG_MFD_CORE=m
 CONFIG_ND_BTT=m
 CONFIG_ND_PFN=m
-CONFIG_NETFS_SUPPORT=m
 # CONFIG_NVMEM_LAYOUTS is not set
+CONFIG_PLDMFW=y
 CONFIG_PREEMPT_NONE_BUILD=y
 CONFIG_RATIONAL=m
 CONFIG_SCSI_COMMON=m

debian/config/amd64/config.vm

@@ -11,8 +11,8 @@
 CONFIG_X86_EXTENDED_PLATFORM=y
 # CONFIG_X86_NUMACHIP is not set
 # CONFIG_X86_VSMP is not set
-CONFIG_X86_GOLDFISH=y
 # CONFIG_X86_INTEL_MID is not set
+CONFIG_X86_GOLDFISH=y
 # CONFIG_X86_INTEL_LPSS is not set
 # CONFIG_X86_AMD_PLATFORM_DEVICE is not set
 CONFIG_IOSF_MBI=m
@@ -96,9 +96,8 @@ CONFIG_IO_DELAY_NONE=y
 ##
 ## file: crypto/Kconfig
 ##
+CONFIG_CRYPTO_BENCHMARK=m
 CONFIG_CRYPTO_ECDH=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_XTS=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
@@ -148,7 +147,8 @@ CONFIG_ANDROID_BINDER_DEVICES="binder"
 CONFIG_ATA=m
 # CONFIG_ATA_ACPI is not set
 # CONFIG_SATA_PMP is not set
-# CONFIG_SATA_AHCI is not set
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=0
 # CONFIG_SATA_AHCI_PLATFORM is not set
 # CONFIG_AHCI_DWC is not set
 # CONFIG_SATA_ACARD_AHCI is not set
@@ -217,6 +217,7 @@ CONFIG_ATA=m
 ## file: drivers/block/Kconfig
 ##
 # CONFIG_ATA_OVER_ETH is not set
+CONFIG_BLK_DEV_ZONED_LOOP=m
 
 ##
 ## file: drivers/block/mtip32xx/Kconfig
@@ -343,6 +344,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
 # CONFIG_CRYPTO_DEV_QAT_C62X is not set
 # CONFIG_CRYPTO_DEV_QAT_4XXX is not set
 # CONFIG_CRYPTO_DEV_QAT_420XX is not set
+# CONFIG_CRYPTO_DEV_QAT_6XXX is not set
 # CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
 # CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
 # CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
@@ -352,6 +354,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
 ##
 CONFIG_CXL_BUS=y
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
+# CONFIG_CXL_FEATURES is not set
 
 ##
 ## file: drivers/devfreq/Kconfig
@@ -427,6 +430,9 @@ CONFIG_EDAC_LEGACY_SYSFS=y
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_DECODE_MCE=y
 CONFIG_EDAC_GHES=y
+# CONFIG_EDAC_SCRUB is not set
+# CONFIG_EDAC_ECS is not set
+# CONFIG_EDAC_MEM_REPAIR is not set
 # CONFIG_EDAC_AMD64 is not set
 # CONFIG_EDAC_E752X is not set
 # CONFIG_EDAC_I82975X is not set
@@ -484,6 +490,11 @@ CONFIG_GOOGLE_COREBOOT_TABLE=m
 CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
 CONFIG_GOOGLE_VPD=m
 
+##
+## file: drivers/fwctl/Kconfig
+##
+# CONFIG_FWCTL is not set
+
 ##
 ## file: drivers/gnss/Kconfig
 ##
@@ -543,14 +554,18 @@ CONFIG_GPIO_SIM=m
 ## file: drivers/gpu/drm/Kconfig
 ##
 CONFIG_DRM=y
-# CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_PANIC is not set
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_HYPERV=m
+
+##
+## file: drivers/gpu/drm/Kconfig.debug
+##
 # CONFIG_DRM_WERROR is not set
+# CONFIG_DRM_DEBUG_MM is not set
 
 ##
 ## file: drivers/gpu/drm/amd/amdgpu/Kconfig
@@ -562,6 +577,11 @@ CONFIG_DRM_HYPERV=m
 ##
 # CONFIG_DRM_AST is not set
 
+##
+## file: drivers/gpu/drm/bridge/Kconfig
+##
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+
 ##
 ## file: drivers/gpu/drm/bridge/analogix/Kconfig
 ##
@@ -598,14 +618,6 @@ CONFIG_DRM_CLIENT_DEFAULT_FBDEV=y
 ##
 # CONFIG_DRM_HISI_HIBMC is not set
 
-##
-## file: drivers/gpu/drm/i2c/Kconfig
-##
-# CONFIG_DRM_I2C_CH7006 is not set
-# CONFIG_DRM_I2C_SIL164 is not set
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-
 ##
 ## file: drivers/gpu/drm/i915/Kconfig
 ##
@@ -631,18 +643,30 @@ CONFIG_DRM_QXL=m
 ##
 # CONFIG_DRM_RADEON is not set
 
+##
+## file: drivers/gpu/drm/sitronix/Kconfig
+##
+# CONFIG_DRM_ST7571_I2C is not set
+
 ##
 ## file: drivers/gpu/drm/solomon/Kconfig
 ##
 # CONFIG_DRM_SSD130X is not set
 
+##
+## file: drivers/gpu/drm/sysfb/Kconfig
+##
+CONFIG_DRM_EFIDRM=m
+# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_VESADRM=m
+
 ##
 ## file: drivers/gpu/drm/tiny/Kconfig
 ##
+# CONFIG_DRM_APPLETBDRM is not set
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_GM12U320 is not set
-# CONFIG_DRM_SIMPLEDRM is not set
 
 ##
 ## file: drivers/gpu/drm/udl/Kconfig
@@ -843,6 +867,11 @@ CONFIG_HSI_CHAR=m
 ##
 # CONFIG_HTE is not set
 
+##
+## file: drivers/hv/Kconfig
+##
+CONFIG_MSHV_ROOT=m
+
 ##
 ## file: drivers/hwmon/Kconfig
 ##
@@ -894,6 +923,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_G762 is not set
 # CONFIG_SENSORS_HIH6130 is not set
 # CONFIG_SENSORS_HS3001 is not set
+# CONFIG_SENSORS_HTU31 is not set
 # CONFIG_SENSORS_I5500 is not set
 # CONFIG_SENSORS_CORETEMP is not set
 # CONFIG_SENSORS_ISL28022 is not set
@@ -961,11 +991,9 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_NZXT_KRAKEN2 is not set
 # CONFIG_SENSORS_NZXT_KRAKEN3 is not set
 # CONFIG_SENSORS_NZXT_SMART2 is not set
-# CONFIG_SENSORS_OXP is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_PT5161L is not set
 # CONFIG_SENSORS_SBTSI is not set
-# CONFIG_SENSORS_SBRMI is not set
 # CONFIG_SENSORS_SHT15 is not set
 # CONFIG_SENSORS_SHT21 is not set
 # CONFIG_SENSORS_SHT3x is not set
@@ -1039,6 +1067,7 @@ CONFIG_SENSORS_PMBUS=m
 # CONFIG_SENSORS_DELTA_AHE50DC_FAN is not set
 # CONFIG_SENSORS_FSP_3Y is not set
 # CONFIG_SENSORS_DPS920AB is not set
+# CONFIG_SENSORS_INA233 is not set
 # CONFIG_SENSORS_INSPUR_IPSPS is not set
 # CONFIG_SENSORS_IR35221 is not set
 # CONFIG_SENSORS_IR36021 is not set
@@ -1046,6 +1075,7 @@ CONFIG_SENSORS_PMBUS=m
 # CONFIG_SENSORS_IRPS5401 is not set
 # CONFIG_SENSORS_ISL68137 is not set
 # CONFIG_SENSORS_LM25066 is not set
+# CONFIG_SENSORS_LT3074 is not set
 # CONFIG_SENSORS_LT7182S is not set
 # CONFIG_SENSORS_LTC2978 is not set
 # CONFIG_SENSORS_LTC3815 is not set
@@ -1631,6 +1661,7 @@ CONFIG_MFD_INTEL_PMC_BXT=m
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77541 is not set
 # CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77705 is not set
 # CONFIG_MFD_MAX77843 is not set
 # CONFIG_MFD_MAX8907 is not set
 # CONFIG_MFD_MAX8925 is not set
@@ -1642,7 +1673,6 @@ CONFIG_MFD_INTEL_PMC_BXT=m
 # CONFIG_MFD_MENF21BMC is not set
 # CONFIG_MFD_VIPERBOARD is not set
 # CONFIG_MFD_RETU is not set
-# CONFIG_MFD_PCF50633 is not set
 # CONFIG_MFD_SY7636A is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RT4831 is not set
@@ -1691,6 +1721,7 @@ CONFIG_MFD_INTEL_PMC_BXT=m
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_IBM_ASM is not set
 # CONFIG_PHANTOM is not set
+# CONFIG_TI_FPC202 is not set
 # CONFIG_TIFM_CORE is not set
 # CONFIG_ICS932S401 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
@@ -1713,6 +1744,12 @@ CONFIG_NTSYNC=m
 ##
 # CONFIG_ALTERA_STAPL is not set
 
+##
+## file: drivers/misc/amd-sbi/Kconfig
+##
+CONFIG_AMD_SBRMI_I2C=m
+CONFIG_AMD_SBRMI_HWMON=y
+
 ##
 ## file: drivers/misc/bcm-vk/Kconfig
 ##
@@ -1782,6 +1819,7 @@ CONFIG_EEPROM_AT24=m
 ##
 ## file: drivers/net/Kconfig
 ##
+CONFIG_OVPN=m
 # CONFIG_FUJITSU_ES is not set
 
 ##
@@ -2169,6 +2207,7 @@ CONFIG_FBNIC=m
 ##
 CONFIG_MCTP_SERIAL=m
 CONFIG_MCTP_TRANSPORT_I2C=m
+CONFIG_MCTP_TRANSPORT_USB=m
 
 ##
 ## file: drivers/net/mdio/Kconfig
@@ -2187,6 +2226,7 @@ CONFIG_MCTP_TRANSPORT_I2C=m
 ## file: drivers/net/phy/Kconfig
 ##
 # CONFIG_SFP is not set
+# CONFIG_AS21XXX_PHY is not set
 # CONFIG_AIR_EN8811H_PHY is not set
 # CONFIG_AMD_PHY is not set
 # CONFIG_ADIN_PHY is not set
@@ -2209,6 +2249,7 @@ CONFIG_MCTP_TRANSPORT_I2C=m
 # CONFIG_MARVELL_88Q2XXX_PHY is not set
 # CONFIG_MARVELL_88X2222_PHY is not set
 # CONFIG_MAXLINEAR_GPHY is not set
+# CONFIG_MAXLINEAR_86110_PHY is not set
 # CONFIG_MICREL_PHY is not set
 # CONFIG_MICROCHIP_T1S_PHY is not set
 # CONFIG_MICROCHIP_PHY is not set
@@ -2376,6 +2417,11 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 ## end choice
 
+##
+## file: drivers/pci/pwrctrl/Kconfig
+##
+CONFIG_PCI_PWRCTRL_SLOT=m
+
 ##
 ## file: drivers/pci/switch/Kconfig
 ##
@@ -2446,11 +2492,13 @@ CONFIG_WMI_BMOF=m
 # CONFIG_GPD_POCKET_FAN is not set
 # CONFIG_WIRELESS_HOTKEY is not set
 # CONFIG_IBM_RTL is not set
+# CONFIG_LENOVO_WMI_HOTKEY_UTILITIES is not set
 # CONFIG_SENSORS_HDAPS is not set
 # CONFIG_THINKPAD_LMI is not set
 CONFIG_ACPI_QUICKSTART=m
 # CONFIG_MEEGOPAD_ANX7428 is not set
 CONFIG_MSI_WMI_PLATFORM=m
+# CONFIG_PORTWELL_EC is not set
 # CONFIG_BARCO_P50_GPIO is not set
 # CONFIG_SAMSUNG_Q10 is not set
 # CONFIG_TOSHIBA_BT_RFKILL is not set
@@ -2459,9 +2507,9 @@ CONFIG_MSI_WMI_PLATFORM=m
 # CONFIG_ACPI_CMPC is not set
 # CONFIG_TOPSTAR_LAPTOP is not set
 CONFIG_SERIAL_MULTI_INSTANTIATE=m
-# CONFIG_MLX_PLATFORM is not set
 # CONFIG_INSPUR_PLATFORM_PROFILE is not set
 # CONFIG_LENOVO_WMI_CAMERA is not set
+# CONFIG_DASHARO_ACPI is not set
 # CONFIG_INTEL_IPS is not set
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set
@@ -2472,6 +2520,7 @@ CONFIG_SERIAL_MULTI_INSTANTIATE=m
 ##
 # CONFIG_AMD_3D_VCACHE is not set
 # CONFIG_AMD_WBRF is not set
+CONFIG_AMD_ISP_PLATFORM=m
 
 ##
 ## file: drivers/platform/x86/amd/hsmp/Kconfig
@@ -2542,6 +2591,11 @@ CONFIG_SERIAL_MULTI_INSTANTIATE=m
 ##
 # CONFIG_SIEMENS_SIMATIC_IPC is not set
 
+##
+## file: drivers/platform/x86/tuxedo/nb04/Kconfig
+##
+# CONFIG_TUXEDO_NB04_WMI_AB is not set
+
 ##
 ## file: drivers/pnp/Kconfig
 ##
@@ -2582,6 +2636,7 @@ CONFIG_CHARGER_GPIO=m
 # CONFIG_CHARGER_LT3651 is not set
 # CONFIG_CHARGER_LTC4162L is not set
 # CONFIG_CHARGER_MAX77976 is not set
+# CONFIG_CHARGER_MAX8971 is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24257 is not set
@@ -2594,7 +2649,6 @@ CONFIG_CHARGER_GPIO=m
 CONFIG_BATTERY_GOLDFISH=m
 # CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
-# CONFIG_FUEL_GAUGE_STC3117 is not set
 # CONFIG_CHARGER_BD99954 is not set
 # CONFIG_BATTERY_UG3105 is not set
 # CONFIG_FUEL_GAUGE_MM8013 is not set
@@ -2609,6 +2663,11 @@ CONFIG_BATTERY_GOLDFISH=m
 ##
 CONFIG_PPS=m
 
+##
+## file: drivers/pps/generators/Kconfig
+##
+CONFIG_PPS_GENERATOR_TIO=m
+
 ##
 ## file: drivers/ptp/Kconfig
 ##
@@ -2864,6 +2923,7 @@ CONFIG_GOLDFISH_TTY=m
 # CONFIG_SERIAL_8250_RSA is not set
 # CONFIG_SERIAL_8250_RT288X is not set
 # CONFIG_SERIAL_8250_MID is not set
+# CONFIG_SERIAL_8250_NI is not set
 
 ##
 ## file: drivers/ufs/Kconfig
@@ -2947,6 +3007,7 @@ CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_DBGCAP is not set
 CONFIG_USB_XHCI_PCI_RENESAS=m
 CONFIG_USB_XHCI_PLATFORM=m
+# CONFIG_USB_XHCI_SIDEBAND is not set
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -3158,6 +3219,7 @@ CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=m
 CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=m
 CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
 # CONFIG_LENOVO_SE10_WDT is not set
+# CONFIG_LENOVO_SE30_WDT is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
 # CONFIG_CADENCE_WATCHDOG is not set
@@ -3178,6 +3240,7 @@ CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
 # CONFIG_IBMASR is not set
 # CONFIG_WAFER_WDT is not set
 # CONFIG_IE6XX_WDT is not set
+# CONFIG_INTEL_OC_WATCHDOG is not set
 # CONFIG_IT8712F_WDT is not set
 # CONFIG_IT87_WDT is not set
 # CONFIG_HP_WATCHDOG is not set
@@ -3205,14 +3268,6 @@ CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
 ##
 # CONFIG_VALIDATE_FS_PARSER is not set
 
-##
-## file: fs/9p/Kconfig
-##
-CONFIG_9P_FS=y
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-CONFIG_9P_FS_SECURITY=y
-
 ##
 ## file: fs/adfs/Kconfig
 ##
@@ -3260,6 +3315,11 @@ CONFIG_ECRYPT_FS_MESSAGING=y
 ##
 # CONFIG_EFS_FS is not set
 
+##
+## file: fs/erofs/Kconfig
+##
+CONFIG_EROFS_FS_ZIP_ACCEL=y
+
 ##
 ## file: fs/f2fs/Kconfig
 ##
@@ -3423,9 +3483,9 @@ CONFIG_CIFS_FSCACHE=y
 # CONFIG_CIFS_COMPRESSION is not set
 
 ##
-## file: fs/sysv/Kconfig
+## file: fs/squashfs/Kconfig
 ##
-# CONFIG_SYSV_FS is not set
+CONFIG_SQUASHFS_COMP_CACHE_FULL=y
 
 ##
 ## file: fs/ufs/Kconfig
@@ -3451,6 +3511,7 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_UCLAMP_TASK=y
 CONFIG_UCLAMP_BUCKETS_COUNT=10
 CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED_DEFAULT_DISABLED is not set
 CONFIG_UCLAMP_TASK_GROUP=y
 
 ##
@@ -3560,12 +3621,9 @@ CONFIG_ZSWAP_SHRINKER_DEFAULT_ON=y
 CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
 ## end choice
 ## choice: Default allocator
-CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y
 ## end choice
-CONFIG_ZBUD=y
-CONFIG_Z3FOLD_DEPRECATED=m
+CONFIG_ZSMALLOC=y
 # CONFIG_HWPOISON_INJECT is not set
 CONFIG_NUMA_EMU=y
 
@@ -3596,12 +3654,7 @@ CONFIG_NET_PKTGEN=m
 ##
 ## file: net/9p/Kconfig
 ##
-CONFIG_NET_9P=y
-CONFIG_NET_9P_FD=y
-CONFIG_NET_9P_VIRTIO=y
-CONFIG_NET_9P_XEN=y
 CONFIG_NET_9P_RDMA=m
-# CONFIG_NET_9P_DEBUG is not set
 
 ##
 ## file: net/appletalk/Kconfig
@@ -3639,17 +3692,6 @@ CONFIG_NET_9P_RDMA=m
 ##
 # CONFIG_CAN is not set
 
-##
-## file: net/dccp/Kconfig
-##
-# CONFIG_IP_DCCP_DEBUG is not set
-
-##
-## file: net/dccp/ccids/Kconfig
-##
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-
 ##
 ## file: net/ieee802154/Kconfig
 ##
@@ -3757,6 +3799,7 @@ CONFIG_AF_RXRPC_IPV6=y
 # CONFIG_AF_RXRPC_INJECT_RX_DELAY is not set
 # CONFIG_AF_RXRPC_DEBUG is not set
 # CONFIG_RXKAD is not set
+# CONFIG_RXGK is not set
 # CONFIG_RXPERF is not set
 
 ##
@@ -3880,6 +3923,7 @@ CONFIG_IPE_PROP_DM_VERITY_SIGNATURE=y
 ## file: security/keys/Kconfig
 ##
 # CONFIG_KEYS_REQUEST_CACHE is not set
+# CONFIG_BIG_KEYS is not set
 # CONFIG_TRUSTED_KEYS is not set
 # CONFIG_USER_DECRYPTED_DATA is not set
 
@@ -3898,9 +3942,17 @@ CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
 CONFIG_BLK_DEV_RNBD=y
 CONFIG_CHECK_SIGNATURE=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRYPTO_CHACHA20_X86_64=m
 CONFIG_CRYPTO_LIB_AESCFB=m
 CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_POLY1305_X86_64=m
 CONFIG_CXL_PORT=y
+CONFIG_DEV_SYNC_PROBE=m
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_CLIENT=y
 CONFIG_DRM_CLIENT_DEFAULT="fbdev"
@@ -3912,6 +3964,7 @@ CONFIG_DRM_GEM_SHMEM_HELPER=m
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_BRIDGE=y
+CONFIG_DRM_SYSFB_HELPER=m
 CONFIG_DRM_TTM=m
 CONFIG_DRM_TTM_HELPER=m
 CONFIG_DRM_VRAM_HELPER=m
@@ -3942,10 +3995,11 @@ CONFIG_MFD_CORE=m
 CONFIG_MOUSE_PS2_SMBUS=y
 CONFIG_ND_BTT=m
 CONFIG_ND_PFN=m
-CONFIG_NETFS_SUPPORT=y
 CONFIG_NET_CLS=y
 CONFIG_NLS_UCS2_UTILS=m
 # CONFIG_NVMEM_LAYOUTS is not set
+CONFIG_PCI_PWRCTRL=m
+CONFIG_PLDMFW=y
 CONFIG_PM_CLK=y
 CONFIG_PM_OPP=y
 CONFIG_PM_SLEEP_DEBUG=y
@@ -3953,7 +4007,6 @@ CONFIG_PPPOE_HASH_BITS=4
 CONFIG_PREEMPTION=y
 CONFIG_PREEMPT_BUILD=y
 CONFIG_PREEMPT_COUNT=y
-CONFIG_PREEMPT_RCU=y
 CONFIG_RAID6_PQ=m
 CONFIG_RATIONAL=y
 CONFIG_REGMAP=y
@@ -3980,8 +4033,7 @@ CONFIG_USB_XHCI_PCI=m
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
 CONFIG_XEN_FRONT_PGDIR_SHBUF=m
-CONFIG_Z3FOLD=m
 CONFIG_ZPOOL=y
 CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSWAP_COMPRESSOR_DEFAULT="zstd"
-CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc"

debian/config/config

@@ -61,7 +61,6 @@ CONFIG_X86_VSYSCALL_EMULATION=y
 # CONFIG_MICROCODE_LATE_LOADING is not set
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
-# CONFIG_X86_5LEVEL is not set
 # CONFIG_X86_CPA_STATISTICS is not set
 CONFIG_AMD_MEM_ENCRYPT=y
 CONFIG_NUMA=y
@@ -116,8 +115,8 @@ CONFIG_MITIGATION_PAGE_TABLE_ISOLATION=y
 # CONFIG_MITIGATION_SPECTRE_V2 is not set
 # CONFIG_MITIGATION_SRBDS is not set
 # CONFIG_MITIGATION_SSB is not set
+# CONFIG_MITIGATION_TSA is not set
 CONFIG_PCI_MMCONFIG=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
 # CONFIG_ISA_BUS is not set
 CONFIG_ISA_DMA_API=y
 CONFIG_IA32_EMULATION=y
@@ -127,7 +126,9 @@ CONFIG_IA32_EMULATION=y
 ##
 ## file: arch/x86/Kconfig.cpu
 ##
-## choice: Processor family
+# CONFIG_X86_NATIVE_CPU is not set
+## choice: x86_64 Compiler Build Optimization
+CONFIG_GENERIC_CPU=y
 # CONFIG_MK8 is not set
 # CONFIG_MK8SSE3 is not set
 # CONFIG_MK10 is not set
@@ -144,7 +145,6 @@ CONFIG_IA32_EMULATION=y
 # CONFIG_MZEN4 is not set
 # CONFIG_MZEN5 is not set
 # CONFIG_MPSC is not set
-# CONFIG_MATOM is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MNEHALEM is not set
 # CONFIG_MWESTMERE is not set
@@ -160,8 +160,8 @@ CONFIG_IA32_EMULATION=y
 # CONFIG_MCANNONLAKE is not set
 # CONFIG_MICELAKE_CLIENT is not set
 # CONFIG_MICELAKE_SERVER is not set
-# CONFIG_MCASCADELAKE is not set
 # CONFIG_MCOOPERLAKE is not set
+# CONFIG_MCASCADELAKE is not set
 # CONFIG_MTIGERLAKE is not set
 # CONFIG_MSAPPHIRERAPIDS is not set
 # CONFIG_MROCKETLAKE is not set
@@ -169,9 +169,7 @@ CONFIG_IA32_EMULATION=y
 # CONFIG_MRAPTORLAKE is not set
 # CONFIG_MMETEORLAKE is not set
 # CONFIG_MEMERALDRAPIDS is not set
-CONFIG_GENERIC_CPU=y
-# CONFIG_MNATIVE_INTEL is not set
-# CONFIG_MNATIVE_AMD is not set
+# CONFIG_MDIAMONDRAPIDS is not set
 ## end choice
 # CONFIG_PROCESSOR_SELECT is not set
 CONFIG_CPU_SUP_INTEL=y
@@ -230,10 +228,8 @@ CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64=m
 CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
 CONFIG_CRYPTO_NHPOLY1305_SSE2=m
 CONFIG_CRYPTO_NHPOLY1305_AVX2=m
-CONFIG_CRYPTO_BLAKE2S_X86=y
 CONFIG_CRYPTO_POLYVAL_CLMUL_NI=m
 CONFIG_CRYPTO_SHA1_SSSE3=m
-CONFIG_CRYPTO_SHA256_SSSE3=m
 CONFIG_CRYPTO_SHA512_SSSE3=m
 CONFIG_CRYPTO_SM3_AVX_X86_64=m
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
@@ -265,6 +261,11 @@ CONFIG_KVM_HYPERV=y
 # CONFIG_KVM_PROVE_MMU is not set
 CONFIG_KVM_MAX_NR_VCPUS=1024
 
+##
+## file: arch/x86/lib/crypto/Kconfig
+##
+CONFIG_CRYPTO_BLAKE2S_X86=y
+
 ##
 ## file: arch/x86/xen/Kconfig
 ##
@@ -325,14 +326,13 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO=y
-CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+# CONFIG_CRYPTO_SELFTESTS is not set
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_KRB5ENC=m
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
@@ -355,10 +355,12 @@ CONFIG_CRYPTO_ADIANTUM=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_HCTR2=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_AEGIS128=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CCM=m
@@ -373,7 +375,6 @@ CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_POLY1305=m
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
@@ -386,8 +387,6 @@ CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XXHASH=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRC64_ROCKSOFT=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DRBG_MENU=y
@@ -414,6 +413,12 @@ CONFIG_PKCS7_MESSAGE_PARSER=y
 CONFIG_SIGNED_PE_FILE_VERIFICATION=y
 # CONFIG_FIPS_SIGNATURE_SELFTEST is not set
 
+##
+## file: crypto/krb5/Kconfig
+##
+CONFIG_CRYPTO_KRB5=m
+# CONFIG_CRYPTO_KRB5_SELFTESTS is not set
+
 ##
 ## file: drivers/acpi/Kconfig
 ##
@@ -621,6 +626,7 @@ CONFIG_TCG_TPM2_HMAC=y
 CONFIG_HW_RANDOM_TPM=y
 CONFIG_TCG_XEN=m
 CONFIG_TCG_VTPM_PROXY=m
+CONFIG_TCG_SVSM=m
 
 ##
 ## file: drivers/comedi/Kconfig
@@ -663,6 +669,7 @@ CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_AMD_FREQ_SENSITIVITY=m
 CONFIG_X86_SPEEDSTEP_CENTRINO=m
 CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_CPUFREQ_ARCH_CUR_FREQ=y
 
 ##
 ## file: drivers/cpuidle/Kconfig
@@ -955,11 +962,6 @@ CONFIG_VMWARE_BALLOON=m
 # CONFIG_PCI_ENDPOINT_TEST is not set
 CONFIG_NSM=m
 
-##
-## file: drivers/misc/echo/Kconfig
-##
-# CONFIG_ECHO is not set
-
 ##
 ## file: drivers/misc/genwqe/Kconfig
 ##
@@ -1104,7 +1106,7 @@ CONFIG_HYPERV_NET=m
 ##
 ## file: drivers/net/mdio/Kconfig
 ##
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_BUS=m
 
 ##
 ## file: drivers/net/phy/Kconfig
@@ -1169,6 +1171,7 @@ CONFIG_PCI_REALLOC_ENABLE_AUTO=y
 CONFIG_PCI_STUB=m
 CONFIG_PCI_PF_STUB=m
 CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_PCI_DOE=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
@@ -1606,6 +1609,7 @@ CONFIG_VHOST_SCSI=m
 CONFIG_VHOST_VSOCK=m
 CONFIG_VHOST_VDPA=m
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y
 
 ##
 ## file: drivers/video/console/Kconfig
@@ -1724,6 +1728,9 @@ CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 # CONFIG_VIRTIO_DEBUG is not set
+CONFIG_VIRTIO_RTC=m
+CONFIG_VIRTIO_RTC_PTP=y
+CONFIG_VIRTIO_RTC_CLASS=y
 
 ##
 ## file: drivers/watchdog/Kconfig
@@ -1799,6 +1806,14 @@ CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
 
+##
+## file: fs/9p/Kconfig
+##
+CONFIG_9P_FS=y
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+
 ##
 ## file: fs/afs/Kconfig
 ##
@@ -2040,6 +2055,11 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=m
 
+##
+## file: fs/resctrl/Kconfig
+##
+CONFIG_RESCTRL_FS=y
+
 ##
 ## file: fs/smb/server/Kconfig
 ##
@@ -2079,7 +2099,6 @@ CONFIG_UDF_FS=m
 ## file: fs/unicode/Kconfig
 ##
 CONFIG_UNICODE=y
-# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
 
 ##
 ## file: fs/verity/Kconfig
@@ -2126,7 +2145,6 @@ CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_WATCH_QUEUE=y
 CONFIG_CROSS_MEMORY_ATTACH=y
-# CONFIG_USELIB is not set
 CONFIG_AUDIT=y
 ## choice: Cputime accounting
 CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
@@ -2161,7 +2179,6 @@ CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
 # CONFIG_CPUSETS_V1 is not set
-CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
@@ -2173,6 +2190,7 @@ CONFIG_UTS_NS=y
 CONFIG_TIME_NS=y
 CONFIG_IPC_NS=y
 CONFIG_USER_NS=y
+CONFIG_USER_NS_UNPRIVILEGED=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_CHECKPOINT_RESTORE=y
@@ -2419,17 +2437,6 @@ CONFIG_SYNTH_EVENTS=y
 ## file: lib/Kconfig
 ##
 CONFIG_PACKING=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC64_ROCKSOFT=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-CONFIG_CRC64=y
-CONFIG_CRC4=m
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=y
-CONFIG_CRC8=m
 CONFIG_CRC_OPTIMIZATIONS=y
 # CONFIG_RANDOM32_SELFTEST is not set
 # CONFIG_GLOB_SELFTEST is not set
@@ -2476,6 +2483,7 @@ CONFIG_STRIP_ASM_SYMS=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
+# CONFIG_OBJTOOL_WERROR is not set
 CONFIG_VMLINUX_MAP=y
 CONFIG_BUILTIN_MODULE_RANGES=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
@@ -2493,6 +2501,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
 # CONFIG_SHRINKER_DEBUG is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 CONFIG_SCHED_STACK_END_CHECK=y
+# CONFIG_DEBUG_VFS is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_VM_PGTABLE is not set
 # CONFIG_DEBUG_VIRTUAL is not set
@@ -2509,9 +2518,9 @@ CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_DETECT_HUNG_TASK_BLOCKER=y
 # CONFIG_WQ_WATCHDOG is not set
 # CONFIG_TEST_LOCKUP is not set
-# CONFIG_SCHED_DEBUG is not set
 CONFIG_SCHEDSTATS=y
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_LOCK_STAT is not set
@@ -2565,14 +2574,6 @@ CONFIG_IO_STRICT_DEVMEM=y
 ##
 # CONFIG_UBSAN is not set
 
-##
-## file: lib/crypto/Kconfig
-##
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-
 ##
 ## file: lib/fonts/Kconfig
 ##
@@ -2620,7 +2621,6 @@ CONFIG_XZ_DEC_MICROLZMA=y
 ## file: mm/Kconfig
 ##
 CONFIG_SWAP=y
-CONFIG_ZSMALLOC=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
 # CONFIG_SLUB_TINY is not set
@@ -2657,7 +2657,9 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set
 ## end choice
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
+# CONFIG_NO_PAGE_MAPCOUNT is not set
 # CONFIG_CMA is not set
+CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_MEM_SOFT_DIRTY=y
 CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
@@ -2732,6 +2734,15 @@ CONFIG_VLAN_8021Q=m
 # CONFIG_VLAN_8021Q_GVRP is not set
 # CONFIG_VLAN_8021Q_MVRP is not set
 
+##
+## file: net/9p/Kconfig
+##
+CONFIG_NET_9P=y
+CONFIG_NET_9P_FD=y
+CONFIG_NET_9P_VIRTIO=y
+CONFIG_NET_9P_XEN=y
+# CONFIG_NET_9P_DEBUG is not set
+
 ##
 ## file: net/batman-adv/Kconfig
 ##
@@ -2773,16 +2784,6 @@ CONFIG_CEPH_LIB=m
 ##
 # CONFIG_DCB is not set
 
-##
-## file: net/dccp/Kconfig
-##
-CONFIG_IP_DCCP=m
-
-##
-## file: net/dccp/ccids/Kconfig
-##
-CONFIG_IP_DCCP_CCID3=y
-
 ##
 ## file: net/dns_resolver/Kconfig
 ##
@@ -3207,6 +3208,7 @@ CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_CAKE=m
 CONFIG_NET_SCH_PIE=y
 CONFIG_NET_SCH_FQ_PIE=y
+CONFIG_NET_SCH_BPF=y
 CONFIG_NET_SCH_DEFAULT=y
 ## choice: Default queuing discipline
 # CONFIG_DEFAULT_FQ is not set
@@ -3267,11 +3269,11 @@ CONFIG_UNIX_DIAG=y
 ##
 ## file: net/vmw_vsock/Kconfig
 ##
-CONFIG_VSOCKETS=m
-CONFIG_VSOCKETS_DIAG=m
-CONFIG_VSOCKETS_LOOPBACK=m
+CONFIG_VSOCKETS=y
+CONFIG_VSOCKETS_DIAG=y
+CONFIG_VSOCKETS_LOOPBACK=y
 CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=y
 CONFIG_HYPERV_VSOCKETS=m
 
 ##
@@ -3315,8 +3317,6 @@ CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
 CONFIG_INTEL_TXT=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
 ## choice: First legacy 'major LSM' to be initialized
 # CONFIG_DEFAULT_SECURITY_SELINUX is not set
@@ -3335,6 +3335,9 @@ CONFIG_INIT_STACK_ALL_ZERO=y
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 CONFIG_ZERO_CALL_USED_REGS=y
+CONFIG_FORTIFY_SOURCE=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_DEFAULT_ON=y
 ## choice: Randomize layout of sensitive kernel structures
 CONFIG_RANDSTRUCT_NONE=y
 ## end choice
@@ -3452,6 +3455,7 @@ CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
 CONFIG_ACPI_LPIT=y
 CONFIG_ACPI_MADT_WAKEUP=y
 CONFIG_ACPI_MDIO=m
+CONFIG_ACPI_MRRM=y
 CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_PROCESSOR_CSTATE=y
 CONFIG_ACPI_PROCESSOR_IDLE=y
@@ -3484,7 +3488,9 @@ CONFIG_ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION=y
 CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y
 CONFIG_ARCH_HAS_CPU_PASID=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_CPU_RESCTRL=y
 CONFIG_ARCH_HAS_CRC32=y
+CONFIG_ARCH_HAS_CRC64=y
 CONFIG_ARCH_HAS_CRC_T10DIF=y
 CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
@@ -3494,6 +3500,7 @@ CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_ARCH_HAS_DMA_OPS=y
 CONFIG_ARCH_HAS_ELFCORE_COMPAT=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_ARCH_HAS_EXECMEM_ROX=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
@@ -3511,6 +3518,7 @@ CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y
 CONFIG_ARCH_HAS_PKEYS=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_PREEMPT_LAZY=y
+CONFIG_ARCH_HAS_PTDUMP=y
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
@@ -3552,6 +3560,7 @@ CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_ARCH_SUPPORTS_KEXEC=y
 CONFIG_ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG=y
 CONFIG_ARCH_SUPPORTS_KEXEC_FILE=y
+CONFIG_ARCH_SUPPORTS_KEXEC_HANDOVER=y
 CONFIG_ARCH_SUPPORTS_KEXEC_JUMP=y
 CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY=y
 CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y
@@ -3560,6 +3569,7 @@ CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_ARCH_SUPPORTS_MSEAL_SYSTEM_MAPPINGS=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
 CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
@@ -3579,6 +3589,7 @@ CONFIG_ARCH_USE_MEMTEST=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+CONFIG_ARCH_VMLINUX_NEEDS_RELOCS=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_ARCH_WANTS_NO_INSTR=y
 CONFIG_ARCH_WANTS_THP_SWAP=y
@@ -3586,7 +3597,9 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ARCH_WANT_HUGETLB_VMEMMAP_PREINIT=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_IRQS_OFF_ACTIVATE_MM=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=y
@@ -3608,9 +3621,7 @@ CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_ICQ=y
-CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_STACKING=y
-CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_PM=y
 CONFIG_BLK_RQ_ALLOC_TIME=y
 CONFIG_BLOCK_HOLDER_DEPRECATED=y
@@ -3643,7 +3654,13 @@ CONFIG_CONTIG_ALLOC=y
 CONFIG_CPU_FREQ_GOV_ATTR_SET=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_RMAP=y
+CONFIG_CRC16=y
+CONFIG_CRC32=y
 CONFIG_CRC32_ARCH=y
+CONFIG_CRC64=y
+CONFIG_CRC64_ARCH=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC_T10DIF=y
 CONFIG_CRC_T10DIF_ARCH=y
 CONFIG_CRYPTO_ACOMP2=y
 CONFIG_CRYPTO_AEAD=m
@@ -3656,9 +3673,10 @@ CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
 CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
 CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=y
 CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_SHA256=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_SHA256_SIMD=y
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
 CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CHACHA20_X86_64=m
 CONFIG_CRYPTO_CURVE25519_X86=m
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_DRBG_HMAC=y
@@ -3668,6 +3686,7 @@ CONFIG_CRYPTO_GENIV=m
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_HKDF=y
 CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
 CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
 CONFIG_CRYPTO_KDF800108_CTR=y
@@ -3676,36 +3695,35 @@ CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_AESGCM=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA_INTERNAL=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
 CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
 CONFIG_CRYPTO_LIB_CURVE25519_INTERNAL=m
 CONFIG_CRYPTO_LIB_DES=m
 CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305_INTERNAL=m
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
 CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SHA256_GENERIC=y
+CONFIG_CRYPTO_LIB_SM3=m
 CONFIG_CRYPTO_LIB_UTILS=y
+CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_NHPOLY1305=m
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_POLY1305_X86_64=m
 CONFIG_CRYPTO_POLYVAL=m
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_SHA256_X86_64=y
 CONFIG_CRYPTO_SIG=y
 CONFIG_CRYPTO_SIG2=y
-CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_SKCIPHER=y
 CONFIG_CRYPTO_SKCIPHER2=y
-CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_XCTR=m
+CONFIG_CXL_MCE=y
 CONFIG_CXL_SUSPEND=y
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_DEBUG_INFO=y
@@ -3742,7 +3760,6 @@ CONFIG_DYNAMIC_EVENTS=y
 CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_DYNAMIC_MEMORY_LAYOUT=y
 CONFIG_DYNAMIC_PHYSICAL_MASK=y
 CONFIG_DYNAMIC_SIGFRAME=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
@@ -3792,6 +3809,8 @@ CONFIG_FUNCTION_ALIGNMENT_16B=y
 CONFIG_FUNCTION_ALIGNMENT_4B=y
 CONFIG_FUNCTION_PADDING_BYTES=16
 CONFIG_FUNCTION_PADDING_CFI=11
+CONFIG_FUNCTION_TRACE_ARGS=y
+CONFIG_FUTEX_MPOL=y
 CONFIG_FUTEX_PI=y
 CONFIG_FWNODE_MDIO=m
 CONFIG_FW_LOADER_PAGED_BUF=y
@@ -3824,12 +3843,12 @@ CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_GENERIC_PTDUMP=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_TRACER=y
+CONFIG_GENERIC_VDSO_DATA_STORE=y
 CONFIG_GENERIC_VDSO_OVERFLOW_PROTECT=y
 CONFIG_GENERIC_VDSO_TIME_NS=y
 CONFIG_GET_FREE_REGION=y
@@ -4011,7 +4030,6 @@ CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
 CONFIG_INET6_TUNNEL=m
 CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET_DCCP_DIAG=m
 CONFIG_INET_MPTCP_DIAG=y
 CONFIG_INET_SCTP_DIAG=m
 CONFIG_INET_TCP_DIAG=y
@@ -4032,27 +4050,26 @@ CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_IO_PGTABLE=y
 CONFIG_IOMMU_MM_DATA=y
 CONFIG_IOMMU_SVA=y
+CONFIG_IO_URING_ZCRX=y
 CONFIG_IO_WQ=y
 CONFIG_IPV6_FOU=m
 CONFIG_IPV6_FOU_TUNNEL=m
 CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_SEG6_BPF=y
 CONFIG_IPVLAN_L3S=y
-CONFIG_IP_DCCP_TFRC_LIB=y
 CONFIG_IP_MROUTE_COMMON=y
 CONFIG_IP_ROUTE_CLASSID=y
 CONFIG_IRQ_BYPASS_MANAGER=m
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_IRQ_MSI_IOMMU=y
 CONFIG_IRQ_WORK=y
 CONFIG_JBD2=y
-CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
 CONFIG_KERNFS=y
 CONFIG_KPROBES_ON_FTRACE=y
 CONFIG_KRETPROBES=y
 CONFIG_KRETPROBE_ON_RETHOOK=y
+CONFIG_KVFREE_RCU_BATCHED=y
 CONFIG_KVM_ASYNC_PF=y
 CONFIG_KVM_COMMON=y
 CONFIG_KVM_COMPAT=y
@@ -4064,6 +4081,7 @@ CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
 CONFIG_KVM_GENERIC_PRE_FAULT_MEMORY=y
 CONFIG_KVM_GENERIC_PRIVATE_MEM=y
 CONFIG_KVM_MMIO=y
+CONFIG_KVM_MMU_LOCKLESS_AGING=y
 CONFIG_KVM_PRIVATE_MEM=y
 CONFIG_KVM_VFIO=y
 CONFIG_KVM_X86=m
@@ -4086,8 +4104,6 @@ CONFIG_LRU_GEN_WALKS_MMU=y
 CONFIG_LZ4_DECOMPRESS=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
-CONFIG_MDIO_BUS=m
-CONFIG_MDIO_DEVRES=m
 CONFIG_MEMORY_BALLOON=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_MEMREGION=y
@@ -4102,6 +4118,7 @@ CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
 CONFIG_MMU_GATHER_TABLE_FREE=y
 CONFIG_MMU_LAZY_TLB_REFCOUNT=y
 CONFIG_MMU_NOTIFIER=y
+CONFIG_MM_ID=y
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_MODULE_SIG_FORMAT=y
@@ -4122,7 +4139,9 @@ CONFIG_NETFILTER_FAMILY_BRIDGE=y
 CONFIG_NETFILTER_NETLINK=y
 CONFIG_NETFILTER_SKIP_EGRESS=y
 CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NETFS_SUPPORT=y
 CONFIG_NETPOLL=y
+CONFIG_NET_CRC32C=y
 CONFIG_NET_DEVLINK=y
 CONFIG_NET_DEVMEM=y
 CONFIG_NET_EGRESS=y
@@ -4187,6 +4206,7 @@ CONFIG_OUTPUT_FORMAT="elf64-x86-64"
 CONFIG_P2SB=y
 CONFIG_PADATA=y
 CONFIG_PAGE_COUNTER=y
+CONFIG_PAGE_MAPCOUNT=y
 CONFIG_PAGE_POOL=y
 CONFIG_PAGE_SHIFT=12
 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
@@ -4197,14 +4217,13 @@ CONFIG_PARAVIRT_XXL=y
 CONFIG_PCIE_PME=y
 CONFIG_PCI_ATS=y
 CONFIG_PCI_DIRECT=y
-CONFIG_PCI_DOE=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_LABEL=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
 CONFIG_PCI_XEN=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
-CONFIG_PGTABLE_LEVELS=4
+CONFIG_PGTABLE_LEVELS=5
 CONFIG_PHYLINK=m
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PM_SLEEP=y
@@ -4221,7 +4240,7 @@ CONFIG_PROC_CPU_RESCTRL=y
 CONFIG_PROC_PID_ARCH_STATUS=y
 CONFIG_PROC_THERMAL_MMIO_RAPL=m
 CONFIG_PSTORE_ZONE=m
-CONFIG_PTDUMP_CORE=y
+CONFIG_PTDUMP=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=m
 CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
@@ -4232,6 +4251,7 @@ CONFIG_RCU_STALL_COMMON=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_RESCTRL_FS_PSEUDO_LOCK=y
 CONFIG_RETHOOK=y
 CONFIG_RING_BUFFER=y
 CONFIG_RPMSG=m
@@ -4267,6 +4287,7 @@ CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_VMEMMAP_PREINIT=y
 CONFIG_SPLIT_PMD_PTLOCKS=y
 CONFIG_SPLIT_PTE_PTLOCKS=y
 CONFIG_SQUASHFS_DECOMP_MULTI=y
@@ -4311,6 +4332,8 @@ CONFIG_TRACING=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
+CONFIG_TSM_GUEST=y
+CONFIG_TSM_MEASUREMENTS=y
 CONFIG_TSM_REPORTS=m
 CONFIG_UCS2_STRING=y
 CONFIG_UEFI_CPER=y
@@ -4327,7 +4350,6 @@ CONFIG_VDSO_GETRANDOM=y
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_PCI_CORE=m
 CONFIG_VFIO_PCI_INTX=y
-CONFIG_VFIO_PCI_MMAP=y
 CONFIG_VFIO_VIRQFD=y
 CONFIG_VGASTATE=m
 CONFIG_VHOST=m
@@ -4339,7 +4361,7 @@ CONFIG_VIRTIO_ANCHOR=y
 CONFIG_VIRTIO_PCI_ADMIN_LEGACY=y
 CONFIG_VIRTIO_PCI_LIB=y
 CONFIG_VIRTIO_PCI_LIB_LEGACY=y
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_VMCORE_INFO=y
 CONFIG_VT_CONSOLE_SLEEP=y
@@ -4349,9 +4371,21 @@ CONFIG_X86=y
 CONFIG_X86_64=y
 CONFIG_X86_64_SMP=y
 CONFIG_X86_CMOV=y
-CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CX8=y
 CONFIG_X86_DEBUGCTLMSR=y
 CONFIG_X86_DIRECT_GBPAGES=y
+CONFIG_X86_DISABLED_FEATURE_CALL_DEPTH=y
+CONFIG_X86_DISABLED_FEATURE_CENTAUR_MCR=y
+CONFIG_X86_DISABLED_FEATURE_CYRIX_ARR=y
+CONFIG_X86_DISABLED_FEATURE_IBT=y
+CONFIG_X86_DISABLED_FEATURE_K6_MTRR=y
+CONFIG_X86_DISABLED_FEATURE_LAM=y
+CONFIG_X86_DISABLED_FEATURE_RETHUNK=y
+CONFIG_X86_DISABLED_FEATURE_RETPOLINE=y
+CONFIG_X86_DISABLED_FEATURE_RETPOLINE_LFENCE=y
+CONFIG_X86_DISABLED_FEATURE_UNRET=y
+CONFIG_X86_DISABLED_FEATURE_USER_SHSTK=y
+CONFIG_X86_DISABLED_FEATURE_VME=y
 CONFIG_X86_HAVE_PAE=y
 CONFIG_X86_HV_CALLBACK_VECTOR=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
@@ -4362,6 +4396,18 @@ CONFIG_X86_MCE_THRESHOLD=y
 CONFIG_X86_MEM_ENCRYPT=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_NEED_RELOCS=y
+CONFIG_X86_REQUIRED_FEATURE_ALWAYS=y
+CONFIG_X86_REQUIRED_FEATURE_CMOV=y
+CONFIG_X86_REQUIRED_FEATURE_CPUID=y
+CONFIG_X86_REQUIRED_FEATURE_CX8=y
+CONFIG_X86_REQUIRED_FEATURE_FPU=y
+CONFIG_X86_REQUIRED_FEATURE_FXSR=y
+CONFIG_X86_REQUIRED_FEATURE_LM=y
+CONFIG_X86_REQUIRED_FEATURE_MSR=y
+CONFIG_X86_REQUIRED_FEATURE_NOPL=y
+CONFIG_X86_REQUIRED_FEATURE_PAE=y
+CONFIG_X86_REQUIRED_FEATURE_XMM=y
+CONFIG_X86_REQUIRED_FEATURE_XMM2=y
 CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_X86_THERMAL_VECTOR=y

debian/config/defines.toml

@@ -11,7 +11,7 @@ name = 'x86'
 name = 'none'
 
 [build]
-compiler = 'gcc-14'
+compiler = 'gcc-15'
 
 [relations.image]
 depends = [

debian/lib/python/debian_linux/debian.py

@@ -175,12 +175,6 @@ class VersionLinux(Version):
         .+?
     )
 )?
-(?:
-    \.dfsg\.
-    (?P<dfsg>
-        \d+
-    )
-)?
 $
     """, re.X)
 
@@ -192,7 +186,6 @@ $
         if up_match is None or rev_match is None:
             raise RuntimeError(u"Invalid debian linux version")
         d = up_match.groupdict()
-        self.linux_modifier = d['modifier']
         self.linux_version = d['version']
         if d['modifier'] is not None:
             assert not d['update']
@@ -200,7 +193,6 @@ $
         else:
             self.linux_upstream = d['version']
         self.linux_upstream_full = self.linux_upstream + d['update']
-        self.linux_dfsg = d['dfsg']
 
 
 class PackageArchitecture(set[str]):

debian/linux-misc-tools.manpages

@@ -0,0 +1,2 @@
+tools/thermal/thermometer/thermometer.8
+tools/thermal/tmon/tmon.8

debian/patches/bugfix/all/bootconfig-fix-negative-seeks-on-32-bit-with-lfs-ena.patch

@@ -0,0 +1,45 @@
+From: Ben Hutchings <benh@debian.org>
+Date: Sun, 17 Aug 2025 16:06:28 +0200
+Subject: bootconfig: Fix negative seeks on 32-bit with LFS enabled
+Forwarded: https://lore.kernel.org/linux-trace-kernel/aKHlevxeg6Y7UQrz@decadent.org.uk/T/
+
+Commit 26dda5769509 "tools/bootconfig: Cleanup bootconfig footer size
+calculations" replaced some expressions of type int with the
+BOOTCONFIG_FOOTER_SIZE macro, which expands to an expression of type
+size_t, which is unsigned.
+
+On 32-bit architectures with LFS enabled (i.e. off_t is 64-bit), the
+seek offset of -BOOTCONFIG_FOOTER_SIZE now turns into a positive
+value.
+
+Fix this by casting the size to off_t before negating it.
+
+Just in case someone changes BOOTCONFIG_MAGIC_LEN to have type size_t
+later, do the same thing to the seek offset of -BOOTCONFIG_MAGIC_LEN.
+
+Fixes: 26dda5769509 ("tools/bootconfig: Cleanup bootconfig footer size calculations")
+Signed-off-by: Ben Hutchings <benh@debian.org>
+---
+ tools/bootconfig/main.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/tools/bootconfig/main.c
++++ b/tools/bootconfig/main.c
+@@ -193,7 +193,7 @@ static int load_xbc_from_initrd(int fd,
+ 	if (stat.st_size < BOOTCONFIG_FOOTER_SIZE)
+ 		return 0;
+ 
+-	if (lseek(fd, -BOOTCONFIG_MAGIC_LEN, SEEK_END) < 0)
++	if (lseek(fd, -(off_t)BOOTCONFIG_MAGIC_LEN, SEEK_END) < 0)
+ 		return pr_errno("Failed to lseek for magic", -errno);
+ 
+ 	if (read(fd, magic, BOOTCONFIG_MAGIC_LEN) < 0)
+@@ -203,7 +203,7 @@ static int load_xbc_from_initrd(int fd,
+ 	if (memcmp(magic, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN) != 0)
+ 		return 0;
+ 
+-	if (lseek(fd, -BOOTCONFIG_FOOTER_SIZE, SEEK_END) < 0)
++	if (lseek(fd, -(off_t)BOOTCONFIG_FOOTER_SIZE, SEEK_END) < 0)
+ 		return pr_errno("Failed to lseek for size", -errno);
+ 
+ 	if (read(fd, &size, sizeof(uint32_t)) < 0)

debian/patches/bugfix/all/bootconfig-fix-unaligned-access-when-building-footer.patch

@@ -0,0 +1,71 @@
+From: Ben Hutchings <benh@debian.org>
+Date: Wed, 23 Jul 2025 12:17:14 +0200
+Subject: bootconfig: Fix unaligned access when building footer
+Forwarded: https://lore.kernel.org/linux-trace-kernel/aIC-NTw-cdm9ZGFw@decadent.org.uk/T/
+
+Currently we add padding between the bootconfig text and footer to
+ensure that the footer is aligned within the initramfs image.
+However, because only the bootconfig data is held in memory, not the
+full initramfs image, the footer may not be naturally aligned in
+memory.
+
+This can result in an alignment fault (SIGBUS) when writing the footer
+on some architectures, such as sparc.
+
+Build the footer in a struct on the stack before adding it to the
+buffer.
+
+References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=sparc64&ver=6.16%7Erc7-1%7Eexp1&stamp=1753209801&raw=0
+Signed-off-by: Ben Hutchings <benh@debian.org>
+---
+ tools/bootconfig/main.c | 24 +++++++++++++-----------
+ 1 file changed, 13 insertions(+), 11 deletions(-)
+
+--- a/tools/bootconfig/main.c
++++ b/tools/bootconfig/main.c
+@@ -11,6 +11,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <endian.h>
++#include <assert.h>
+ 
+ #include <linux/bootconfig.h>
+ 
+@@ -363,7 +364,12 @@ static int delete_xbc(const char *path)
+ 
+ static int apply_xbc(const char *path, const char *xbc_path)
+ {
+-	char *buf, *data, *p;
++	struct {
++		uint32_t size;
++		uint32_t csum;
++		char magic[BOOTCONFIG_MAGIC_LEN];
++	} footer;
++	char *buf, *data;
+ 	size_t total_size;
+ 	struct stat stat;
+ 	const char *msg;
+@@ -433,17 +439,13 @@ static int apply_xbc(const char *path, c
+ 	size += pad;
+ 
+ 	/* Add a footer */
+-	p = data + size;
+-	*(uint32_t *)p = htole32(size);
+-	p += sizeof(uint32_t);
++	footer.size = htole32(size);
++	footer.csum = htole32(csum);
++	memcpy(footer.magic, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);
++	static_assert(sizeof(footer) == BOOTCONFIG_FOOTER_SIZE);
++	memcpy(data + size, &footer, BOOTCONFIG_FOOTER_SIZE);
+ 
+-	*(uint32_t *)p = htole32(csum);
+-	p += sizeof(uint32_t);
+-
+-	memcpy(p, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);
+-	p += BOOTCONFIG_MAGIC_LEN;
+-
+-	total_size = p - data;
++	total_size = size + BOOTCONFIG_FOOTER_SIZE;
+ 
+ 	ret = write(fd, data, total_size);
+ 	if (ret < total_size) {

debian/patches/bugfix/all/disable-some-marvell-phys.patch

@@ -42,7 +42,7 @@ correctness.
  
  static int m88e1540_get_fld(struct phy_device *phydev, u8 *msecs)
  {
-@@ -3848,6 +3852,7 @@ static struct phy_driver marvell_drivers
+@@ -3828,6 +3832,7 @@ static struct phy_driver marvell_drivers
  		.led_hw_control_set = m88e1318_led_hw_control_set,
  		.led_hw_control_get = m88e1318_led_hw_control_get,
  	},
@@ -50,7 +50,7 @@ correctness.
  	{
  		.phy_id = MARVELL_PHY_ID_88E1145,
  		.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -3871,6 +3876,8 @@ static struct phy_driver marvell_drivers
+@@ -3851,6 +3856,8 @@ static struct phy_driver marvell_drivers
  		.cable_test_start = m88e1111_vct_cable_test_start,
  		.cable_test_get_status = m88e1111_vct_cable_test_get_status,
  	},
@@ -59,7 +59,7 @@ correctness.
  	{
  		.phy_id = MARVELL_PHY_ID_88E1149R,
  		.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -3889,6 +3896,8 @@ static struct phy_driver marvell_drivers
+@@ -3869,6 +3876,8 @@ static struct phy_driver marvell_drivers
  		.get_strings = marvell_get_strings,
  		.get_stats = marvell_get_stats,
  	},
@@ -68,7 +68,7 @@ correctness.
  	{
  		.phy_id = MARVELL_PHY_ID_88E1240,
  		.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -3909,6 +3918,7 @@ static struct phy_driver marvell_drivers
+@@ -3889,6 +3898,7 @@ static struct phy_driver marvell_drivers
  		.get_tunable = m88e1011_get_tunable,
  		.set_tunable = m88e1011_set_tunable,
  	},
@@ -76,7 +76,7 @@ correctness.
  	{
  		.phy_id = MARVELL_PHY_ID_88E1116R,
  		.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -4197,9 +4207,9 @@ static const struct mdio_device_id __may
+@@ -4177,9 +4187,9 @@ static const struct mdio_device_id __may
  	{ MARVELL_PHY_ID_88E1111_FINISAR, MARVELL_PHY_ID_MASK },
  	{ MARVELL_PHY_ID_88E1118, MARVELL_PHY_ID_MASK },
  	{ MARVELL_PHY_ID_88E1121R, MARVELL_PHY_ID_MASK },

debian/patches/bugfix/all/documentation-use-relative-source-paths-in-abi-documentation.patch

@@ -1,32 +0,0 @@
-From: Ben Hutchings <benh@debian.org>
-Date: Mon, 16 Sep 2024 00:07:04 +0200
-Subject: Documentation: Use relative source filenames in ABI documentation
-
-Currently the ABI documentation files contain absolute source
-filenames, which makes them unreproducible if the build directory can
-vary.
-
-Remove the source base directory ($srctree) from the source filenames
-shown in the documentation.
-
-Signed-off-by: Ben Hutchings <benh@debian.org>
----
---- a/Documentation/sphinx/kernel_abi.py
-+++ b/Documentation/sphinx/kernel_abi.py
-@@ -103,6 +103,7 @@ class KernelCmd(Directive):
-             lines = code_block + "\n\n"
- 
-         line_regex = re.compile(r"^\.\. LINENO (\S+)\#([0-9]+)$")
-+        srctree = os.path.abspath(os.environ["srctree"])
-         ln = 0
-         n = 0
-         f = fname
-@@ -127,7 +128,7 @@ class KernelCmd(Directive):
-                 # sphinx counts lines from 0
-                 ln = int(match.group(2)) - 1
-             else:
--                content.append(line, f, ln)
-+                content.append(line, os.path.relpath(f, srctree), ln)
- 
-         kernellog.info(self.state.document.settings.env.app, "%s: parsed %i lines" % (fname, n))
- 

debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch

@@ -18,7 +18,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/fs/btrfs/super.c
 +++ b/fs/btrfs/super.c
-@@ -2630,7 +2630,7 @@ module_exit(exit_btrfs_fs)
+@@ -2625,7 +2625,7 @@ module_exit(exit_btrfs_fs)
  
  MODULE_DESCRIPTION("B-Tree File System (BTRFS)");
  MODULE_LICENSE("GPL");
@@ -29,7 +29,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  MODULE_SOFTDEP("pre: blake2b-256");
 --- a/fs/jbd2/journal.c
 +++ b/fs/jbd2/journal.c
-@@ -3158,6 +3158,7 @@ static void __exit journal_exit(void)
+@@ -3157,6 +3157,7 @@ static void __exit journal_exit(void)
  
  MODULE_DESCRIPTION("Generic filesystem journal-writing module");
  MODULE_LICENSE("GPL");
@@ -39,7 +39,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  
 --- a/fs/nfsd/nfsctl.c
 +++ b/fs/nfsd/nfsctl.c
-@@ -2349,5 +2349,8 @@ static void __exit exit_nfsd(void)
+@@ -2353,5 +2353,8 @@ static void __exit exit_nfsd(void)
  MODULE_AUTHOR("Olaf Kirch <okir@monad.swb.de>");
  MODULE_DESCRIPTION("In-kernel NFS server");
  MODULE_LICENSE("GPL");

debian/patches/bugfix/all/kbuild-bpf-fix-btf-reproducibility.patch

@@ -24,7 +24,7 @@ Signed-off-by: Ben Hutchings <benh@debian.org>
  pahole-flags-$(call test-ge, $(pahole-ver), 125)	+= --skip_encoding_btf_inconsistent_proto --btf_gen_optimized
  
  else
-@@ -29,6 +27,18 @@ endif
+@@ -31,6 +29,18 @@ endif
  
  endif
  

debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch

@@ -9,7 +9,7 @@ sources.
 
 --- a/scripts/Makefile.build
 +++ b/scripts/Makefile.build
-@@ -188,6 +188,11 @@ cmd_record_mcount = $(if $(findstring $(
+@@ -268,6 +268,11 @@ cmd_record_mcount = $(if $(findstring $(
  	$(sub_cmd_record_mcount))
  endif # CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT
  

debian/patches/bugfix/all/perf-tools-pass-extra_cflags-through-to-libbpf-build-again.patch

@@ -16,7 +16,7 @@ Signed-off-by: Ben Hutchings <benh@debian.org>
 ---
 --- a/tools/perf/Makefile.perf
 +++ b/tools/perf/Makefile.perf
-@@ -945,7 +945,7 @@ $(LIBAPI)-clean:
+@@ -963,7 +963,7 @@ $(LIBAPI)-clean:
  $(LIBBPF): FORCE | $(LIBBPF_OUTPUT)
  	$(Q)$(MAKE) -C $(LIBBPF_DIR) FEATURES_DUMP=$(FEATURE_DUMP_EXPORT) \
  		O= OUTPUT=$(LIBBPF_OUTPUT)/ DESTDIR=$(LIBBPF_DESTDIR) prefix= subdir= \

debian/patches/bugfix/all/proc-fix-missing-pde_set_flags-for-net-proc-files.patch

@@ -0,0 +1,108 @@
+From: wangzijie <wangzijie1@honor.com>
+Subject: proc: fix missing pde_set_flags() for net proc files
+Date: Thu, 21 Aug 2025 18:58:06 +0800
+Origin: https://lore.kernel.org/stable/20250821105806.1453833-1-wangzijie1@honor.com/
+
+To avoid potential UAF issues during module removal races, we use pde_set_flags()
+to save proc_ops flags in PDE itself before proc_register(), and then use
+pde_has_proc_*() helpers instead of directly dereferencing pde->proc_ops->*.
+
+However, the pde_set_flags() call was missing when creating net related proc files.
+This omission caused incorrect behavior which FMODE_LSEEK was being cleared
+inappropriately in proc_reg_open() for net proc files. Lars reported it in this link[1].
+
+Fix this by ensuring pde_set_flags() is called when register proc entry, and add
+NULL check for proc_ops in pde_set_flags().
+
+[1]: https://lore.kernel.org/all/20250815195616.64497967@chagall.paradoxon.rec/
+
+Fixes: ff7ec8dc1b64 ("proc: use the same treatment to check proc_lseek as ones for proc_read_iter et.al")
+Cc: stable@vger.kernel.org
+Reported-by: Lars Wendler <polynomial-c@gmx.de>
+Signed-off-by: wangzijie <wangzijie1@honor.com>
+---
+ fs/proc/generic.c | 38 +++++++++++++++++++++-----------------
+ 1 file changed, 21 insertions(+), 17 deletions(-)
+
+--- a/fs/proc/generic.c
++++ b/fs/proc/generic.c
+@@ -364,6 +364,25 @@ static const struct inode_operations pro
+ 	.setattr	= proc_notify_change,
+ };
+ 
++static void pde_set_flags(struct proc_dir_entry *pde)
++{
++	const struct proc_ops *proc_ops = pde->proc_ops;
++
++	if (!proc_ops)
++		return;
++
++	if (proc_ops->proc_flags & PROC_ENTRY_PERMANENT)
++		pde->flags |= PROC_ENTRY_PERMANENT;
++	if (proc_ops->proc_read_iter)
++		pde->flags |= PROC_ENTRY_proc_read_iter;
++#ifdef CONFIG_COMPAT
++	if (proc_ops->proc_compat_ioctl)
++		pde->flags |= PROC_ENTRY_proc_compat_ioctl;
++#endif
++	if (proc_ops->proc_lseek)
++		pde->flags |= PROC_ENTRY_proc_lseek;
++}
++
+ /* returns the registered entry, or frees dp and returns NULL on failure */
+ struct proc_dir_entry *proc_register(struct proc_dir_entry *dir,
+ 		struct proc_dir_entry *dp)
+@@ -371,6 +390,8 @@ struct proc_dir_entry *proc_register(str
+ 	if (proc_alloc_inum(&dp->low_ino))
+ 		goto out_free_entry;
+ 
++	pde_set_flags(dp);
++
+ 	write_lock(&proc_subdir_lock);
+ 	dp->parent = dir;
+ 	if (pde_subdir_insert(dir, dp) == false) {
+@@ -559,20 +580,6 @@ struct proc_dir_entry *proc_create_reg(c
+ 	return p;
+ }
+ 
+-static void pde_set_flags(struct proc_dir_entry *pde)
+-{
+-	if (pde->proc_ops->proc_flags & PROC_ENTRY_PERMANENT)
+-		pde->flags |= PROC_ENTRY_PERMANENT;
+-	if (pde->proc_ops->proc_read_iter)
+-		pde->flags |= PROC_ENTRY_proc_read_iter;
+-#ifdef CONFIG_COMPAT
+-	if (pde->proc_ops->proc_compat_ioctl)
+-		pde->flags |= PROC_ENTRY_proc_compat_ioctl;
+-#endif
+-	if (pde->proc_ops->proc_lseek)
+-		pde->flags |= PROC_ENTRY_proc_lseek;
+-}
+-
+ struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
+ 		struct proc_dir_entry *parent,
+ 		const struct proc_ops *proc_ops, void *data)
+@@ -583,7 +590,6 @@ struct proc_dir_entry *proc_create_data(
+ 	if (!p)
+ 		return NULL;
+ 	p->proc_ops = proc_ops;
+-	pde_set_flags(p);
+ 	return proc_register(parent, p);
+ }
+ EXPORT_SYMBOL(proc_create_data);
+@@ -634,7 +640,6 @@ struct proc_dir_entry *proc_create_seq_p
+ 	p->proc_ops = &proc_seq_ops;
+ 	p->seq_ops = ops;
+ 	p->state_size = state_size;
+-	pde_set_flags(p);
+ 	return proc_register(parent, p);
+ }
+ EXPORT_SYMBOL(proc_create_seq_private);
+@@ -665,7 +670,6 @@ struct proc_dir_entry *proc_create_singl
+ 		return NULL;
+ 	p->proc_ops = &proc_single_ops;
+ 	p->single_show = show;
+-	pde_set_flags(p);
+ 	return proc_register(parent, p);
+ }
+ EXPORT_SYMBOL(proc_create_single_data);

debian/patches/bugfix/all/tools-bootconfig-cleanup-bootconfig-footer-size-calc.patch

@@ -0,0 +1,90 @@
+From: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
+Date: Thu, 10 Jul 2025 11:24:17 +0900
+Subject: tools/bootconfig: Cleanup bootconfig footer size calculations
+Origin: https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git/commit?id=26dda57695090e05c1a99c3e8f802f862d1ac474
+
+There are many same pattern of 8 + BOOTCONFIG_MAGIC_LEN for calculating
+the size of bootconfig footer. Use BOOTCONFIG_FOOTER_SIZE macro to
+clean up those magic numbers.
+
+Link: https://lore.kernel.org/all/175211425693.2591046.16029516706923643510.stgit@mhiramat.tok.corp.google.com/
+
+Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
+---
+ tools/bootconfig/main.c | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+--- a/tools/bootconfig/main.c
++++ b/tools/bootconfig/main.c
+@@ -16,6 +16,10 @@
+ 
+ #define pr_err(fmt, ...) fprintf(stderr, fmt, ##__VA_ARGS__)
+ 
++/* Bootconfig footer is [size][csum][BOOTCONFIG_MAGIC]. */
++#define BOOTCONFIG_FOOTER_SIZE	\
++	(sizeof(uint32_t) * 2 + BOOTCONFIG_MAGIC_LEN)
++
+ static int xbc_show_value(struct xbc_node *node, bool semicolon)
+ {
+ 	const char *val, *eol;
+@@ -185,7 +189,7 @@ static int load_xbc_from_initrd(int fd,
+ 	if (ret < 0)
+ 		return -errno;
+ 
+-	if (stat.st_size < 8 + BOOTCONFIG_MAGIC_LEN)
++	if (stat.st_size < BOOTCONFIG_FOOTER_SIZE)
+ 		return 0;
+ 
+ 	if (lseek(fd, -BOOTCONFIG_MAGIC_LEN, SEEK_END) < 0)
+@@ -198,7 +202,7 @@ static int load_xbc_from_initrd(int fd,
+ 	if (memcmp(magic, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN) != 0)
+ 		return 0;
+ 
+-	if (lseek(fd, -(8 + BOOTCONFIG_MAGIC_LEN), SEEK_END) < 0)
++	if (lseek(fd, -BOOTCONFIG_FOOTER_SIZE, SEEK_END) < 0)
+ 		return pr_errno("Failed to lseek for size", -errno);
+ 
+ 	if (read(fd, &size, sizeof(uint32_t)) < 0)
+@@ -210,12 +214,12 @@ static int load_xbc_from_initrd(int fd,
+ 	csum = le32toh(csum);
+ 
+ 	/* Wrong size error  */
+-	if (stat.st_size < size + 8 + BOOTCONFIG_MAGIC_LEN) {
++	if (stat.st_size < size + BOOTCONFIG_FOOTER_SIZE) {
+ 		pr_err("bootconfig size is too big\n");
+ 		return -E2BIG;
+ 	}
+ 
+-	if (lseek(fd, stat.st_size - (size + 8 + BOOTCONFIG_MAGIC_LEN),
++	if (lseek(fd, stat.st_size - (size + BOOTCONFIG_FOOTER_SIZE),
+ 		  SEEK_SET) < 0)
+ 		return pr_errno("Failed to lseek", -errno);
+ 
+@@ -346,7 +350,7 @@ static int delete_xbc(const char *path)
+ 		ret = fstat(fd, &stat);
+ 		if (!ret)
+ 			ret = ftruncate(fd, stat.st_size
+-					- size - 8 - BOOTCONFIG_MAGIC_LEN);
++					- size - BOOTCONFIG_FOOTER_SIZE);
+ 		if (ret)
+ 			ret = -errno;
+ 	} /* Ignore if there is no boot config in initrd */
+@@ -376,8 +380,7 @@ static int apply_xbc(const char *path, c
+ 	csum = xbc_calc_checksum(buf, size);
+ 
+ 	/* Backup the bootconfig data */
+-	data = calloc(size + BOOTCONFIG_ALIGN +
+-		      sizeof(uint32_t) + sizeof(uint32_t) + BOOTCONFIG_MAGIC_LEN, 1);
++	data = calloc(size + BOOTCONFIG_ALIGN + BOOTCONFIG_FOOTER_SIZE, 1);
+ 	if (!data)
+ 		return -ENOMEM;
+ 	memcpy(data, buf, size);
+@@ -425,7 +428,7 @@ static int apply_xbc(const char *path, c
+ 	}
+ 
+ 	/* To align up the total size to BOOTCONFIG_ALIGN, get padding size */
+-	total_size = stat.st_size + size + sizeof(uint32_t) * 2 + BOOTCONFIG_MAGIC_LEN;
++	total_size = stat.st_size + size + BOOTCONFIG_FOOTER_SIZE;
+ 	pad = ((total_size + BOOTCONFIG_ALIGN - 1) & (~BOOTCONFIG_ALIGN_MASK)) - total_size;
+ 	size += pad;
+ 

debian/patches/bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch

@@ -21,7 +21,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 +	 * much older kernel.  Do "use" the attr structure here to avoid
 +	 * a "set but not used" warning.
  	 */
--	return syscall(__NR_bpf, BPF_PROG_LOAD, &attr, sizeof(attr));
+-	return syscall(__NR_bpf, BPF_PROG_LOAD, &attr, sizeof(attr)) == 0;
 +	(void)&attr;
 +	return 0;
  }

debian/patches/bugfix/all/tools-perf-fix-missing-ldflags-for-some-programs.patch

@@ -6,7 +6,7 @@ Signed-off-by: Ben Hutchings <benh@debian.org>
 ---
 --- a/tools/perf/Makefile.perf
 +++ b/tools/perf/Makefile.perf
-@@ -919,7 +919,7 @@ $(OUTPUT)dlfilters/%.o: dlfilters/%.c in
+@@ -937,7 +937,7 @@ $(OUTPUT)dlfilters/%.o: dlfilters/%.c in
  .SECONDARY: $(DLFILTERS:.so=.o)
  
  $(OUTPUT)dlfilters/%.so: $(OUTPUT)dlfilters/%.o

debian/patches/bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch

@@ -69,7 +69,7 @@ Signed-off-by: Geoff Levand <geoff@infradead.org>
   * acpi_boot_table_init() called from setup_arch(), always.
   *	1. find RSDP and get its address, and then find XSDT
   *	2. extract all tables and checksums them all
-@@ -257,6 +286,8 @@ done:
+@@ -261,6 +290,8 @@ done:
  
  		if (IS_ENABLED(CONFIG_ACPI_BGRT))
  			acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt);

debian/patches/bugfix/powerpc/powerpc-boot-fix-missing-crc32poly.h-when-building-with-kernel_xz.patch

@@ -26,7 +26,7 @@ Tested-by: Michal Kubecek <mkubecek@suse.cz>
 
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -97,7 +97,7 @@ BOOTCFLAGS	+= -fno-stack-protector
+@@ -98,7 +98,7 @@ BOOTCFLAGS	+= -fno-stack-protector
  endif
  
  BOOTCFLAGS	+= -include $(srctree)/include/linux/compiler_attributes.h

debian/patches/bugfix/sh/sh-boot-do-not-use-hyphen-in-exported-variable-name.patch

@@ -1,89 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Mon, 07 Feb 2022 00:00:26 +0100
-Subject: sh: Do not use hyphen in exported variable names
-
-arch/sh/Makefile defines and exports ld-bfd to be used by
-arch/sh/boot/Makefile and arch/sh/boot/compressed/Makefile.  However
-some shells, including dash, will not pass through environment
-variables whose name includes a hyphen.  Usually GNU make does not use
-a shell to recurse, but if e.g. $(srctree) contains '~' it will use a
-shell here.
-
-Rename the variable to ld_bfd.
-
-(Another instance of this problem was fixed upstream by commit
-82977af93a0d "sh: rename suffix-y to suffix_y".)
-
-References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=sh4&ver=4.13%7Erc5-1%7Eexp1&stamp=1502943967&raw=0
-Fixes: ef9b542fce00 ("sh: bzip2/lzma uImage support.")
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
----
- arch/sh/Makefile                 | 10 +++++-----
- arch/sh/boot/compressed/Makefile |  4 ++--
- arch/sh/boot/romimage/Makefile   |  4 ++--
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
---- a/arch/sh/Makefile
-+++ b/arch/sh/Makefile
-@@ -102,16 +102,16 @@ UTS_MACHINE		:= sh
- LDFLAGS_vmlinux		+= -e _stext
- 
- ifdef CONFIG_CPU_LITTLE_ENDIAN
--ld-bfd			:= elf32-sh-linux
--LDFLAGS_vmlinux		+= --defsym jiffies=jiffies_64 --oformat $(ld-bfd)
-+ld_bfd			:= elf32-sh-linux
-+LDFLAGS_vmlinux		+= --defsym jiffies=jiffies_64 --oformat $(ld_bfd)
- KBUILD_LDFLAGS		+= -EL
- else
--ld-bfd			:= elf32-shbig-linux
--LDFLAGS_vmlinux		+= --defsym jiffies=jiffies_64+4 --oformat $(ld-bfd)
-+ld_bfd			:= elf32-shbig-linux
-+LDFLAGS_vmlinux		+= --defsym jiffies=jiffies_64+4 --oformat $(ld_bfd)
- KBUILD_LDFLAGS		+= -EB
- endif
- 
--export ld-bfd
-+export ld_bfd
- 
- # Mach groups
- machdir-$(CONFIG_SOLUTION_ENGINE)		+= mach-se
---- a/arch/sh/boot/compressed/Makefile
-+++ b/arch/sh/boot/compressed/Makefile
-@@ -27,7 +27,7 @@ endif
- 
- ccflags-remove-$(CONFIG_MCOUNT) += -pg
- 
--LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(IMAGE_OFFSET) -e startup \
-+LDFLAGS_vmlinux := --oformat $(ld_bfd) -Ttext $(IMAGE_OFFSET) -e startup \
- 		   -T $(obj)/../../kernel/vmlinux.lds
- 
- KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
-@@ -51,7 +51,7 @@ $(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.b
- 
- OBJCOPYFLAGS += -R .empty_zero_page
- 
--LDFLAGS_piggy.o := -r --format binary --oformat $(ld-bfd) -T
-+LDFLAGS_piggy.o := -r --format binary --oformat $(ld_bfd) -T
- 
- $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix_y) FORCE
- 	$(call if_changed,ld)
---- a/arch/sh/boot/romimage/Makefile
-+++ b/arch/sh/boot/romimage/Makefile
-@@ -13,7 +13,7 @@ mmcif-obj-$(CONFIG_CPU_SUBTYPE_SH7724)	:
- load-$(CONFIG_ROMIMAGE_MMCIF)		:= $(mmcif-load-y)
- obj-$(CONFIG_ROMIMAGE_MMCIF)		:= $(mmcif-obj-y)
- 
--LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(load-y) -e romstart \
-+LDFLAGS_vmlinux := --oformat $(ld_bfd) -Ttext $(load-y) -e romstart \
- 		   -T $(obj)/../../kernel/vmlinux.lds
- 
- $(obj)/vmlinux: $(obj)/head.o $(obj-y) $(obj)/piggy.o FORCE
-@@ -24,7 +24,7 @@ OBJCOPYFLAGS += -j .empty_zero_page
- $(obj)/zeropage.bin: vmlinux FORCE
- 	$(call if_changed,objcopy)
- 
--LDFLAGS_piggy.o := -r --format binary --oformat $(ld-bfd) -T
-+LDFLAGS_piggy.o := -r --format binary --oformat $(ld_bfd) -T
- 
- $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/zeropage.bin arch/sh/boot/zImage FORCE
- 	$(call if_changed,ld)

debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch

@@ -1,7 +1,7 @@
 From: Serge Hallyn <serge.hallyn@canonical.com>
 Date: Fri, 31 May 2013 19:12:12 +0000 (+0100)
 Subject: add sysctl to disallow unprivileged CLONE_NEWUSER by default
-Origin: https://kernel.ubuntu.com/git?p=serge%2Fubuntu-saucy.git;a=commit;h=5c847404dcb2e3195ad0057877e1422ae90892b8
+Origin: http://kernel.ubuntu.com/git?p=serge%2Fubuntu-saucy.git;a=commit;h=5c847404dcb2e3195ad0057877e1422ae90892b8
 
 add sysctl to disallow unprivileged CLONE_NEWUSER by default
 
@@ -21,7 +21,7 @@ Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
 
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -119,6 +119,12 @@
+@@ -122,6 +122,12 @@
  
  #include <kunit/visibility.h>
  
@@ -34,7 +34,7 @@ Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
  /*
   * Minimum number of threads to boot the kernel
   */
-@@ -2172,6 +2178,10 @@ __latent_entropy struct task_struct *cop
+@@ -1933,6 +1939,10 @@ __latent_entropy struct task_struct *cop
  	if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
  		return ERR_PTR(-EINVAL);
  
@@ -45,7 +45,7 @@ Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
  	/*
  	 * Thread groups must share signals as well, and detached threads
  	 * can only be started up within the thread group.
-@@ -3325,6 +3335,12 @@ int ksys_unshare(unsigned long unshare_f
+@@ -3099,6 +3109,12 @@ int ksys_unshare(unsigned long unshare_f
  	if (unshare_flags & CLONE_NEWNS)
  		unshare_flags |= CLONE_FS;
  
@@ -60,21 +60,21 @@ Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
  		goto bad_unshare_out;
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -135,6 +135,10 @@ static enum sysctl_writes_mode sysctl_wr
- int sysctl_legacy_va_layout;
- #endif
+@@ -77,6 +77,10 @@ EXPORT_SYMBOL_GPL(sysctl_long_vals);
+ static const int ngroups_max = NGROUPS_MAX;
+ static const int cap_last_cap = CAP_LAST_CAP;
  
 +#ifdef CONFIG_USER_NS
 +extern int unprivileged_userns_clone;
 +#endif
 +
- #endif /* CONFIG_SYSCTL */
+ #ifdef CONFIG_PROC_SYSCTL
  
- /*
-@@ -1617,6 +1621,15 @@ static const struct ctl_table kern_table
- 		.mode		= 0644,
- 		.proc_handler	= proc_dointvec,
- 	},
+ /**
+@@ -1581,6 +1585,15 @@ int proc_do_static_key(const struct ctl_
+ }
+ 
+ static const struct ctl_table kern_table[] = {
 +#ifdef CONFIG_USER_NS
 +	{
 +		.procname	= "unprivileged_userns_clone",

debian/patches/debian/android-enable-building-ashmem-and-binder-as-modules.patch

@@ -1,90 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Fri, 22 Jun 2018 17:27:00 +0100
-Subject: android: Enable building ashmem and binder as modules
-Bug-Debian: https://bugs.debian.org/901492
-
-We want to enable use of the Android ashmem and binder drivers to
-support Anbox, but they should not be built-in as that would waste
-resources and increase security attack surface on systems that don't
-need them.
-
-- Add a MODULE_LICENSE declaration to ashmem
-- Change the Makefiles to build each driver as an object with the
-  "_linux" suffix (which is what Anbox expects)
-- Change config symbol types to tristate
-
-Update:
-In upstream commit 721412ed3d titled "staging: remove ashmem" the ashmem
-driver was removed entirely. Secondary commit message:
-"The mainline replacement for ashmem is memfd, so remove the legacy
-code from drivers/staging/"
-Consequently, the ashmem part of this patch has been removed.
----
- drivers/android/Kconfig          | 2 +-
- drivers/android/Makefile         | 7 ++++---
- drivers/android/binder_alloc.c   | 2 +-
- 3 files changed, 6 insertions(+), 5 deletions(-)
-
---- a/drivers/android/Kconfig
-+++ b/drivers/android/Kconfig
-@@ -2,7 +2,7 @@
- menu "Android"
- 
- config ANDROID_BINDER_IPC
--	bool "Android Binder IPC Driver"
-+	tristate "Android Binder IPC Driver"
- 	depends on MMU
- 	default n
- 	help
---- a/drivers/android/Makefile
-+++ b/drivers/android/Makefile
-@@ -1,6 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0-only
- ccflags-y += -I$(src)			# needed for trace events
- 
--obj-$(CONFIG_ANDROID_BINDERFS)		+= binderfs.o
--obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o binder_alloc.o
--obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
-+obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder_linux.o
-+binder_linux-y := binder.o binder_alloc.o
-+binder_linux-$(CONFIG_ANDROID_BINDERFS)	+= binderfs.o
-+binder_linux-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
---- a/drivers/android/binder_alloc.c
-+++ b/drivers/android/binder_alloc.c
-@@ -38,7 +38,7 @@ enum {
- };
- static uint32_t binder_alloc_debug_mask = BINDER_DEBUG_USER_ERROR;
- 
--module_param_named(debug_mask, binder_alloc_debug_mask,
-+module_param_named(alloc_debug_mask, binder_alloc_debug_mask,
- 		   uint, 0644);
- 
- #define binder_alloc_debug(mask, x...) \
---- a/mm/list_lru.c
-+++ b/mm/list_lru.c
-@@ -175,6 +175,7 @@ bool list_lru_add(struct list_lru *lru,
- 	unlock_list_lru(l, false);
- 	return false;
- }
-+EXPORT_SYMBOL_GPL(list_lru_add);
- 
- bool list_lru_add_obj(struct list_lru *lru, struct list_head *item)
- {
-@@ -212,6 +213,7 @@ bool list_lru_del(struct list_lru *lru,
- 	unlock_list_lru(l, false);
- 	return false;
- }
-+EXPORT_SYMBOL_GPL(list_lru_del);
- 
- bool list_lru_del_obj(struct list_lru *lru, struct list_head *item)
- {
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -6392,6 +6392,7 @@ inval:
- 	count_vm_vma_lock_event(VMA_LOCK_ABORT);
- 	return NULL;
- }
-+EXPORT_SYMBOL_GPL(lock_vma_under_rcu);
- #endif /* CONFIG_PER_VMA_LOCK */
- 
- #ifndef __PAGETABLE_P4D_FOLDED

debian/patches/debian/android-enable-building-binder-as-module.patch

@@ -0,0 +1,53 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Tue, 08 Jul 2025 13:30:55 +0200
+Subject: android: Enable building binder as module
+Bug-Debian: https://bugs.debian.org/901492
+
+We want to enable use of the Android binder driver to support
+Waydroid, but it should not be built-in as that would waste resources
+and increase security attack surface on systems that don't need it.
+
+- Change the Makefiles to build the driver as an object with the
+  "_linux" suffix (which is what Waydroid expects)
+- Change config symbol types to tristate
+---
+ drivers/android/Kconfig        |    2 +-
+ drivers/android/Makefile       |    7 ++++---
+ drivers/android/binder_alloc.c |    2 +-
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+--- a/drivers/android/Kconfig
++++ b/drivers/android/Kconfig
+@@ -2,7 +2,7 @@
+ menu "Android"
+ 
+ config ANDROID_BINDER_IPC
+-	bool "Android Binder IPC Driver"
++	tristate "Android Binder IPC Driver"
+ 	depends on MMU
+ 	default n
+ 	help
+--- a/drivers/android/Makefile
++++ b/drivers/android/Makefile
+@@ -1,6 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0-only
+ ccflags-y += -I$(src)			# needed for trace events
+ 
+-obj-$(CONFIG_ANDROID_BINDERFS)		+= binderfs.o
+-obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o binder_alloc.o
+-obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
++obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder_linux.o
++binder_linux-y := binder.o binder_alloc.o
++binder_linux-$(CONFIG_ANDROID_BINDERFS)	+= binderfs.o
++binder_linux-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
+--- a/drivers/android/binder_alloc.c
++++ b/drivers/android/binder_alloc.c
+@@ -38,7 +38,7 @@ enum {
+ };
+ static uint32_t binder_alloc_debug_mask = BINDER_DEBUG_USER_ERROR;
+ 
+-module_param_named(debug_mask, binder_alloc_debug_mask,
++module_param_named(alloc_debug_mask, binder_alloc_debug_mask,
+ 		   uint, 0644);
+ 
+ #define binder_alloc_debug(mask, x...) \

debian/patches/debian/btrfs-warn-about-raid5-6-being-experimental-at-mount.patch

@@ -22,7 +22,7 @@ implementation went from disk-io.c to super.c; forwarded the issue]
 
 --- a/fs/btrfs/super.c
 +++ b/fs/btrfs/super.c
-@@ -769,6 +769,18 @@ static void set_device_specific_options(
+@@ -761,6 +761,18 @@ static void set_device_specific_options(
  		btrfs_set_opt(fs_info->mount_opt, SSD);
  
  	/*

debian/patches/debian/dccp-disable-auto-loading-as-mitigation-against-local-exploits.patch

@@ -1,41 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Thu, 16 Feb 2017 19:09:17 +0000
-Subject: dccp: Disable auto-loading as mitigation against local exploits
-Forwarded: not-needed
-
-We can mitigate the effect of vulnerabilities in obscure protocols by
-preventing unprivileged users from loading the modules, so that they
-are only exploitable on systems where the administrator has chosen to
-load the protocol.
-
-The 'dccp' protocol is not actively maintained or widely used.
-Therefore disable auto-loading.
-
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
----
---- a/net/dccp/ipv4.c
-+++ b/net/dccp/ipv4.c
-@@ -1099,8 +1099,8 @@ module_exit(dccp_v4_exit);
-  * values directly, Also cover the case where the protocol is not specified,
-  * i.e. net-pf-PF_INET-proto-0-type-SOCK_DCCP
-  */
--MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 33, 6);
--MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 0, 6);
-+/* MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 33, 6); */
-+/* MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 0, 6); */
- MODULE_LICENSE("GPL");
- MODULE_AUTHOR("Arnaldo Carvalho de Melo <acme@mandriva.com>");
- MODULE_DESCRIPTION("DCCP - Datagram Congestion Controlled Protocol");
---- a/net/dccp/ipv6.c
-+++ b/net/dccp/ipv6.c
-@@ -1174,8 +1174,8 @@ module_exit(dccp_v6_exit);
-  * values directly, Also cover the case where the protocol is not specified,
-  * i.e. net-pf-PF_INET6-proto-0-type-SOCK_DCCP
-  */
--MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET6, 33, 6);
--MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET6, 0, 6);
-+/* MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET6, 33, 6); */
-+/* MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET6, 0, 6); */
- MODULE_LICENSE("GPL");
- MODULE_AUTHOR("Arnaldo Carvalho de Melo <acme@mandriva.com>");
- MODULE_DESCRIPTION("DCCPv6 - Datagram Congestion Controlled Protocol");

debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch

@@ -21,7 +21,7 @@ probably discontinued 10 years ago.
  
 -config FB_NVIDIA
 -	tristate "nVidia Framebuffer Support"
--	depends on FB && PCI
+-	depends on FB && PCI && HAS_IOPORT
 -	select FB_CFB_FILLRECT
 -	select FB_CFB_COPYAREA
 -	select FB_CFB_IMAGEBLIT

debian/patches/debian/documentation-drop-sphinx-version-check.patch

@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- a/Documentation/Makefile
 +++ b/Documentation/Makefile
-@@ -118,7 +118,6 @@ $(YNL_RST_DIR)/%.rst: $(YNL_YAML_DIR)/%.
+@@ -119,7 +119,6 @@ $(YNL_RST_DIR)/%.rst: $(YNL_YAML_DIR)/%.
  htmldocs texinfodocs latexdocs epubdocs xmldocs: $(YNL_INDEX)
  
  htmldocs:
@@ -18,7 +18,7 @@ Forwarded: not-needed
  	@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),,$(var)))
  
  # If Rust support is available and .config exists, add rustdoc generated contents.
-@@ -132,7 +131,6 @@ endif
+@@ -133,7 +132,6 @@ endif
  endif
  
  texinfodocs:
@@ -26,7 +26,7 @@ Forwarded: not-needed
  	@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,texinfo,$(var),texinfo,$(var)))
  
  # Note: the 'info' Make target is generated by sphinx itself when
-@@ -144,7 +142,6 @@ linkcheckdocs:
+@@ -145,7 +143,6 @@ linkcheckdocs:
  	@$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,linkcheck,$(var),,$(var)))
  
  latexdocs:
@@ -34,7 +34,7 @@ Forwarded: not-needed
  	@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,latex,$(var),latex,$(var)))
  
  ifeq ($(HAVE_PDFLATEX),0)
-@@ -157,7 +154,6 @@ else # HAVE_PDFLATEX
+@@ -158,7 +155,6 @@ else # HAVE_PDFLATEX
  
  pdfdocs: DENY_VF = XDG_CONFIG_HOME=$(FONTS_CONF_DENY_VF)
  pdfdocs: latexdocs
@@ -42,7 +42,7 @@ Forwarded: not-needed
  	$(foreach var,$(SPHINXDIRS), \
  	   $(MAKE) PDFLATEX="$(PDFLATEX)" LATEXOPTS="$(LATEXOPTS)" $(DENY_VF) -C $(BUILDDIR)/$(var)/latex || sh $(srctree)/scripts/check-variable-fonts.sh || exit; \
  	   mkdir -p $(BUILDDIR)/$(var)/pdf; \
-@@ -167,11 +163,9 @@ pdfdocs: latexdocs
+@@ -168,11 +164,9 @@ pdfdocs: latexdocs
  endif # HAVE_PDFLATEX
  
  epubdocs:

debian/patches/debian/export-symbols-needed-by-binder.patch

@@ -1,5 +1,5 @@
 From: Ben Hutchings <ben@decadent.org.uk>
-Date: Mon, 05 Aug 2024 03:26:48 +0200
+Date: Tue, 08 Jul 2025 13:32:21 +0200
 Subject: Export symbols needed by binder
 Bug-Debian: https://bugs.debian.org/901492
 
@@ -10,19 +10,21 @@ and increase security attack surface on systems that don't need it.
 Export the currently un-exported symbols it depends on.
 
 ---
- fs/file.c               | 1 +
- ipc/msgutil.c           | 1 +
- ipc/namespace.c         | 1 +
- kernel/sched/syscalls.c | 1 +
- kernel/sched/wait.c     | 1 +
- kernel/task_work.c      | 1 +
- mm/memory.c             | 1 +
- security/security.c     | 4 ++++
- 8 files changed, 11 insertions(+)
+ fs/file.c               |    1 +
+ ipc/msgutil.c           |    1 +
+ ipc/namespace.c         |    1 +
+ kernel/sched/syscalls.c |    1 +
+ kernel/sched/wait.c     |    1 +
+ kernel/task_work.c      |    1 +
+ mm/list_lru.c           |    2 ++
+ mm/memory.c             |    1 +
+ mm/mmap_lock.c          |    1 +
+ security/security.c     |    4 ++++
+ 10 files changed, 14 insertions(+)
 
 --- a/fs/file.c
 +++ b/fs/file.c
-@@ -845,6 +845,7 @@ struct file *file_close_fd(unsigned int
+@@ -858,6 +858,7 @@ struct file *file_close_fd(unsigned int
  
  	return file;
  }
@@ -80,16 +82,44 @@ Export the currently un-exported symbols it depends on.
  
  /**
   * task_work_cancel_match - cancel a pending work added by task_work_add()
+--- a/mm/list_lru.c
++++ b/mm/list_lru.c
+@@ -175,6 +175,7 @@ bool list_lru_add(struct list_lru *lru,
+ 	unlock_list_lru(l, false);
+ 	return false;
+ }
++EXPORT_SYMBOL_GPL(list_lru_add);
+ 
+ bool list_lru_add_obj(struct list_lru *lru, struct list_head *item)
+ {
+@@ -212,6 +213,7 @@ bool list_lru_del(struct list_lru *lru,
+ 	unlock_list_lru(l, false);
+ 	return false;
+ }
++EXPORT_SYMBOL_GPL(list_lru_del);
+ 
+ bool list_lru_del_obj(struct list_lru *lru, struct list_head *item)
+ {
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -2027,6 +2027,7 @@ void zap_page_range_single(struct vm_are
+@@ -2050,6 +2050,7 @@ void zap_page_range_single(struct vm_are
+ 	zap_page_range_single_batched(&tlb, vma, address, size, details);
  	tlb_finish_mmu(&tlb);
- 	hugetlb_zap_end(vma, details);
  }
 +EXPORT_SYMBOL_GPL(zap_page_range_single);
  
  /**
   * zap_vma_ptes - remove ptes mapping the vma
+--- a/mm/mmap_lock.c
++++ b/mm/mmap_lock.c
+@@ -177,6 +177,7 @@ inval:
+ 	count_vm_vma_lock_event(VMA_LOCK_ABORT);
+ 	return NULL;
+ }
++EXPORT_SYMBOL_GPL(lock_vma_under_rcu);
+ #endif /* CONFIG_PER_VMA_LOCK */
+ 
+ #ifdef CONFIG_LOCK_MM_AND_FIND_VMA
 --- a/security/security.c
 +++ b/security/security.c
 @@ -996,6 +996,7 @@ int security_binder_set_context_mgr(cons

debian/patches/debian/fanotify-taint-on-use-of-fanotify_access_permissions.patch

@@ -12,7 +12,7 @@ actually used.
 ---
 --- a/fs/notify/fanotify/fanotify_user.c
 +++ b/fs/notify/fanotify/fanotify_user.c
-@@ -1838,6 +1838,14 @@ static int do_fanotify_mark(int fanotify
+@@ -1878,6 +1878,14 @@ static int do_fanotify_mark(int fanotify
  		umask = FANOTIFY_EVENT_FLAGS;
  	}
  

debian/patches/debian/firmware_loader-log-direct-loading-failures-as-info-for-d-i.patch

@@ -0,0 +1,37 @@
+From: Ben Hutchings <benh@debian.org>
+Subject: firmware_loader: Log direct loading failures as info for d-i
+Date: Thu, 30 May 2024 13:14:32 +0100
+Forwarded: not-needed
+
+On an installed Debian system, firmware packages will normally be
+installed automatically based on a mapping of device IDs to firmware.
+Within the Debian installer this has not yet happened and we need a
+way to detect missing firmware.
+
+Although many/most drivers log firmware loading failures, they do so
+using many different formats.  This adds a single log message to the
+firmware loader, which the installer's hw-detect package will look
+for.  The log level is set to "info" because some failures are
+expected and we do not want to confuse users with bogus error messages
+(like in bug #966218).
+
+NOTE: The log message format must not be changed without coordinating
+this with the check-missing-firmware.sh in hw-detect.
+---
+ drivers/base/firmware_loader/fallback.c |  2 +-
+ drivers/base/firmware_loader/main.c     | 17 ++++++++---------
+ 2 files changed, 9 insertions(+), 10 deletions(-)
+
+--- a/drivers/base/firmware_loader/main.c
++++ b/drivers/base/firmware_loader/main.c
+@@ -590,6 +590,10 @@ fw_get_filesystem_firmware(struct device
+ 	}
+ 	__putname(path);
+ 
++	if (rc)
++		dev_info(device, "firmware: failed to load %s (%d)\n",
++			 fw_priv->fw_name, rc);
++
+ 	return rc;
+ }
+ 

debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch

@@ -9,7 +9,7 @@ This reverts commit 561ec64ae67ef25cac8d72bb9c4bfc955edfd415
 
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -1094,8 +1094,8 @@ static inline void put_link(struct namei
+@@ -1095,8 +1095,8 @@ static inline void put_link(struct namei
  		path_put(&last->link);
  }
  

debian/patches/debian/hamradio-disable-auto-loading-as-mitigation-against-local-exploits.patch

@@ -37,7 +37,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  {
 --- a/net/rose/af_rose.c
 +++ b/net/rose/af_rose.c
-@@ -1638,7 +1638,7 @@ MODULE_PARM_DESC(rose_ndevs, "number of
+@@ -1639,7 +1639,7 @@ MODULE_PARM_DESC(rose_ndevs, "number of
  MODULE_AUTHOR("Jonathan Naylor G4KLX <g4klx@g4klx.demon.co.uk>");
  MODULE_DESCRIPTION("The amateur radio ROSE network layer protocol");
  MODULE_LICENSE("GPL");

debian/patches/debian/kernelvariables.patch

@@ -19,7 +19,7 @@ use of $(ARCH) needs to be moved after this.
 ---
 --- a/Makefile
 +++ b/Makefile
-@@ -405,36 +405,6 @@ include $(srctree)/scripts/subarch.inclu
+@@ -402,36 +402,6 @@ include $(srctree)/scripts/subarch.inclu
  # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
  ARCH		?= $(SUBARCH)
  
@@ -56,7 +56,7 @@ use of $(ARCH) needs to be moved after this.
  KCONFIG_CONFIG	?= .config
  export KCONFIG_CONFIG
  
-@@ -554,6 +524,35 @@ RUSTFLAGS_KERNEL =
+@@ -556,6 +526,35 @@ RUSTFLAGS_KERNEL =
  AFLAGS_KERNEL	=
  LDFLAGS_vmlinux =
  

debian/patches/debian/linux-perf-remove-remaining-source-filenames-from-executable.patch

@@ -15,7 +15,7 @@ to the installed location.
 ---
 --- a/tools/perf/builtin-report.c
 +++ b/tools/perf/builtin-report.c
-@@ -660,10 +660,12 @@ static int report__browse_hists(struct r
+@@ -669,10 +669,12 @@ static int report__browse_hists(struct r
  
  	path = system_path(TIPDIR);
  	if (perf_tip(&help, path) || help == NULL) {
@@ -30,7 +30,7 @@ to the installed location.
  	free(path);
 --- a/tools/perf/tests/Build
 +++ b/tools/perf/tests/Build
-@@ -73,7 +73,7 @@ ifeq ($(SRCARCH),$(filter $(SRCARCH),x86
+@@ -74,7 +74,7 @@ ifeq ($(SRCARCH),$(filter $(SRCARCH),x86
  perf-test-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o
  endif
  

debian/patches/debian/makefile-make-compiler-version-comparison-optional.patch

@@ -20,7 +20,7 @@ is non-empty.
 ---
 --- a/Makefile
 +++ b/Makefile
-@@ -1871,7 +1871,7 @@ PHONY += prepare
+@@ -1882,7 +1882,7 @@ PHONY += prepare
  # now expand this into a simple variable to reduce the cost of shell evaluations
  prepare: CC_VERSION_TEXT := $(CC_VERSION_TEXT)
  prepare:

debian/patches/debian/tools-perf-install-python-bindings.patch

@@ -1,7 +1,7 @@
 From: Adriaan Schmidt <adriaan.schmidt@siemens.com>
 Date: Mon, 4 Apr 2022 13:38:33 +0200
 Subject: tools: install perf python bindings
-Bug-Debian: https://bugs.debian.org/860957
+Bug-Debian: http://bugs.debian.org/860957
 Forwarded: not-needed
 
 ---
@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- a/tools/perf/Makefile.perf
 +++ b/tools/perf/Makefile.perf
-@@ -1139,7 +1139,7 @@ install-bin: install-tools install-tests
+@@ -1158,7 +1158,7 @@ install-bin: install-tools install-tests
  install: install-bin try-install-man
  
  install-python_ext:

debian/patches/debian/tools-perf-perf-read-vdso-in-libexec.patch

@@ -4,7 +4,7 @@ Subject: linux-tools: Install perf-read-vdso{,x}32 in directory under /usr/lib
 
 --- a/tools/perf/Makefile.perf
 +++ b/tools/perf/Makefile.perf
-@@ -1067,21 +1067,21 @@ install-tools: all install-gtk
+@@ -1085,21 +1085,21 @@ install-tools: all install-gtk
  		$(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(bindir_SQ)/trace'; \
  		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(includedir_SQ)/perf'; \
  		$(INSTALL) -m 644 include/perf/perf_dlfilter.h -t '$(DESTDIR_SQ)$(includedir_SQ)/perf'

debian/patches/debian/uname-version-timestamp.patch

@@ -13,7 +13,7 @@ $KBUILD_BUILD_TIMESTAMP.
 
 --- a/init/Makefile
 +++ b/init/Makefile
-@@ -29,7 +29,7 @@ preempt-flag-$(CONFIG_PREEMPT_DYNAMIC)	:
+@@ -30,7 +30,7 @@ preempt-flag-$(CONFIG_PREEMPT_DYNAMIC)	:
  preempt-flag-$(CONFIG_PREEMPT_RT)	:= PREEMPT_RT
  
  build-version = $(or $(KBUILD_BUILD_VERSION), $(build-version-auto))

debian/patches/debian/yama-disable-by-default.patch

@@ -19,7 +19,7 @@ Forwarded: not-needed
  
  /* describe a ptrace relationship for potential exception */
  struct ptrace_relation {
-@@ -474,7 +474,7 @@ static inline void yama_init_sysctl(void
+@@ -469,7 +469,7 @@ static inline void yama_init_sysctl(void
  
  static int __init yama_init(void)
  {

debian/patches/features/all/lockdown/efi-add-an-efi_secure_boot-flag-to-indicate-secure-b.patch

@@ -31,7 +31,7 @@ cc: linux-efi@vger.kernel.org
 
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
-@@ -1073,19 +1073,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1149,19 +1149,7 @@ void __init setup_arch(char **cmdline_p)
  	/* Allocate bigger log buffer */
  	setup_log_buf(1);
  

debian/patches/features/all/lockdown/efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch

@@ -26,7 +26,7 @@ Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
 
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
-@@ -907,6 +907,8 @@ void __init setup_arch(char **cmdline_p)
+@@ -986,6 +986,8 @@ void __init setup_arch(char **cmdline_p)
  	if (efi_enabled(EFI_BOOT))
  		efi_init();
  
@@ -35,7 +35,7 @@ Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
  	reserve_ibft_region();
  	x86_init.resources.dmi_setup();
  
-@@ -1073,8 +1075,6 @@ void __init setup_arch(char **cmdline_p)
+@@ -1149,8 +1151,6 @@ void __init setup_arch(char **cmdline_p)
  	/* Allocate bigger log buffer */
  	setup_log_buf(1);
  
@@ -67,7 +67,7 @@ Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
  		default:
 --- a/include/linux/security.h
 +++ b/include/linux/security.h
-@@ -574,6 +574,7 @@ int security_inode_notifysecctx(struct i
+@@ -573,6 +573,7 @@ int security_inode_notifysecctx(struct i
  int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen);
  int security_inode_getsecctx(struct inode *inode, struct lsm_context *cp);
  int security_locked_down(enum lockdown_reason what);
@@ -75,7 +75,7 @@ Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
  int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, u32 *uctx_len,
  		      void *val, size_t val_len, u64 id, u64 flags);
  int security_bdev_alloc(struct block_device *bdev);
-@@ -1580,6 +1581,11 @@ static inline int security_locked_down(e
+@@ -1574,6 +1575,11 @@ static inline int security_locked_down(e
  {
  	return 0;
  }

debian/patches/features/all/security-perf-allow-further-restriction-of-perf_event_open.patch

@@ -22,9 +22,9 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/include/linux/perf_event.h
 +++ b/include/linux/perf_event.h
-@@ -1701,6 +1701,11 @@ int perf_cpu_time_max_percent_handler(co
- int perf_event_max_stack_handler(const struct ctl_table *table, int write,
- 		void *buffer, size_t *lenp, loff_t *ppos);
+@@ -1761,6 +1761,11 @@ extern int sysctl_perf_event_sample_rate
+ 
+ extern void perf_sample_event_took(u64 sample_len_ns);
  
 +static inline bool perf_paranoid_any(void)
 +{
@@ -36,7 +36,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  
 --- a/kernel/events/core.c
 +++ b/kernel/events/core.c
-@@ -449,8 +449,13 @@ static struct kmem_cache *perf_event_cac
+@@ -463,8 +463,13 @@ static struct kmem_cache *perf_event_cac
   *   0 - disallow raw tracepoint access for unpriv
   *   1 - disallow cpu events for unpriv
   *   2 - disallow kernel profiling for unpriv
@@ -48,9 +48,9 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  int sysctl_perf_event_paranoid __read_mostly = 2;
 +#endif
  
- /* Minimum for 512 kiB + 1 user control page */
- int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
-@@ -12813,6 +12818,9 @@ SYSCALL_DEFINE5(perf_event_open,
+ /* Minimum for 512 kiB + 1 user control page. 'free' kiB per user. */
+ static int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024);
+@@ -13382,6 +13387,9 @@ SYSCALL_DEFINE5(perf_event_open,
  	if (err)
  		return err;
  
@@ -58,13 +58,13 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 +		return -EACCES;
 +
  	/* Do we allow access to perf_event_open(2) ? */
- 	err = security_perf_event_open(&attr, PERF_SECURITY_OPEN);
+ 	err = security_perf_event_open(PERF_SECURITY_OPEN);
  	if (err)
 --- a/security/Kconfig
 +++ b/security/Kconfig
-@@ -51,6 +51,15 @@ config PROC_MEM_NO_FORCE
- 
- endchoice
+@@ -72,6 +72,15 @@ config MSEAL_SYSTEM_MAPPINGS
+ 	  For complete descriptions of memory sealing, please see
+ 	  Documentation/userspace-api/mseal.rst
  
 +config SECURITY_PERF_EVENTS_RESTRICT
 +	bool "Restrict unprivileged use of performance events"

debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch

@@ -22,7 +22,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -2264,6 +2264,8 @@
+@@ -2306,6 +2306,8 @@
  			bypassed by not enabling DMAR with this option. In
  			this case, gfx device will use physical address for
  			DMA.
@@ -68,7 +68,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  		} else if (!strncmp(str, "forcedac", 8)) {
  			pr_warn("intel_iommu=forcedac deprecated; use iommu.forcedac instead\n");
  			iommu_dma_forcedac = true;
-@@ -1902,6 +1910,9 @@ static int device_def_domain_type(struct
+@@ -1899,6 +1907,9 @@ static int device_def_domain_type(struct
  
  		if ((iommu_identity_mapping & IDENTMAP_AZALIA) && IS_AZALIA(pdev))
  			return IOMMU_DOMAIN_IDENTITY;
@@ -78,7 +78,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  	}
  
  	return 0;
-@@ -2196,6 +2207,9 @@ static int __init init_dmars(void)
+@@ -2189,6 +2200,9 @@ static int __init init_dmars(void)
  		iommu_set_root_entry(iommu);
  	}
  

debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch

@@ -29,7 +29,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -7004,6 +7004,10 @@
+@@ -7117,6 +7117,10 @@
  			later by a loaded module cannot be set this way.
  			Example: sysctl.vm.swappiness=40
  
@@ -42,7 +42,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  			Ignore sysrq setting - this boot parameter will
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -3202,6 +3202,14 @@ config COMPAT_32
+@@ -3150,6 +3150,14 @@ config COMPAT_32
  	select HAVE_UID16
  	select OLD_SIGSUSPEND3
  
@@ -57,9 +57,70 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  config COMPAT
  	def_bool y
  	depends on IA32_EMULATION || X86_X32_ABI
---- a/arch/x86/entry/common.c
-+++ b/arch/x86/entry/common.c
-@@ -64,7 +64,7 @@ static __always_inline bool do_syscall_x
+--- a/arch/x86/include/asm/elf.h
++++ b/arch/x86/include/asm/elf.h
+@@ -12,6 +12,9 @@
+ #include <asm/user.h>
+ #include <asm/auxvec.h>
+ #include <asm/fsgsbase.h>
++#ifndef COMPILE_OFFSETS /* avoid a circular dependency on asm-offsets.h */
++#include <asm/syscall.h>
++#endif
+ 
+ typedef unsigned long elf_greg_t;
+ 
+@@ -148,7 +151,8 @@ do {						\
+ 
+ #define compat_elf_check_arch(x)					\
+ 	((elf_check_arch_ia32(x) && ia32_enabled_verbose()) ||		\
+-	 (IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine == EM_X86_64))
++	 (IS_ENABLED(CONFIG_X86_X32_ABI) && x32_enabled &&		\
++	  (x)->e_machine == EM_X86_64))
+ 
+ static inline void elf_common_init(struct thread_struct *t,
+ 				   struct pt_regs *regs, const u16 ds)
+--- a/arch/x86/include/asm/syscall.h
++++ b/arch/x86/include/asm/syscall.h
+@@ -13,6 +13,7 @@
+ #include <uapi/linux/audit.h>
+ #include <linux/sched.h>
+ #include <linux/err.h>
++#include <linux/jump_label.h>
+ #include <asm/thread_info.h>	/* for TS_COMPAT */
+ #include <asm/unistd.h>
+ 
+@@ -28,6 +29,18 @@ extern long ia32_sys_call(const struct p
+ extern long x32_sys_call(const struct pt_regs *, unsigned int nr);
+ extern long x64_sys_call(const struct pt_regs *, unsigned int nr);
+ 
++#if defined(CONFIG_X86_X32_ABI)
++#if defined(CONFIG_X86_X32_DISABLED)
++DECLARE_STATIC_KEY_FALSE(x32_enabled_skey);
++#define x32_enabled static_branch_unlikely(&x32_enabled_skey)
++#else
++DECLARE_STATIC_KEY_TRUE(x32_enabled_skey);
++#define x32_enabled static_branch_likely(&x32_enabled_skey)
++#endif
++#else
++#define x32_enabled 0
++#endif
++
+ /*
+  * Only the low 32 bits of orig_ax are meaningful, so we return int.
+  * This importantly ignores the high bits on 64-bit, so comparisons
+--- a/arch/x86/entry/syscall_64.c
++++ b/arch/x86/entry/syscall_64.c
+@@ -7,6 +7,9 @@
+ #include <linux/syscalls.h>
+ #include <linux/entry-common.h>
+ #include <linux/nospec.h>
++#include <linux/moduleparam.h>
++#undef MODULE_PARAM_PREFIX
++#define MODULE_PARAM_PREFIX "syscall."
+ #include <asm/syscall.h>
+ 
+ #define __SYSCALL(nr, sym) extern long __x64_##sym(const struct pt_regs *);
+@@ -75,7 +78,7 @@ static __always_inline bool do_syscall_x
  	 */
  	unsigned int xnr = nr - __X32_SYSCALL_BIT;
  
@@ -68,23 +129,12 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  		xnr = array_index_nospec(xnr, X32_NR_syscalls);
  		regs->ax = x32_sys_call(regs, xnr);
  		return true;
---- a/arch/x86/entry/syscall_x32.c
-+++ b/arch/x86/entry/syscall_x32.c
-@@ -4,6 +4,9 @@
- #include <linux/linkage.h>
- #include <linux/sys.h>
- #include <linux/cache.h>
-+#include <linux/moduleparam.h>
-+#undef MODULE_PARAM_PREFIX
-+#define MODULE_PARAM_PREFIX "syscall."
- #include <linux/syscalls.h>
- #include <asm/syscall.h>
- 
-@@ -23,3 +26,46 @@ long x32_sys_call(const struct pt_regs *
- 	default: return __x64_sys_ni_syscall(regs);
- 	}
- };
+@@ -139,3 +142,48 @@ __visible noinstr bool do_syscall_64(str
+ 	/* Use SYSRET to exit to userspace */
+ 	return true;
+ }
 +
++#ifdef CONFIG_X86_X32_ABI
 +/* Maybe enable x32 syscalls */
 +
 +#if defined(CONFIG_X86_X32_DISABLED)
@@ -127,54 +177,4 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 +};
 +
 +arch_param_cb(x32, &x32_param_ops, NULL, 0444);
---- a/arch/x86/include/asm/elf.h
-+++ b/arch/x86/include/asm/elf.h
-@@ -12,6 +12,9 @@
- #include <asm/user.h>
- #include <asm/auxvec.h>
- #include <asm/fsgsbase.h>
-+#ifndef COMPILE_OFFSETS /* avoid a circular dependency on asm-offsets.h */
-+#include <asm/syscall.h>
 +#endif
- 
- typedef unsigned long elf_greg_t;
- 
-@@ -151,7 +154,8 @@ do {						\
- 
- #define compat_elf_check_arch(x)					\
- 	((elf_check_arch_ia32(x) && ia32_enabled_verbose()) ||		\
--	 (IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine == EM_X86_64))
-+	 (IS_ENABLED(CONFIG_X86_X32_ABI) && x32_enabled &&		\
-+	  (x)->e_machine == EM_X86_64))
- 
- static inline void elf_common_init(struct thread_struct *t,
- 				   struct pt_regs *regs, const u16 ds)
---- a/arch/x86/include/asm/syscall.h
-+++ b/arch/x86/include/asm/syscall.h
-@@ -13,6 +13,7 @@
- #include <uapi/linux/audit.h>
- #include <linux/sched.h>
- #include <linux/err.h>
-+#include <linux/jump_label.h>
- #include <asm/thread_info.h>	/* for TS_COMPAT */
- #include <asm/unistd.h>
- 
-@@ -28,6 +29,18 @@ extern long ia32_sys_call(const struct p
- extern long x32_sys_call(const struct pt_regs *, unsigned int nr);
- extern long x64_sys_call(const struct pt_regs *, unsigned int nr);
- 
-+#if defined(CONFIG_X86_X32_ABI)
-+#if defined(CONFIG_X86_X32_DISABLED)
-+DECLARE_STATIC_KEY_FALSE(x32_enabled_skey);
-+#define x32_enabled static_branch_unlikely(&x32_enabled_skey)
-+#else
-+DECLARE_STATIC_KEY_TRUE(x32_enabled_skey);
-+#define x32_enabled static_branch_likely(&x32_enabled_skey)
-+#endif
-+#else
-+#define x32_enabled 0
-+#endif
-+
- /*
-  * Only the low 32 bits of orig_ax are meaningful, so we return int.
-  * This importantly ignores the high bits on 64-bit, so comparisons

debian/patches/krd/0001-Revert-objtool-dont-fail-the-kernel-build-on-fatal-errors.patch

@@ -1,52 +0,0 @@
-this reverts following commit:
-
-    From: Josh Poimboeuf <jpoimboe@redhat.com>
-    Date: Thu, 14 Jan 2021 16:32:42 -0600
-    Subject: objtool: Don't fail the kernel build on fatal errors
-
-    [ Upstream commit 655cf86548a3938538642a6df27dd359e13c86bd ]
-
-    This is basically a revert of commit 644592d32837 ("objtool: Fail the
-    kernel build on fatal errors").
-
-    That change turned out to be more trouble than it's worth.  Failing the
-    build is an extreme measure which sometimes gets too much attention and
-    blocks CI build testing.
-
-    These fatal-type warnings aren't yet as rare as we'd hope, due to the
-    ever-increasing matrix of supported toolchains/plugins and their
-    fast-changing nature as of late.
-
-    Also, there are more people (and bots) looking for objtool warnings than
-    ever before, so even non-fatal warnings aren't likely to be ignored for
-    long.
-
-    Suggested-by: Nick Desaulniers <ndesaulniers@google.com>
-    Reviewed-by: Miroslav Benes <mbenes@suse.cz>
-    Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
-    Reviewed-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
-    Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
-    Signed-off-by: Sasha Levin <sashal@kernel.org>
-
---- a/tools/objtool/check.c
-+++ b/tools/objtool/check.c
-@@ -4783,10 +4783,14 @@ int check(struct objtool_file *file)
- 	}
- 
- out:
--	/*
--	 *  For now, don't fail the kernel build on fatal warnings.  These
--	 *  errors are still fairly common due to the growing matrix of
--	 *  supported toolchains and their recent pace of change.
--	 */
-+	if (ret < 0) {
-+		/*
-+		 *  Fatal error.  The binary is corrupt or otherwise broken in
-+		 *  some way, or objtool itself is broken.  Fail the kernel
-+		 *  build.
-+		 */
-+		return ret;
-+	}
-+
- 	return 0;
- }

debian/patches/krd/0002-local-ports.patch

@@ -1,6 +1,6 @@
 --- a/net/ipv4/af_inet.c
 +++ b/net/ipv4/af_inet.c
-@@ -1790,7 +1790,7 @@ static __net_init int inet_init_net(stru
+@@ -1787,7 +1787,7 @@ static __net_init int inet_init_net(stru
  	/*
  	 * Set defaults for local port range
  	 */

debian/patches/krd/0003-bridge-group_fwd_mask.patch

@@ -1,6 +1,6 @@
 --- a/net/bridge/br_input.c
 +++ b/net/bridge/br_input.c
-@@ -383,7 +383,11 @@ static rx_handler_result_t br_handle_fra
+@@ -384,7 +384,11 @@ static rx_handler_result_t br_handle_fra
  
  		case 0x01:	/* IEEE MAC (Pause) */
  			reason = SKB_DROP_REASON_MAC_IEEE_MAC_CONTROL;

debian/patches/misc-openwrt/0102-mac80211-avoid-crashing-missing-band.patch

@@ -0,0 +1,34 @@
+From: David Bauer <mail@david-bauer.net>
+Date: Thu, 30 Nov 2023 07:32:52 +0100
+Subject: [PATCH] mac80211: avoid crashing on invalid band info
+
+Frequent crashes have been observed on MT7916 based platforms. While the
+root of these crashes are currently unknown, they happen when decoding
+rate information of connected STAs in AP mode. The rate-information is
+associated with a band which is not available on the PHY.
+
+Check for this condition in order to avoid crashing the whole system.
+This patch should be removed once the roout cause has been found and
+fixed.
+
+Link: https://github.com/freifunk-gluon/gluon/issues/2980
+
+Signed-off-by: David Bauer <mail@david-bauer.net>
+---
+
+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -2468,6 +2468,13 @@ static void sta_stats_decode_rate(struct
+ 
+ 		sband = local->hw.wiphy->bands[band];
+ 
++		if (!sband) {
++			wiphy_warn(local->hw.wiphy,
++				    "Invalid band %d\n",
++				    band);
++			break;
++		}
++
+ 		if (WARN_ON_ONCE(!sband->bitrates))
+ 			break;
+ 

debian/patches/misc-openwrt/0103-mac80211-sta-randomize-BA-session-dialog-token-alloc.patch

@@ -0,0 +1,38 @@
+From b478e06a16a8baa00c5ecc87c1d636981f2206d5 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Tue, 29 Oct 2019 10:25:25 +0100
+Subject: [PATCH] mac80211: sta: randomize BA session dialog token allocator
+
+We currently always start the dialog token generator at zero,
+so the first dialog token we use is always 1. This would be
+OK if we had a perfect guarantee that we always do a proper
+deauth/re-auth handshake, but in IBSS mode this doesn't always
+happen properly.
+
+To make problems with block ack (aggregation) sessions getting
+stuck less likely, randomize the dialog token so if we start a
+new session but the peer still has old state for us, it can
+better detect this.
+
+This is really just a workaround to make things a bit more
+robust than they are now - a better fix would be to do a full
+authentication handshake in IBSS mode upon having discovered a
+new station, and on the receiver resetting the state (removing
+and re-adding the station) on receiving the authentication
+packet.
+
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+---
+ net/mac80211/sta_info.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -582,6 +582,7 @@ __sta_info_alloc(struct ieee80211_sub_if
+ 	spin_lock_init(&sta->ps_lock);
+ 	INIT_WORK(&sta->drv_deliver_wk, sta_deliver_ps_frames);
+ 	wiphy_work_init(&sta->ampdu_mlme.work, ieee80211_ba_session_work);
++	sta->ampdu_mlme.dialog_token_allocator = get_random_u32_below(U8_MAX);
+ #ifdef CONFIG_MAC80211_MESH
+ 	if (ieee80211_vif_is_mesh(&sdata->vif)) {
+ 		sta->mesh = kzalloc(sizeof(*sta->mesh), gfp);

debian/patches/misc-openwrt/0104-mac80211-minstrel_ht-fix-MINSTREL_FRAC-macro.patch

@@ -0,0 +1,21 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Wed, 28 Apr 2021 21:03:13 +0200
+Subject: [PATCH] mac80211: minstrel_ht: fix MINSTREL_FRAC macro
+
+Add missing braces to avoid issues with e.g. using additions in the
+div expression
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/net/mac80211/rc80211_minstrel_ht.h
++++ b/net/mac80211/rc80211_minstrel_ht.h
+@@ -14,7 +14,7 @@
+ 
+ /* scaled fraction values */
+ #define MINSTREL_SCALE  12
+-#define MINSTREL_FRAC(val, div) (((val) << MINSTREL_SCALE) / div)
++#define MINSTREL_FRAC(val, div) (((val) << MINSTREL_SCALE) / (div))
+ #define MINSTREL_TRUNC(val) ((val) >> MINSTREL_SCALE)
+ 
+ #define EWMA_LEVEL	96	/* ewma weighting factor [/EWMA_DIV] */

debian/patches/misc-openwrt/0105-mac80211-minstrel_ht-reduce-fluctuations-in-rate-pro.patch

@@ -0,0 +1,30 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Sat, 6 Feb 2021 16:08:01 +0100
+Subject: [PATCH] mac80211: minstrel_ht: reduce fluctuations in rate
+ probability stats
+
+In some scenarios when there is a lot of fluctuation in packet error rates,
+rate switching can be amplified when the statistics get skewed by time slots
+with very few tries.
+Make the input data to the moving average more smooth by adding the
+success/attempts count from the last stats window as well. This has the
+advantage of smoothing the data without introducing any extra lag to sampling
+rates.
+This significantly improves rate stability on a strong test link subjected to
+periodic noise bursts generated with a SDR
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/net/mac80211/rc80211_minstrel_ht.c
++++ b/net/mac80211/rc80211_minstrel_ht.c
+@@ -769,7 +769,8 @@ minstrel_ht_calc_rate_stats(struct minst
+ 	unsigned int cur_prob;
+ 
+ 	if (unlikely(mrs->attempts > 0)) {
+-		cur_prob = MINSTREL_FRAC(mrs->success, mrs->attempts);
++		cur_prob = MINSTREL_FRAC(mrs->success + mrs->last_success,
++					 mrs->attempts + mrs->last_attempts);
+ 		minstrel_filter_avg_add(&mrs->prob_avg,
+ 					&mrs->prob_avg_1, cur_prob);
+ 		mrs->att_hist += mrs->attempts;

debian/patches/misc-openwrt/0106-mac80211-minstrel_ht-rework-rate-downgrade-code-and-.patch

@@ -0,0 +1,151 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Sat, 6 Feb 2021 16:33:14 +0100
+Subject: [PATCH] mac80211: minstrel_ht: rework rate downgrade code and
+ max_prob rate selection
+
+The current fallback code for fast rate switching on potentially failing rates
+is triggering too often if there is some strong noise on the channel. This can
+lead to wild fluctuations in the rate selection.
+Additionally, switching down to max_prob_rate can create a significant gap down
+in throughput, especially when using only 2 spatial streams, because max_prob_rate
+is limited to using fewer streams than the max_tp rates.
+In order to improve throughput without reducing reliability too much, use the
+rate downgrade code for the max_prob_rate only, and allow the non-downgraded
+max_prob_rate to use as many spatial streams as the max_tp rates
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/net/mac80211/rc80211_minstrel_ht.c
++++ b/net/mac80211/rc80211_minstrel_ht.c
+@@ -580,6 +580,14 @@ minstrel_ht_set_best_prob_rate(struct mi
+ 	int cur_tp_avg, cur_group, cur_idx;
+ 	int max_gpr_group, max_gpr_idx;
+ 	int max_gpr_tp_avg, max_gpr_prob;
++	int min_dur;
++
++	min_dur = max(minstrel_get_duration(mi->max_tp_rate[0]),
++		      minstrel_get_duration(mi->max_tp_rate[1]));
++
++	/* make the rate at least 18% slower than max tp rates */
++	if (minstrel_get_duration(index) <= min_dur * 19 / 16)
++		return;
+ 
+ 	cur_group = MI_RATE_GROUP(index);
+ 	cur_idx = MI_RATE_IDX(index);
+@@ -601,11 +609,6 @@ minstrel_ht_set_best_prob_rate(struct mi
+ 	    !minstrel_ht_is_legacy_group(max_tp_group))
+ 		return;
+ 
+-	/* skip rates faster than max tp rate with lower prob */
+-	if (minstrel_get_duration(mi->max_tp_rate[0]) > minstrel_get_duration(index) &&
+-	    mrs->prob_avg < max_tp_prob)
+-		return;
+-
+ 	max_gpr_group = MI_RATE_GROUP(mg->max_group_prob_rate);
+ 	max_gpr_idx = MI_RATE_IDX(mg->max_group_prob_rate);
+ 	max_gpr_prob = mi->groups[max_gpr_group].rates[max_gpr_idx].prob_avg;
+@@ -663,40 +666,6 @@ minstrel_ht_assign_best_tp_rates(struct
+ 
+ }
+ 
+-/*
+- * Try to increase robustness of max_prob rate by decrease number of
+- * streams if possible.
+- */
+-static inline void
+-minstrel_ht_prob_rate_reduce_streams(struct minstrel_ht_sta *mi)
+-{
+-	struct minstrel_mcs_group_data *mg;
+-	int tmp_max_streams, group, tmp_idx, tmp_prob;
+-	int tmp_tp = 0;
+-
+-	if (!mi->sta->deflink.ht_cap.ht_supported)
+-		return;
+-
+-	group = MI_RATE_GROUP(mi->max_tp_rate[0]);
+-	tmp_max_streams = minstrel_mcs_groups[group].streams;
+-	for (group = 0; group < ARRAY_SIZE(minstrel_mcs_groups); group++) {
+-		mg = &mi->groups[group];
+-		if (!mi->supported[group] || group == MINSTREL_CCK_GROUP)
+-			continue;
+-
+-		tmp_idx = MI_RATE_IDX(mg->max_group_prob_rate);
+-		tmp_prob = mi->groups[group].rates[tmp_idx].prob_avg;
+-
+-		if (tmp_tp < minstrel_ht_get_tp_avg(mi, group, tmp_idx, tmp_prob) &&
+-		   (minstrel_mcs_groups[group].streams < tmp_max_streams)) {
+-				mi->max_prob_rate = mg->max_group_prob_rate;
+-				tmp_tp = minstrel_ht_get_tp_avg(mi, group,
+-								tmp_idx,
+-								tmp_prob);
+-		}
+-	}
+-}
+-
+ static u16
+ __minstrel_ht_get_sample_rate(struct minstrel_ht_sta *mi,
+ 			      enum minstrel_sample_type type)
+@@ -1176,8 +1145,6 @@ minstrel_ht_update_stats(struct minstrel
+ 
+ 	mi->max_prob_rate = tmp_max_prob_rate;
+ 
+-	/* Try to increase robustness of max_prob_rate*/
+-	minstrel_ht_prob_rate_reduce_streams(mi);
+ 	minstrel_ht_refill_sample_rates(mi);
+ 
+ #ifdef CONFIG_MAC80211_DEBUGFS
+@@ -1256,7 +1223,7 @@ minstrel_ht_ri_txstat_valid(struct minst
+ }
+ 
+ static void
+-minstrel_downgrade_rate(struct minstrel_ht_sta *mi, u16 *idx, bool primary)
++minstrel_downgrade_prob_rate(struct minstrel_ht_sta *mi, u16 *idx)
+ {
+ 	int group, orig_group;
+ 
+@@ -1271,11 +1238,7 @@ minstrel_downgrade_rate(struct minstrel_
+ 		    minstrel_mcs_groups[orig_group].streams)
+ 			continue;
+ 
+-		if (primary)
+-			*idx = mi->groups[group].max_group_tp_rate[0];
+-		else
+-			*idx = mi->groups[group].max_group_tp_rate[1];
+-		break;
++		*idx = mi->groups[group].max_group_prob_rate;
+ 	}
+ }
+ 
+@@ -1286,7 +1249,7 @@ minstrel_ht_tx_status(void *priv, struct
+ 	struct ieee80211_tx_info *info = st->info;
+ 	struct minstrel_ht_sta *mi = priv_sta;
+ 	struct ieee80211_tx_rate *ar = info->status.rates;
+-	struct minstrel_rate_stats *rate, *rate2;
++	struct minstrel_rate_stats *rate;
+ 	struct minstrel_priv *mp = priv;
+ 	u32 update_interval = mp->update_interval;
+ 	bool last, update = false;
+@@ -1354,18 +1317,13 @@ minstrel_ht_tx_status(void *priv, struct
+ 		/*
+ 		 * check for sudden death of spatial multiplexing,
+ 		 * downgrade to a lower number of streams if necessary.
++		 * only do this for the max_prob_rate to prevent spurious
++		 * rate fluctuations when the link changes suddenly
+ 		 */
+-		rate = minstrel_get_ratestats(mi, mi->max_tp_rate[0]);
++		rate = minstrel_get_ratestats(mi, mi->max_prob_rate);
+ 		if (rate->attempts > 30 &&
+ 		    rate->success < rate->attempts / 4) {
+-			minstrel_downgrade_rate(mi, &mi->max_tp_rate[0], true);
+-			update = true;
+-		}
+-
+-		rate2 = minstrel_get_ratestats(mi, mi->max_tp_rate[1]);
+-		if (rate2->attempts > 30 &&
+-		    rate2->success < rate2->attempts / 4) {
+-			minstrel_downgrade_rate(mi, &mi->max_tp_rate[1], false);
++			minstrel_downgrade_prob_rate(mi, &mi->max_prob_rate);
+ 			update = true;
+ 		}
+ 	}

debian/patches/misc-openwrt/0107-mac80211-increase-quantum-for-airtime-scheduler.patch

@@ -0,0 +1,53 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Sun, 26 Jun 2022 11:43:25 +0200
+Subject: [PATCH] mac80211: increase quantum for airtime scheduler
+
+Given the typical AQL budget and queue length, a quantum of 256 with the
+default station weight often requires iterating over all queues frequently,
+until one of them becomes eligible.
+Improve performance by using 8 times station weight as scheduler quantum
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -103,6 +103,8 @@ ieee80211_sta_keep_active(struct sta_inf
+ 	return time_before_eq(jiffies, sta->airtime[ac].last_active + HZ / 10);
+ }
+ 
++#define AIRTIME_QUANTUM_SHIFT	3
++
+ struct ieee80211_bss {
+ 	u32 device_ts_beacon, device_ts_presp;
+ 
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -4074,7 +4074,7 @@ struct ieee80211_txq *ieee80211_next_txq
+ 
+ 		if (deficit < 0)
+ 			sta->airtime[txqi->txq.ac].deficit +=
+-				sta->airtime_weight;
++				sta->airtime_weight << AIRTIME_QUANTUM_SHIFT;
+ 
+ 		if (deficit < 0 || !aql_check) {
+ 			list_move_tail(&txqi->schedule_order,
+@@ -4219,7 +4219,8 @@ bool ieee80211_txq_may_transmit(struct i
+ 		}
+ 		sta = container_of(iter->txq.sta, struct sta_info, sta);
+ 		if (ieee80211_sta_deficit(sta, ac) < 0)
+-			sta->airtime[ac].deficit += sta->airtime_weight;
++			sta->airtime[ac].deficit += sta->airtime_weight <<
++						    AIRTIME_QUANTUM_SHIFT;
+ 		list_move_tail(&iter->schedule_order, &local->active_txqs[ac]);
+ 	}
+ 
+@@ -4227,7 +4228,7 @@ bool ieee80211_txq_may_transmit(struct i
+ 	if (sta->airtime[ac].deficit >= 0)
+ 		goto out;
+ 
+-	sta->airtime[ac].deficit += sta->airtime_weight;
++	sta->airtime[ac].deficit += sta->airtime_weight << AIRTIME_QUANTUM_SHIFT;
+ 	list_move_tail(&txqi->schedule_order, &local->active_txqs[ac]);
+ 	spin_unlock_bh(&local->active_txq_lock[ac]);
+ 

debian/patches/misc-openwrt/0108-mac80211-add-AQL-support-for-broadcast-packets.patch

@@ -0,0 +1,293 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Fri, 9 Feb 2024 19:43:40 +0100
+Subject: [PATCH] mac80211: add AQL support for broadcast packets
+
+Excessive broadcast traffic with little competing unicast traffic can easily
+flood hardware queues, leading to throughput issues. Additionally, filling
+the hardware queues with too many packets breaks FQ for broadcast data.
+Fix this by enabling AQL for broadcast packets.
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/include/net/cfg80211.h
++++ b/include/net/cfg80211.h
+@@ -3434,6 +3434,7 @@ enum wiphy_params_flags {
+ /* The per TXQ device queue limit in airtime */
+ #define IEEE80211_DEFAULT_AQL_TXQ_LIMIT_L	5000
+ #define IEEE80211_DEFAULT_AQL_TXQ_LIMIT_H	12000
++#define IEEE80211_DEFAULT_AQL_TXQ_LIMIT_BC	50000
+ 
+ /* The per interface airtime threshold to switch to lower queue limit */
+ #define IEEE80211_AQL_THRESHOLD			24000
+--- a/net/mac80211/debugfs.c
++++ b/net/mac80211/debugfs.c
+@@ -212,11 +212,13 @@ static ssize_t aql_pending_read(struct f
+ 			"VI     %u us\n"
+ 			"BE     %u us\n"
+ 			"BK     %u us\n"
++			"BC/MC  %u us\n"
+ 			"total  %u us\n",
+ 			atomic_read(&local->aql_ac_pending_airtime[IEEE80211_AC_VO]),
+ 			atomic_read(&local->aql_ac_pending_airtime[IEEE80211_AC_VI]),
+ 			atomic_read(&local->aql_ac_pending_airtime[IEEE80211_AC_BE]),
+ 			atomic_read(&local->aql_ac_pending_airtime[IEEE80211_AC_BK]),
++			atomic_read(&local->aql_bc_pending_airtime),
+ 			atomic_read(&local->aql_total_pending_airtime));
+ 	return simple_read_from_buffer(user_buf, count, ppos,
+ 				       buf, len);
+@@ -241,7 +243,8 @@ static ssize_t aql_txq_limit_read(struct
+ 			"VO	%u		%u\n"
+ 			"VI	%u		%u\n"
+ 			"BE	%u		%u\n"
+-			"BK	%u		%u\n",
++			"BK	%u		%u\n"
++			"BC/MC	%u\n",
+ 			local->aql_txq_limit_low[IEEE80211_AC_VO],
+ 			local->aql_txq_limit_high[IEEE80211_AC_VO],
+ 			local->aql_txq_limit_low[IEEE80211_AC_VI],
+@@ -249,7 +252,8 @@ static ssize_t aql_txq_limit_read(struct
+ 			local->aql_txq_limit_low[IEEE80211_AC_BE],
+ 			local->aql_txq_limit_high[IEEE80211_AC_BE],
+ 			local->aql_txq_limit_low[IEEE80211_AC_BK],
+-			local->aql_txq_limit_high[IEEE80211_AC_BK]);
++			local->aql_txq_limit_high[IEEE80211_AC_BK],
++			local->aql_txq_limit_bc);
+ 	return simple_read_from_buffer(user_buf, count, ppos,
+ 				       buf, len);
+ }
+@@ -275,6 +279,11 @@ static ssize_t aql_txq_limit_write(struc
+ 	else
+ 		buf[count] = '\0';
+ 
++	if (sscanf(buf, "mcast %u", &q_limit_low) == 1) {
++		local->aql_txq_limit_bc = q_limit_low;
++		return count;
++	}
++
+ 	if (sscanf(buf, "%u %u %u", &ac, &q_limit_low, &q_limit_high) != 3)
+ 		return -EINVAL;
+ 
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -1392,10 +1392,12 @@ struct ieee80211_local {
+ 	spinlock_t handle_wake_tx_queue_lock;
+ 
+ 	u16 airtime_flags;
++	u32 aql_txq_limit_bc;
+ 	u32 aql_txq_limit_low[IEEE80211_NUM_ACS];
+ 	u32 aql_txq_limit_high[IEEE80211_NUM_ACS];
+ 	u32 aql_threshold;
+ 	atomic_t aql_total_pending_airtime;
++	atomic_t aql_bc_pending_airtime;
+ 	atomic_t aql_ac_pending_airtime[IEEE80211_NUM_ACS];
+ 
+ 	const struct ieee80211_ops *ops;
+--- a/net/mac80211/main.c
++++ b/net/mac80211/main.c
+@@ -970,6 +970,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
+ 	spin_lock_init(&local->rx_path_lock);
+ 	spin_lock_init(&local->queue_stop_reason_lock);
+ 
++	local->aql_txq_limit_bc = IEEE80211_DEFAULT_AQL_TXQ_LIMIT_BC;
+ 	for (i = 0; i < IEEE80211_NUM_ACS; i++) {
+ 		INIT_LIST_HEAD(&local->active_txqs[i]);
+ 		spin_lock_init(&local->active_txq_lock[i]);
+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -2382,13 +2382,28 @@ EXPORT_SYMBOL(ieee80211_sta_recalc_aggre
+ 
+ void ieee80211_sta_update_pending_airtime(struct ieee80211_local *local,
+ 					  struct sta_info *sta, u8 ac,
+-					  u16 tx_airtime, bool tx_completed)
++					  u16 tx_airtime, bool tx_completed,
++					  bool mcast)
+ {
+ 	int tx_pending;
+ 
+ 	if (!wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL))
+ 		return;
+ 
++	if (mcast) {
++		if (!tx_completed) {
++			atomic_add(tx_airtime, &local->aql_bc_pending_airtime);
++			return;
++		}
++
++		tx_pending = atomic_sub_return(tx_airtime,
++					       &local->aql_bc_pending_airtime);
++		if (tx_pending < 0)
++			atomic_cmpxchg(&local->aql_bc_pending_airtime,
++				       tx_pending, 0);
++		return;
++	}
++
+ 	if (!tx_completed) {
+ 		if (sta)
+ 			atomic_add(tx_airtime,
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -2546,7 +2546,7 @@ static u16 ieee80211_store_ack_skb(struc
+ 
+ 		spin_lock_irqsave(&local->ack_status_lock, flags);
+ 		id = idr_alloc(&local->ack_status_frames, ack_skb,
+-			       1, 0x2000, GFP_ATOMIC);
++			       1, 0x1000, GFP_ATOMIC);
+ 		spin_unlock_irqrestore(&local->ack_status_lock, flags);
+ 
+ 		if (id >= 0) {
+@@ -3975,20 +3975,20 @@ begin:
+ encap_out:
+ 	info->control.vif = vif;
+ 
+-	if (tx.sta &&
+-	    wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) {
+-		bool ampdu = txq->ac != IEEE80211_AC_VO;
++	if (wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) {
++		bool ampdu = txq->sta && txq->ac != IEEE80211_AC_VO;
+ 		u32 airtime;
+ 
+ 		airtime = ieee80211_calc_expected_tx_airtime(hw, vif, txq->sta,
+ 							     skb->len, ampdu);
+-		if (airtime) {
+-			airtime = ieee80211_info_set_tx_time_est(info, airtime);
+-			ieee80211_sta_update_pending_airtime(local, tx.sta,
+-							     txq->ac,
+-							     airtime,
+-							     false);
+-		}
++		if (!airtime)
++			return skb;
++
++		airtime = ieee80211_info_set_tx_time_est(info, airtime);
++		info->tx_time_mc = !tx.sta;
++		ieee80211_sta_update_pending_airtime(local, tx.sta, txq->ac,
++						     airtime, false,
++						     info->tx_time_mc);
+ 	}
+ 
+ 	return skb;
+@@ -4040,6 +4040,7 @@ struct ieee80211_txq *ieee80211_next_txq
+ 	struct ieee80211_txq *ret = NULL;
+ 	struct txq_info *txqi = NULL, *head = NULL;
+ 	bool found_eligible_txq = false;
++	bool aql_check;
+ 
+ 	spin_lock_bh(&local->active_txq_lock[ac]);
+ 
+@@ -4063,26 +4064,26 @@ struct ieee80211_txq *ieee80211_next_txq
+ 	if (!head)
+ 		head = txqi;
+ 
++	aql_check = ieee80211_txq_airtime_check(hw, &txqi->txq);
++	if (aql_check)
++		found_eligible_txq = true;
++
+ 	if (txqi->txq.sta) {
+ 		struct sta_info *sta = container_of(txqi->txq.sta,
+ 						    struct sta_info, sta);
+-		bool aql_check = ieee80211_txq_airtime_check(hw, &txqi->txq);
+-		s32 deficit = ieee80211_sta_deficit(sta, txqi->txq.ac);
+-
+-		if (aql_check)
+-			found_eligible_txq = true;
+-
+-		if (deficit < 0)
++		if (ieee80211_sta_deficit(sta, txqi->txq.ac) < 0) {
+ 			sta->airtime[txqi->txq.ac].deficit +=
+ 				sta->airtime_weight << AIRTIME_QUANTUM_SHIFT;
+-
+-		if (deficit < 0 || !aql_check) {
+-			list_move_tail(&txqi->schedule_order,
+-				       &local->active_txqs[txqi->txq.ac]);
+-			goto begin;
++			aql_check = false;
+ 		}
+ 	}
+ 
++	if (!aql_check) {
++		list_move_tail(&txqi->schedule_order,
++				   &local->active_txqs[txqi->txq.ac]);
++		goto begin;
++	}
++
+ 	if (txqi->schedule_round == local->schedule_round[ac])
+ 		goto out;
+ 
+@@ -4149,7 +4150,8 @@ bool ieee80211_txq_airtime_check(struct
+ 		return true;
+ 
+ 	if (!txq->sta)
+-		return true;
++		return atomic_read(&local->aql_bc_pending_airtime) <
++		       local->aql_txq_limit_bc;
+ 
+ 	if (unlikely(txq->tid == IEEE80211_NUM_TIDS))
+ 		return true;
+@@ -4198,15 +4200,15 @@ bool ieee80211_txq_may_transmit(struct i
+ 
+ 	spin_lock_bh(&local->active_txq_lock[ac]);
+ 
+-	if (!txqi->txq.sta)
+-		goto out;
+-
+ 	if (list_empty(&txqi->schedule_order))
+ 		goto out;
+ 
+ 	if (!ieee80211_txq_schedule_airtime_check(local, ac))
+ 		goto out;
+ 
++	if (!txqi->txq.sta)
++		goto out;
++
+ 	list_for_each_entry_safe(iter, tmp, &local->active_txqs[ac],
+ 				 schedule_order) {
+ 		if (iter == txqi)
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -1245,8 +1245,8 @@ struct ieee80211_tx_info {
+ 	    status_data_idr:1,
+ 	    status_data:13,
+ 	    hw_queue:4,
++	    tx_time_mc:1,
+ 	    tx_time_est:10;
+-	/* 1 free bit */
+ 
+ 	union {
+ 		struct {
+--- a/net/mac80211/sta_info.h
++++ b/net/mac80211/sta_info.h
+@@ -147,7 +147,8 @@ struct airtime_info {
+ 
+ void ieee80211_sta_update_pending_airtime(struct ieee80211_local *local,
+ 					  struct sta_info *sta, u8 ac,
+-					  u16 tx_airtime, bool tx_completed);
++					  u16 tx_airtime, bool tx_completed,
++					  bool mcast);
+ 
+ struct sta_info;
+ 
+--- a/net/mac80211/status.c
++++ b/net/mac80211/status.c
+@@ -734,7 +734,7 @@ static void ieee80211_report_used_skb(st
+ 		ieee80211_sta_update_pending_airtime(local, sta,
+ 						     skb_get_queue_mapping(skb),
+ 						     tx_time_est,
+-						     true);
++						     true, info->tx_time_mc);
+ 		rcu_read_unlock();
+ 	}
+ 
+@@ -1143,10 +1143,11 @@ void ieee80211_tx_status_ext(struct ieee
+ 		/* Do this here to avoid the expensive lookup of the sta
+ 		 * in ieee80211_report_used_skb().
+ 		 */
++		bool mcast = IEEE80211_SKB_CB(skb)->tx_time_mc;
+ 		ieee80211_sta_update_pending_airtime(local, sta,
+ 						     skb_get_queue_mapping(skb),
+ 						     tx_time_est,
+-						     true);
++						     true, mcast);
+ 		ieee80211_info_set_tx_time_est(IEEE80211_SKB_CB(skb), 0);
+ 	}
+ 

debian/patches/misc-openwrt/0109-mac80211-txq-tune.patch

@@ -0,0 +1,13 @@
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -1596,8 +1596,8 @@ int ieee80211_txq_setup_flows(struct iee
+ 		fq->memory_limit = 4 << 20; /* 4 Mbytes */
+ 
+ 	codel_params_init(&local->cparams);
+-	local->cparams.interval = MS2TIME(100);
+-	local->cparams.target = MS2TIME(20);
++	local->cparams.interval = MS2TIME(50);
++	local->cparams.target = MS2TIME(10);
+ 	local->cparams.ecn = true;
+ 
+ 	local->cvars = kvcalloc(fq->flows_cnt, sizeof(local->cvars[0]),

debian/patches/misc-openwrt/0110-cfg80211-aql-txq-limit.patch

@@ -0,0 +1,18 @@
+--- a/include/net/cfg80211.h
++++ b/include/net/cfg80211.h
+@@ -3432,12 +3432,12 @@ enum wiphy_params_flags {
+ #define IEEE80211_DEFAULT_AIRTIME_WEIGHT	256
+ 
+ /* The per TXQ device queue limit in airtime */
+-#define IEEE80211_DEFAULT_AQL_TXQ_LIMIT_L	5000
+-#define IEEE80211_DEFAULT_AQL_TXQ_LIMIT_H	12000
++#define IEEE80211_DEFAULT_AQL_TXQ_LIMIT_L	1500
++#define IEEE80211_DEFAULT_AQL_TXQ_LIMIT_H	5000
+ #define IEEE80211_DEFAULT_AQL_TXQ_LIMIT_BC	50000
+ 
+ /* The per interface airtime threshold to switch to lower queue limit */
+-#define IEEE80211_AQL_THRESHOLD			24000
++#define IEEE80211_AQL_THRESHOLD			12000
+ 
+ /**
+  * struct cfg80211_pmksa - PMK Security Association

debian/patches/misc-openwrt/0201-sched-sch_cake-fix-bulk-flow-accounting-logic-for-host.patch

@@ -0,0 +1,72 @@
+From 546ea84d07e3e324644025e2aae2d12ea4c5896e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com>
+Date: Tue, 3 Sep 2024 18:08:45 +0200
+Subject: [PATCH] sched: sch_cake: fix bulk flow accounting logic for host
+ fairness
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In sch_cake, we keep track of the count of active bulk flows per host,
+when running in dst/src host fairness mode, which is used as the
+round-robin weight when iterating through flows. The count of active
+bulk flows is updated whenever a flow changes state.
+
+This has a peculiar interaction with the hash collision handling: when a
+hash collision occurs (after the set-associative hashing), the state of
+the hash bucket is simply updated to match the new packet that collided,
+and if host fairness is enabled, that also means assigning new per-host
+state to the flow. For this reason, the bulk flow counters of the
+host(s) assigned to the flow are decremented, before new state is
+assigned (and the counters, which may not belong to the same host
+anymore, are incremented again).
+
+Back when this code was introduced, the host fairness mode was always
+enabled, so the decrement was unconditional. When the configuration
+flags were introduced the *increment* was made conditional, but
+the *decrement* was not. Which of course can lead to a spurious
+decrement (and associated wrap-around to U16_MAX).
+
+AFAICT, when host fairness is disabled, the decrement and wrap-around
+happens as soon as a hash collision occurs (which is not that common in
+itself, due to the set-associative hashing). However, in most cases this
+is harmless, as the value is only used when host fairness mode is
+enabled. So in order to trigger an array overflow, sch_cake has to first
+be configured with host fairness disabled, and while running in this
+mode, a hash collision has to occur to cause the overflow. Then, the
+qdisc has to be reconfigured to enable host fairness, which leads to the
+array out-of-bounds because the wrapped-around value is retained and
+used as an array index. It seems that syzbot managed to trigger this,
+which is quite impressive in its own right.
+
+This patch fixes the issue by introducing the same conditional check on
+decrement as is used on increment.
+
+The original bug predates the upstreaming of cake, but the commit listed
+in the Fixes tag touched that code, meaning that this patch won't apply
+before that.
+
+Fixes: 712639929912 ("sch_cake: Make the dual modes fairer")
+Reported-by: syzbot+7fe7b81d602cc1e6b94d@syzkaller.appspotmail.com
+Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
+Link: https://patch.msgid.link/20240903160846.20909-1-toke@redhat.com
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+---
+ net/sched/sch_cake.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+--- a/net/sched/sch_cake.c
++++ b/net/sched/sch_cake.c
+@@ -833,8 +833,10 @@ skip_hash:
+ 		allocate_dst = cake_ddst(flow_mode);
+ 
+ 		if (q->flows[outer_hash + k].set == CAKE_SET_BULK) {
+-			cake_dec_srchost_bulk_flow_count(q, &q->flows[outer_hash + k], flow_mode);
+-			cake_dec_dsthost_bulk_flow_count(q, &q->flows[outer_hash + k], flow_mode);
++			if (allocate_src)
++				q->hosts[q->flows[reduced_hash].srchost].srchost_bulk_flow_count--;
++			if (allocate_dst)
++				q->hosts[q->flows[reduced_hash].dsthost].dsthost_bulk_flow_count--;
+ 		}
+ found:
+ 		/* reserve queue for future packets in same flow */

debian/patches/misc-openwrt/0301-fq-adjust-memory-size.patch

@@ -0,0 +1,11 @@
+--- a/include/net/fq_impl.h
++++ b/include/net/fq_impl.h
+@@ -356,7 +356,7 @@ static int fq_init(struct fq *fq, int fl
+ 	fq->flows_cnt = max_t(u32, flows_cnt, 1);
+ 	fq->quantum = 300;
+ 	fq->limit = 8192;
+-	fq->memory_limit = 16 << 20; /* 16 MBytes */
++	fq->memory_limit = 32 << 20; /* 32 MBytes */
+ 
+ 	fq->flows = kvcalloc(fq->flows_cnt, sizeof(fq->flows[0]), GFP_KERNEL);
+ 	if (!fq->flows)

debian/patches/mixed-arch/0001-graysky2-more-ISA-levels-and-uarches.patch

@@ -1,18 +1,6 @@
-From 90b69178f6a866c7f3330c2006f6b5396146192c Mon Sep 17 00:00:00 2001
+From 6b1d270f55e3143bcb3ad914adf920774351a6b9 Mon Sep 17 00:00:00 2001
 From: graysky <therealgraysky AT proton DOT me>
-Date: Mon, 16 Sep 2024 05:55:58 -0400
-Subject: ZEN: Add graysky's more-uarches
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From https://github.com/graysky2/kernel_compiler_patch
-
-more-ISA-levels-and-uarches-for-kernel-6.1.79+.patch
-
-FEATURES
-This patch adds additional tunings via new x86-64 ISA levels and
-more micro-architecture options to the Linux kernel in three classes.
+Date: Mon, 18 Aug 2025 04:14:48 -0400
 
 1. New generic x86-64 ISA levels
 
@@ -111,7 +99,7 @@ See the following experimental evidence supporting this statement:
 https://github.com/graysky2/kernel_compiler_patch?tab=readme-ov-file#benchmarks
 
 REQUIREMENTS
-linux version 6.1.79+
+linux version 6.16+
 gcc version >=9.0 or clang version >=9.0
 
 ACKNOWLEDGMENTS
@@ -121,46 +109,79 @@ REFERENCES
 1.  https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html#index-x86-Options
 2.  https://bugzilla.kernel.org/show_bug.cgi?id=77461
 3.  https://github.com/graysky2/kernel_gcc_patch/issues/15
-4.  https://www.linuxforge.net/docs/linux/linux-gcc.php
+4.  http://www.linuxforge.net/docs/linux/linux-gcc.php
+
 ---
- arch/x86/Kconfig.cpu            | 367 ++++++++++++++++++++++++++++++--
- arch/x86/Makefile               |  89 +++++++-
- arch/x86/include/asm/vermagic.h |  72 +++++++
- 3 files changed, 511 insertions(+), 17 deletions(-)
+ arch/x86/Kconfig.cpu | 427 ++++++++++++++++++++++++++++++++++++++++++-
+ arch/x86/Makefile    | 213 ++++++++++++++++++++-
+ 2 files changed, 631 insertions(+), 9 deletions(-)
 
 --- a/arch/x86/Kconfig.cpu
 +++ b/arch/x86/Kconfig.cpu
-@@ -155,9 +155,8 @@ config MPENTIUM4
- 		-Paxville
- 		-Dempsey
+@@ -31,6 +31,7 @@ choice
+ 	  - "Pentium-4" for the Intel Pentium 4 or P4-based Celeron.
+ 	  - "K6" for the AMD K6, K6-II and K6-III (aka K6-3D).
+ 	  - "Athlon" for the AMD K7 family (Athlon/Duron/Thunderbird).
++	  - "Opteron/Athlon64/Hammer/K8" for all K8 and newer AMD CPUs.
+ 	  - "Crusoe" for the Transmeta Crusoe series.
+ 	  - "Efficeon" for the Transmeta Efficeon series.
+ 	  - "Winchip-C6" for original IDT Winchip.
+@@ -41,7 +42,10 @@ choice
+ 	  - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.
+ 	  - "VIA C3-2" for VIA C3-2 "Nehemiah" (model 9 and above).
+ 	  - "VIA C7" for VIA C7.
++	  - "Intel P4" for the Pentium 4/Netburst microarchitecture.
++	  - "Core 2/newer Xeon" for all core2 and newer Intel CPUs.
+ 	  - "Intel Atom" for the Atom-microarchitecture CPUs.
++	  - "Generic-x86-64" for a kernel which runs on any x86-64 CPU.
+ 
+ 	  See each option's help text for additional details. If you don't know
+ 	  what to do, choose "Pentium-Pro".
+@@ -135,10 +139,21 @@ config MPENTIUM4
+ 		-Mobile Pentium 4
+ 		-Mobile Pentium 4 M
+ 		-Extreme Edition (Gallatin)
++		-Prescott
++		-Prescott 2M
++		-Cedar Mill
++		-Presler
++		-Smithfiled
+ 	    Xeons (Intel Xeon, Xeon MP, Xeon LV, Xeon MV) corename:
+ 		-Foster
+ 		-Prestonia
+ 		-Gallatin
++		-Nocona
++		-Irwindale
++		-Cranford
++		-Potomac
++		-Paxville
++		-Dempsey
  
--
  config MK6
--	bool "K6/K6-II/K6-III"
-+	bool "AMD K6/K6-II/K6-III"
- 	depends on X86_32
- 	help
- 	  Select this for an AMD K6-family processor.  Enables use of
-@@ -165,7 +164,7 @@ config MK6
- 	  flags to GCC.
+ 	bool "K6/K6-II/K6-III"
+@@ -281,6 +296,402 @@ config X86_GENERIC
+ 	  This is really intended for distributors who need more
+ 	  generic optimizations.
  
- config MK7
--	bool "Athlon/Duron/K7"
-+	bool "AMD Athlon/Duron/K7"
- 	depends on X86_32
- 	help
- 	  Select this for an AMD Athlon K7-family processor.  Enables use of
-@@ -173,12 +172,114 @@ config MK7
- 	  flags to GCC.
- 
- config MK8
--	bool "Opteron/Athlon64/Hammer/K8"
++choice
++	prompt "x86_64 Compiler Build Optimization"
++	depends on !X86_NATIVE_CPU
++	default GENERIC_CPU
++
++config GENERIC_CPU
++	bool "Generic-x86-64"
++	depends on X86_64
++	help
++	  Generic x86-64 CPU.
++	  Runs equally well on all x86-64 CPUs.
++
++config MK8
 +	bool "AMD Opteron/Athlon64/Hammer/K8"
- 	help
- 	  Select this for an AMD Opteron or Athlon64 Hammer-family processor.
- 	  Enables use of some extended instructions, and passes appropriate
- 	  optimization flags to GCC.
- 
++	help
++	  Select this for an AMD Opteron or Athlon64 Hammer-family processor.
++	  Enables use of some extended instructions, and passes appropriate
++	  optimization flags to GCC.
++
 +config MK8SSE3
 +	bool "AMD Opteron/Athlon64/Hammer/K8 with SSE3"
 +	help
@@ -226,21 +247,21 @@ REFERENCES
 +	  Enables -march=bdver4
 +
 +config MZEN
-+	bool "AMD Zen"
++	bool "AMD Ryzen"
 +	help
 +	  Select this for AMD Family 17h Zen processors.
 +
 +	  Enables -march=znver1
 +
 +config MZEN2
-+	bool "AMD Zen 2"
++	bool "AMD Ryzen 2"
 +	help
 +	  Select this for AMD Family 17h Zen 2 processors.
 +
 +	  Enables -march=znver2
 +
 +config MZEN3
-+	bool "AMD Zen 3"
++	bool "AMD Ryzen 3"
 +	depends on (CC_IS_GCC && GCC_VERSION >= 100300) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
 +	help
 +	  Select this for AMD Family 19h Zen 3 processors.
@@ -248,7 +269,7 @@ REFERENCES
 +	  Enables -march=znver3
 +
 +config MZEN4
-+	bool "AMD Zen 4"
++	bool "AMD Ryzen 4"
 +	depends on (CC_IS_GCC && GCC_VERSION >= 130000) || (CC_IS_CLANG && CLANG_VERSION >= 160000)
 +	help
 +	  Select this for AMD Family 19h Zen 4 processors.
@@ -256,57 +277,48 @@ REFERENCES
 +	  Enables -march=znver4
 +
 +config MZEN5
-+	bool "AMD Zen 5"
++	bool "AMD Ryzen 5"
 +	depends on (CC_IS_GCC && GCC_VERSION > 140000) || (CC_IS_CLANG && CLANG_VERSION >= 190100)
 +	help
 +	  Select this for AMD Family 19h Zen 5 processors.
 +
 +	  Enables -march=znver5
 +
- config MCRUSOE
- 	bool "Crusoe"
- 	depends on X86_32
-@@ -269,8 +370,17 @@ config MPSC
- 	  using the cpu family field
- 	  in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.
- 
-+config MATOM
-+	bool "Intel Atom"
++config MPSC
++	bool "Intel P4 / older Netburst based Xeon"
++	depends on X86_64
++	help
++	  Optimize for Intel Pentium 4, Pentium D and older Nocona/Dempsey
++	  Xeon CPUs with Intel 64bit which is compatible with x86-64.
++	  Note that the latest Xeons (Xeon 51xx and 53xx) are not based on the
++	  Netburst core and shouldn't use this option. You can distinguish them
++	  using the cpu family field
++	  in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.
++
++config MCORE2
++	bool "Intel Core 2"
++	depends on X86_64
 +	help
 +
-+	  Select this for the Intel Atom platform. Intel Atom CPUs have an
-+	  in-order pipelining architecture and thus can benefit from
-+	  accordingly optimized code. Use a recent GCC with specific Atom
-+	  support in order to fully benefit from selecting this option.
++	  Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and
++	  53xx) CPUs. You can distinguish newer from older Xeons by the CPU
++	  family in /proc/cpuinfo. Newer ones have 6 and older ones 15
++	  (not a typo)
 +
- config MCORE2
--	bool "Core 2/newer Xeon"
-+	bool "Intel Core 2"
- 	help
- 
- 	  Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and
-@@ -278,14 +388,199 @@ config MCORE2
- 	  family in /proc/cpuinfo. Newer ones have 6 and older ones 15
- 	  (not a typo)
- 
--config MATOM
--	bool "Intel Atom"
 +	  Enables -march=core2
 +
 +config MNEHALEM
 +	bool "Intel Nehalem"
- 	help
- 
--	  Select this for the Intel Atom platform. Intel Atom CPUs have an
--	  in-order pipelining architecture and thus can benefit from
--	  accordingly optimized code. Use a recent GCC with specific Atom
--	  support in order to fully benefit from selecting this option.
++	depends on X86_64
++	help
++
 +	  Select this for 1st Gen Core processors in the Nehalem family.
 +
 +	  Enables -march=nehalem
 +
 +config MWESTMERE
 +	bool "Intel Westmere"
++	depends on X86_64
 +	help
 +
 +	  Select this for the Intel Westmere formerly Nehalem-C family.
@@ -315,6 +327,7 @@ REFERENCES
 +
 +config MSILVERMONT
 +	bool "Intel Silvermont"
++	depends on X86_64
 +	help
 +
 +	  Select this for the Intel Silvermont platform.
@@ -323,6 +336,7 @@ REFERENCES
 +
 +config MGOLDMONT
 +	bool "Intel Goldmont"
++	depends on X86_64
 +	help
 +
 +	  Select this for the Intel Goldmont platform including Apollo Lake and Denverton.
@@ -331,6 +345,7 @@ REFERENCES
 +
 +config MGOLDMONTPLUS
 +	bool "Intel Goldmont Plus"
++	depends on X86_64
 +	help
 +
 +	  Select this for the Intel Goldmont Plus platform including Gemini Lake.
@@ -339,6 +354,7 @@ REFERENCES
 +
 +config MSANDYBRIDGE
 +	bool "Intel Sandy Bridge"
++	depends on X86_64
 +	help
 +
 +	  Select this for 2nd Gen Core processors in the Sandy Bridge family.
@@ -347,6 +363,7 @@ REFERENCES
 +
 +config MIVYBRIDGE
 +	bool "Intel Ivy Bridge"
++	depends on X86_64
 +	help
 +
 +	  Select this for 3rd Gen Core processors in the Ivy Bridge family.
@@ -355,6 +372,7 @@ REFERENCES
 +
 +config MHASWELL
 +	bool "Intel Haswell"
++	depends on X86_64
 +	help
 +
 +	  Select this for 4th Gen Core processors in the Haswell family.
@@ -363,6 +381,7 @@ REFERENCES
 +
 +config MBROADWELL
 +	bool "Intel Broadwell"
++	depends on X86_64
 +	help
 +
 +	  Select this for 5th Gen Core processors in the Broadwell family.
@@ -371,6 +390,7 @@ REFERENCES
 +
 +config MSKYLAKE
 +	bool "Intel Skylake"
++	depends on X86_64
 +	help
 +
 +	  Select this for 6th Gen Core processors in the Skylake family.
@@ -378,23 +398,26 @@ REFERENCES
 +	  Enables -march=skylake
 +
 +config MSKYLAKEX
-+	bool "Intel Skylake X"
++	bool "Intel Skylake-X (7th Gen Core i7/i9)"
++	depends on X86_64
 +	help
 +
-+	  Select this for 6th Gen Core processors in the Skylake X family.
++	  Select this for 7th Gen Core i7/i9 processors in the Skylake-X family.
 +
 +	  Enables -march=skylake-avx512
 +
 +config MCANNONLAKE
-+	bool "Intel Cannon Lake"
++	bool "Intel Coffee Lake/Kaby Lake Refresh (8th Gen Core i3/i5/i7)"
++	depends on X86_64
 +	help
 +
-+	  Select this for 8th Gen Core processors
++	  Select this for 8th Gen Core i3/i5/i7 processors in the Coffee Lake or Kaby Lake Refresh families.
 +
 +	  Enables -march=cannonlake
 +
 +config MICELAKE_CLIENT
 +	bool "Intel Ice Lake"
++	depends on X86_64
 +	help
 +
 +	  Select this for 10th Gen Core client processors in the Ice Lake family.
@@ -402,23 +425,17 @@ REFERENCES
 +	  Enables -march=icelake-client
 +
 +config MICELAKE_SERVER
-+	bool "Intel Ice Lake Server"
++	bool "Intel Ice Lake-SP (3rd Gen Xeon Scalable)"
++	depends on X86_64
 +	help
 +
-+	  Select this for 10th Gen Core server processors in the Ice Lake family.
++	  Select this for 3rd Gen Xeon Scalable processors in the Ice Lake-SP family.
 +
 +	  Enables -march=icelake-server
 +
-+config MCASCADELAKE
-+	bool "Intel Cascade Lake"
-+	help
-+
-+	  Select this for Xeon processors in the Cascade Lake family.
-+
-+	  Enables -march=cascadelake
-+
 +config MCOOPERLAKE
 +	bool "Intel Cooper Lake"
++	depends on X86_64
 +	depends on (CC_IS_GCC && GCC_VERSION > 100100) || (CC_IS_CLANG && CLANG_VERSION >= 100000)
 +	help
 +
@@ -426,8 +443,19 @@ REFERENCES
 +
 +	  Enables -march=cooperlake
 +
++config MCASCADELAKE
++	bool "Intel Cascade Lake"
++	depends on X86_64
++	depends on (CC_IS_GCC && GCC_VERSION > 100100) || (CC_IS_CLANG && CLANG_VERSION >= 100000)
++	help
++
++	  Select this for Xeon processors in the Cascade Lake family.
++
++	  Enables -march=cascadelake
++
 +config MTIGERLAKE
 +	bool "Intel Tiger Lake"
++	depends on X86_64
 +	depends on  (CC_IS_GCC && GCC_VERSION > 100100) || (CC_IS_CLANG && CLANG_VERSION >= 100000)
 +	help
 +
@@ -437,6 +465,7 @@ REFERENCES
 +
 +config MSAPPHIRERAPIDS
 +	bool "Intel Sapphire Rapids"
++	depends on X86_64
 +	depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
 +	help
 +
@@ -446,6 +475,7 @@ REFERENCES
 +
 +config MROCKETLAKE
 +	bool "Intel Rocket Lake"
++	depends on X86_64
 +	depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
 +	help
 +
@@ -455,6 +485,7 @@ REFERENCES
 +
 +config MALDERLAKE
 +	bool "Intel Alder Lake"
++	depends on X86_64
 +	depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
 +	help
 +
@@ -464,6 +495,7 @@ REFERENCES
 +
 +config MRAPTORLAKE
 +	bool "Intel Raptor Lake"
++	depends on X86_64
 +	depends on (CC_IS_GCC && GCC_VERSION >= 130000) || (CC_IS_CLANG && CLANG_VERSION >= 150500)
 +	help
 +
@@ -473,6 +505,7 @@ REFERENCES
 +
 +config MMETEORLAKE
 +	bool "Intel Meteor Lake"
++	depends on X86_64
 +	depends on (CC_IS_GCC && GCC_VERSION >= 130000) || (CC_IS_CLANG && CLANG_VERSION >= 150500)
 +	help
 +
@@ -482,46 +515,26 @@ REFERENCES
 +
 +config MEMERALDRAPIDS
 +	bool "Intel Emerald Rapids"
++	depends on X86_64
 +	depends on (CC_IS_GCC && GCC_VERSION > 130000) || (CC_IS_CLANG && CLANG_VERSION >= 150500)
 +	help
 +
-+	  Select this for fifth-generation 10 nm process processors in the Emerald Rapids family.
++	  Select this for fifth-generation Xeon Scalable processors in the Emerald Rapids family.
 +
 +	  Enables -march=emeraldrapids
- 
- config GENERIC_CPU
- 	bool "Generic-x86-64"
-@@ -294,6 +589,26 @@ config GENERIC_CPU
- 	  Generic x86-64 CPU.
- 	  Run equally well on all x86-64 CPUs.
- 
-+config MNATIVE_INTEL
-+	bool "Intel-Native optimizations autodetected by the compiler"
++
++config MDIAMONDRAPIDS
++	bool "Intel Diamond Rapids (7th Gen Xeon Scalable)"
++	depends on X86_64
++	depends on (CC_IS_GCC && GCC_VERSION > 150000) || (CC_IS_CLANG && CLANG_VERSION >= 200000)
 +	help
 +
-+	  Clang 3.8, GCC 4.2 and above support -march=native, which automatically detects
-+	  the optimum settings to use based on your processor. Do NOT use this
-+	  for AMD CPUs.  Intel Only!
++	  Select this for seventh-generation Xeon Scalable processors in the Diamond Rapids family.
 +
-+	  Enables -march=native
++	  Enables -march=diamondrapids
 +
-+config MNATIVE_AMD
-+	bool "AMD-Native optimizations autodetected by the compiler"
-+	help
++endchoice
 +
-+	  Clang 3.8, GCC 4.2 and above support -march=native, which automatically detects
-+	  the optimum settings to use based on your processor. Do NOT use this
-+	  for Intel CPUs.  AMD Only!
-+
-+	  Enables -march=native
-+
- endchoice
- 
- config X86_GENERIC
-@@ -308,6 +623,30 @@ config X86_GENERIC
- 	  This is really intended for distributors who need more
- 	  generic optimizations.
- 
 +config X86_64_VERSION
 +	int "x86-64 compiler ISA level"
 +	range 1 3
@@ -531,7 +544,7 @@ REFERENCES
 +	  Specify a specific x86-64 compiler ISA level.
 +
 +	  There are three x86-64 ISA levels that work on top of
-+	  the x86-64 baseline, namely: x86-64-v2, x86-64-v3, and x86-64-v4.
++	  the x86-64 baseline, namely: x86-64-v2 and x86-64-v3.
 +
 +	  x86-64-v2 brings support for vector instructions up to Streaming SIMD
 +	  Extensions 4.2 (SSE4.2) and Supplemental Streaming SIMD Extensions 3
@@ -549,218 +562,278 @@ REFERENCES
  #
  # Define implied options from the CPU selection here
  config X86_INTERNODE_CACHE_SHIFT
-@@ -318,7 +657,7 @@ config X86_INTERNODE_CACHE_SHIFT
+@@ -290,8 +701,8 @@ config X86_INTERNODE_CACHE_SHIFT
+ 
  config X86_L1_CACHE_SHIFT
  	int
- 	default "7" if MPENTIUM4 || MPSC
--	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
-+	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MZEN4 || MZEN5 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE_CLIENT || MICELAKE_SERVER || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MNATIVE_INTEL || MNATIVE_AMD
+-	default "7" if MPENTIUM4
+-	default "6" if MK7 || MPENTIUMM || MATOM || MVIAC7 || X86_GENERIC || X86_64
++	default "7" if MPENTIUM4 || MPSC
++	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MZEN4 || MZEN5 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE_CLIENT || MICELAKE_SERVER || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MDIAMONDRAPIDS || X86_NATIVE_CPU
  	default "4" if MELAN || M486SX || M486 || MGEODEGX1
  	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
  
-@@ -336,11 +675,11 @@ config X86_ALIGNMENT_16
+@@ -309,19 +720,19 @@ config X86_ALIGNMENT_16
  
  config X86_INTEL_USERCOPY
  	def_bool y
--	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2
-+	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE_CLIENT || MICELAKE_SERVER || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MNATIVE_INTEL
+-	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK7 || MEFFICEON
++	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE_CLIENT || MICELAKE_SERVER || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MDIAMONDRAPIDS
  
  config X86_USE_PPRO_CHECKSUM
  	def_bool y
--	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM
-+	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MZEN4 || MZEN5 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE_CLIENT || MICELAKE_SERVER || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MNATIVE_INTEL || MNATIVE_AMD
+-	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MATOM
++	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MZEN4 || MZEN5 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE_CLIENT || MICELAKE_SERVER || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MDIAMONDRAPIDS
+ 
+ config X86_TSC
+ 	def_bool y
+-	depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MATOM) || X86_64
++	depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM) || X86_64
+ 
+ config X86_HAVE_PAE
+ 	def_bool y
+-	depends on MCRUSOE || MEFFICEON || MCYRIXIII || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC7 || MATOM || X86_64
++	depends on MCRUSOE || MEFFICEON || MCYRIXIII || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC7 || MCORE2 || MATOM || X86_64
+ 
+ config X86_CX8
+ 	def_bool y
+@@ -331,12 +742,12 @@ config X86_CX8
+ # generates cmov.
+ config X86_CMOV
+ 	def_bool y
+-	depends on (MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || MATOM || MGEODE_LX || X86_64)
++	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
+ 
+ config X86_MINIMUM_CPU_FAMILY
+ 	int
+ 	default "64" if X86_64
+-	default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MK7)
++	default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MCORE2 || MK7 || MK8)
+ 	default "5" if X86_32 && X86_CX8
+ 	default "4"
  
- #
- # P6_NOPs are a relatively minor optimization that require a family >=
 --- a/arch/x86/Makefile
 +++ b/arch/x86/Makefile
-@@ -182,15 +182,98 @@ else
-         cflags-$(CONFIG_MK8)		+= -march=k8
-         cflags-$(CONFIG_MPSC)		+= -march=nocona
-         cflags-$(CONFIG_MCORE2)		+= -march=core2
--        cflags-$(CONFIG_MATOM)		+= -march=atom
--        cflags-$(CONFIG_GENERIC_CPU)	+= -mtune=generic
-+        cflags-$(CONFIG_MATOM)		+= -march=bonnell
-+        ifeq ($(CONFIG_X86_64_VERSION),1)
-+          cflags-$(CONFIG_GENERIC_CPU)		+= -mtune=generic
-+          rustflags-$(CONFIG_GENERIC_CPU)	+= -Ztune-cpu=generic
-+        else
-+          cflags-$(CONFIG_GENERIC_CPU)		+= -march=x86-64-v$(CONFIG_X86_64_VERSION)
-+          rustflags-$(CONFIG_GENERIC_CPU)	+= -Ctarget-cpu=x86-64-v$(CONFIG_X86_64_VERSION)
-+        endif
-+        cflags-$(CONFIG_MK8SSE3)	+= -march=k8-sse3
-+        cflags-$(CONFIG_MK10) 		+= -march=amdfam10
-+        cflags-$(CONFIG_MBARCELONA) 	+= -march=barcelona
-+        cflags-$(CONFIG_MBOBCAT) 	+= -march=btver1
-+        cflags-$(CONFIG_MJAGUAR) 	+= -march=btver2
-+        cflags-$(CONFIG_MBULLDOZER) 	+= -march=bdver1
-+        cflags-$(CONFIG_MPILEDRIVER)	+= -march=bdver2 -mno-tbm
-+        cflags-$(CONFIG_MSTEAMROLLER) 	+= -march=bdver3 -mno-tbm
-+        cflags-$(CONFIG_MEXCAVATOR) 	+= -march=bdver4 -mno-tbm
-+        cflags-$(CONFIG_MZEN) 		+= -march=znver1
-+        cflags-$(CONFIG_MZEN2) 	+= -march=znver2
-+        cflags-$(CONFIG_MZEN3) 	+= -march=znver3
-+        cflags-$(CONFIG_MZEN4) 	+= -march=znver4
-+        cflags-$(CONFIG_MZEN5) 	+= -march=znver5
-+        cflags-$(CONFIG_MNATIVE_INTEL) += -march=native
-+        cflags-$(CONFIG_MNATIVE_AMD) 	+= -march=native -mno-tbm
-+        cflags-$(CONFIG_MNEHALEM) 	+= -march=nehalem
-+        cflags-$(CONFIG_MWESTMERE) 	+= -march=westmere
-+        cflags-$(CONFIG_MSILVERMONT) 	+= -march=silvermont
-+        cflags-$(CONFIG_MGOLDMONT) 	+= -march=goldmont
-+        cflags-$(CONFIG_MGOLDMONTPLUS) += -march=goldmont-plus
-+        cflags-$(CONFIG_MSANDYBRIDGE) 	+= -march=sandybridge
-+        cflags-$(CONFIG_MIVYBRIDGE) 	+= -march=ivybridge
-+        cflags-$(CONFIG_MHASWELL) 	+= -march=haswell
-+        cflags-$(CONFIG_MBROADWELL) 	+= -march=broadwell
-+        cflags-$(CONFIG_MSKYLAKE) 	+= -march=skylake
-+        cflags-$(CONFIG_MSKYLAKEX) 	+= -march=skylake-avx512
-+        cflags-$(CONFIG_MCANNONLAKE) 	+= -march=cannonlake
-+        cflags-$(CONFIG_MICELAKE_CLIENT) 	+= -march=icelake-client
-+        cflags-$(CONFIG_MICELAKE_SERVER) 	+= -march=icelake-server
-+        cflags-$(CONFIG_MCASCADELAKE) 	+= -march=cascadelake
-+        cflags-$(CONFIG_MCOOPERLAKE) 	+= -march=cooperlake
-+        cflags-$(CONFIG_MTIGERLAKE) 	+= -march=tigerlake
-+        cflags-$(CONFIG_MSAPPHIRERAPIDS) += -march=sapphirerapids
-+        cflags-$(CONFIG_MROCKETLAKE) 	+= -march=rocketlake
-+        cflags-$(CONFIG_MALDERLAKE) 	+= -march=alderlake
-+        cflags-$(CONFIG_MRAPTORLAKE) 	+= -march=raptorlake
-+        cflags-$(CONFIG_MMETEORLAKE) 	+= -march=meteorlake
-+        cflags-$(CONFIG_MEMERALDRAPIDS)	+= -march=emeraldrapids
-         KBUILD_CFLAGS += $(cflags-y)
- 
-         rustflags-$(CONFIG_MK8)		+= -Ctarget-cpu=k8
-         rustflags-$(CONFIG_MPSC)	+= -Ctarget-cpu=nocona
-         rustflags-$(CONFIG_MCORE2)	+= -Ctarget-cpu=core2
-         rustflags-$(CONFIG_MATOM)	+= -Ctarget-cpu=atom
--        rustflags-$(CONFIG_GENERIC_CPU)	+= -Ztune-cpu=generic
-+        rustflags-$(CONFIG_MK8SSE3)	+= -Ctarget-cpu=k8-sse3
-+        rustflags-$(CONFIG_MK10) 		+= -Ctarget-cpu=amdfam10
-+        rustflags-$(CONFIG_MBARCELONA) 	+= -Ctarget-cpu=barcelona
-+        rustflags-$(CONFIG_MBOBCAT) 	+= -Ctarget-cpu=btver1
-+        rustflags-$(CONFIG_MJAGUAR) 	+= -Ctarget-cpu=btver2
-+        rustflags-$(CONFIG_MBULLDOZER) 	+= -Ctarget-cpu=bdver1
-+        rustflags-$(CONFIG_MPILEDRIVER)	+= -Ctarget-cpu=bdver2
-+        rustflags-$(CONFIG_MSTEAMROLLER) 	+= -Ctarget-cpu=bdver3
-+        rustflags-$(CONFIG_MEXCAVATOR) 	+= -Ctarget-cpu=bdver4
-+        rustflags-$(CONFIG_MZEN) 		+= -Ctarget-cpu=znver1
-+        rustflags-$(CONFIG_MZEN2) 	+= -Ctarget-cpu=znver2
-+        rustflags-$(CONFIG_MZEN3) 	+= -Ctarget-cpu=znver3
-+        rustflags-$(CONFIG_MZEN4) 	+= -Ctarget-cpu=znver4
-+        rustflags-$(CONFIG_MZEN5) 	+= -Ctarget-cpu=znver5
-+        rustflags-$(CONFIG_MNATIVE_INTEL) += -Ctarget-cpu=native
-+        rustflags-$(CONFIG_MNATIVE_AMD) 	+= -Ctarget-cpu=native
-+        rustflags-$(CONFIG_MNEHALEM) 	+= -Ctarget-cpu=nehalem
-+        rustflags-$(CONFIG_MWESTMERE) 	+= -Ctarget-cpu=westmere
-+        rustflags-$(CONFIG_MSILVERMONT) 	+= -Ctarget-cpu=silvermont
-+        rustflags-$(CONFIG_MGOLDMONT) 	+= -Ctarget-cpu=goldmont
-+        rustflags-$(CONFIG_MGOLDMONTPLUS) += -Ctarget-cpu=goldmont-plus
-+        rustflags-$(CONFIG_MSANDYBRIDGE) 	+= -Ctarget-cpu=sandybridge
-+        rustflags-$(CONFIG_MIVYBRIDGE) 	+= -Ctarget-cpu=ivybridge
-+        rustflags-$(CONFIG_MHASWELL) 	+= -Ctarget-cpu=haswell
-+        rustflags-$(CONFIG_MBROADWELL) 	+= -Ctarget-cpu=broadwell
-+        rustflags-$(CONFIG_MSKYLAKE) 	+= -Ctarget-cpu=skylake
-+        rustflags-$(CONFIG_MSKYLAKEX) 	+= -Ctarget-cpu=skylake-avx512
-+        rustflags-$(CONFIG_MCANNONLAKE) 	+= -Ctarget-cpu=cannonlake
-+        rustflags-$(CONFIG_MICELAKE_CLIENT) 	+= -Ctarget-cpu=icelake-client
-+        rustflags-$(CONFIG_MICELAKE_SERVER) 	+= -Ctarget-cpu=icelake-server
-+        rustflags-$(CONFIG_MCASCADELAKE) 	+= -Ctarget-cpu=cascadelake
-+        rustflags-$(CONFIG_MCOOPERLAKE) 	+= -Ctarget-cpu=cooperlake
-+        rustflags-$(CONFIG_MTIGERLAKE) 	+= -Ctarget-cpu=tigerlake
-+        rustflags-$(CONFIG_MSAPPHIRERAPIDS) += -Ctarget-cpu=sapphirerapids
-+        rustflags-$(CONFIG_MROCKETLAKE) 	+= -Ctarget-cpu=rocketlake
-+        rustflags-$(CONFIG_MALDERLAKE) 	+= -Ctarget-cpu=alderlake
-+        rustflags-$(CONFIG_MRAPTORLAKE) 	+= -Ctarget-cpu=raptorlake
-+        rustflags-$(CONFIG_MMETEORLAKE) 	+= -Ctarget-cpu=meteorlake
-+        rustflags-$(CONFIG_MEMERALDRAPIDS)	+= -Ctarget-cpu=emeraldrapids
-         KBUILD_RUSTFLAGS += $(rustflags-y)
- 
+@@ -177,10 +177,221 @@ ifdef CONFIG_X86_NATIVE_CPU
+         KBUILD_CFLAGS += -march=native
+         KBUILD_RUSTFLAGS += -Ctarget-cpu=native
+ else
++ifdef CONFIG_MK8
++        KBUILD_CFLAGS += -march=k8
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=k8
++endif
++
++ifdef CONFIG_MK8SSE3
++        KBUILD_CFLAGS += -march=k8-sse3
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=k8-sse3
++endif
++
++ifdef CONFIG_MK10
++        KBUILD_CFLAGS += -march=amdfam10
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=amdfam10
++endif
++
++ifdef CONFIG_MBARCELONA
++        KBUILD_CFLAGS += -march=barcelona
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=barcelona
++endif
++
++ifdef CONFIG_MBOBCAT
++        KBUILD_CFLAGS += -march=btver1
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=btver1
++endif
++
++ifdef CONFIG_MJAGUAR
++        KBUILD_CFLAGS += -march=btver2
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=btver2
++endif
++
++ifdef CONFIG_MBULLDOZER
++        KBUILD_CFLAGS += -march=bdver1
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=bdver1
++endif
++
++ifdef CONFIG_MPILEDRIVER
++        KBUILD_CFLAGS += -march=bdver2 -mno-tbm
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=bdver2 -mno-tbm
++endif
++
++ifdef CONFIG_MSTEAMROLLER
++        KBUILD_CFLAGS += -march=bdver3 -mno-tbm
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=bdver3 -mno-tbm
++endif
++
++ifdef CONFIG_MEXCAVATOR
++        KBUILD_CFLAGS += -march=bdver4 -mno-tbm
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=bdver4 -mno-tbm
++endif
++
++ifdef CONFIG_MZEN
++        KBUILD_CFLAGS += -march=znver1
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=znver1
++endif
++
++ifdef CONFIG_MZEN2
++        KBUILD_CFLAGS += -march=znver2
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=znver2
++endif
++
++ifdef CONFIG_MZEN3
++        KBUILD_CFLAGS += -march=znver3
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=znver3
++endif
++
++ifdef CONFIG_MZEN4
++        KBUILD_CFLAGS += -march=znver4
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=znver4
++endif
++
++ifdef CONFIG_MZEN5
++        KBUILD_CFLAGS += -march=znver5
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=znver5
++endif
++
++ifdef CONFIG_MPSC
++        KBUILD_CFLAGS += -march=nocona
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=nocona
++endif
++
++ifdef CONFIG_MCORE2
++        KBUILD_CFLAGS += -march=core2
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=core2
++endif
++
++ifdef CONFIG_MNEHALEM
++        KBUILD_CFLAGS += -march=nehalem
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=nehalem
++endif
++
++ifdef CONFIG_MWESTMERE
++        KBUILD_CFLAGS += -march=westmere
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=westmere
++endif
++
++ifdef CONFIG_MSILVERMONT
++        KBUILD_CFLAGS += -march=silvermont
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=silvermont
++endif
++
++ifdef CONFIG_MGOLDMONT
++        KBUILD_CFLAGS += -march=goldmont
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=goldmont
++endif
++
++ifdef CONFIG_MGOLDMONTPLUS
++        KBUILD_CFLAGS += -march=goldmont-plus
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=goldmont-plus
++endif
++
++ifdef CONFIG_MSANDYBRIDGE
++        KBUILD_CFLAGS += -march=sandybridge
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=sandybridge
++endif
++
++ifdef CONFIG_MIVYBRIDGE
++        KBUILD_CFLAGS += -march=ivybridge
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=ivybridge
++endif
++
++ifdef CONFIG_MHASWELL
++        KBUILD_CFLAGS += -march=haswell
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=haswell
++endif
++
++ifdef CONFIG_MBROADWELL
++        KBUILD_CFLAGS += -march=broadwell
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=broadwell
++endif
++
++ifdef CONFIG_MSKYLAKE
++        KBUILD_CFLAGS += -march=skylake
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=skylake
++endif
++
++ifdef CONFIG_MSKYLAKEX
++        KBUILD_CFLAGS += -march=skylake-avx512
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=skylake-avx512
++endif
++
++ifdef CONFIG_MCANNONLAKE
++        KBUILD_CFLAGS += -march=cannonlake
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=cannonlake
++endif
++
++ifdef CONFIG_MICELAKE_CLIENT
++        KBUILD_CFLAGS += -march=icelake-client
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=icelake-client
++endif
++
++ifdef CONFIG_MICELAKE_SERVER
++        KBUILD_CFLAGS += -march=icelake-server
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=icelake-server
++endif
++
++ifdef CONFIG_MCOOPERLAKE
++        KBUILD_CFLAGS += -march=cooperlake
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=cooperlake
++endif
++
++ifdef CONFIG_MCASCADELAKE
++        KBUILD_CFLAGS += -march=cascadelake
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=cascadelake
++endif
++
++ifdef CONFIG_MTIGERLAKE
++        KBUILD_CFLAGS += -march=tigerlake
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=tigerlake
++endif
++
++ifdef CONFIG_MSAPPHIRERAPIDS
++        KBUILD_CFLAGS += -march=sapphirerapids
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=sapphirerapids
++endif
++
++ifdef CONFIG_MROCKETLAKE
++        KBUILD_CFLAGS += -march=rocketlake
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=rocketlake
++endif
++
++ifdef CONFIG_MALDERLAKE
++        KBUILD_CFLAGS += -march=alderlake
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=alderlake
++endif
++
++ifdef CONFIG_MRAPTORLAKE
++        KBUILD_CFLAGS += -march=raptorlake
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=raptorlake
++endif
++
++ifdef CONFIG_MMETEORLAKE
++        KBUILD_CFLAGS += -march=meteorlake
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=meteorlake
++endif
++
++ifdef CONFIG_MEMERALDRAPIDS
++        KBUILD_CFLAGS += -march=emeraldrapids
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=emeraldrapids
++endif
++
++ifdef CONFIG_MDIAMONDRAPIDS
++        KBUILD_CFLAGS += -march=diamondrapids
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=diamondrapids
++endif
++
++ifdef CONFIG_GENERIC_CPU
++ifeq ($(CONFIG_X86_64_VERSION),1)
+         KBUILD_CFLAGS += -march=x86-64 -mtune=generic
+         KBUILD_RUSTFLAGS += -Ctarget-cpu=x86-64 -Ztune-cpu=generic
++else
++        KBUILD_CFLAGS +=-march=x86-64-v$(CONFIG_X86_64_VERSION)
++        KBUILD_RUSTFLAGS += -Ctarget-cpu=x86-64-v$(CONFIG_X86_64_VERSION)
++endif
++endif
+ endif
+-
          KBUILD_CFLAGS += -mno-red-zone
---- a/arch/x86/include/asm/vermagic.h
-+++ b/arch/x86/include/asm/vermagic.h
-@@ -17,6 +17,56 @@
- #define MODULE_PROC_FAMILY "586MMX "
- #elif defined CONFIG_MCORE2
- #define MODULE_PROC_FAMILY "CORE2 "
-+#elif defined CONFIG_MNATIVE_INTEL
-+#define MODULE_PROC_FAMILY "NATIVE_INTEL "
-+#elif defined CONFIG_MNATIVE_AMD
-+#define MODULE_PROC_FAMILY "NATIVE_AMD "
-+#elif defined CONFIG_MNEHALEM
-+#define MODULE_PROC_FAMILY "NEHALEM "
-+#elif defined CONFIG_MWESTMERE
-+#define MODULE_PROC_FAMILY "WESTMERE "
-+#elif defined CONFIG_MSILVERMONT
-+#define MODULE_PROC_FAMILY "SILVERMONT "
-+#elif defined CONFIG_MGOLDMONT
-+#define MODULE_PROC_FAMILY "GOLDMONT "
-+#elif defined CONFIG_MGOLDMONTPLUS
-+#define MODULE_PROC_FAMILY "GOLDMONTPLUS "
-+#elif defined CONFIG_MSANDYBRIDGE
-+#define MODULE_PROC_FAMILY "SANDYBRIDGE "
-+#elif defined CONFIG_MIVYBRIDGE
-+#define MODULE_PROC_FAMILY "IVYBRIDGE "
-+#elif defined CONFIG_MHASWELL
-+#define MODULE_PROC_FAMILY "HASWELL "
-+#elif defined CONFIG_MBROADWELL
-+#define MODULE_PROC_FAMILY "BROADWELL "
-+#elif defined CONFIG_MSKYLAKE
-+#define MODULE_PROC_FAMILY "SKYLAKE "
-+#elif defined CONFIG_MSKYLAKEX
-+#define MODULE_PROC_FAMILY "SKYLAKEX "
-+#elif defined CONFIG_MCANNONLAKE
-+#define MODULE_PROC_FAMILY "CANNONLAKE "
-+#elif defined CONFIG_MICELAKE_CLIENT
-+#define MODULE_PROC_FAMILY "ICELAKE_CLIENT "
-+#elif defined CONFIG_MICELAKE_SERVER
-+#define MODULE_PROC_FAMILY "ICELAKE_SERVER "
-+#elif defined CONFIG_MCASCADELAKE
-+#define MODULE_PROC_FAMILY "CASCADELAKE "
-+#elif defined CONFIG_MCOOPERLAKE
-+#define MODULE_PROC_FAMILY "COOPERLAKE "
-+#elif defined CONFIG_MTIGERLAKE
-+#define MODULE_PROC_FAMILY "TIGERLAKE "
-+#elif defined CONFIG_MSAPPHIRERAPIDS
-+#define MODULE_PROC_FAMILY "SAPPHIRERAPIDS "
-+#elif defined CONFIG_ROCKETLAKE
-+#define MODULE_PROC_FAMILY "ROCKETLAKE "
-+#elif defined CONFIG_MALDERLAKE
-+#define MODULE_PROC_FAMILY "ALDERLAKE "
-+#elif defined CONFIG_MRAPTORLAKE
-+#define MODULE_PROC_FAMILY "RAPTORLAKE "
-+#elif defined CONFIG_MMETEORLAKE
-+#define MODULE_PROC_FAMILY "METEORLAKE "
-+#elif defined CONFIG_MEMERALDRAPIDS
-+#define MODULE_PROC_FAMILY "EMERALDRAPIDS "
- #elif defined CONFIG_MATOM
- #define MODULE_PROC_FAMILY "ATOM "
- #elif defined CONFIG_M686
-@@ -35,6 +85,28 @@
- #define MODULE_PROC_FAMILY "K7 "
- #elif defined CONFIG_MK8
- #define MODULE_PROC_FAMILY "K8 "
-+#elif defined CONFIG_MK8SSE3
-+#define MODULE_PROC_FAMILY "K8SSE3 "
-+#elif defined CONFIG_MK10
-+#define MODULE_PROC_FAMILY "K10 "
-+#elif defined CONFIG_MBARCELONA
-+#define MODULE_PROC_FAMILY "BARCELONA "
-+#elif defined CONFIG_MBOBCAT
-+#define MODULE_PROC_FAMILY "BOBCAT "
-+#elif defined CONFIG_MBULLDOZER
-+#define MODULE_PROC_FAMILY "BULLDOZER "
-+#elif defined CONFIG_MPILEDRIVER
-+#define MODULE_PROC_FAMILY "PILEDRIVER "
-+#elif defined CONFIG_MSTEAMROLLER
-+#define MODULE_PROC_FAMILY "STEAMROLLER "
-+#elif defined CONFIG_MJAGUAR
-+#define MODULE_PROC_FAMILY "JAGUAR "
-+#elif defined CONFIG_MEXCAVATOR
-+#define MODULE_PROC_FAMILY "EXCAVATOR "
-+#elif defined CONFIG_MZEN
-+#define MODULE_PROC_FAMILY "ZEN "
-+#elif defined CONFIG_MZEN2
-+#define MODULE_PROC_FAMILY "ZEN2 "
- #elif defined CONFIG_MELAN
- #define MODULE_PROC_FAMILY "ELAN "
- #elif defined CONFIG_MCRUSOE
+         KBUILD_CFLAGS += -mcmodel=kernel
+         KBUILD_RUSTFLAGS += -Cno-redzone=y

debian/patches/mixed-arch/0002-ZEN-Restore-CONFIG_OPTIMIZE_FOR_PERFORMANCE_O3.patch

@@ -1,4 +1,4 @@
-From f4f448a305e9d705b9a0da102ddfd58bfaac5cc0 Mon Sep 17 00:00:00 2001
+From 15db9c3419fd147812151d95fb34bbd70f2f9715 Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
 Date: Sun, 11 Dec 2022 23:51:16 +0100
 Subject: ZEN: Restore CONFIG_OPTIMIZE_FOR_PERFORMANCE_O3
@@ -13,7 +13,7 @@ dependency on CONFIG_ARC and adds RUSTFLAGS.
 
 --- a/Makefile
 +++ b/Makefile
-@@ -871,6 +871,9 @@ KBUILD_CFLAGS	+= -fno-delete-null-pointe
+@@ -873,6 +873,9 @@ KBUILD_CFLAGS	+= -fno-delete-null-pointe
  ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
  KBUILD_CFLAGS += -O2
  KBUILD_RUSTFLAGS += -Copt-level=2
@@ -25,7 +25,7 @@ dependency on CONFIG_ARC and adds RUSTFLAGS.
  KBUILD_RUSTFLAGS += -Copt-level=s
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1473,6 +1473,12 @@ config CC_OPTIMIZE_FOR_PERFORMANCE
+@@ -1498,6 +1498,12 @@ config CC_OPTIMIZE_FOR_PERFORMANCE
  	  with the "-O2" compiler flag for best performance and most
  	  helpful compile-time warnings.
  

debian/patches/mixed-arch/0003-krd-adjust-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3.patch

@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -879,6 +879,10 @@ KBUILD_CFLAGS += -Os
+@@ -881,6 +881,10 @@ KBUILD_CFLAGS += -Os
  KBUILD_RUSTFLAGS += -Copt-level=s
  endif
  

debian/patches/mixed-arch/0004-XANMOD-x86-build-Prevent-generating-avx2-and-avx512-.patch

@@ -1,24 +0,0 @@
-From 3ebc1fdf3e0ee9bff1efe20eb5791eba5c84a810 Mon Sep 17 00:00:00 2001
-From: Alexandre Frade <kernel@xanmod.org>
-Date: Thu, 3 Aug 2023 13:53:49 +0000
-Subject: XANMOD: x86/build: Prevent generating avx2 and avx512 floating-point code
-
-Signed-off-by: Alexandre Frade <kernel@xanmod.org>
----
- arch/x86/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/x86/Makefile
-+++ b/arch/x86/Makefile
-@@ -74,9 +74,9 @@ export BITS
- #
- #    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53383
- #
--KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx
-+KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx -mno-avx2 -mno-avx512f
- KBUILD_RUSTFLAGS += --target=$(objtree)/scripts/target.json
--KBUILD_RUSTFLAGS += -Ctarget-feature=-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2
-+KBUILD_RUSTFLAGS += -Ctarget-feature=-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,-avx512f
- 
- #
- # CFLAGS for compiling floating point code inside the kernel.

debian/patches/mixed-arch/0004-XANMOD-x86-build-prevent-generating-avx2-floating-point-code.patch

@@ -0,0 +1,22 @@
+From 40f9fa82bb21a5e3f17f539897128a69824ad8ef Mon Sep 17 00:00:00 2001
+From: Alexandre Frade <kernel@xanmod.org>
+Date: Mon, 18 Nov 2024 20:17:44 +0000
+Subject: [PATCH 1/4] XANMOD: x86/build: Prevent generating avx2 floating-point
+ code
+
+Signed-off-by: Alexandre Frade <kernel@xanmod.org>
+---
+ arch/x86/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/Makefile
++++ b/arch/x86/Makefile
+@@ -74,7 +74,7 @@ export BITS
+ #
+ #    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53383
+ #
+-KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx
++KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx -mno-avx2
+ KBUILD_RUSTFLAGS += --target=$(objtree)/scripts/target.json
+ KBUILD_RUSTFLAGS += -Ctarget-feature=-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2
+ 

debian/patches/mixed-arch/0005-krd-adjust-KBUILD_CFLAGS-fno-tree-vectorize.patch

@@ -4,8 +4,8 @@
  #
  #    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53383
  #
--KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx -mno-avx2 -mno-avx512f
-+KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx -mno-avx2 -mno-avx512f -fno-tree-vectorize
+-KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx -mno-avx2
++KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx -mno-avx2 -fno-tree-vectorize
  KBUILD_RUSTFLAGS += --target=$(objtree)/scripts/target.json
- KBUILD_RUSTFLAGS += -Ctarget-feature=-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,-avx512f
+ KBUILD_RUSTFLAGS += -Ctarget-feature=-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2
  

debian/patches/mixed-arch/0006-XANMOD-kbuild-add-GCC-SMS-based-modulo-scheduling-flags.patch

@@ -1,7 +1,8 @@
-From b1a99a2a9675f80b7c04a239a6b047373ccf3a17 Mon Sep 17 00:00:00 2001
+From 7e45fca50a3151248266bca7058e1efa9b5233ca Mon Sep 17 00:00:00 2001
 From: Alexandre Frade <kernel@xanmod.org>
 Date: Mon, 16 Sep 2024 00:55:35 +0000
-Subject: XANMOD: kbuild: Add GCC SMS-based modulo scheduling flags
+Subject: [PATCH 02/19] XANMOD: kbuild: Add GCC SMS-based modulo scheduling
+ flags
 
 Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 ---
@@ -10,7 +11,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -883,6 +883,13 @@ ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
+@@ -885,6 +885,13 @@ ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
  KBUILD_CFLAGS += $(call cc-option,-fivopts)
  endif
  

debian/patches/patchset-pf/amd-pstate/0001-cpufreq-amd-pstate-Remove-the-redundant-des_perf-cla.patch

@@ -1,27 +0,0 @@
-From cb40e98d75a75567cbd10f9fc69c2ec12c87a445 Mon Sep 17 00:00:00 2001
-From: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Date: Wed, 5 Feb 2025 11:25:15 +0000
-Subject: cpufreq/amd-pstate: Remove the redundant des_perf clamping in
- adjust_perf
-
-des_perf is later on clamped between min_perf and max_perf in
-amd_pstate_update. So, remove the redundant clamping from
-amd_pstate_adjust_perf.
-
-Signed-off-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -705,8 +705,6 @@ static void amd_pstate_adjust_perf(unsig
- 	if (max_perf < min_perf)
- 		max_perf = min_perf;
- 
--	des_perf = clamp_t(unsigned long, des_perf, min_perf, max_perf);
--
- 	amd_pstate_update(cpudata, min_perf, des_perf, max_perf, true,
- 			policy->governor->flags);
- 	cpufreq_cpu_put(policy);

debian/patches/patchset-pf/amd-pstate/0002-cpufreq-amd-pstate-Modularize-perf-freq-conversion.patch

@@ -1,133 +0,0 @@
-From f58e440e56a6c8a2c04894e5d169d1a98a8ce74f Mon Sep 17 00:00:00 2001
-From: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Date: Wed, 5 Feb 2025 11:25:18 +0000
-Subject: cpufreq/amd-pstate: Modularize perf<->freq conversion
-
-Delegate the perf<->frequency conversion to helper functions to reduce
-code duplication, and improve readability.
-
-Signed-off-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 57 +++++++++++++++++++-----------------
- 1 file changed, 30 insertions(+), 27 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -142,6 +142,20 @@ static struct quirk_entry quirk_amd_7k62
- 	.lowest_freq = 550,
- };
- 
-+static inline u8 freq_to_perf(struct amd_cpudata *cpudata, unsigned int freq_val)
-+{
-+	u8 perf_val = DIV_ROUND_UP_ULL((u64)freq_val * cpudata->nominal_perf,
-+					cpudata->nominal_freq);
-+
-+	return clamp_t(u8, perf_val, cpudata->lowest_perf, cpudata->highest_perf);
-+}
-+
-+static inline u32 perf_to_freq(struct amd_cpudata *cpudata, u8 perf_val)
-+{
-+	return DIV_ROUND_UP_ULL((u64)cpudata->nominal_freq * perf_val,
-+				cpudata->nominal_perf);
-+}
-+
- static int __init dmi_matched_7k62_bios_bug(const struct dmi_system_id *dmi)
- {
- 	/**
-@@ -534,7 +548,6 @@ static inline bool amd_pstate_sample(str
- static void amd_pstate_update(struct amd_cpudata *cpudata, u8 min_perf,
- 			      u8 des_perf, u8 max_perf, bool fast_switch, int gov_flags)
- {
--	unsigned long max_freq;
- 	struct cpufreq_policy *policy = cpufreq_cpu_get(cpudata->cpu);
- 	u8 nominal_perf = READ_ONCE(cpudata->nominal_perf);
- 
-@@ -543,8 +556,7 @@ static void amd_pstate_update(struct amd
- 
- 	des_perf = clamp_t(u8, des_perf, min_perf, max_perf);
- 
--	max_freq = READ_ONCE(cpudata->max_limit_freq);
--	policy->cur = div_u64(des_perf * max_freq, max_perf);
-+	policy->cur = perf_to_freq(cpudata, des_perf);
- 
- 	if ((cppc_state == AMD_PSTATE_GUIDED) && (gov_flags & CPUFREQ_GOV_DYNAMIC_SWITCHING)) {
- 		min_perf = des_perf;
-@@ -594,14 +606,11 @@ static int amd_pstate_verify(struct cpuf
- 
- static int amd_pstate_update_min_max_limit(struct cpufreq_policy *policy)
- {
--	u8 max_limit_perf, min_limit_perf, max_perf;
--	u32 max_freq;
-+	u8 max_limit_perf, min_limit_perf;
- 	struct amd_cpudata *cpudata = policy->driver_data;
- 
--	max_perf = READ_ONCE(cpudata->highest_perf);
--	max_freq = READ_ONCE(cpudata->max_freq);
--	max_limit_perf = div_u64(policy->max * max_perf, max_freq);
--	min_limit_perf = div_u64(policy->min * max_perf, max_freq);
-+	max_limit_perf = freq_to_perf(cpudata, policy->max);
-+	min_limit_perf = freq_to_perf(cpudata, policy->min);
- 
- 	if (cpudata->policy == CPUFREQ_POLICY_PERFORMANCE)
- 		min_limit_perf = min(cpudata->nominal_perf, max_limit_perf);
-@@ -619,21 +628,15 @@ static int amd_pstate_update_freq(struct
- {
- 	struct cpufreq_freqs freqs;
- 	struct amd_cpudata *cpudata = policy->driver_data;
--	u8 des_perf, cap_perf;
--
--	if (!cpudata->max_freq)
--		return -ENODEV;
-+	u8 des_perf;
- 
- 	if (policy->min != cpudata->min_limit_freq || policy->max != cpudata->max_limit_freq)
- 		amd_pstate_update_min_max_limit(policy);
- 
--	cap_perf = READ_ONCE(cpudata->highest_perf);
--
- 	freqs.old = policy->cur;
- 	freqs.new = target_freq;
- 
--	des_perf = DIV_ROUND_CLOSEST(target_freq * cap_perf,
--				     cpudata->max_freq);
-+	des_perf = freq_to_perf(cpudata, target_freq);
- 
- 	WARN_ON(fast_switch && !policy->fast_switch_enabled);
- 	/*
-@@ -907,7 +910,6 @@ static int amd_pstate_init_freq(struct a
- {
- 	int ret;
- 	u32 min_freq, max_freq;
--	u8 highest_perf, nominal_perf, lowest_nonlinear_perf;
- 	u32 nominal_freq, lowest_nonlinear_freq;
- 	struct cppc_perf_caps cppc_perf;
- 
-@@ -925,16 +927,17 @@ static int amd_pstate_init_freq(struct a
- 	else
- 		nominal_freq = cppc_perf.nominal_freq;
- 
--	highest_perf = READ_ONCE(cpudata->highest_perf);
--	nominal_perf = READ_ONCE(cpudata->nominal_perf);
--	max_freq = div_u64((u64)highest_perf * nominal_freq, nominal_perf);
--
--	lowest_nonlinear_perf = READ_ONCE(cpudata->lowest_nonlinear_perf);
--	lowest_nonlinear_freq = div_u64((u64)nominal_freq * lowest_nonlinear_perf, nominal_perf);
--	WRITE_ONCE(cpudata->min_freq, min_freq * 1000);
--	WRITE_ONCE(cpudata->lowest_nonlinear_freq, lowest_nonlinear_freq * 1000);
--	WRITE_ONCE(cpudata->nominal_freq, nominal_freq * 1000);
--	WRITE_ONCE(cpudata->max_freq, max_freq * 1000);
-+	min_freq *= 1000;
-+	nominal_freq *= 1000;
-+
-+	WRITE_ONCE(cpudata->nominal_freq, nominal_freq);
-+	WRITE_ONCE(cpudata->min_freq, min_freq);
-+
-+	max_freq = perf_to_freq(cpudata, cpudata->highest_perf);
-+	lowest_nonlinear_freq = perf_to_freq(cpudata, cpudata->lowest_nonlinear_perf);
-+
-+	WRITE_ONCE(cpudata->lowest_nonlinear_freq, lowest_nonlinear_freq);
-+	WRITE_ONCE(cpudata->max_freq, max_freq);
- 
- 	/**
- 	 * Below values need to be initialized correctly, otherwise driver will fail to load

debian/patches/patchset-pf/amd-pstate/0003-cpufreq-amd-pstate-Remove-the-unnecessary-cpufreq_up.patch

@@ -1,37 +0,0 @@
-From 0a12d4a3ca1a996c1073d60c6775424972e8b7b9 Mon Sep 17 00:00:00 2001
-From: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Date: Wed, 5 Feb 2025 11:25:19 +0000
-Subject: cpufreq/amd-pstate: Remove the unnecessary cpufreq_update_policy call
-
-The update_limits callback is only called in two conditions.
-
-* When the preferred core rankings change. In which case, we just need to
-change the prefcore ranking in the cpudata struct. As there are no changes
-to any of the perf values, there is no need to call cpufreq_update_policy()
-
-* When the _PPC ACPI object changes, i.e. the highest allowed Pstate
-changes. The _PPC object is only used for a table based cpufreq driver
-like acpi-cpufreq, hence is irrelevant for CPPC based amd-pstate.
-
-Hence, the cpufreq_update_policy() call becomes unnecessary and can be
-removed.
-
-Signed-off-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 4 ----
- 1 file changed, 4 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -855,10 +855,6 @@ static void amd_pstate_update_limits(uns
- 			sched_set_itmt_core_prio((int)cur_high, cpu);
- 	}
- 	cpufreq_cpu_put(policy);
--
--	if (!highest_perf_changed)
--		cpufreq_update_policy(cpu);
--
- }
- 
- /*

debian/patches/patchset-pf/amd-pstate/0004-cpufreq-amd-pstate-Use-scope-based-cleanup-for-cpufr.patch

@@ -1,124 +0,0 @@
-From ab0520499c83ff44d468f1b2b604c85e2f78d694 Mon Sep 17 00:00:00 2001
-From: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Date: Wed, 5 Feb 2025 11:25:22 +0000
-Subject: cpufreq/amd-pstate: Use scope based cleanup for cpufreq_policy refs
-
-There have been instances in past where refcount decrementing is missed
-while exiting a function. Use automatic scope based cleanup to avoid
-such errors.
-
-Signed-off-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 25 ++++++++-----------------
- include/linux/cpufreq.h      |  3 +++
- 2 files changed, 11 insertions(+), 17 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -548,7 +548,7 @@ static inline bool amd_pstate_sample(str
- static void amd_pstate_update(struct amd_cpudata *cpudata, u8 min_perf,
- 			      u8 des_perf, u8 max_perf, bool fast_switch, int gov_flags)
- {
--	struct cpufreq_policy *policy = cpufreq_cpu_get(cpudata->cpu);
-+	struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpudata->cpu);
- 	u8 nominal_perf = READ_ONCE(cpudata->nominal_perf);
- 
- 	if (!policy)
-@@ -574,8 +574,6 @@ static void amd_pstate_update(struct amd
- 	}
- 
- 	amd_pstate_update_perf(cpudata, min_perf, des_perf, max_perf, 0, fast_switch);
--
--	cpufreq_cpu_put(policy);
- }
- 
- static int amd_pstate_verify(struct cpufreq_policy_data *policy_data)
-@@ -587,7 +585,8 @@ static int amd_pstate_verify(struct cpuf
- 	 * amd-pstate qos_requests.
- 	 */
- 	if (policy_data->min == FREQ_QOS_MIN_DEFAULT_VALUE) {
--		struct cpufreq_policy *policy = cpufreq_cpu_get(policy_data->cpu);
-+		struct cpufreq_policy *policy __free(put_cpufreq_policy) =
-+					      cpufreq_cpu_get(policy_data->cpu);
- 		struct amd_cpudata *cpudata;
- 
- 		if (!policy)
-@@ -595,7 +594,6 @@ static int amd_pstate_verify(struct cpuf
- 
- 		cpudata = policy->driver_data;
- 		policy_data->min = cpudata->lowest_nonlinear_freq;
--		cpufreq_cpu_put(policy);
- 	}
- 
- 	cpufreq_verify_within_cpu_limits(policy_data);
-@@ -678,7 +676,7 @@ static void amd_pstate_adjust_perf(unsig
- 				   unsigned long capacity)
- {
- 	u8 max_perf, min_perf, des_perf, cap_perf, min_limit_perf;
--	struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
-+	struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpu);
- 	struct amd_cpudata *cpudata;
- 
- 	if (!policy)
-@@ -710,7 +708,6 @@ static void amd_pstate_adjust_perf(unsig
- 
- 	amd_pstate_update(cpudata, min_perf, des_perf, max_perf, true,
- 			policy->governor->flags);
--	cpufreq_cpu_put(policy);
- }
- 
- static int amd_pstate_cpu_boost_update(struct cpufreq_policy *policy, bool on)
-@@ -823,28 +820,23 @@ static void amd_pstate_init_prefcore(str
- 
- static void amd_pstate_update_limits(unsigned int cpu)
- {
--	struct cpufreq_policy *policy = NULL;
-+	struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpu);
- 	struct amd_cpudata *cpudata;
- 	u32 prev_high = 0, cur_high = 0;
--	int ret;
- 	bool highest_perf_changed = false;
- 
- 	if (!amd_pstate_prefcore)
- 		return;
- 
--	policy = cpufreq_cpu_get(cpu);
- 	if (!policy)
- 		return;
- 
--	cpudata = policy->driver_data;
--
- 	guard(mutex)(&amd_pstate_driver_lock);
- 
--	ret = amd_get_highest_perf(cpu, &cur_high);
--	if (ret) {
--		cpufreq_cpu_put(policy);
-+	if (amd_get_highest_perf(cpu, &cur_high))
- 		return;
--	}
-+
-+	cpudata = policy->driver_data;
- 
- 	prev_high = READ_ONCE(cpudata->prefcore_ranking);
- 	highest_perf_changed = (prev_high != cur_high);
-@@ -854,7 +846,6 @@ static void amd_pstate_update_limits(uns
- 		if (cur_high < CPPC_MAX_PERF)
- 			sched_set_itmt_core_prio((int)cur_high, cpu);
- 	}
--	cpufreq_cpu_put(policy);
- }
- 
- /*
---- a/include/linux/cpufreq.h
-+++ b/include/linux/cpufreq.h
-@@ -213,6 +213,9 @@ static inline struct cpufreq_policy *cpu
- static inline void cpufreq_cpu_put(struct cpufreq_policy *policy) { }
- #endif
- 
-+/* Scope based cleanup macro for cpufreq_policy kobject reference counting */
-+DEFINE_FREE(put_cpufreq_policy, struct cpufreq_policy *, if (_T) cpufreq_cpu_put(_T))
-+
- static inline bool policy_is_inactive(struct cpufreq_policy *policy)
- {
- 	return cpumask_empty(policy->cpus);

debian/patches/patchset-pf/amd-pstate/0005-cpufreq-amd-pstate-Remove-the-unncecessary-driver_lo.patch

@@ -1,26 +0,0 @@
-From 658a4b7a41583e3b73477c0fbbee07aa6d6f7e0e Mon Sep 17 00:00:00 2001
-From: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Date: Wed, 5 Feb 2025 11:25:23 +0000
-Subject: cpufreq/amd-pstate: Remove the unncecessary driver_lock in
- amd_pstate_update_limits
-
-There is no need to take a driver wide lock while updating the
-highest_perf value in the percpu cpudata struct. Hence remove it.
-
-Signed-off-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -831,8 +831,6 @@ static void amd_pstate_update_limits(uns
- 	if (!policy)
- 		return;
- 
--	guard(mutex)(&amd_pstate_driver_lock);
--
- 	if (amd_get_highest_perf(cpu, &cur_high))
- 		return;
- 

debian/patches/patchset-pf/amd-pstate/0006-cpufreq-amd-pstate-Fix-the-clamping-of-perf-values.patch

@@ -1,35 +0,0 @@
-From 20f8507de83bc844c6ff2329e61ffc37734364e9 Mon Sep 17 00:00:00 2001
-From: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Date: Sat, 22 Feb 2025 03:32:22 +0000
-Subject: cpufreq/amd-pstate: Fix the clamping of perf values
-
-The clamping in freq_to_perf() is broken right now, as we first typecast
-(read wraparound) the overflowing value into a u8 and then clamp it down.
-So, use a u32 to store the >255 value in certain edge cases and then clamp
-it down into a u8.
-
-Also, use a "explicit typecast + clamp" instead of just a "clamp_t" as the
-latter typecasts first and then clamps between the limits, which defeats
-our purpose.
-
-Fixes: 305621eb6a8b ("cpufreq/amd-pstate: Modularize perf<->freq conversion")
-Signed-off-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -144,10 +144,10 @@ static struct quirk_entry quirk_amd_7k62
- 
- static inline u8 freq_to_perf(struct amd_cpudata *cpudata, unsigned int freq_val)
- {
--	u8 perf_val = DIV_ROUND_UP_ULL((u64)freq_val * cpudata->nominal_perf,
-+	u32 perf_val = DIV_ROUND_UP_ULL((u64)freq_val * cpudata->nominal_perf,
- 					cpudata->nominal_freq);
- 
--	return clamp_t(u8, perf_val, cpudata->lowest_perf, cpudata->highest_perf);
-+	return (u8)clamp(perf_val, cpudata->lowest_perf, cpudata->highest_perf);
- }
- 
- static inline u32 perf_to_freq(struct amd_cpudata *cpudata, u8 perf_val)

debian/patches/patchset-pf/amd-pstate/0007-cpufreq-amd-pstate-Show-a-warning-when-a-CPU-fails-t.patch

@@ -1,35 +0,0 @@
-From 240a074b7f92278755df715be1ea5ea5d3d2f5ac Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:17 -0600
-Subject: cpufreq/amd-pstate: Show a warning when a CPU fails to setup
-
-I came across a system that MSR_AMD_CPPC_CAP1 for some CPUs isn't
-populated.  This is an unexpected behavior that is most likely a
-BIOS bug. In the event it happens I'd like users to report bugs
-to properly root cause and get this fixed.
-
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -1027,6 +1027,7 @@ static int amd_pstate_cpu_init(struct cp
- free_cpudata2:
- 	freq_qos_remove_request(&cpudata->req[0]);
- free_cpudata1:
-+	pr_warn("Failed to initialize CPU %d: %d\n", policy->cpu, ret);
- 	kfree(cpudata);
- 	return ret;
- }
-@@ -1520,6 +1521,7 @@ static int amd_pstate_epp_cpu_init(struc
- 	return 0;
- 
- free_cpudata1:
-+	pr_warn("Failed to initialize CPU %d: %d\n", policy->cpu, ret);
- 	kfree(cpudata);
- 	return ret;
- }

debian/patches/patchset-pf/amd-pstate/0008-cpufreq-amd-pstate-Drop-min-and-max-cached-frequenci.patch

@@ -1,209 +0,0 @@
-From 82520910e91d62f19c944ff17ba8f966553e79d6 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:18 -0600
-Subject: cpufreq/amd-pstate: Drop min and max cached frequencies
-
-Use the perf_to_freq helpers to calculate this on the fly.
-As the members are no longer cached add an extra check into
-amd_pstate_epp_update_limit() to avoid unnecessary calls in
-amd_pstate_update_min_max_limit().
-
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate-ut.c | 14 +++++------
- drivers/cpufreq/amd-pstate.c    | 43 +++++++++------------------------
- drivers/cpufreq/amd-pstate.h    |  9 ++-----
- 3 files changed, 20 insertions(+), 46 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate-ut.c
-+++ b/drivers/cpufreq/amd-pstate-ut.c
-@@ -214,14 +214,14 @@ static void amd_pstate_ut_check_freq(u32
- 			break;
- 		cpudata = policy->driver_data;
- 
--		if (!((cpudata->max_freq >= cpudata->nominal_freq) &&
-+		if (!((policy->cpuinfo.max_freq >= cpudata->nominal_freq) &&
- 			(cpudata->nominal_freq > cpudata->lowest_nonlinear_freq) &&
--			(cpudata->lowest_nonlinear_freq > cpudata->min_freq) &&
--			(cpudata->min_freq > 0))) {
-+			(cpudata->lowest_nonlinear_freq > policy->cpuinfo.min_freq) &&
-+			(policy->cpuinfo.min_freq > 0))) {
- 			amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 			pr_err("%s cpu%d max=%d >= nominal=%d > lowest_nonlinear=%d > min=%d > 0, the formula is incorrect!\n",
--				__func__, cpu, cpudata->max_freq, cpudata->nominal_freq,
--				cpudata->lowest_nonlinear_freq, cpudata->min_freq);
-+				__func__, cpu, policy->cpuinfo.max_freq, cpudata->nominal_freq,
-+				cpudata->lowest_nonlinear_freq, policy->cpuinfo.min_freq);
- 			goto skip_test;
- 		}
- 
-@@ -233,13 +233,13 @@ static void amd_pstate_ut_check_freq(u32
- 		}
- 
- 		if (cpudata->boost_supported) {
--			if ((policy->max == cpudata->max_freq) ||
-+			if ((policy->max == policy->cpuinfo.max_freq) ||
- 					(policy->max == cpudata->nominal_freq))
- 				amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
- 			else {
- 				amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 				pr_err("%s cpu%d policy_max=%d should be equal cpu_max=%d or cpu_nominal=%d !\n",
--					__func__, cpu, policy->max, cpudata->max_freq,
-+					__func__, cpu, policy->max, policy->cpuinfo.max_freq,
- 					cpudata->nominal_freq);
- 				goto skip_test;
- 			}
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -717,7 +717,7 @@ static int amd_pstate_cpu_boost_update(s
- 	int ret = 0;
- 
- 	nominal_freq = READ_ONCE(cpudata->nominal_freq);
--	max_freq = READ_ONCE(cpudata->max_freq);
-+	max_freq = perf_to_freq(cpudata, READ_ONCE(cpudata->highest_perf));
- 
- 	if (on)
- 		policy->cpuinfo.max_freq = max_freq;
-@@ -916,13 +916,10 @@ static int amd_pstate_init_freq(struct a
- 	nominal_freq *= 1000;
- 
- 	WRITE_ONCE(cpudata->nominal_freq, nominal_freq);
--	WRITE_ONCE(cpudata->min_freq, min_freq);
- 
- 	max_freq = perf_to_freq(cpudata, cpudata->highest_perf);
- 	lowest_nonlinear_freq = perf_to_freq(cpudata, cpudata->lowest_nonlinear_perf);
--
- 	WRITE_ONCE(cpudata->lowest_nonlinear_freq, lowest_nonlinear_freq);
--	WRITE_ONCE(cpudata->max_freq, max_freq);
- 
- 	/**
- 	 * Below values need to be initialized correctly, otherwise driver will fail to load
-@@ -947,9 +944,9 @@ static int amd_pstate_init_freq(struct a
- 
- static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
- {
--	int min_freq, max_freq, ret;
--	struct device *dev;
- 	struct amd_cpudata *cpudata;
-+	struct device *dev;
-+	int ret;
- 
- 	/*
- 	 * Resetting PERF_CTL_MSR will put the CPU in P0 frequency,
-@@ -980,17 +977,11 @@ static int amd_pstate_cpu_init(struct cp
- 	if (ret)
- 		goto free_cpudata1;
- 
--	min_freq = READ_ONCE(cpudata->min_freq);
--	max_freq = READ_ONCE(cpudata->max_freq);
--
- 	policy->cpuinfo.transition_latency = amd_pstate_get_transition_latency(policy->cpu);
- 	policy->transition_delay_us = amd_pstate_get_transition_delay_us(policy->cpu);
- 
--	policy->min = min_freq;
--	policy->max = max_freq;
--
--	policy->cpuinfo.min_freq = min_freq;
--	policy->cpuinfo.max_freq = max_freq;
-+	policy->cpuinfo.min_freq = policy->min = perf_to_freq(cpudata, cpudata->lowest_perf);
-+	policy->cpuinfo.max_freq = policy->max = perf_to_freq(cpudata, cpudata->highest_perf);
- 
- 	policy->boost_enabled = READ_ONCE(cpudata->boost_supported);
- 
-@@ -1014,9 +1005,6 @@ static int amd_pstate_cpu_init(struct cp
- 		goto free_cpudata2;
- 	}
- 
--	cpudata->max_limit_freq = max_freq;
--	cpudata->min_limit_freq = min_freq;
--
- 	policy->driver_data = cpudata;
- 
- 	if (!current_pstate_driver->adjust_perf)
-@@ -1074,14 +1062,10 @@ static int amd_pstate_cpu_suspend(struct
- static ssize_t show_amd_pstate_max_freq(struct cpufreq_policy *policy,
- 					char *buf)
- {
--	int max_freq;
- 	struct amd_cpudata *cpudata = policy->driver_data;
- 
--	max_freq = READ_ONCE(cpudata->max_freq);
--	if (max_freq < 0)
--		return max_freq;
- 
--	return sysfs_emit(buf, "%u\n", max_freq);
-+	return sysfs_emit(buf, "%u\n", perf_to_freq(cpudata, READ_ONCE(cpudata->highest_perf)));
- }
- 
- static ssize_t show_amd_pstate_lowest_nonlinear_freq(struct cpufreq_policy *policy,
-@@ -1439,10 +1423,10 @@ static bool amd_pstate_acpi_pm_profile_u
- 
- static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
- {
--	int min_freq, max_freq, ret;
- 	struct amd_cpudata *cpudata;
- 	struct device *dev;
- 	u64 value;
-+	int ret;
- 
- 	/*
- 	 * Resetting PERF_CTL_MSR will put the CPU in P0 frequency,
-@@ -1473,19 +1457,13 @@ static int amd_pstate_epp_cpu_init(struc
- 	if (ret)
- 		goto free_cpudata1;
- 
--	min_freq = READ_ONCE(cpudata->min_freq);
--	max_freq = READ_ONCE(cpudata->max_freq);
--
--	policy->cpuinfo.min_freq = min_freq;
--	policy->cpuinfo.max_freq = max_freq;
-+	policy->cpuinfo.min_freq = policy->min = perf_to_freq(cpudata, cpudata->lowest_perf);
-+	policy->cpuinfo.max_freq = policy->max = perf_to_freq(cpudata, cpudata->highest_perf);
- 	/* It will be updated by governor */
- 	policy->cur = policy->cpuinfo.min_freq;
- 
- 	policy->driver_data = cpudata;
- 
--	policy->min = policy->cpuinfo.min_freq;
--	policy->max = policy->cpuinfo.max_freq;
--
- 	policy->boost_enabled = READ_ONCE(cpudata->boost_supported);
- 
- 	/*
-@@ -1543,7 +1521,8 @@ static int amd_pstate_epp_update_limit(s
- 	struct amd_cpudata *cpudata = policy->driver_data;
- 	u8 epp;
- 
--	amd_pstate_update_min_max_limit(policy);
-+	if (policy->min != cpudata->min_limit_freq || policy->max != cpudata->max_limit_freq)
-+		amd_pstate_update_min_max_limit(policy);
- 
- 	if (cpudata->policy == CPUFREQ_POLICY_PERFORMANCE)
- 		epp = 0;
---- a/drivers/cpufreq/amd-pstate.h
-+++ b/drivers/cpufreq/amd-pstate.h
-@@ -46,8 +46,6 @@ struct amd_aperf_mperf {
-  * @max_limit_perf: Cached value of the performance corresponding to policy->max
-  * @min_limit_freq: Cached value of policy->min (in khz)
-  * @max_limit_freq: Cached value of policy->max (in khz)
-- * @max_freq: the frequency (in khz) that mapped to highest_perf
-- * @min_freq: the frequency (in khz) that mapped to lowest_perf
-  * @nominal_freq: the frequency (in khz) that mapped to nominal_perf
-  * @lowest_nonlinear_freq: the frequency (in khz) that mapped to lowest_nonlinear_perf
-  * @cur: Difference of Aperf/Mperf/tsc count between last and current sample
-@@ -77,11 +75,8 @@ struct amd_cpudata {
- 	u8	prefcore_ranking;
- 	u8	min_limit_perf;
- 	u8	max_limit_perf;
--	u32     min_limit_freq;
--	u32     max_limit_freq;
--
--	u32	max_freq;
--	u32	min_freq;
-+	u32	min_limit_freq;
-+	u32	max_limit_freq;
- 	u32	nominal_freq;
- 	u32	lowest_nonlinear_freq;
- 

debian/patches/patchset-pf/amd-pstate/0009-cpufreq-amd-pstate-Move-perf-values-into-a-union.patch

@@ -1,611 +0,0 @@
-From 21109b42429e0d9f0ee1bfadddae38fb5b0b23c3 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:19 -0600
-Subject: cpufreq/amd-pstate: Move perf values into a union
-
-By storing perf values in a union all the writes and reads can
-be done atomically, removing the need for some concurrency protections.
-
-While making this change, also drop the cached frequency values,
-using inline helpers to calculate them on demand from perf value.
-
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate-ut.c |  18 +--
- drivers/cpufreq/amd-pstate.c    | 205 ++++++++++++++++++--------------
- drivers/cpufreq/amd-pstate.h    |  51 +++++---
- 3 files changed, 158 insertions(+), 116 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate-ut.c
-+++ b/drivers/cpufreq/amd-pstate-ut.c
-@@ -129,6 +129,7 @@ static void amd_pstate_ut_check_perf(u32
- 	struct cppc_perf_caps cppc_perf;
- 	struct cpufreq_policy *policy = NULL;
- 	struct amd_cpudata *cpudata = NULL;
-+	union perf_cached cur_perf;
- 
- 	for_each_possible_cpu(cpu) {
- 		policy = cpufreq_cpu_get(cpu);
-@@ -162,19 +163,20 @@ static void amd_pstate_ut_check_perf(u32
- 			lowest_perf = AMD_CPPC_LOWEST_PERF(cap1);
- 		}
- 
--		if (highest_perf != READ_ONCE(cpudata->highest_perf) && !cpudata->hw_prefcore) {
-+		cur_perf = READ_ONCE(cpudata->perf);
-+		if (highest_perf != cur_perf.highest_perf && !cpudata->hw_prefcore) {
- 			pr_err("%s cpu%d highest=%d %d highest perf doesn't match\n",
--				__func__, cpu, highest_perf, cpudata->highest_perf);
-+				__func__, cpu, highest_perf, cur_perf.highest_perf);
- 			goto skip_test;
- 		}
--		if ((nominal_perf != READ_ONCE(cpudata->nominal_perf)) ||
--			(lowest_nonlinear_perf != READ_ONCE(cpudata->lowest_nonlinear_perf)) ||
--			(lowest_perf != READ_ONCE(cpudata->lowest_perf))) {
-+		if (nominal_perf != cur_perf.nominal_perf ||
-+		   (lowest_nonlinear_perf != cur_perf.lowest_nonlinear_perf) ||
-+		   (lowest_perf != cur_perf.lowest_perf)) {
- 			amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 			pr_err("%s cpu%d nominal=%d %d lowest_nonlinear=%d %d lowest=%d %d, they should be equal!\n",
--				__func__, cpu, nominal_perf, cpudata->nominal_perf,
--				lowest_nonlinear_perf, cpudata->lowest_nonlinear_perf,
--				lowest_perf, cpudata->lowest_perf);
-+				__func__, cpu, nominal_perf, cur_perf.nominal_perf,
-+				lowest_nonlinear_perf, cur_perf.lowest_nonlinear_perf,
-+				lowest_perf, cur_perf.lowest_perf);
- 			goto skip_test;
- 		}
- 
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -142,18 +142,17 @@ static struct quirk_entry quirk_amd_7k62
- 	.lowest_freq = 550,
- };
- 
--static inline u8 freq_to_perf(struct amd_cpudata *cpudata, unsigned int freq_val)
-+static inline u8 freq_to_perf(union perf_cached perf, u32 nominal_freq, unsigned int freq_val)
- {
--	u32 perf_val = DIV_ROUND_UP_ULL((u64)freq_val * cpudata->nominal_perf,
--					cpudata->nominal_freq);
-+	u32 perf_val = DIV_ROUND_UP_ULL((u64)freq_val * perf.nominal_perf, nominal_freq);
- 
--	return (u8)clamp(perf_val, cpudata->lowest_perf, cpudata->highest_perf);
-+	return (u8)clamp(perf_val, perf.lowest_perf, perf.highest_perf);
- }
- 
--static inline u32 perf_to_freq(struct amd_cpudata *cpudata, u8 perf_val)
-+static inline u32 perf_to_freq(union perf_cached perf, u32 nominal_freq, u8 perf_val)
- {
--	return DIV_ROUND_UP_ULL((u64)cpudata->nominal_freq * perf_val,
--				cpudata->nominal_perf);
-+	return DIV_ROUND_UP_ULL((u64)nominal_freq * perf_val,
-+				perf.nominal_perf);
- }
- 
- static int __init dmi_matched_7k62_bios_bug(const struct dmi_system_id *dmi)
-@@ -347,7 +346,9 @@ static int amd_pstate_set_energy_pref_in
- 	}
- 
- 	if (trace_amd_pstate_epp_perf_enabled()) {
--		trace_amd_pstate_epp_perf(cpudata->cpu, cpudata->highest_perf,
-+		union perf_cached perf = READ_ONCE(cpudata->perf);
-+
-+		trace_amd_pstate_epp_perf(cpudata->cpu, perf.highest_perf,
- 					  epp,
- 					  FIELD_GET(AMD_CPPC_MIN_PERF_MASK, cpudata->cppc_req_cached),
- 					  FIELD_GET(AMD_CPPC_MAX_PERF_MASK, cpudata->cppc_req_cached),
-@@ -425,6 +426,7 @@ static inline int amd_pstate_cppc_enable
- 
- static int msr_init_perf(struct amd_cpudata *cpudata)
- {
-+	union perf_cached perf = READ_ONCE(cpudata->perf);
- 	u64 cap1, numerator;
- 
- 	int ret = rdmsrl_safe_on_cpu(cpudata->cpu, MSR_AMD_CPPC_CAP1,
-@@ -436,19 +438,21 @@ static int msr_init_perf(struct amd_cpud
- 	if (ret)
- 		return ret;
- 
--	WRITE_ONCE(cpudata->highest_perf, numerator);
--	WRITE_ONCE(cpudata->max_limit_perf, numerator);
--	WRITE_ONCE(cpudata->nominal_perf, AMD_CPPC_NOMINAL_PERF(cap1));
--	WRITE_ONCE(cpudata->lowest_nonlinear_perf, AMD_CPPC_LOWNONLIN_PERF(cap1));
--	WRITE_ONCE(cpudata->lowest_perf, AMD_CPPC_LOWEST_PERF(cap1));
-+	perf.highest_perf = numerator;
-+	perf.max_limit_perf = numerator;
-+	perf.min_limit_perf = AMD_CPPC_LOWEST_PERF(cap1);
-+	perf.nominal_perf = AMD_CPPC_NOMINAL_PERF(cap1);
-+	perf.lowest_nonlinear_perf = AMD_CPPC_LOWNONLIN_PERF(cap1);
-+	perf.lowest_perf = AMD_CPPC_LOWEST_PERF(cap1);
-+	WRITE_ONCE(cpudata->perf, perf);
- 	WRITE_ONCE(cpudata->prefcore_ranking, AMD_CPPC_HIGHEST_PERF(cap1));
--	WRITE_ONCE(cpudata->min_limit_perf, AMD_CPPC_LOWEST_PERF(cap1));
- 	return 0;
- }
- 
- static int shmem_init_perf(struct amd_cpudata *cpudata)
- {
- 	struct cppc_perf_caps cppc_perf;
-+	union perf_cached perf = READ_ONCE(cpudata->perf);
- 	u64 numerator;
- 
- 	int ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
-@@ -459,14 +463,14 @@ static int shmem_init_perf(struct amd_cp
- 	if (ret)
- 		return ret;
- 
--	WRITE_ONCE(cpudata->highest_perf, numerator);
--	WRITE_ONCE(cpudata->max_limit_perf, numerator);
--	WRITE_ONCE(cpudata->nominal_perf, cppc_perf.nominal_perf);
--	WRITE_ONCE(cpudata->lowest_nonlinear_perf,
--		   cppc_perf.lowest_nonlinear_perf);
--	WRITE_ONCE(cpudata->lowest_perf, cppc_perf.lowest_perf);
-+	perf.highest_perf = numerator;
-+	perf.max_limit_perf = numerator;
-+	perf.min_limit_perf = cppc_perf.lowest_perf;
-+	perf.nominal_perf = cppc_perf.nominal_perf;
-+	perf.lowest_nonlinear_perf = cppc_perf.lowest_nonlinear_perf;
-+	perf.lowest_perf = cppc_perf.lowest_perf;
-+	WRITE_ONCE(cpudata->perf, perf);
- 	WRITE_ONCE(cpudata->prefcore_ranking, cppc_perf.highest_perf);
--	WRITE_ONCE(cpudata->min_limit_perf, cppc_perf.lowest_perf);
- 
- 	if (cppc_state == AMD_PSTATE_ACTIVE)
- 		return 0;
-@@ -549,14 +553,14 @@ static void amd_pstate_update(struct amd
- 			      u8 des_perf, u8 max_perf, bool fast_switch, int gov_flags)
- {
- 	struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpudata->cpu);
--	u8 nominal_perf = READ_ONCE(cpudata->nominal_perf);
-+	union perf_cached perf = READ_ONCE(cpudata->perf);
- 
- 	if (!policy)
- 		return;
- 
- 	des_perf = clamp_t(u8, des_perf, min_perf, max_perf);
- 
--	policy->cur = perf_to_freq(cpudata, des_perf);
-+	policy->cur = perf_to_freq(perf, cpudata->nominal_freq, des_perf);
- 
- 	if ((cppc_state == AMD_PSTATE_GUIDED) && (gov_flags & CPUFREQ_GOV_DYNAMIC_SWITCHING)) {
- 		min_perf = des_perf;
-@@ -565,7 +569,7 @@ static void amd_pstate_update(struct amd
- 
- 	/* limit the max perf when core performance boost feature is disabled */
- 	if (!cpudata->boost_supported)
--		max_perf = min_t(u8, nominal_perf, max_perf);
-+		max_perf = min_t(u8, perf.nominal_perf, max_perf);
- 
- 	if (trace_amd_pstate_perf_enabled() && amd_pstate_sample(cpudata)) {
- 		trace_amd_pstate_perf(min_perf, des_perf, max_perf, cpudata->freq,
-@@ -602,39 +606,41 @@ static int amd_pstate_verify(struct cpuf
- 	return 0;
- }
- 
--static int amd_pstate_update_min_max_limit(struct cpufreq_policy *policy)
-+static void amd_pstate_update_min_max_limit(struct cpufreq_policy *policy)
- {
--	u8 max_limit_perf, min_limit_perf;
- 	struct amd_cpudata *cpudata = policy->driver_data;
-+	union perf_cached perf = READ_ONCE(cpudata->perf);
- 
--	max_limit_perf = freq_to_perf(cpudata, policy->max);
--	min_limit_perf = freq_to_perf(cpudata, policy->min);
-+	perf.max_limit_perf = freq_to_perf(perf, cpudata->nominal_freq, policy->max);
-+	perf.min_limit_perf = freq_to_perf(perf, cpudata->nominal_freq, policy->min);
- 
- 	if (cpudata->policy == CPUFREQ_POLICY_PERFORMANCE)
--		min_limit_perf = min(cpudata->nominal_perf, max_limit_perf);
-+		perf.min_limit_perf = min(perf.nominal_perf, perf.max_limit_perf);
- 
--	WRITE_ONCE(cpudata->max_limit_perf, max_limit_perf);
--	WRITE_ONCE(cpudata->min_limit_perf, min_limit_perf);
- 	WRITE_ONCE(cpudata->max_limit_freq, policy->max);
- 	WRITE_ONCE(cpudata->min_limit_freq, policy->min);
--
--	return 0;
-+	WRITE_ONCE(cpudata->perf, perf);
- }
- 
- static int amd_pstate_update_freq(struct cpufreq_policy *policy,
- 				  unsigned int target_freq, bool fast_switch)
- {
- 	struct cpufreq_freqs freqs;
--	struct amd_cpudata *cpudata = policy->driver_data;
-+	struct amd_cpudata *cpudata;
-+	union perf_cached perf;
- 	u8 des_perf;
- 
-+	cpudata = policy->driver_data;
-+
- 	if (policy->min != cpudata->min_limit_freq || policy->max != cpudata->max_limit_freq)
- 		amd_pstate_update_min_max_limit(policy);
- 
-+	perf = READ_ONCE(cpudata->perf);
-+
- 	freqs.old = policy->cur;
- 	freqs.new = target_freq;
- 
--	des_perf = freq_to_perf(cpudata, target_freq);
-+	des_perf = freq_to_perf(perf, cpudata->nominal_freq, target_freq);
- 
- 	WARN_ON(fast_switch && !policy->fast_switch_enabled);
- 	/*
-@@ -645,8 +651,8 @@ static int amd_pstate_update_freq(struct
- 	if (!fast_switch)
- 		cpufreq_freq_transition_begin(policy, &freqs);
- 
--	amd_pstate_update(cpudata, cpudata->min_limit_perf, des_perf,
--			  cpudata->max_limit_perf, fast_switch,
-+	amd_pstate_update(cpudata, perf.min_limit_perf, des_perf,
-+			  perf.max_limit_perf, fast_switch,
- 			  policy->governor->flags);
- 
- 	if (!fast_switch)
-@@ -675,9 +681,10 @@ static void amd_pstate_adjust_perf(unsig
- 				   unsigned long target_perf,
- 				   unsigned long capacity)
- {
--	u8 max_perf, min_perf, des_perf, cap_perf, min_limit_perf;
-+	u8 max_perf, min_perf, des_perf, cap_perf;
- 	struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpu);
- 	struct amd_cpudata *cpudata;
-+	union perf_cached perf;
- 
- 	if (!policy)
- 		return;
-@@ -687,8 +694,8 @@ static void amd_pstate_adjust_perf(unsig
- 	if (policy->min != cpudata->min_limit_freq || policy->max != cpudata->max_limit_freq)
- 		amd_pstate_update_min_max_limit(policy);
- 
--	cap_perf = READ_ONCE(cpudata->highest_perf);
--	min_limit_perf = READ_ONCE(cpudata->min_limit_perf);
-+	perf = READ_ONCE(cpudata->perf);
-+	cap_perf = perf.highest_perf;
- 
- 	des_perf = cap_perf;
- 	if (target_perf < capacity)
-@@ -699,10 +706,10 @@ static void amd_pstate_adjust_perf(unsig
- 	else
- 		min_perf = cap_perf;
- 
--	if (min_perf < min_limit_perf)
--		min_perf = min_limit_perf;
-+	if (min_perf < perf.min_limit_perf)
-+		min_perf = perf.min_limit_perf;
- 
--	max_perf = cpudata->max_limit_perf;
-+	max_perf = perf.max_limit_perf;
- 	if (max_perf < min_perf)
- 		max_perf = min_perf;
- 
-@@ -713,11 +720,12 @@ static void amd_pstate_adjust_perf(unsig
- static int amd_pstate_cpu_boost_update(struct cpufreq_policy *policy, bool on)
- {
- 	struct amd_cpudata *cpudata = policy->driver_data;
-+	union perf_cached perf = READ_ONCE(cpudata->perf);
- 	u32 nominal_freq, max_freq;
- 	int ret = 0;
- 
- 	nominal_freq = READ_ONCE(cpudata->nominal_freq);
--	max_freq = perf_to_freq(cpudata, READ_ONCE(cpudata->highest_perf));
-+	max_freq = perf_to_freq(perf, cpudata->nominal_freq, perf.highest_perf);
- 
- 	if (on)
- 		policy->cpuinfo.max_freq = max_freq;
-@@ -881,30 +889,30 @@ static u32 amd_pstate_get_transition_lat
- }
- 
- /*
-- * amd_pstate_init_freq: Initialize the max_freq, min_freq,
-- *                       nominal_freq and lowest_nonlinear_freq for
-- *                       the @cpudata object.
-+ * amd_pstate_init_freq: Initialize the nominal_freq and lowest_nonlinear_freq
-+ *			 for the @cpudata object.
-  *
-- *  Requires: highest_perf, lowest_perf, nominal_perf and
-- *            lowest_nonlinear_perf members of @cpudata to be
-- *            initialized.
-+ * Requires: all perf members of @cpudata to be initialized.
-  *
-- *  Returns 0 on success, non-zero value on failure.
-+ * Returns 0 on success, non-zero value on failure.
-  */
- static int amd_pstate_init_freq(struct amd_cpudata *cpudata)
- {
--	int ret;
--	u32 min_freq, max_freq;
--	u32 nominal_freq, lowest_nonlinear_freq;
-+	u32 min_freq, max_freq, nominal_freq, lowest_nonlinear_freq;
- 	struct cppc_perf_caps cppc_perf;
-+	union perf_cached perf;
-+	int ret;
- 
- 	ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
- 	if (ret)
- 		return ret;
-+	perf = READ_ONCE(cpudata->perf);
- 
--	if (quirks && quirks->lowest_freq)
-+	if (quirks && quirks->lowest_freq) {
- 		min_freq = quirks->lowest_freq;
--	else
-+		perf.lowest_perf = freq_to_perf(perf, nominal_freq, min_freq);
-+		WRITE_ONCE(cpudata->perf, perf);
-+	} else
- 		min_freq = cppc_perf.lowest_freq;
- 
- 	if (quirks && quirks->nominal_freq)
-@@ -917,8 +925,8 @@ static int amd_pstate_init_freq(struct a
- 
- 	WRITE_ONCE(cpudata->nominal_freq, nominal_freq);
- 
--	max_freq = perf_to_freq(cpudata, cpudata->highest_perf);
--	lowest_nonlinear_freq = perf_to_freq(cpudata, cpudata->lowest_nonlinear_perf);
-+	max_freq = perf_to_freq(perf, nominal_freq, perf.highest_perf);
-+	lowest_nonlinear_freq = perf_to_freq(perf, nominal_freq, perf.lowest_nonlinear_perf);
- 	WRITE_ONCE(cpudata->lowest_nonlinear_freq, lowest_nonlinear_freq);
- 
- 	/**
-@@ -945,6 +953,7 @@ static int amd_pstate_init_freq(struct a
- static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
- {
- 	struct amd_cpudata *cpudata;
-+	union perf_cached perf;
- 	struct device *dev;
- 	int ret;
- 
-@@ -980,8 +989,14 @@ static int amd_pstate_cpu_init(struct cp
- 	policy->cpuinfo.transition_latency = amd_pstate_get_transition_latency(policy->cpu);
- 	policy->transition_delay_us = amd_pstate_get_transition_delay_us(policy->cpu);
- 
--	policy->cpuinfo.min_freq = policy->min = perf_to_freq(cpudata, cpudata->lowest_perf);
--	policy->cpuinfo.max_freq = policy->max = perf_to_freq(cpudata, cpudata->highest_perf);
-+	perf = READ_ONCE(cpudata->perf);
-+
-+	policy->cpuinfo.min_freq = policy->min = perf_to_freq(perf,
-+							      cpudata->nominal_freq,
-+							      perf.lowest_perf);
-+	policy->cpuinfo.max_freq = policy->max = perf_to_freq(perf,
-+							      cpudata->nominal_freq,
-+							      perf.highest_perf);
- 
- 	policy->boost_enabled = READ_ONCE(cpudata->boost_supported);
- 
-@@ -1062,23 +1077,27 @@ static int amd_pstate_cpu_suspend(struct
- static ssize_t show_amd_pstate_max_freq(struct cpufreq_policy *policy,
- 					char *buf)
- {
--	struct amd_cpudata *cpudata = policy->driver_data;
-+	struct amd_cpudata *cpudata;
-+	union perf_cached perf;
- 
-+	cpudata = policy->driver_data;
-+	perf = READ_ONCE(cpudata->perf);
- 
--	return sysfs_emit(buf, "%u\n", perf_to_freq(cpudata, READ_ONCE(cpudata->highest_perf)));
-+	return sysfs_emit(buf, "%u\n",
-+			  perf_to_freq(perf, cpudata->nominal_freq, perf.highest_perf));
- }
- 
- static ssize_t show_amd_pstate_lowest_nonlinear_freq(struct cpufreq_policy *policy,
- 						     char *buf)
- {
--	int freq;
--	struct amd_cpudata *cpudata = policy->driver_data;
-+	struct amd_cpudata *cpudata;
-+	union perf_cached perf;
- 
--	freq = READ_ONCE(cpudata->lowest_nonlinear_freq);
--	if (freq < 0)
--		return freq;
-+	cpudata = policy->driver_data;
-+	perf = READ_ONCE(cpudata->perf);
- 
--	return sysfs_emit(buf, "%u\n", freq);
-+	return sysfs_emit(buf, "%u\n",
-+			  perf_to_freq(perf, cpudata->nominal_freq, perf.lowest_nonlinear_perf));
- }
- 
- /*
-@@ -1088,12 +1107,11 @@ static ssize_t show_amd_pstate_lowest_no
- static ssize_t show_amd_pstate_highest_perf(struct cpufreq_policy *policy,
- 					    char *buf)
- {
--	u8 perf;
--	struct amd_cpudata *cpudata = policy->driver_data;
-+	struct amd_cpudata *cpudata;
- 
--	perf = READ_ONCE(cpudata->highest_perf);
-+	cpudata = policy->driver_data;
- 
--	return sysfs_emit(buf, "%u\n", perf);
-+	return sysfs_emit(buf, "%u\n", cpudata->perf.highest_perf);
- }
- 
- static ssize_t show_amd_pstate_prefcore_ranking(struct cpufreq_policy *policy,
-@@ -1424,6 +1442,7 @@ static bool amd_pstate_acpi_pm_profile_u
- static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
- {
- 	struct amd_cpudata *cpudata;
-+	union perf_cached perf;
- 	struct device *dev;
- 	u64 value;
- 	int ret;
-@@ -1457,8 +1476,15 @@ static int amd_pstate_epp_cpu_init(struc
- 	if (ret)
- 		goto free_cpudata1;
- 
--	policy->cpuinfo.min_freq = policy->min = perf_to_freq(cpudata, cpudata->lowest_perf);
--	policy->cpuinfo.max_freq = policy->max = perf_to_freq(cpudata, cpudata->highest_perf);
-+	perf = READ_ONCE(cpudata->perf);
-+
-+	policy->cpuinfo.min_freq = policy->min = perf_to_freq(perf,
-+							      cpudata->nominal_freq,
-+							      perf.lowest_perf);
-+	policy->cpuinfo.max_freq = policy->max = perf_to_freq(perf,
-+							      cpudata->nominal_freq,
-+							      perf.highest_perf);
-+
- 	/* It will be updated by governor */
- 	policy->cur = policy->cpuinfo.min_freq;
- 
-@@ -1519,6 +1545,7 @@ static void amd_pstate_epp_cpu_exit(stru
- static int amd_pstate_epp_update_limit(struct cpufreq_policy *policy)
- {
- 	struct amd_cpudata *cpudata = policy->driver_data;
-+	union perf_cached perf;
- 	u8 epp;
- 
- 	if (policy->min != cpudata->min_limit_freq || policy->max != cpudata->max_limit_freq)
-@@ -1529,15 +1556,16 @@ static int amd_pstate_epp_update_limit(s
- 	else
- 		epp = READ_ONCE(cpudata->epp_cached);
- 
-+	perf = READ_ONCE(cpudata->perf);
- 	if (trace_amd_pstate_epp_perf_enabled()) {
--		trace_amd_pstate_epp_perf(cpudata->cpu, cpudata->highest_perf, epp,
--					  cpudata->min_limit_perf,
--					  cpudata->max_limit_perf,
-+		trace_amd_pstate_epp_perf(cpudata->cpu, perf.highest_perf, epp,
-+					  perf.min_limit_perf,
-+					  perf.max_limit_perf,
- 					  policy->boost_enabled);
- 	}
- 
--	return amd_pstate_update_perf(cpudata, cpudata->min_limit_perf, 0U,
--				      cpudata->max_limit_perf, epp, false);
-+	return amd_pstate_update_perf(cpudata, perf.min_limit_perf, 0U,
-+				      perf.max_limit_perf, epp, false);
- }
- 
- static int amd_pstate_epp_set_policy(struct cpufreq_policy *policy)
-@@ -1569,20 +1597,18 @@ static int amd_pstate_epp_set_policy(str
- static int amd_pstate_epp_reenable(struct cpufreq_policy *policy)
- {
- 	struct amd_cpudata *cpudata = policy->driver_data;
--	u8 max_perf;
-+	union perf_cached perf = READ_ONCE(cpudata->perf);
- 	int ret;
- 
- 	ret = amd_pstate_cppc_enable(true);
- 	if (ret)
- 		pr_err("failed to enable amd pstate during resume, return %d\n", ret);
- 
--	max_perf = READ_ONCE(cpudata->highest_perf);
--
- 	if (trace_amd_pstate_epp_perf_enabled()) {
--		trace_amd_pstate_epp_perf(cpudata->cpu, cpudata->highest_perf,
-+		trace_amd_pstate_epp_perf(cpudata->cpu, perf.highest_perf,
- 					  cpudata->epp_cached,
- 					  FIELD_GET(AMD_CPPC_MIN_PERF_MASK, cpudata->cppc_req_cached),
--					  max_perf, policy->boost_enabled);
-+					  perf.highest_perf, policy->boost_enabled);
- 	}
- 
- 	return amd_pstate_epp_update_limit(policy);
-@@ -1606,22 +1632,21 @@ static int amd_pstate_epp_cpu_online(str
- static int amd_pstate_epp_cpu_offline(struct cpufreq_policy *policy)
- {
- 	struct amd_cpudata *cpudata = policy->driver_data;
--	u8 min_perf;
-+	union perf_cached perf = READ_ONCE(cpudata->perf);
- 
- 	if (cpudata->suspended)
- 		return 0;
- 
--	min_perf = READ_ONCE(cpudata->lowest_perf);
--
- 	guard(mutex)(&amd_pstate_limits_lock);
- 
- 	if (trace_amd_pstate_epp_perf_enabled()) {
--		trace_amd_pstate_epp_perf(cpudata->cpu, cpudata->highest_perf,
-+		trace_amd_pstate_epp_perf(cpudata->cpu, perf.highest_perf,
- 					  AMD_CPPC_EPP_BALANCE_POWERSAVE,
--					  min_perf, min_perf, policy->boost_enabled);
-+					  perf.lowest_perf, perf.lowest_perf,
-+					  policy->boost_enabled);
- 	}
- 
--	return amd_pstate_update_perf(cpudata, min_perf, 0, min_perf,
-+	return amd_pstate_update_perf(cpudata, perf.lowest_perf, 0, perf.lowest_perf,
- 				      AMD_CPPC_EPP_BALANCE_POWERSAVE, false);
- }
- 
---- a/drivers/cpufreq/amd-pstate.h
-+++ b/drivers/cpufreq/amd-pstate.h
-@@ -13,6 +13,36 @@
- /*********************************************************************
-  *                        AMD P-state INTERFACE                       *
-  *********************************************************************/
-+
-+/**
-+ * union perf_cached - A union to cache performance-related data.
-+ * @highest_perf: the maximum performance an individual processor may reach,
-+ *		  assuming ideal conditions
-+ *		  For platforms that support the preferred core feature, the highest_perf value maybe
-+ * 		  configured to any value in the range 166-255 by the firmware (because the preferred
-+ * 		  core ranking is encoded in the highest_perf value). To maintain consistency across
-+ * 		  all platforms, we split the highest_perf and preferred core ranking values into
-+ * 		  cpudata->perf.highest_perf and cpudata->prefcore_ranking.
-+ * @nominal_perf: the maximum sustained performance level of the processor,
-+ *		  assuming ideal operating conditions
-+ * @lowest_nonlinear_perf: the lowest performance level at which nonlinear power
-+ *			   savings are achieved
-+ * @lowest_perf: the absolute lowest performance level of the processor
-+ * @min_limit_perf: Cached value of the performance corresponding to policy->min
-+ * @max_limit_perf: Cached value of the performance corresponding to policy->max
-+ */
-+union perf_cached {
-+	struct {
-+		u8	highest_perf;
-+		u8	nominal_perf;
-+		u8	lowest_nonlinear_perf;
-+		u8	lowest_perf;
-+		u8	min_limit_perf;
-+		u8	max_limit_perf;
-+	};
-+	u64	val;
-+};
-+
- /**
-  * struct  amd_aperf_mperf
-  * @aperf: actual performance frequency clock count
-@@ -30,20 +60,9 @@ struct amd_aperf_mperf {
-  * @cpu: CPU number
-  * @req: constraint request to apply
-  * @cppc_req_cached: cached performance request hints
-- * @highest_perf: the maximum performance an individual processor may reach,
-- *		  assuming ideal conditions
-- *		  For platforms that do not support the preferred core feature, the
-- *		  highest_pef may be configured with 166 or 255, to avoid max frequency
-- *		  calculated wrongly. we take the fixed value as the highest_perf.
-- * @nominal_perf: the maximum sustained performance level of the processor,
-- *		  assuming ideal operating conditions
-- * @lowest_nonlinear_perf: the lowest performance level at which nonlinear power
-- *			   savings are achieved
-- * @lowest_perf: the absolute lowest performance level of the processor
-+ * @perf: cached performance-related data
-  * @prefcore_ranking: the preferred core ranking, the higher value indicates a higher
-  * 		  priority.
-- * @min_limit_perf: Cached value of the performance corresponding to policy->min
-- * @max_limit_perf: Cached value of the performance corresponding to policy->max
-  * @min_limit_freq: Cached value of policy->min (in khz)
-  * @max_limit_freq: Cached value of policy->max (in khz)
-  * @nominal_freq: the frequency (in khz) that mapped to nominal_perf
-@@ -68,13 +87,9 @@ struct amd_cpudata {
- 	struct	freq_qos_request req[2];
- 	u64	cppc_req_cached;
- 
--	u8	highest_perf;
--	u8	nominal_perf;
--	u8	lowest_nonlinear_perf;
--	u8	lowest_perf;
-+	union perf_cached perf;
-+
- 	u8	prefcore_ranking;
--	u8	min_limit_perf;
--	u8	max_limit_perf;
- 	u32	min_limit_freq;
- 	u32	max_limit_freq;
- 	u32	nominal_freq;

debian/patches/patchset-pf/amd-pstate/0010-cpufreq-amd-pstate-Overhaul-locking.patch

@@ -1,81 +0,0 @@
-From 0daee82069cfe4a322bed954a4a5f19226e49e95 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:20 -0600
-Subject: cpufreq/amd-pstate: Overhaul locking
-
-amd_pstate_cpu_boost_update() and refresh_frequency_limits() both
-update the policy state and have nothing to do with the amd-pstate
-driver itself.
-
-A global "limits" lock doesn't make sense because each CPU can have
-policies changed independently.  Each time a CPU changes values they
-will atomically be written to the per-CPU perf member. Drop per CPU
-locking cases.
-
-The remaining "global" driver lock is used to ensure that only one
-entity can change driver modes at a given time.
-
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -196,7 +196,6 @@ static inline int get_mode_idx_from_str(
- 	return -EINVAL;
- }
- 
--static DEFINE_MUTEX(amd_pstate_limits_lock);
- static DEFINE_MUTEX(amd_pstate_driver_lock);
- 
- static u8 msr_get_epp(struct amd_cpudata *cpudata)
-@@ -1169,8 +1168,6 @@ static ssize_t store_energy_performance_
- 	if (ret < 0)
- 		return -EINVAL;
- 
--	guard(mutex)(&amd_pstate_limits_lock);
--
- 	ret = amd_pstate_set_energy_pref_index(policy, ret);
- 
- 	return ret ? ret : count;
-@@ -1343,8 +1340,10 @@ int amd_pstate_update_status(const char
- 	if (mode_idx < 0 || mode_idx >= AMD_PSTATE_MAX)
- 		return -EINVAL;
- 
--	if (mode_state_machine[cppc_state][mode_idx])
-+	if (mode_state_machine[cppc_state][mode_idx]) {
-+		guard(mutex)(&amd_pstate_driver_lock);
- 		return mode_state_machine[cppc_state][mode_idx](mode_idx);
-+	}
- 
- 	return 0;
- }
-@@ -1365,7 +1364,6 @@ static ssize_t status_store(struct devic
- 	char *p = memchr(buf, '\n', count);
- 	int ret;
- 
--	guard(mutex)(&amd_pstate_driver_lock);
- 	ret = amd_pstate_update_status(buf, p ? p - buf : count);
- 
- 	return ret < 0 ? ret : count;
-@@ -1637,8 +1635,6 @@ static int amd_pstate_epp_cpu_offline(st
- 	if (cpudata->suspended)
- 		return 0;
- 
--	guard(mutex)(&amd_pstate_limits_lock);
--
- 	if (trace_amd_pstate_epp_perf_enabled()) {
- 		trace_amd_pstate_epp_perf(cpudata->cpu, perf.highest_perf,
- 					  AMD_CPPC_EPP_BALANCE_POWERSAVE,
-@@ -1678,8 +1674,6 @@ static int amd_pstate_epp_resume(struct
- 	struct amd_cpudata *cpudata = policy->driver_data;
- 
- 	if (cpudata->suspended) {
--		guard(mutex)(&amd_pstate_limits_lock);
--
- 		/* enable amd pstate from suspend state*/
- 		amd_pstate_epp_reenable(policy);
- 

debian/patches/patchset-pf/amd-pstate/0011-cpufreq-amd-pstate-Drop-cppc_cap1_cached.patch

@@ -1,48 +0,0 @@
-From 7c820a91ffd02aa7e426e8801893575f218a7a80 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:21 -0600
-Subject: cpufreq/amd-pstate: Drop `cppc_cap1_cached`
-
-The `cppc_cap1_cached` variable isn't used at all, there is no
-need to read it at initialization for each CPU.
-
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 5 -----
- drivers/cpufreq/amd-pstate.h | 2 --
- 2 files changed, 7 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -1508,11 +1508,6 @@ static int amd_pstate_epp_cpu_init(struc
- 		if (ret)
- 			return ret;
- 		WRITE_ONCE(cpudata->cppc_req_cached, value);
--
--		ret = rdmsrl_on_cpu(cpudata->cpu, MSR_AMD_CPPC_CAP1, &value);
--		if (ret)
--			return ret;
--		WRITE_ONCE(cpudata->cppc_cap1_cached, value);
- 	}
- 	ret = amd_pstate_set_epp(cpudata, cpudata->epp_default);
- 	if (ret)
---- a/drivers/cpufreq/amd-pstate.h
-+++ b/drivers/cpufreq/amd-pstate.h
-@@ -76,7 +76,6 @@ struct amd_aperf_mperf {
-  * 		  AMD P-State driver supports preferred core featue.
-  * @epp_cached: Cached CPPC energy-performance preference value
-  * @policy: Cpufreq policy value
-- * @cppc_cap1_cached Cached MSR_AMD_CPPC_CAP1 register value
-  *
-  * The amd_cpudata is key private data for each CPU thread in AMD P-State, and
-  * represents all the attributes and goals that AMD P-State requests at runtime.
-@@ -105,7 +104,6 @@ struct amd_cpudata {
- 	/* EPP feature related attributes*/
- 	u8	epp_cached;
- 	u32	policy;
--	u64	cppc_cap1_cached;
- 	bool	suspended;
- 	u8	epp_default;
- };

debian/patches/patchset-pf/amd-pstate/0012-cpufreq-amd-pstate-ut-Use-_free-macro-to-free-put-po.patch

@@ -1,144 +0,0 @@
-From 5d0c340db98de378a11abfbaf587b6e601e7291c Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:22 -0600
-Subject: cpufreq/amd-pstate-ut: Use _free macro to free put policy
-
-Using a scoped cleanup macro simplifies cleanup code.
-
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate-ut.c | 33 ++++++++++++++-------------------
- 1 file changed, 14 insertions(+), 19 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate-ut.c
-+++ b/drivers/cpufreq/amd-pstate-ut.c
-@@ -26,6 +26,7 @@
- #include <linux/module.h>
- #include <linux/moduleparam.h>
- #include <linux/fs.h>
-+#include <linux/cleanup.h>
- 
- #include <acpi/cppc_acpi.h>
- 
-@@ -127,11 +128,12 @@ static void amd_pstate_ut_check_perf(u32
- 	u32 highest_perf = 0, nominal_perf = 0, lowest_nonlinear_perf = 0, lowest_perf = 0;
- 	u64 cap1 = 0;
- 	struct cppc_perf_caps cppc_perf;
--	struct cpufreq_policy *policy = NULL;
- 	struct amd_cpudata *cpudata = NULL;
- 	union perf_cached cur_perf;
- 
- 	for_each_possible_cpu(cpu) {
-+		struct cpufreq_policy *policy __free(put_cpufreq_policy) = NULL;
-+
- 		policy = cpufreq_cpu_get(cpu);
- 		if (!policy)
- 			break;
-@@ -142,7 +144,7 @@ static void amd_pstate_ut_check_perf(u32
- 			if (ret) {
- 				amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 				pr_err("%s cppc_get_perf_caps ret=%d error!\n", __func__, ret);
--				goto skip_test;
-+				return;
- 			}
- 
- 			highest_perf = cppc_perf.highest_perf;
-@@ -154,7 +156,7 @@ static void amd_pstate_ut_check_perf(u32
- 			if (ret) {
- 				amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 				pr_err("%s read CPPC_CAP1 ret=%d error!\n", __func__, ret);
--				goto skip_test;
-+				return;
- 			}
- 
- 			highest_perf = AMD_CPPC_HIGHEST_PERF(cap1);
-@@ -167,7 +169,7 @@ static void amd_pstate_ut_check_perf(u32
- 		if (highest_perf != cur_perf.highest_perf && !cpudata->hw_prefcore) {
- 			pr_err("%s cpu%d highest=%d %d highest perf doesn't match\n",
- 				__func__, cpu, highest_perf, cur_perf.highest_perf);
--			goto skip_test;
-+			return;
- 		}
- 		if (nominal_perf != cur_perf.nominal_perf ||
- 		   (lowest_nonlinear_perf != cur_perf.lowest_nonlinear_perf) ||
-@@ -177,7 +179,7 @@ static void amd_pstate_ut_check_perf(u32
- 				__func__, cpu, nominal_perf, cur_perf.nominal_perf,
- 				lowest_nonlinear_perf, cur_perf.lowest_nonlinear_perf,
- 				lowest_perf, cur_perf.lowest_perf);
--			goto skip_test;
-+			return;
- 		}
- 
- 		if (!((highest_perf >= nominal_perf) &&
-@@ -188,15 +190,11 @@ static void amd_pstate_ut_check_perf(u32
- 			pr_err("%s cpu%d highest=%d >= nominal=%d > lowest_nonlinear=%d > lowest=%d > 0, the formula is incorrect!\n",
- 				__func__, cpu, highest_perf, nominal_perf,
- 				lowest_nonlinear_perf, lowest_perf);
--			goto skip_test;
-+			return;
- 		}
--		cpufreq_cpu_put(policy);
- 	}
- 
- 	amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
--	return;
--skip_test:
--	cpufreq_cpu_put(policy);
- }
- 
- /*
-@@ -207,10 +205,11 @@ skip_test:
- static void amd_pstate_ut_check_freq(u32 index)
- {
- 	int cpu = 0;
--	struct cpufreq_policy *policy = NULL;
- 	struct amd_cpudata *cpudata = NULL;
- 
- 	for_each_possible_cpu(cpu) {
-+		struct cpufreq_policy *policy __free(put_cpufreq_policy) = NULL;
-+
- 		policy = cpufreq_cpu_get(cpu);
- 		if (!policy)
- 			break;
-@@ -224,14 +223,14 @@ static void amd_pstate_ut_check_freq(u32
- 			pr_err("%s cpu%d max=%d >= nominal=%d > lowest_nonlinear=%d > min=%d > 0, the formula is incorrect!\n",
- 				__func__, cpu, policy->cpuinfo.max_freq, cpudata->nominal_freq,
- 				cpudata->lowest_nonlinear_freq, policy->cpuinfo.min_freq);
--			goto skip_test;
-+			return;
- 		}
- 
- 		if (cpudata->lowest_nonlinear_freq != policy->min) {
- 			amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 			pr_err("%s cpu%d cpudata_lowest_nonlinear_freq=%d policy_min=%d, they should be equal!\n",
- 				__func__, cpu, cpudata->lowest_nonlinear_freq, policy->min);
--			goto skip_test;
-+			return;
- 		}
- 
- 		if (cpudata->boost_supported) {
-@@ -243,20 +242,16 @@ static void amd_pstate_ut_check_freq(u32
- 				pr_err("%s cpu%d policy_max=%d should be equal cpu_max=%d or cpu_nominal=%d !\n",
- 					__func__, cpu, policy->max, policy->cpuinfo.max_freq,
- 					cpudata->nominal_freq);
--				goto skip_test;
-+				return;
- 			}
- 		} else {
- 			amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 			pr_err("%s cpu%d must support boost!\n", __func__, cpu);
--			goto skip_test;
-+			return;
- 		}
--		cpufreq_cpu_put(policy);
- 	}
- 
- 	amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
--	return;
--skip_test:
--	cpufreq_cpu_put(policy);
- }
- 
- static int amd_pstate_set_mode(enum amd_pstate_mode mode)

debian/patches/patchset-pf/amd-pstate/0013-cpufreq-amd-pstate-ut-Allow-lowest-nonlinear-and-low.patch

@@ -1,37 +0,0 @@
-From 8937b7068ca30072c4c4cf4c22000112afbd6839 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:23 -0600
-Subject: cpufreq/amd-pstate-ut: Allow lowest nonlinear and lowest to be the
- same
-
-Several Ryzen AI processors support the exact same value for lowest
-nonlinear perf and lowest perf.  Loosen up the unit tests to allow this
-scenario.
-
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate-ut.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate-ut.c
-+++ b/drivers/cpufreq/amd-pstate-ut.c
-@@ -184,7 +184,7 @@ static void amd_pstate_ut_check_perf(u32
- 
- 		if (!((highest_perf >= nominal_perf) &&
- 			(nominal_perf > lowest_nonlinear_perf) &&
--			(lowest_nonlinear_perf > lowest_perf) &&
-+			(lowest_nonlinear_perf >= lowest_perf) &&
- 			(lowest_perf > 0))) {
- 			amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 			pr_err("%s cpu%d highest=%d >= nominal=%d > lowest_nonlinear=%d > lowest=%d > 0, the formula is incorrect!\n",
-@@ -217,7 +217,7 @@ static void amd_pstate_ut_check_freq(u32
- 
- 		if (!((policy->cpuinfo.max_freq >= cpudata->nominal_freq) &&
- 			(cpudata->nominal_freq > cpudata->lowest_nonlinear_freq) &&
--			(cpudata->lowest_nonlinear_freq > policy->cpuinfo.min_freq) &&
-+			(cpudata->lowest_nonlinear_freq >= policy->cpuinfo.min_freq) &&
- 			(policy->cpuinfo.min_freq > 0))) {
- 			amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 			pr_err("%s cpu%d max=%d >= nominal=%d > lowest_nonlinear=%d > min=%d > 0, the formula is incorrect!\n",

debian/patches/patchset-pf/amd-pstate/0014-cpufreq-amd-pstate-ut-Drop-SUCCESS-and-FAIL-enums.patch

@@ -1,309 +0,0 @@
-From 8cb701e059fa08dcb9ab74e3c84abc224ff72714 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:24 -0600
-Subject: cpufreq/amd-pstate-ut: Drop SUCCESS and FAIL enums
-
-Enums are effectively used as a boolean and don't show
-the return value of the failing call.
-
-Instead of using enums switch to returning the actual return
-code from the unit test.
-
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate-ut.c | 143 ++++++++++++--------------------
- 1 file changed, 55 insertions(+), 88 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate-ut.c
-+++ b/drivers/cpufreq/amd-pstate-ut.c
-@@ -32,30 +32,20 @@
- 
- #include "amd-pstate.h"
- 
--/*
-- * Abbreviations:
-- * amd_pstate_ut: used as a shortform for AMD P-State unit test.
-- * It helps to keep variable names smaller, simpler
-- */
--enum amd_pstate_ut_result {
--	AMD_PSTATE_UT_RESULT_PASS,
--	AMD_PSTATE_UT_RESULT_FAIL,
--};
- 
- struct amd_pstate_ut_struct {
- 	const char *name;
--	void (*func)(u32 index);
--	enum amd_pstate_ut_result result;
-+	int (*func)(u32 index);
- };
- 
- /*
-  * Kernel module for testing the AMD P-State unit test
-  */
--static void amd_pstate_ut_acpi_cpc_valid(u32 index);
--static void amd_pstate_ut_check_enabled(u32 index);
--static void amd_pstate_ut_check_perf(u32 index);
--static void amd_pstate_ut_check_freq(u32 index);
--static void amd_pstate_ut_check_driver(u32 index);
-+static int amd_pstate_ut_acpi_cpc_valid(u32 index);
-+static int amd_pstate_ut_check_enabled(u32 index);
-+static int amd_pstate_ut_check_perf(u32 index);
-+static int amd_pstate_ut_check_freq(u32 index);
-+static int amd_pstate_ut_check_driver(u32 index);
- 
- static struct amd_pstate_ut_struct amd_pstate_ut_cases[] = {
- 	{"amd_pstate_ut_acpi_cpc_valid",   amd_pstate_ut_acpi_cpc_valid   },
-@@ -78,51 +68,46 @@ static bool get_shared_mem(void)
- /*
-  * check the _CPC object is present in SBIOS.
-  */
--static void amd_pstate_ut_acpi_cpc_valid(u32 index)
-+static int amd_pstate_ut_acpi_cpc_valid(u32 index)
- {
--	if (acpi_cpc_valid())
--		amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
--	else {
--		amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
-+	if (!acpi_cpc_valid()) {
- 		pr_err("%s the _CPC object is not present in SBIOS!\n", __func__);
-+		return -EINVAL;
- 	}
-+
-+	return 0;
- }
- 
--static void amd_pstate_ut_pstate_enable(u32 index)
-+/*
-+ * check if amd pstate is enabled
-+ */
-+static int amd_pstate_ut_check_enabled(u32 index)
- {
--	int ret = 0;
- 	u64 cppc_enable = 0;
-+	int ret;
-+
-+	if (get_shared_mem())
-+		return 0;
- 
- 	ret = rdmsrl_safe(MSR_AMD_CPPC_ENABLE, &cppc_enable);
- 	if (ret) {
--		amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 		pr_err("%s rdmsrl_safe MSR_AMD_CPPC_ENABLE ret=%d error!\n", __func__, ret);
--		return;
-+		return ret;
- 	}
--	if (cppc_enable)
--		amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
--	else {
--		amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
-+
-+	if (!cppc_enable) {
- 		pr_err("%s amd pstate must be enabled!\n", __func__);
-+		return -EINVAL;
- 	}
--}
- 
--/*
-- * check if amd pstate is enabled
-- */
--static void amd_pstate_ut_check_enabled(u32 index)
--{
--	if (get_shared_mem())
--		amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
--	else
--		amd_pstate_ut_pstate_enable(index);
-+	return 0;
- }
- 
- /*
-  * check if performance values are reasonable.
-  * highest_perf >= nominal_perf > lowest_nonlinear_perf > lowest_perf > 0
-  */
--static void amd_pstate_ut_check_perf(u32 index)
-+static int amd_pstate_ut_check_perf(u32 index)
- {
- 	int cpu = 0, ret = 0;
- 	u32 highest_perf = 0, nominal_perf = 0, lowest_nonlinear_perf = 0, lowest_perf = 0;
-@@ -142,9 +127,8 @@ static void amd_pstate_ut_check_perf(u32
- 		if (get_shared_mem()) {
- 			ret = cppc_get_perf_caps(cpu, &cppc_perf);
- 			if (ret) {
--				amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 				pr_err("%s cppc_get_perf_caps ret=%d error!\n", __func__, ret);
--				return;
-+				return ret;
- 			}
- 
- 			highest_perf = cppc_perf.highest_perf;
-@@ -154,9 +138,8 @@ static void amd_pstate_ut_check_perf(u32
- 		} else {
- 			ret = rdmsrl_safe_on_cpu(cpu, MSR_AMD_CPPC_CAP1, &cap1);
- 			if (ret) {
--				amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 				pr_err("%s read CPPC_CAP1 ret=%d error!\n", __func__, ret);
--				return;
-+				return ret;
- 			}
- 
- 			highest_perf = AMD_CPPC_HIGHEST_PERF(cap1);
-@@ -169,32 +152,30 @@ static void amd_pstate_ut_check_perf(u32
- 		if (highest_perf != cur_perf.highest_perf && !cpudata->hw_prefcore) {
- 			pr_err("%s cpu%d highest=%d %d highest perf doesn't match\n",
- 				__func__, cpu, highest_perf, cur_perf.highest_perf);
--			return;
-+			return -EINVAL;
- 		}
- 		if (nominal_perf != cur_perf.nominal_perf ||
- 		   (lowest_nonlinear_perf != cur_perf.lowest_nonlinear_perf) ||
- 		   (lowest_perf != cur_perf.lowest_perf)) {
--			amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 			pr_err("%s cpu%d nominal=%d %d lowest_nonlinear=%d %d lowest=%d %d, they should be equal!\n",
- 				__func__, cpu, nominal_perf, cur_perf.nominal_perf,
- 				lowest_nonlinear_perf, cur_perf.lowest_nonlinear_perf,
- 				lowest_perf, cur_perf.lowest_perf);
--			return;
-+			return -EINVAL;
- 		}
- 
- 		if (!((highest_perf >= nominal_perf) &&
- 			(nominal_perf > lowest_nonlinear_perf) &&
- 			(lowest_nonlinear_perf >= lowest_perf) &&
- 			(lowest_perf > 0))) {
--			amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 			pr_err("%s cpu%d highest=%d >= nominal=%d > lowest_nonlinear=%d > lowest=%d > 0, the formula is incorrect!\n",
- 				__func__, cpu, highest_perf, nominal_perf,
- 				lowest_nonlinear_perf, lowest_perf);
--			return;
-+			return -EINVAL;
- 		}
- 	}
- 
--	amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
-+	return 0;
- }
- 
- /*
-@@ -202,7 +183,7 @@ static void amd_pstate_ut_check_perf(u32
-  * max_freq >= nominal_freq > lowest_nonlinear_freq > min_freq > 0
-  * check max freq when set support boost mode.
-  */
--static void amd_pstate_ut_check_freq(u32 index)
-+static int amd_pstate_ut_check_freq(u32 index)
- {
- 	int cpu = 0;
- 	struct amd_cpudata *cpudata = NULL;
-@@ -219,39 +200,33 @@ static void amd_pstate_ut_check_freq(u32
- 			(cpudata->nominal_freq > cpudata->lowest_nonlinear_freq) &&
- 			(cpudata->lowest_nonlinear_freq >= policy->cpuinfo.min_freq) &&
- 			(policy->cpuinfo.min_freq > 0))) {
--			amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 			pr_err("%s cpu%d max=%d >= nominal=%d > lowest_nonlinear=%d > min=%d > 0, the formula is incorrect!\n",
- 				__func__, cpu, policy->cpuinfo.max_freq, cpudata->nominal_freq,
- 				cpudata->lowest_nonlinear_freq, policy->cpuinfo.min_freq);
--			return;
-+			return -EINVAL;
- 		}
- 
- 		if (cpudata->lowest_nonlinear_freq != policy->min) {
--			amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 			pr_err("%s cpu%d cpudata_lowest_nonlinear_freq=%d policy_min=%d, they should be equal!\n",
- 				__func__, cpu, cpudata->lowest_nonlinear_freq, policy->min);
--			return;
-+			return -EINVAL;
- 		}
- 
- 		if (cpudata->boost_supported) {
--			if ((policy->max == policy->cpuinfo.max_freq) ||
--					(policy->max == cpudata->nominal_freq))
--				amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
--			else {
--				amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
-+			if ((policy->max != policy->cpuinfo.max_freq) &&
-+			    (policy->max != cpudata->nominal_freq)) {
- 				pr_err("%s cpu%d policy_max=%d should be equal cpu_max=%d or cpu_nominal=%d !\n",
- 					__func__, cpu, policy->max, policy->cpuinfo.max_freq,
- 					cpudata->nominal_freq);
--				return;
-+				return -EINVAL;
- 			}
- 		} else {
--			amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
- 			pr_err("%s cpu%d must support boost!\n", __func__, cpu);
--			return;
-+			return -EINVAL;
- 		}
- 	}
- 
--	amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
-+	return 0;
- }
- 
- static int amd_pstate_set_mode(enum amd_pstate_mode mode)
-@@ -263,32 +238,28 @@ static int amd_pstate_set_mode(enum amd_
- 	return amd_pstate_update_status(mode_str, strlen(mode_str));
- }
- 
--static void amd_pstate_ut_check_driver(u32 index)
-+static int amd_pstate_ut_check_driver(u32 index)
- {
- 	enum amd_pstate_mode mode1, mode2 = AMD_PSTATE_DISABLE;
--	int ret;
- 
- 	for (mode1 = AMD_PSTATE_DISABLE; mode1 < AMD_PSTATE_MAX; mode1++) {
--		ret = amd_pstate_set_mode(mode1);
-+		int ret = amd_pstate_set_mode(mode1);
- 		if (ret)
--			goto out;
-+			return ret;
- 		for (mode2 = AMD_PSTATE_DISABLE; mode2 < AMD_PSTATE_MAX; mode2++) {
- 			if (mode1 == mode2)
- 				continue;
- 			ret = amd_pstate_set_mode(mode2);
--			if (ret)
--				goto out;
-+			if (ret) {
-+				pr_err("%s: failed to update status for %s->%s\n", __func__,
-+					amd_pstate_get_mode_string(mode1),
-+					amd_pstate_get_mode_string(mode2));
-+				return ret;
-+			}
- 		}
- 	}
--out:
--	if (ret)
--		pr_warn("%s: failed to update status for %s->%s: %d\n", __func__,
--			amd_pstate_get_mode_string(mode1),
--			amd_pstate_get_mode_string(mode2), ret);
--
--	amd_pstate_ut_cases[index].result = ret ?
--					    AMD_PSTATE_UT_RESULT_FAIL :
--					    AMD_PSTATE_UT_RESULT_PASS;
-+
-+	return 0;
- }
- 
- static int __init amd_pstate_ut_init(void)
-@@ -296,16 +267,12 @@ static int __init amd_pstate_ut_init(voi
- 	u32 i = 0, arr_size = ARRAY_SIZE(amd_pstate_ut_cases);
- 
- 	for (i = 0; i < arr_size; i++) {
--		amd_pstate_ut_cases[i].func(i);
--		switch (amd_pstate_ut_cases[i].result) {
--		case AMD_PSTATE_UT_RESULT_PASS:
-+		int ret = amd_pstate_ut_cases[i].func(i);
-+
-+		if (ret)
-+			pr_err("%-4d %-20s\t fail: %d!\n", i+1, amd_pstate_ut_cases[i].name, ret);
-+		else
- 			pr_info("%-4d %-20s\t success!\n", i+1, amd_pstate_ut_cases[i].name);
--			break;
--		case AMD_PSTATE_UT_RESULT_FAIL:
--		default:
--			pr_info("%-4d %-20s\t fail!\n", i+1, amd_pstate_ut_cases[i].name);
--			break;
--		}
- 	}
- 
- 	return 0;

debian/patches/patchset-pf/amd-pstate/0015-cpufreq-amd-pstate-ut-Run-on-all-of-the-correct-CPUs.patch

@@ -1,50 +0,0 @@
-From c553e0165997349a3f831fa04bdd7f61913a3442 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:25 -0600
-Subject: cpufreq/amd-pstate-ut: Run on all of the correct CPUs
-
-If a CPU is missing a policy or one has been offlined then the unit test
-is skipped for the rest of the CPUs on the system.
-
-Instead; iterate online CPUs and skip any missing policies to allow
-continuing to test the rest of them.
-
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate-ut.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate-ut.c
-+++ b/drivers/cpufreq/amd-pstate-ut.c
-@@ -116,12 +116,12 @@ static int amd_pstate_ut_check_perf(u32
- 	struct amd_cpudata *cpudata = NULL;
- 	union perf_cached cur_perf;
- 
--	for_each_possible_cpu(cpu) {
-+	for_each_online_cpu(cpu) {
- 		struct cpufreq_policy *policy __free(put_cpufreq_policy) = NULL;
- 
- 		policy = cpufreq_cpu_get(cpu);
- 		if (!policy)
--			break;
-+			continue;
- 		cpudata = policy->driver_data;
- 
- 		if (get_shared_mem()) {
-@@ -188,12 +188,12 @@ static int amd_pstate_ut_check_freq(u32
- 	int cpu = 0;
- 	struct amd_cpudata *cpudata = NULL;
- 
--	for_each_possible_cpu(cpu) {
-+	for_each_online_cpu(cpu) {
- 		struct cpufreq_policy *policy __free(put_cpufreq_policy) = NULL;
- 
- 		policy = cpufreq_cpu_get(cpu);
- 		if (!policy)
--			break;
-+			continue;
- 		cpudata = policy->driver_data;
- 
- 		if (!((policy->cpuinfo.max_freq >= cpudata->nominal_freq) &&

debian/patches/patchset-pf/amd-pstate/0016-cpufreq-amd-pstate-ut-Adjust-variable-scope.patch

@@ -1,42 +0,0 @@
-From c4197fd693cb98a8a71557187a7cf592d6b68b3c Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:26 -0600
-Subject: cpufreq/amd-pstate-ut: Adjust variable scope
-
-In amd_pstate_ut_check_freq() and amd_pstate_ut_check_perf() the cpudata
-variable is only needed in the scope of the for loop. Move it there.
-
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate-ut.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate-ut.c
-+++ b/drivers/cpufreq/amd-pstate-ut.c
-@@ -113,11 +113,11 @@ static int amd_pstate_ut_check_perf(u32
- 	u32 highest_perf = 0, nominal_perf = 0, lowest_nonlinear_perf = 0, lowest_perf = 0;
- 	u64 cap1 = 0;
- 	struct cppc_perf_caps cppc_perf;
--	struct amd_cpudata *cpudata = NULL;
- 	union perf_cached cur_perf;
- 
- 	for_each_online_cpu(cpu) {
- 		struct cpufreq_policy *policy __free(put_cpufreq_policy) = NULL;
-+		struct amd_cpudata *cpudata;
- 
- 		policy = cpufreq_cpu_get(cpu);
- 		if (!policy)
-@@ -186,10 +186,10 @@ static int amd_pstate_ut_check_perf(u32
- static int amd_pstate_ut_check_freq(u32 index)
- {
- 	int cpu = 0;
--	struct amd_cpudata *cpudata = NULL;
- 
- 	for_each_online_cpu(cpu) {
- 		struct cpufreq_policy *policy __free(put_cpufreq_policy) = NULL;
-+		struct amd_cpudata *cpudata;
- 
- 		policy = cpufreq_cpu_get(cpu);
- 		if (!policy)

debian/patches/patchset-pf/amd-pstate/0017-cpufreq-amd-pstate-Replace-all-AMD_CPPC_-macros-with.patch

@@ -1,123 +0,0 @@
-From 19c375251767f49b62894d3b4782f0b8b01313b8 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:27 -0600
-Subject: cpufreq/amd-pstate: Replace all AMD_CPPC_* macros with masks
-
-Bitfield masks are easier to follow and less error prone.
-
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- arch/x86/include/asm/msr-index.h | 20 +++++++++++---------
- arch/x86/kernel/acpi/cppc.c      |  4 +++-
- drivers/cpufreq/amd-pstate-ut.c  |  9 +++++----
- drivers/cpufreq/amd-pstate.c     | 16 ++++++----------
- 4 files changed, 25 insertions(+), 24 deletions(-)
-
---- a/arch/x86/include/asm/msr-index.h
-+++ b/arch/x86/include/asm/msr-index.h
-@@ -709,15 +709,17 @@
- #define MSR_AMD_CPPC_REQ		0xc00102b3
- #define MSR_AMD_CPPC_STATUS		0xc00102b4
- 
--#define AMD_CPPC_LOWEST_PERF(x)		(((x) >> 0) & 0xff)
--#define AMD_CPPC_LOWNONLIN_PERF(x)	(((x) >> 8) & 0xff)
--#define AMD_CPPC_NOMINAL_PERF(x)	(((x) >> 16) & 0xff)
--#define AMD_CPPC_HIGHEST_PERF(x)	(((x) >> 24) & 0xff)
-+/* Masks for use with MSR_AMD_CPPC_CAP1 */
-+#define AMD_CPPC_LOWEST_PERF_MASK	GENMASK(7, 0)
-+#define AMD_CPPC_LOWNONLIN_PERF_MASK	GENMASK(15, 8)
-+#define AMD_CPPC_NOMINAL_PERF_MASK	GENMASK(23, 16)
-+#define AMD_CPPC_HIGHEST_PERF_MASK	GENMASK(31, 24)
- 
--#define AMD_CPPC_MAX_PERF(x)		(((x) & 0xff) << 0)
--#define AMD_CPPC_MIN_PERF(x)		(((x) & 0xff) << 8)
--#define AMD_CPPC_DES_PERF(x)		(((x) & 0xff) << 16)
--#define AMD_CPPC_ENERGY_PERF_PREF(x)	(((x) & 0xff) << 24)
-+/* Masks for use with MSR_AMD_CPPC_REQ */
-+#define AMD_CPPC_MAX_PERF_MASK		GENMASK(7, 0)
-+#define AMD_CPPC_MIN_PERF_MASK		GENMASK(15, 8)
-+#define AMD_CPPC_DES_PERF_MASK		GENMASK(23, 16)
-+#define AMD_CPPC_EPP_PERF_MASK		GENMASK(31, 24)
- 
- /* AMD Performance Counter Global Status and Control MSRs */
- #define MSR_AMD64_PERF_CNTR_GLOBAL_STATUS	0xc0000300
---- a/arch/x86/kernel/acpi/cppc.c
-+++ b/arch/x86/kernel/acpi/cppc.c
-@@ -4,6 +4,8 @@
-  * Copyright (c) 2016, Intel Corporation.
-  */
- 
-+#include <linux/bitfield.h>
-+
- #include <acpi/cppc_acpi.h>
- #include <asm/msr.h>
- #include <asm/processor.h>
-@@ -149,7 +151,7 @@ int amd_get_highest_perf(unsigned int cp
- 		if (ret)
- 			goto out;
- 
--		val = AMD_CPPC_HIGHEST_PERF(val);
-+		val = FIELD_GET(AMD_CPPC_HIGHEST_PERF_MASK, val);
- 	} else {
- 		ret = cppc_get_highest_perf(cpu, &val);
- 		if (ret)
---- a/drivers/cpufreq/amd-pstate-ut.c
-+++ b/drivers/cpufreq/amd-pstate-ut.c
-@@ -22,6 +22,7 @@
- 
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
- 
-+#include <linux/bitfield.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/moduleparam.h>
-@@ -142,10 +143,10 @@ static int amd_pstate_ut_check_perf(u32
- 				return ret;
- 			}
- 
--			highest_perf = AMD_CPPC_HIGHEST_PERF(cap1);
--			nominal_perf = AMD_CPPC_NOMINAL_PERF(cap1);
--			lowest_nonlinear_perf = AMD_CPPC_LOWNONLIN_PERF(cap1);
--			lowest_perf = AMD_CPPC_LOWEST_PERF(cap1);
-+			highest_perf = FIELD_GET(AMD_CPPC_HIGHEST_PERF_MASK, cap1);
-+			nominal_perf = FIELD_GET(AMD_CPPC_NOMINAL_PERF_MASK, cap1);
-+			lowest_nonlinear_perf = FIELD_GET(AMD_CPPC_LOWNONLIN_PERF_MASK, cap1);
-+			lowest_perf = FIELD_GET(AMD_CPPC_LOWEST_PERF_MASK, cap1);
- 		}
- 
- 		cur_perf = READ_ONCE(cpudata->perf);
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -89,11 +89,6 @@ static bool cppc_enabled;
- static bool amd_pstate_prefcore = true;
- static struct quirk_entry *quirks;
- 
--#define AMD_CPPC_MAX_PERF_MASK		GENMASK(7, 0)
--#define AMD_CPPC_MIN_PERF_MASK		GENMASK(15, 8)
--#define AMD_CPPC_DES_PERF_MASK		GENMASK(23, 16)
--#define AMD_CPPC_EPP_PERF_MASK		GENMASK(31, 24)
--
- /*
-  * AMD Energy Preference Performance (EPP)
-  * The EPP is used in the CCLK DPM controller to drive
-@@ -439,12 +434,13 @@ static int msr_init_perf(struct amd_cpud
- 
- 	perf.highest_perf = numerator;
- 	perf.max_limit_perf = numerator;
--	perf.min_limit_perf = AMD_CPPC_LOWEST_PERF(cap1);
--	perf.nominal_perf = AMD_CPPC_NOMINAL_PERF(cap1);
--	perf.lowest_nonlinear_perf = AMD_CPPC_LOWNONLIN_PERF(cap1);
--	perf.lowest_perf = AMD_CPPC_LOWEST_PERF(cap1);
-+	perf.min_limit_perf = FIELD_GET(AMD_CPPC_LOWEST_PERF_MASK, cap1);
-+	perf.nominal_perf = FIELD_GET(AMD_CPPC_NOMINAL_PERF_MASK, cap1);
-+	perf.lowest_nonlinear_perf = FIELD_GET(AMD_CPPC_LOWNONLIN_PERF_MASK, cap1);
-+	perf.lowest_perf = FIELD_GET(AMD_CPPC_LOWEST_PERF_MASK, cap1);
- 	WRITE_ONCE(cpudata->perf, perf);
--	WRITE_ONCE(cpudata->prefcore_ranking, AMD_CPPC_HIGHEST_PERF(cap1));
-+	WRITE_ONCE(cpudata->prefcore_ranking, FIELD_GET(AMD_CPPC_HIGHEST_PERF_MASK, cap1));
-+
- 	return 0;
- }
- 

debian/patches/patchset-pf/amd-pstate/0018-cpufreq-amd-pstate-Cache-CPPC-request-in-shared-mem-.patch

@@ -1,60 +0,0 @@
-From bb7fadf4a86e19b52cbe850c9274bfa643d3ce52 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:28 -0600
-Subject: cpufreq/amd-pstate: Cache CPPC request in shared mem case too
-
-In order to prevent a potential write for shmem_update_perf()
-cache the request into the cppc_req_cached variable normally only
-used for the MSR case.
-
-This adds symmetry into the code and potentially avoids extra writes.
-
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 22 +++++++++++++++++++++-
- 1 file changed, 21 insertions(+), 1 deletion(-)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -496,6 +496,8 @@ static int shmem_update_perf(struct amd_
- 			     u8 des_perf, u8 max_perf, u8 epp, bool fast_switch)
- {
- 	struct cppc_perf_ctrls perf_ctrls;
-+	u64 value, prev;
-+	int ret;
- 
- 	if (cppc_state == AMD_PSTATE_ACTIVE) {
- 		int ret = shmem_set_epp(cpudata, epp);
-@@ -504,11 +506,29 @@ static int shmem_update_perf(struct amd_
- 			return ret;
- 	}
- 
-+	value = prev = READ_ONCE(cpudata->cppc_req_cached);
-+
-+	value &= ~(AMD_CPPC_MAX_PERF_MASK | AMD_CPPC_MIN_PERF_MASK |
-+		   AMD_CPPC_DES_PERF_MASK | AMD_CPPC_EPP_PERF_MASK);
-+	value |= FIELD_PREP(AMD_CPPC_MAX_PERF_MASK, max_perf);
-+	value |= FIELD_PREP(AMD_CPPC_DES_PERF_MASK, des_perf);
-+	value |= FIELD_PREP(AMD_CPPC_MIN_PERF_MASK, min_perf);
-+	value |= FIELD_PREP(AMD_CPPC_EPP_PERF_MASK, epp);
-+
-+	if (value == prev)
-+		return 0;
-+
- 	perf_ctrls.max_perf = max_perf;
- 	perf_ctrls.min_perf = min_perf;
- 	perf_ctrls.desired_perf = des_perf;
- 
--	return cppc_set_perf(cpudata->cpu, &perf_ctrls);
-+	ret = cppc_set_perf(cpudata->cpu, &perf_ctrls);
-+	if (ret)
-+		return ret;
-+
-+	WRITE_ONCE(cpudata->cppc_req_cached, value);
-+
-+	return 0;
- }
- 
- static inline bool amd_pstate_sample(struct amd_cpudata *cpudata)

debian/patches/patchset-pf/amd-pstate/0019-cpufreq-amd-pstate-Move-all-EPP-tracing-into-_update.patch

@@ -1,318 +0,0 @@
-From e02f8a14d44223160d348d5841cc3dd916a14401 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:29 -0600
-Subject: cpufreq/amd-pstate: Move all EPP tracing into *_update_perf and
- *_set_epp functions
-
-The EPP tracing is done by the caller today, but this precludes the
-information about whether the CPPC request has changed.
-
-Move it into the update_perf and set_epp functions and include information
-about whether the request has changed from the last one.
-amd_pstate_update_perf() and amd_pstate_set_epp() now require the policy
-as an argument instead of the cpudata.
-
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate-trace.h |  13 +++-
- drivers/cpufreq/amd-pstate.c       | 118 +++++++++++++++++------------
- 2 files changed, 80 insertions(+), 51 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate-trace.h
-+++ b/drivers/cpufreq/amd-pstate-trace.h
-@@ -90,7 +90,8 @@ TRACE_EVENT(amd_pstate_epp_perf,
- 		 u8 epp,
- 		 u8 min_perf,
- 		 u8 max_perf,
--		 bool boost
-+		 bool boost,
-+		 bool changed
- 		 ),
- 
- 	TP_ARGS(cpu_id,
-@@ -98,7 +99,8 @@ TRACE_EVENT(amd_pstate_epp_perf,
- 		epp,
- 		min_perf,
- 		max_perf,
--		boost),
-+		boost,
-+		changed),
- 
- 	TP_STRUCT__entry(
- 		__field(unsigned int, cpu_id)
-@@ -107,6 +109,7 @@ TRACE_EVENT(amd_pstate_epp_perf,
- 		__field(u8, min_perf)
- 		__field(u8, max_perf)
- 		__field(bool, boost)
-+		__field(bool, changed)
- 		),
- 
- 	TP_fast_assign(
-@@ -116,15 +119,17 @@ TRACE_EVENT(amd_pstate_epp_perf,
- 		__entry->min_perf = min_perf;
- 		__entry->max_perf = max_perf;
- 		__entry->boost = boost;
-+		__entry->changed = changed;
- 		),
- 
--	TP_printk("cpu%u: [%hhu<->%hhu]/%hhu, epp=%hhu, boost=%u",
-+	TP_printk("cpu%u: [%hhu<->%hhu]/%hhu, epp=%hhu, boost=%u, changed=%u",
- 		  (unsigned int)__entry->cpu_id,
- 		  (u8)__entry->min_perf,
- 		  (u8)__entry->max_perf,
- 		  (u8)__entry->highest_perf,
- 		  (u8)__entry->epp,
--		  (bool)__entry->boost
-+		  (bool)__entry->boost,
-+		  (bool)__entry->changed
- 		 )
- );
- 
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -228,9 +228,10 @@ static u8 shmem_get_epp(struct amd_cpuda
- 	return FIELD_GET(AMD_CPPC_EPP_PERF_MASK, epp);
- }
- 
--static int msr_update_perf(struct amd_cpudata *cpudata, u8 min_perf,
-+static int msr_update_perf(struct cpufreq_policy *policy, u8 min_perf,
- 			   u8 des_perf, u8 max_perf, u8 epp, bool fast_switch)
- {
-+	struct amd_cpudata *cpudata = policy->driver_data;
- 	u64 value, prev;
- 
- 	value = prev = READ_ONCE(cpudata->cppc_req_cached);
-@@ -242,6 +243,18 @@ static int msr_update_perf(struct amd_cp
- 	value |= FIELD_PREP(AMD_CPPC_MIN_PERF_MASK, min_perf);
- 	value |= FIELD_PREP(AMD_CPPC_EPP_PERF_MASK, epp);
- 
-+	if (trace_amd_pstate_epp_perf_enabled()) {
-+		union perf_cached perf = READ_ONCE(cpudata->perf);
-+
-+		trace_amd_pstate_epp_perf(cpudata->cpu,
-+					  perf.highest_perf,
-+					  epp,
-+					  min_perf,
-+					  max_perf,
-+					  policy->boost_enabled,
-+					  value != prev);
-+	}
-+
- 	if (value == prev)
- 		return 0;
- 
-@@ -256,24 +269,26 @@ static int msr_update_perf(struct amd_cp
- 	}
- 
- 	WRITE_ONCE(cpudata->cppc_req_cached, value);
--	WRITE_ONCE(cpudata->epp_cached, epp);
-+	if (epp != cpudata->epp_cached)
-+		WRITE_ONCE(cpudata->epp_cached, epp);
- 
- 	return 0;
- }
- 
- DEFINE_STATIC_CALL(amd_pstate_update_perf, msr_update_perf);
- 
--static inline int amd_pstate_update_perf(struct amd_cpudata *cpudata,
-+static inline int amd_pstate_update_perf(struct cpufreq_policy *policy,
- 					  u8 min_perf, u8 des_perf,
- 					  u8 max_perf, u8 epp,
- 					  bool fast_switch)
- {
--	return static_call(amd_pstate_update_perf)(cpudata, min_perf, des_perf,
-+	return static_call(amd_pstate_update_perf)(policy, min_perf, des_perf,
- 						   max_perf, epp, fast_switch);
- }
- 
--static int msr_set_epp(struct amd_cpudata *cpudata, u8 epp)
-+static int msr_set_epp(struct cpufreq_policy *policy, u8 epp)
- {
-+	struct amd_cpudata *cpudata = policy->driver_data;
- 	u64 value, prev;
- 	int ret;
- 
-@@ -281,6 +296,19 @@ static int msr_set_epp(struct amd_cpudat
- 	value &= ~AMD_CPPC_EPP_PERF_MASK;
- 	value |= FIELD_PREP(AMD_CPPC_EPP_PERF_MASK, epp);
- 
-+	if (trace_amd_pstate_epp_perf_enabled()) {
-+		union perf_cached perf = cpudata->perf;
-+
-+		trace_amd_pstate_epp_perf(cpudata->cpu, perf.highest_perf,
-+					  epp,
-+					  FIELD_GET(AMD_CPPC_MIN_PERF_MASK,
-+						    cpudata->cppc_req_cached),
-+					  FIELD_GET(AMD_CPPC_MAX_PERF_MASK,
-+						    cpudata->cppc_req_cached),
-+					  policy->boost_enabled,
-+					  value != prev);
-+	}
-+
- 	if (value == prev)
- 		return 0;
- 
-@@ -299,15 +327,29 @@ static int msr_set_epp(struct amd_cpudat
- 
- DEFINE_STATIC_CALL(amd_pstate_set_epp, msr_set_epp);
- 
--static inline int amd_pstate_set_epp(struct amd_cpudata *cpudata, u8 epp)
-+static inline int amd_pstate_set_epp(struct cpufreq_policy *policy, u8 epp)
- {
--	return static_call(amd_pstate_set_epp)(cpudata, epp);
-+	return static_call(amd_pstate_set_epp)(policy, epp);
- }
- 
--static int shmem_set_epp(struct amd_cpudata *cpudata, u8 epp)
-+static int shmem_set_epp(struct cpufreq_policy *policy, u8 epp)
- {
--	int ret;
-+	struct amd_cpudata *cpudata = policy->driver_data;
- 	struct cppc_perf_ctrls perf_ctrls;
-+	int ret;
-+
-+	if (trace_amd_pstate_epp_perf_enabled()) {
-+		union perf_cached perf = cpudata->perf;
-+
-+		trace_amd_pstate_epp_perf(cpudata->cpu, perf.highest_perf,
-+					  epp,
-+					  FIELD_GET(AMD_CPPC_MIN_PERF_MASK,
-+						    cpudata->cppc_req_cached),
-+					  FIELD_GET(AMD_CPPC_MAX_PERF_MASK,
-+						    cpudata->cppc_req_cached),
-+					  policy->boost_enabled,
-+					  epp != cpudata->epp_cached);
-+	}
- 
- 	if (epp == cpudata->epp_cached)
- 		return 0;
-@@ -339,17 +381,7 @@ static int amd_pstate_set_energy_pref_in
- 		return -EBUSY;
- 	}
- 
--	if (trace_amd_pstate_epp_perf_enabled()) {
--		union perf_cached perf = READ_ONCE(cpudata->perf);
--
--		trace_amd_pstate_epp_perf(cpudata->cpu, perf.highest_perf,
--					  epp,
--					  FIELD_GET(AMD_CPPC_MIN_PERF_MASK, cpudata->cppc_req_cached),
--					  FIELD_GET(AMD_CPPC_MAX_PERF_MASK, cpudata->cppc_req_cached),
--					  policy->boost_enabled);
--	}
--
--	return amd_pstate_set_epp(cpudata, epp);
-+	return amd_pstate_set_epp(policy, epp);
- }
- 
- static inline int msr_cppc_enable(bool enable)
-@@ -492,15 +524,16 @@ static inline int amd_pstate_init_perf(s
- 	return static_call(amd_pstate_init_perf)(cpudata);
- }
- 
--static int shmem_update_perf(struct amd_cpudata *cpudata, u8 min_perf,
-+static int shmem_update_perf(struct cpufreq_policy *policy, u8 min_perf,
- 			     u8 des_perf, u8 max_perf, u8 epp, bool fast_switch)
- {
-+	struct amd_cpudata *cpudata = policy->driver_data;
- 	struct cppc_perf_ctrls perf_ctrls;
- 	u64 value, prev;
- 	int ret;
- 
- 	if (cppc_state == AMD_PSTATE_ACTIVE) {
--		int ret = shmem_set_epp(cpudata, epp);
-+		int ret = shmem_set_epp(policy, epp);
- 
- 		if (ret)
- 			return ret;
-@@ -515,6 +548,18 @@ static int shmem_update_perf(struct amd_
- 	value |= FIELD_PREP(AMD_CPPC_MIN_PERF_MASK, min_perf);
- 	value |= FIELD_PREP(AMD_CPPC_EPP_PERF_MASK, epp);
- 
-+	if (trace_amd_pstate_epp_perf_enabled()) {
-+		union perf_cached perf = READ_ONCE(cpudata->perf);
-+
-+		trace_amd_pstate_epp_perf(cpudata->cpu,
-+					  perf.highest_perf,
-+					  epp,
-+					  min_perf,
-+					  max_perf,
-+					  policy->boost_enabled,
-+					  value != prev);
-+	}
-+
- 	if (value == prev)
- 		return 0;
- 
-@@ -592,7 +637,7 @@ static void amd_pstate_update(struct amd
- 				cpudata->cpu, fast_switch);
- 	}
- 
--	amd_pstate_update_perf(cpudata, min_perf, des_perf, max_perf, 0, fast_switch);
-+	amd_pstate_update_perf(policy, min_perf, des_perf, max_perf, 0, fast_switch);
- }
- 
- static int amd_pstate_verify(struct cpufreq_policy_data *policy_data)
-@@ -1525,7 +1570,7 @@ static int amd_pstate_epp_cpu_init(struc
- 			return ret;
- 		WRITE_ONCE(cpudata->cppc_req_cached, value);
- 	}
--	ret = amd_pstate_set_epp(cpudata, cpudata->epp_default);
-+	ret = amd_pstate_set_epp(policy, cpudata->epp_default);
- 	if (ret)
- 		return ret;
- 
-@@ -1566,14 +1611,8 @@ static int amd_pstate_epp_update_limit(s
- 		epp = READ_ONCE(cpudata->epp_cached);
- 
- 	perf = READ_ONCE(cpudata->perf);
--	if (trace_amd_pstate_epp_perf_enabled()) {
--		trace_amd_pstate_epp_perf(cpudata->cpu, perf.highest_perf, epp,
--					  perf.min_limit_perf,
--					  perf.max_limit_perf,
--					  policy->boost_enabled);
--	}
- 
--	return amd_pstate_update_perf(cpudata, perf.min_limit_perf, 0U,
-+	return amd_pstate_update_perf(policy, perf.min_limit_perf, 0U,
- 				      perf.max_limit_perf, epp, false);
- }
- 
-@@ -1605,20 +1644,12 @@ static int amd_pstate_epp_set_policy(str
- 
- static int amd_pstate_epp_reenable(struct cpufreq_policy *policy)
- {
--	struct amd_cpudata *cpudata = policy->driver_data;
--	union perf_cached perf = READ_ONCE(cpudata->perf);
- 	int ret;
- 
- 	ret = amd_pstate_cppc_enable(true);
- 	if (ret)
- 		pr_err("failed to enable amd pstate during resume, return %d\n", ret);
- 
--	if (trace_amd_pstate_epp_perf_enabled()) {
--		trace_amd_pstate_epp_perf(cpudata->cpu, perf.highest_perf,
--					  cpudata->epp_cached,
--					  FIELD_GET(AMD_CPPC_MIN_PERF_MASK, cpudata->cppc_req_cached),
--					  perf.highest_perf, policy->boost_enabled);
--	}
- 
- 	return amd_pstate_epp_update_limit(policy);
- }
-@@ -1646,14 +1677,7 @@ static int amd_pstate_epp_cpu_offline(st
- 	if (cpudata->suspended)
- 		return 0;
- 
--	if (trace_amd_pstate_epp_perf_enabled()) {
--		trace_amd_pstate_epp_perf(cpudata->cpu, perf.highest_perf,
--					  AMD_CPPC_EPP_BALANCE_POWERSAVE,
--					  perf.lowest_perf, perf.lowest_perf,
--					  policy->boost_enabled);
--	}
--
--	return amd_pstate_update_perf(cpudata, perf.lowest_perf, 0, perf.lowest_perf,
-+	return amd_pstate_update_perf(policy, perf.lowest_perf, 0, perf.lowest_perf,
- 				      AMD_CPPC_EPP_BALANCE_POWERSAVE, false);
- }
- 

debian/patches/patchset-pf/amd-pstate/0020-cpufreq-amd-pstate-Update-cppc_req_cached-for-shared.patch

@@ -1,37 +0,0 @@
-From 5f0b3bf5497422293576a0783e47d203c52ed863 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:30 -0600
-Subject: cpufreq/amd-pstate: Update cppc_req_cached for shared mem EPP writes
-
-On EPP only writes update the cached variable so that the min/max
-performance controls don't need to be updated again.
-
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -336,6 +336,7 @@ static int shmem_set_epp(struct cpufreq_
- {
- 	struct amd_cpudata *cpudata = policy->driver_data;
- 	struct cppc_perf_ctrls perf_ctrls;
-+	u64 value;
- 	int ret;
- 
- 	if (trace_amd_pstate_epp_perf_enabled()) {
-@@ -362,6 +363,11 @@ static int shmem_set_epp(struct cpufreq_
- 	}
- 	WRITE_ONCE(cpudata->epp_cached, epp);
- 
-+	value = READ_ONCE(cpudata->cppc_req_cached);
-+	value &= ~AMD_CPPC_EPP_PERF_MASK;
-+	value |= FIELD_PREP(AMD_CPPC_EPP_PERF_MASK, epp);
-+	WRITE_ONCE(cpudata->cppc_req_cached, value);
-+
- 	return ret;
- }
- 

debian/patches/patchset-pf/amd-pstate/0021-cpufreq-amd-pstate-Drop-debug-statements-for-policy-.patch

@@ -1,38 +0,0 @@
-From 6c2201fe880d7d35fbde67d74ec1989f053cc0bd Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:31 -0600
-Subject: cpufreq/amd-pstate: Drop debug statements for policy setting
-
-There are trace events that exist now for all amd-pstate modes that
-will output information right before programming to the hardware.
-
-This makes the existing debug statements unnecessary remaining
-overhead.  Drop them.
-
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 4 ----
- 1 file changed, 4 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -667,7 +667,6 @@ static int amd_pstate_verify(struct cpuf
- 	}
- 
- 	cpufreq_verify_within_cpu_limits(policy_data);
--	pr_debug("policy_max =%d, policy_min=%d\n", policy_data->max, policy_data->min);
- 
- 	return 0;
- }
-@@ -1630,9 +1629,6 @@ static int amd_pstate_epp_set_policy(str
- 	if (!policy->cpuinfo.max_freq)
- 		return -ENODEV;
- 
--	pr_debug("set_policy: cpuinfo.max %u policy->max %u\n",
--				policy->cpuinfo.max_freq, policy->max);
--
- 	cpudata->policy = policy->policy;
- 
- 	ret = amd_pstate_epp_update_limit(policy);

debian/patches/patchset-pf/amd-pstate/0022-cpufreq-amd-pstate-Rework-CPPC-enabling.patch

@@ -1,327 +0,0 @@
-From 3c5030a27361deff20bec5d43339109901f3198c Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:32 -0600
-Subject: cpufreq/amd-pstate: Rework CPPC enabling
-
-The CPPC enable register is configured as "write once".  That is
-any future writes don't actually do anything.
-
-Because of this, all the cleanup paths that currently exist for
-CPPC disable are non-effective.
-
-Rework CPPC enable to only enable after all the CAP registers have
-been read to avoid enabling CPPC on CPUs with invalid _CPC or
-unpopulated MSRs.
-
-As the register is write once, remove all cleanup paths as well.
-
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 179 +++++++----------------------------
- 1 file changed, 35 insertions(+), 144 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -85,7 +85,6 @@ static struct cpufreq_driver *current_ps
- static struct cpufreq_driver amd_pstate_driver;
- static struct cpufreq_driver amd_pstate_epp_driver;
- static int cppc_state = AMD_PSTATE_UNDEFINED;
--static bool cppc_enabled;
- static bool amd_pstate_prefcore = true;
- static struct quirk_entry *quirks;
- 
-@@ -371,89 +370,21 @@ static int shmem_set_epp(struct cpufreq_
- 	return ret;
- }
- 
--static int amd_pstate_set_energy_pref_index(struct cpufreq_policy *policy,
--					    int pref_index)
-+static inline int msr_cppc_enable(struct cpufreq_policy *policy)
- {
--	struct amd_cpudata *cpudata = policy->driver_data;
--	u8 epp;
--
--	if (!pref_index)
--		epp = cpudata->epp_default;
--	else
--		epp = epp_values[pref_index];
--
--	if (epp > 0 && cpudata->policy == CPUFREQ_POLICY_PERFORMANCE) {
--		pr_debug("EPP cannot be set under performance policy\n");
--		return -EBUSY;
--	}
--
--	return amd_pstate_set_epp(policy, epp);
--}
--
--static inline int msr_cppc_enable(bool enable)
--{
--	int ret, cpu;
--	unsigned long logical_proc_id_mask = 0;
--
--       /*
--        * MSR_AMD_CPPC_ENABLE is write-once, once set it cannot be cleared.
--        */
--	if (!enable)
--		return 0;
--
--	if (enable == cppc_enabled)
--		return 0;
--
--	for_each_present_cpu(cpu) {
--		unsigned long logical_id = topology_logical_package_id(cpu);
--
--		if (test_bit(logical_id, &logical_proc_id_mask))
--			continue;
--
--		set_bit(logical_id, &logical_proc_id_mask);
--
--		ret = wrmsrl_safe_on_cpu(cpu, MSR_AMD_CPPC_ENABLE,
--				enable);
--		if (ret)
--			return ret;
--	}
--
--	cppc_enabled = enable;
--	return 0;
-+	return wrmsrl_safe_on_cpu(policy->cpu, MSR_AMD_CPPC_ENABLE, 1);
- }
- 
--static int shmem_cppc_enable(bool enable)
-+static int shmem_cppc_enable(struct cpufreq_policy *policy)
- {
--	int cpu, ret = 0;
--	struct cppc_perf_ctrls perf_ctrls;
--
--	if (enable == cppc_enabled)
--		return 0;
--
--	for_each_present_cpu(cpu) {
--		ret = cppc_set_enable(cpu, enable);
--		if (ret)
--			return ret;
--
--		/* Enable autonomous mode for EPP */
--		if (cppc_state == AMD_PSTATE_ACTIVE) {
--			/* Set desired perf as zero to allow EPP firmware control */
--			perf_ctrls.desired_perf = 0;
--			ret = cppc_set_perf(cpu, &perf_ctrls);
--			if (ret)
--				return ret;
--		}
--	}
--
--	cppc_enabled = enable;
--	return ret;
-+	return cppc_set_enable(policy->cpu, 1);
- }
- 
- DEFINE_STATIC_CALL(amd_pstate_cppc_enable, msr_cppc_enable);
- 
--static inline int amd_pstate_cppc_enable(bool enable)
-+static inline int amd_pstate_cppc_enable(struct cpufreq_policy *policy)
- {
--	return static_call(amd_pstate_cppc_enable)(enable);
-+	return static_call(amd_pstate_cppc_enable)(policy);
- }
- 
- static int msr_init_perf(struct amd_cpudata *cpudata)
-@@ -1063,6 +994,10 @@ static int amd_pstate_cpu_init(struct cp
- 							      cpudata->nominal_freq,
- 							      perf.highest_perf);
- 
-+	ret = amd_pstate_cppc_enable(policy);
-+	if (ret)
-+		goto free_cpudata1;
-+
- 	policy->boost_enabled = READ_ONCE(cpudata->boost_supported);
- 
- 	/* It will be updated by governor */
-@@ -1110,28 +1045,6 @@ static void amd_pstate_cpu_exit(struct c
- 	kfree(cpudata);
- }
- 
--static int amd_pstate_cpu_resume(struct cpufreq_policy *policy)
--{
--	int ret;
--
--	ret = amd_pstate_cppc_enable(true);
--	if (ret)
--		pr_err("failed to enable amd-pstate during resume, return %d\n", ret);
--
--	return ret;
--}
--
--static int amd_pstate_cpu_suspend(struct cpufreq_policy *policy)
--{
--	int ret;
--
--	ret = amd_pstate_cppc_enable(false);
--	if (ret)
--		pr_err("failed to disable amd-pstate during suspend, return %d\n", ret);
--
--	return ret;
--}
--
- /* Sysfs attributes */
- 
- /*
-@@ -1223,8 +1136,10 @@ static ssize_t show_energy_performance_a
- static ssize_t store_energy_performance_preference(
- 		struct cpufreq_policy *policy, const char *buf, size_t count)
- {
-+	struct amd_cpudata *cpudata = policy->driver_data;
- 	char str_preference[21];
- 	ssize_t ret;
-+	u8 epp;
- 
- 	ret = sscanf(buf, "%20s", str_preference);
- 	if (ret != 1)
-@@ -1234,7 +1149,17 @@ static ssize_t store_energy_performance_
- 	if (ret < 0)
- 		return -EINVAL;
- 
--	ret = amd_pstate_set_energy_pref_index(policy, ret);
-+	if (!ret)
-+		epp = cpudata->epp_default;
-+	else
-+		epp = epp_values[ret];
-+
-+	if (epp > 0 && policy->policy == CPUFREQ_POLICY_PERFORMANCE) {
-+		pr_debug("EPP cannot be set under performance policy\n");
-+		return -EBUSY;
-+	}
-+
-+	ret = amd_pstate_set_epp(policy, epp);
- 
- 	return ret ? ret : count;
- }
-@@ -1267,7 +1192,6 @@ static ssize_t show_energy_performance_p
- 
- static void amd_pstate_driver_cleanup(void)
- {
--	amd_pstate_cppc_enable(false);
- 	cppc_state = AMD_PSTATE_DISABLE;
- 	current_pstate_driver = NULL;
- }
-@@ -1301,14 +1225,6 @@ static int amd_pstate_register_driver(in
- 
- 	cppc_state = mode;
- 
--	ret = amd_pstate_cppc_enable(true);
--	if (ret) {
--		pr_err("failed to enable cppc during amd-pstate driver registration, return %d\n",
--		       ret);
--		amd_pstate_driver_cleanup();
--		return ret;
--	}
--
- 	/* at least one CPU supports CPB */
- 	current_pstate_driver->boost_enabled = cpu_feature_enabled(X86_FEATURE_CPB);
- 
-@@ -1548,11 +1464,15 @@ static int amd_pstate_epp_cpu_init(struc
- 	policy->cpuinfo.max_freq = policy->max = perf_to_freq(perf,
- 							      cpudata->nominal_freq,
- 							      perf.highest_perf);
-+	policy->driver_data = cpudata;
-+
-+	ret = amd_pstate_cppc_enable(policy);
-+	if (ret)
-+		goto free_cpudata1;
- 
- 	/* It will be updated by governor */
- 	policy->cur = policy->cpuinfo.min_freq;
- 
--	policy->driver_data = cpudata;
- 
- 	policy->boost_enabled = READ_ONCE(cpudata->boost_supported);
- 
-@@ -1644,31 +1564,11 @@ static int amd_pstate_epp_set_policy(str
- 	return 0;
- }
- 
--static int amd_pstate_epp_reenable(struct cpufreq_policy *policy)
--{
--	int ret;
--
--	ret = amd_pstate_cppc_enable(true);
--	if (ret)
--		pr_err("failed to enable amd pstate during resume, return %d\n", ret);
--
--
--	return amd_pstate_epp_update_limit(policy);
--}
--
- static int amd_pstate_epp_cpu_online(struct cpufreq_policy *policy)
- {
--	struct amd_cpudata *cpudata = policy->driver_data;
--	int ret;
--
--	pr_debug("AMD CPU Core %d going online\n", cpudata->cpu);
-+	pr_debug("AMD CPU Core %d going online\n", policy->cpu);
- 
--	ret = amd_pstate_epp_reenable(policy);
--	if (ret)
--		return ret;
--	cpudata->suspended = false;
--
--	return 0;
-+	return amd_pstate_cppc_enable(policy);
- }
- 
- static int amd_pstate_epp_cpu_offline(struct cpufreq_policy *policy)
-@@ -1686,11 +1586,6 @@ static int amd_pstate_epp_cpu_offline(st
- static int amd_pstate_epp_suspend(struct cpufreq_policy *policy)
- {
- 	struct amd_cpudata *cpudata = policy->driver_data;
--	int ret;
--
--	/* avoid suspending when EPP is not enabled */
--	if (cppc_state != AMD_PSTATE_ACTIVE)
--		return 0;
- 
- 	/* invalidate to ensure it's rewritten during resume */
- 	cpudata->cppc_req_cached = 0;
-@@ -1698,11 +1593,6 @@ static int amd_pstate_epp_suspend(struct
- 	/* set this flag to avoid setting core offline*/
- 	cpudata->suspended = true;
- 
--	/* disable CPPC in lowlevel firmware */
--	ret = amd_pstate_cppc_enable(false);
--	if (ret)
--		pr_err("failed to suspend, return %d\n", ret);
--
- 	return 0;
- }
- 
-@@ -1711,8 +1601,12 @@ static int amd_pstate_epp_resume(struct
- 	struct amd_cpudata *cpudata = policy->driver_data;
- 
- 	if (cpudata->suspended) {
-+		int ret;
-+
- 		/* enable amd pstate from suspend state*/
--		amd_pstate_epp_reenable(policy);
-+		ret = amd_pstate_epp_update_limit(policy);
-+		if (ret)
-+			return ret;
- 
- 		cpudata->suspended = false;
- 	}
-@@ -1727,8 +1621,6 @@ static struct cpufreq_driver amd_pstate_
- 	.fast_switch    = amd_pstate_fast_switch,
- 	.init		= amd_pstate_cpu_init,
- 	.exit		= amd_pstate_cpu_exit,
--	.suspend	= amd_pstate_cpu_suspend,
--	.resume		= amd_pstate_cpu_resume,
- 	.set_boost	= amd_pstate_set_boost,
- 	.update_limits	= amd_pstate_update_limits,
- 	.name		= "amd-pstate",
-@@ -1895,7 +1787,6 @@ static int __init amd_pstate_init(void)
- 
- global_attr_free:
- 	cpufreq_unregister_driver(current_pstate_driver);
--	amd_pstate_cppc_enable(false);
- 	return ret;
- }
- device_initcall(amd_pstate_init);

debian/patches/patchset-pf/amd-pstate/0023-cpufreq-amd-pstate-Stop-caching-EPP.patch

@@ -1,105 +0,0 @@
-From c06cca99a6d74e7a6d6f020dbf982b0b9bf704e6 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:33 -0600
-Subject: cpufreq/amd-pstate: Stop caching EPP
-
-EPP values are cached in the cpudata structure per CPU. This is needless
-though because they are also cached in the CPPC request variable.
-
-Drop the separate cache for EPP values and always reference the CPPC
-request variable when needed.
-
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 19 ++++++++++---------
- drivers/cpufreq/amd-pstate.h |  1 -
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -268,8 +268,6 @@ static int msr_update_perf(struct cpufre
- 	}
- 
- 	WRITE_ONCE(cpudata->cppc_req_cached, value);
--	if (epp != cpudata->epp_cached)
--		WRITE_ONCE(cpudata->epp_cached, epp);
- 
- 	return 0;
- }
-@@ -318,7 +316,6 @@ static int msr_set_epp(struct cpufreq_po
- 	}
- 
- 	/* update both so that msr_update_perf() can effectively check */
--	WRITE_ONCE(cpudata->epp_cached, epp);
- 	WRITE_ONCE(cpudata->cppc_req_cached, value);
- 
- 	return ret;
-@@ -335,9 +332,12 @@ static int shmem_set_epp(struct cpufreq_
- {
- 	struct amd_cpudata *cpudata = policy->driver_data;
- 	struct cppc_perf_ctrls perf_ctrls;
-+	u8 epp_cached;
- 	u64 value;
- 	int ret;
- 
-+
-+	epp_cached = FIELD_GET(AMD_CPPC_EPP_PERF_MASK, cpudata->cppc_req_cached);
- 	if (trace_amd_pstate_epp_perf_enabled()) {
- 		union perf_cached perf = cpudata->perf;
- 
-@@ -348,10 +348,10 @@ static int shmem_set_epp(struct cpufreq_
- 					  FIELD_GET(AMD_CPPC_MAX_PERF_MASK,
- 						    cpudata->cppc_req_cached),
- 					  policy->boost_enabled,
--					  epp != cpudata->epp_cached);
-+					  epp != epp_cached);
- 	}
- 
--	if (epp == cpudata->epp_cached)
-+	if (epp == epp_cached)
- 		return 0;
- 
- 	perf_ctrls.energy_perf = epp;
-@@ -360,7 +360,6 @@ static int shmem_set_epp(struct cpufreq_
- 		pr_debug("failed to set energy perf value (%d)\n", ret);
- 		return ret;
- 	}
--	WRITE_ONCE(cpudata->epp_cached, epp);
- 
- 	value = READ_ONCE(cpudata->cppc_req_cached);
- 	value &= ~AMD_CPPC_EPP_PERF_MASK;
-@@ -1168,9 +1167,11 @@ static ssize_t show_energy_performance_p
- 				struct cpufreq_policy *policy, char *buf)
- {
- 	struct amd_cpudata *cpudata = policy->driver_data;
--	u8 preference;
-+	u8 preference, epp;
-+
-+	epp = FIELD_GET(AMD_CPPC_EPP_PERF_MASK, cpudata->cppc_req_cached);
- 
--	switch (cpudata->epp_cached) {
-+	switch (epp) {
- 	case AMD_CPPC_EPP_PERFORMANCE:
- 		preference = EPP_INDEX_PERFORMANCE;
- 		break;
-@@ -1533,7 +1534,7 @@ static int amd_pstate_epp_update_limit(s
- 	if (cpudata->policy == CPUFREQ_POLICY_PERFORMANCE)
- 		epp = 0;
- 	else
--		epp = READ_ONCE(cpudata->epp_cached);
-+		epp = FIELD_GET(AMD_CPPC_EPP_PERF_MASK, cpudata->cppc_req_cached);
- 
- 	perf = READ_ONCE(cpudata->perf);
- 
---- a/drivers/cpufreq/amd-pstate.h
-+++ b/drivers/cpufreq/amd-pstate.h
-@@ -102,7 +102,6 @@ struct amd_cpudata {
- 	bool	hw_prefcore;
- 
- 	/* EPP feature related attributes*/
--	u8	epp_cached;
- 	u32	policy;
- 	bool	suspended;
- 	u8	epp_default;

debian/patches/patchset-pf/amd-pstate/0024-cpufreq-amd-pstate-Drop-actions-in-amd_pstate_epp_cp.patch

@@ -1,39 +0,0 @@
-From a82e4f4eb6e5e9806c66285cb3cefde644b8ea6b Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Wed, 26 Feb 2025 01:49:34 -0600
-Subject: cpufreq/amd-pstate: Drop actions in amd_pstate_epp_cpu_offline()
-
-When the CPU goes offline there is no need to change the CPPC request
-because the CPU will go into the deepest C-state it supports already.
-
-Actually changing the CPPC request when it goes offline messes up the
-cached values and can lead to the wrong values being restored when
-it comes back.
-
-Instead drop the actions and if the CPU comes back online let
-amd_pstate_epp_set_policy() restore it to expected values.
-
-Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -1574,14 +1574,7 @@ static int amd_pstate_epp_cpu_online(str
- 
- static int amd_pstate_epp_cpu_offline(struct cpufreq_policy *policy)
- {
--	struct amd_cpudata *cpudata = policy->driver_data;
--	union perf_cached perf = READ_ONCE(cpudata->perf);
--
--	if (cpudata->suspended)
--		return 0;
--
--	return amd_pstate_update_perf(policy, perf.lowest_perf, 0, perf.lowest_perf,
--				      AMD_CPPC_EPP_BALANCE_POWERSAVE, false);
-+	return 0;
- }
- 
- static int amd_pstate_epp_suspend(struct cpufreq_policy *policy)

debian/patches/patchset-pf/amd-pstate/0025-cpufreq-amd-pstate-fix-warning-noticed-by-kernel-tes.patch

@@ -1,41 +0,0 @@
-From de3dd387423b30565e846e0ff4424e2c99164030 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <superm1@kernel.org>
-Date: Thu, 27 Feb 2025 14:09:08 -0600
-Subject: cpufreq/amd-pstate: fix warning noticed by kernel test robot
-
-Reported-by: kernel test robot <lkp@intel.com>
-Closes: https://lore.kernel.org/oe-kbuild-all/202502272001.nafS0qXq-lkp@intel.com/
-Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
----
- drivers/cpufreq/amd-pstate.c | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -903,20 +903,19 @@ static int amd_pstate_init_freq(struct a
- 		return ret;
- 	perf = READ_ONCE(cpudata->perf);
- 
-+	if (quirks && quirks->nominal_freq)
-+		nominal_freq = quirks->nominal_freq;
-+	else
-+		nominal_freq = cppc_perf.nominal_freq;
-+	nominal_freq *= 1000;
-+
- 	if (quirks && quirks->lowest_freq) {
- 		min_freq = quirks->lowest_freq;
- 		perf.lowest_perf = freq_to_perf(perf, nominal_freq, min_freq);
- 		WRITE_ONCE(cpudata->perf, perf);
- 	} else
- 		min_freq = cppc_perf.lowest_freq;
--
--	if (quirks && quirks->nominal_freq)
--		nominal_freq = quirks->nominal_freq;
--	else
--		nominal_freq = cppc_perf.nominal_freq;
--
- 	min_freq *= 1000;
--	nominal_freq *= 1000;
- 
- 	WRITE_ONCE(cpudata->nominal_freq, nominal_freq);
-