refresh patches

debian/bin/genpatch-pfkernel

@@ -7,7 +7,7 @@ w=$(git rev-parse --path-format=absolute --show-toplevel) ; : "${w:?}" ; cd "$w"
 
 dst='debian/patches/pf-tmp'
 src='../linux-extras'
-branches='btrfs cpuidle crypto fixes kbuild pksm xfs zstd'
+branches='amd-pstate cpuidle crypto fixes kbuild zstd'
 
 if [ -d "${dst}" ] ; then rm -rf "${dst}" ; fi
 mkdir -p "${dst}"

debian/changelog

@@ -1,5 +1,6 @@
 linux (6.14-1) sid; urgency=medium
 
   * Sync with Debian.
+  * Refresh patches.
 
  -- Konstantin Demin <rockdrilla@gmail.com>  Thu, 27 Mar 2025 01:51:03 +0300

debian/patches/bugfix/all/cpupower-fix-checks-for-cpu-existence.patch

@@ -24,7 +24,7 @@ negative cases.]
 ---
 --- a/tools/power/cpupower/bench/system.c
 +++ b/tools/power/cpupower/bench/system.c
-@@ -58,12 +58,19 @@ long long int get_time()
+@@ -45,12 +45,19 @@ long long int get_time()
  
  int set_cpufreq_governor(char *governor, unsigned int cpu)
  {

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

@@ -16,7 +16,7 @@ correctness.
 
 --- a/drivers/net/phy/marvell.c
 +++ b/drivers/net/phy/marvell.c
-@@ -1366,6 +1366,7 @@ static int m88e1118_config_init(struct p
+@@ -1409,6 +1409,7 @@ static int m88e1118_config_init(struct p
  	return genphy_soft_reset(phydev);
  }
  
@@ -24,7 +24,7 @@ correctness.
  static int m88e1149_config_init(struct phy_device *phydev)
  {
  	int err;
-@@ -1391,7 +1392,9 @@ static int m88e1149_config_init(struct p
+@@ -1434,7 +1435,9 @@ static int m88e1149_config_init(struct p
  
  	return genphy_soft_reset(phydev);
  }
@@ -34,7 +34,7 @@ correctness.
  static int m88e1145_config_init_rgmii(struct phy_device *phydev)
  {
  	int err;
-@@ -1469,6 +1472,7 @@ static int m88e1145_config_init(struct p
+@@ -1512,6 +1515,7 @@ static int m88e1145_config_init(struct p
  
  	return 0;
  }
@@ -42,7 +42,7 @@ correctness.
  
  static int m88e1540_get_fld(struct phy_device *phydev, u8 *msecs)
  {
-@@ -3790,6 +3794,7 @@ static struct phy_driver marvell_drivers
+@@ -3848,6 +3852,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,
-@@ -3813,6 +3818,8 @@ static struct phy_driver marvell_drivers
+@@ -3871,6 +3876,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,
-@@ -3831,6 +3838,8 @@ static struct phy_driver marvell_drivers
+@@ -3889,6 +3896,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,
-@@ -3851,6 +3860,7 @@ static struct phy_driver marvell_drivers
+@@ -3909,6 +3918,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,
-@@ -4139,9 +4149,9 @@ static struct mdio_device_id __maybe_unu
+@@ -4197,9 +4207,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/drm-amdkfd-Fix-user-queue-validation-on-Gfx7-8.patch

@@ -1,66 +0,0 @@
-From: Philip Yang <Philip.Yang@amd.com>
-Date: Wed, 29 Jan 2025 12:37:30 -0500
-Subject: drm/amdkfd: Fix user queue validation on Gfx7/8
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Origin: https://gitlab.freedesktop.org/drm/kernel/-/commit/e7a477735f1771b9a9346a5fbd09d7ff0641723a
-Bug-Debian: https://bugs.debian.org/1093124
-
-To workaround queue full h/w issue on Gfx7/8, when application create
-AQL queue, the ring buffer bo allocate size is queue_size/2 and
-map queue_size ring buffer to GPU in 2 pieces using 2 attachments, each
-attachment map size is queue_size/2, with same ring_bo backing memory.
-
-For Gfx7/8, user queue buffer validation should use queue_size/2 to
-verify ring_bo allocation and mapping size.
-
-Fixes: 68e599db7a54 ("drm/amdkfd: Validate user queue buffers")
-Suggested-by: Tomáš Trnka <trnka@scm.com>
-Signed-off-by: Philip Yang <Philip.Yang@amd.com>
-Acked-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
-index ecccd7adbab4..62c635e9d1aa 100644
---- a/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
-+++ b/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
-@@ -233,6 +233,7 @@ void kfd_queue_buffer_put(struct amdgpu_bo **bo)
- int kfd_queue_acquire_buffers(struct kfd_process_device *pdd, struct queue_properties *properties)
- {
- 	struct kfd_topology_device *topo_dev;
-+	u64 expected_queue_size;
- 	struct amdgpu_vm *vm;
- 	u32 total_cwsr_size;
- 	int err;
-@@ -241,6 +242,15 @@ int kfd_queue_acquire_buffers(struct kfd_process_device *pdd, struct queue_prope
- 	if (!topo_dev)
- 		return -EINVAL;
- 
-+	/* AQL queues on GFX7 and GFX8 appear twice their actual size */
-+	if (properties->type == KFD_QUEUE_TYPE_COMPUTE &&
-+	    properties->format == KFD_QUEUE_FORMAT_AQL &&
-+	    topo_dev->node_props.gfx_target_version >= 70000 &&
-+	    topo_dev->node_props.gfx_target_version < 90000)
-+		expected_queue_size = properties->queue_size / 2;
-+	else
-+		expected_queue_size = properties->queue_size;
-+
- 	vm = drm_priv_to_vm(pdd->drm_priv);
- 	err = amdgpu_bo_reserve(vm->root.bo, false);
- 	if (err)
-@@ -255,7 +265,7 @@ int kfd_queue_acquire_buffers(struct kfd_process_device *pdd, struct queue_prope
- 		goto out_err_unreserve;
- 
- 	err = kfd_queue_buffer_get(vm, (void *)properties->queue_address,
--				   &properties->ring_bo, properties->queue_size);
-+				   &properties->ring_bo, expected_queue_size);
- 	if (err)
- 		goto out_err_unreserve;
- 
--- 
-2.47.2
-

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
-@@ -2619,7 +2619,7 @@ module_exit(exit_btrfs_fs)
+@@ -2627,7 +2627,7 @@ module_exit(exit_btrfs_fs)
  
  MODULE_DESCRIPTION("B-Tree File System (BTRFS)");
  MODULE_LICENSE("GPL");
@@ -27,19 +27,9 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  MODULE_SOFTDEP("pre: xxhash64");
  MODULE_SOFTDEP("pre: sha256");
  MODULE_SOFTDEP("pre: blake2b-256");
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -7404,6 +7404,6 @@ static void __exit ext4_exit_fs(void)
- MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
- MODULE_DESCRIPTION("Fourth Extended Filesystem");
- MODULE_LICENSE("GPL");
--MODULE_SOFTDEP("pre: crc32c");
-+MODULE_SOFTDEP("pre: crypto-crc32c");
- module_init(ext4_init_fs)
- module_exit(ext4_exit_fs)
 --- a/fs/jbd2/journal.c
 +++ b/fs/jbd2/journal.c
-@@ -3194,6 +3194,7 @@ static void __exit journal_exit(void)
+@@ -3152,6 +3152,7 @@ static void __exit journal_exit(void)
  
  MODULE_DESCRIPTION("Generic filesystem journal-writing module");
  MODULE_LICENSE("GPL");
@@ -49,7 +39,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  
 --- a/fs/nfsd/nfsctl.c
 +++ b/fs/nfsd/nfsctl.c
-@@ -2353,5 +2353,8 @@ static void __exit exit_nfsd(void)
+@@ -2344,5 +2344,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-fix-recordmcount-dependency.patch

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

debian/patches/bugfix/all/libapi-define-_fortify_source-as-2-not-empty.patch

@@ -7,7 +7,7 @@ Signed-off-by: Ben Hutchings <benh@debian.org>
 ---
 --- a/tools/lib/api/Makefile
 +++ b/tools/lib/api/Makefile
-@@ -29,7 +29,7 @@ endif
+@@ -35,7 +35,7 @@ ifeq ($(DEBUG),0)
  endif
  
  ifeq ($(DEBUG),0)

debian/patches/bugfix/all/module-disable-matching-missing-version-crc.patch

@@ -9,7 +9,7 @@ alternative may allow subverting module signing.
 ---
 --- a/kernel/module/version.c
 +++ b/kernel/module/version.c
-@@ -46,9 +46,8 @@ int check_version(const struct load_info
+@@ -63,9 +63,8 @@ int check_version(const struct load_info
  		goto bad_version;
  	}
  

debian/patches/bugfix/all/nfsd-fix-legacy-client-tracking-initialization.patch

@@ -1,37 +0,0 @@
-From: Scott Mayhew <smayhew@redhat.com>
-Date: Tue, 10 Dec 2024 07:25:54 -0500
-Subject: nfsd: fix legacy client tracking initialization
-Origin: https://git.kernel.org/linus/de71d4e211eddb670b285a0ea477a299601ce1ca
-
-Get rid of the nfsd4_legacy_tracking_ops->init() call in
-check_for_legacy_methods().  That will be handled in the caller
-(nfsd4_client_tracking_init()).  Otherwise, we'll wind up calling
-nfsd4_legacy_tracking_ops->init() twice, and the second time we'll
-trigger the BUG_ON() in nfsd4_init_recdir().
-
-Fixes: 74fd48739d04 ("nfsd: new Kconfig option for legacy client tracking")
-Reported-by: Jur van der Burg <jur@avtware.com>
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=219580
-Signed-off-by: Scott Mayhew <smayhew@redhat.com>
-Reviewed-by: Jeff Layton <jlayton@kernel.org>
-Tested-by: Salvatore Bonaccorso <carnil@debian.org>
-Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
----
- fs/nfsd/nfs4recover.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
-index 4a765555bf84..1c8fcb04b3cd 100644
---- a/fs/nfsd/nfs4recover.c
-+++ b/fs/nfsd/nfs4recover.c
-@@ -2052,7 +2052,6 @@ static inline int check_for_legacy_methods(int status, struct net *net)
- 		path_put(&path);
- 		if (status)
- 			return -ENOTDIR;
--		status = nn->client_tracking_ops->init(net);
- 	}
- 	return status;
- }
--- 
-2.47.2
-

debian/patches/bugfix/all/perf-docs-Fix-perf-check-manual-page-built-with-asci.patch

@@ -20,8 +20,6 @@ Signed-off-by: Ben Hutchings <benh@debian.org>
  tools/perf/Documentation/perf-check.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/tools/perf/Documentation/perf-check.txt b/tools/perf/Documentation/perf-check.txt
-index a764a4629220..80eb1de4eee0 100644
 --- a/tools/perf/Documentation/perf-check.txt
 +++ b/tools/perf/Documentation/perf-check.txt
 @@ -1,5 +1,5 @@

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
-@@ -951,7 +951,7 @@ $(LIBAPI)-clean:
+@@ -945,7 +945,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/tools-build-remove-bpf-run-time-check-at-build-time.patch

@@ -11,7 +11,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 ---
 --- a/tools/build/feature/test-bpf.c
 +++ b/tools/build/feature/test-bpf.c
-@@ -35,8 +35,10 @@ int main(void)
+@@ -41,8 +41,10 @@ int main(void)
  	attr.prog_flags = 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
-@@ -785,7 +785,7 @@ $(OUTPUT)dlfilters/%.o: dlfilters/%.c in
+@@ -919,7 +919,7 @@ $(OUTPUT)dlfilters/%.o: dlfilters/%.c in
  .SECONDARY: $(DLFILTERS:.so=.o)
  
  $(OUTPUT)dlfilters/%.so: $(OUTPUT)dlfilters/%.o

debian/patches/bugfix/all/tools_lib_symbol_use_d_fortify_source_2_for_non_debug_builds.patch

@@ -14,11 +14,9 @@ Acked-by: Ian Rogers <irogers@google.com>
  tools/lib/symbol/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/tools/lib/symbol/Makefile b/tools/lib/symbol/Makefile
-index 13d43c6f92b4..4a08cc4e19f2 100644
 --- a/tools/lib/symbol/Makefile
 +++ b/tools/lib/symbol/Makefile
-@@ -39,7 +39,7 @@ endif
+@@ -35,7 +35,7 @@ ifeq ($(DEBUG),0)
  endif
  
  ifeq ($(DEBUG),0)
@@ -27,5 +25,3 @@ index 13d43c6f92b4..4a08cc4e19f2 100644
  endif
  
  # Treat warnings as errors unless directed not to
--- 
-2.39.2

debian/patches/bugfix/all/usbip-document-tcp-wrappers.patch

@@ -17,7 +17,7 @@ Add references to TCP wrappers configuration in the manual page.
  
  .SH OPTIONS
  .HP
-@@ -69,7 +70,8 @@ Show version.
+@@ -75,7 +76,8 @@ Show version.
  
  .B usbipd
  offers no authentication or authorization for USB/IP. Any

debian/patches/bugfix/arm/arm-dts-kirkwood-fix-sata-pinmux-ing-for-ts419.patch

@@ -21,7 +21,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi
 +++ b/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi
-@@ -69,3 +69,11 @@
+@@ -67,3 +67,11 @@
  		phy-handle = <&ethphy1>;
  	};
  };

debian/patches/bugfix/arm/arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch

@@ -17,11 +17,9 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  arch/arm/mm/flush.c | 1 +
  1 file changed, 1 insertion(+)
 
-Index: debian-kernel/arch/arm/mm/flush.c
-===================================================================
---- debian-kernel.orig/arch/arm/mm/flush.c
-+++ debian-kernel/arch/arm/mm/flush.c
-@@ -292,6 +292,7 @@ void __sync_icache_dcache(pte_t pteval)
+--- a/arch/arm/mm/flush.c
++++ b/arch/arm/mm/flush.c
+@@ -310,6 +310,7 @@ void __sync_icache_dcache(pte_t pteval)
  	if (pte_exec(pteval))
  		__flush_icache_all();
  }

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

@@ -24,11 +24,9 @@ Tested-by: Michal Kubecek <mkubecek@suse.cz>
  arch/powerpc/boot/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: linux/arch/powerpc/boot/Makefile
-===================================================================
---- linux.orig/arch/powerpc/boot/Makefile
-+++ linux/arch/powerpc/boot/Makefile
-@@ -70,7 +70,7 @@ BOOTCFLAGS	+= -fno-stack-protector
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -97,7 +97,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

@@ -23,10 +23,8 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  arch/sh/boot/romimage/Makefile   |  4 ++--
  3 files changed, 9 insertions(+), 9 deletions(-)
 
-Index: linux/arch/sh/Makefile
-===================================================================
---- linux.orig/arch/sh/Makefile
-+++ linux/arch/sh/Makefile
+--- a/arch/sh/Makefile
++++ b/arch/sh/Makefile
 @@ -102,16 +102,16 @@ UTS_MACHINE		:= sh
  LDFLAGS_vmlinux		+= -e _stext
  
@@ -49,11 +47,9 @@ Index: linux/arch/sh/Makefile
  
  # Mach groups
  machdir-$(CONFIG_SOLUTION_ENGINE)		+= mach-se
-Index: linux/arch/sh/boot/compressed/Makefile
-===================================================================
---- linux.orig/arch/sh/boot/compressed/Makefile
-+++ linux/arch/sh/boot/compressed/Makefile
-@@ -36,7 +36,7 @@ endif
+--- a/arch/sh/boot/compressed/Makefile
++++ b/arch/sh/boot/compressed/Makefile
+@@ -27,7 +27,7 @@ endif
  
  ccflags-remove-$(CONFIG_MCOUNT) += -pg
  
@@ -62,7 +58,7 @@ Index: linux/arch/sh/boot/compressed/Makefile
  		   -T $(obj)/../../kernel/vmlinux.lds
  
  KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
-@@ -60,7 +60,7 @@ $(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.b
+@@ -51,7 +51,7 @@ $(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.b
  
  OBJCOPYFLAGS += -R .empty_zero_page
  
@@ -71,10 +67,8 @@ Index: linux/arch/sh/boot/compressed/Makefile
  
  $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix_y) FORCE
  	$(call if_changed,ld)
-Index: linux/arch/sh/boot/romimage/Makefile
-===================================================================
---- linux.orig/arch/sh/boot/romimage/Makefile
-+++ linux/arch/sh/boot/romimage/Makefile
+--- 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)

debian/patches/bugfix/x86/perf-tools-fix-unwind-build-on-i386.patch

@@ -15,7 +15,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/tools/perf/arch/x86/util/unwind-libunwind.c
 +++ b/tools/perf/arch/x86/util/unwind-libunwind.c
-@@ -66,7 +66,7 @@ int LIBUNWIND__ARCH_REG_ID(int regnum)
+@@ -67,7 +67,7 @@ int LIBUNWIND__ARCH_REG_ID(int regnum)
  		break;
  	default:
  		pr_err("unwind: invalid reg id %d\n", regnum);
@@ -24,7 +24,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  	}
  
  	return id;
-@@ -106,7 +106,7 @@ int LIBUNWIND__ARCH_REG_ID(int regnum)
+@@ -107,7 +107,7 @@ int LIBUNWIND__ARCH_REG_ID(int regnum)
  		break;
  	default:
  		pr_err("unwind: invalid reg id %d\n", regnum);

debian/patches/bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch

@@ -16,7 +16,7 @@ un-blacklist it in udev.
 ---
 --- a/drivers/video/fbdev/via/via-core.c
 +++ b/drivers/video/fbdev/via/via-core.c
-@@ -695,7 +695,14 @@ static const struct pci_device_id via_pc
+@@ -700,7 +700,14 @@ static const struct pci_device_id via_pc
  	  .driver_data = UNICHROME_VX900 },
  	{ }
  };

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

@@ -21,7 +21,7 @@ Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
 
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -118,6 +118,12 @@
+@@ -119,6 +119,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
   */
-@@ -2138,6 +2144,10 @@ __latent_entropy struct task_struct *cop
+@@ -2167,6 +2173,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.
-@@ -3287,6 +3297,12 @@ int ksys_unshare(unsigned long unshare_f
+@@ -3320,6 +3330,12 @@ int ksys_unshare(unsigned long unshare_f
  	if (unshare_flags & CLONE_NEWNS)
  		unshare_flags |= CLONE_FS;
  
@@ -71,7 +71,7 @@ Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
  #endif /* CONFIG_SYSCTL */
  
  /*
-@@ -1618,6 +1622,15 @@ static struct ctl_table kern_table[] = {
+@@ -1617,6 +1621,15 @@ static const struct ctl_table kern_table
  		.mode		= 0644,
  		.proc_handler	= proc_dointvec,
  	},

debian/patches/debian/af_802154-Disable-auto-loading-as-mitigation-against.patch

@@ -21,7 +21,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/net/ieee802154/socket.c
 +++ b/net/ieee802154/socket.c
-@@ -1138,4 +1138,4 @@ module_init(af_ieee802154_init);
+@@ -1140,4 +1140,4 @@ module_exit(af_ieee802154_remove);
  
  MODULE_LICENSE("GPL");
  MODULE_DESCRIPTION("IEEE 802.15.4 socket interface");

debian/patches/debian/arch-sh4-fix-uimage-build.patch

@@ -9,11 +9,9 @@ Forwarded: not-needed
  arch/sh/Makefile | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/arch/sh/Makefile b/arch/sh/Makefile
-index da9cf952f33c..974bbd9dcfcf 100644
 --- a/arch/sh/Makefile
 +++ b/arch/sh/Makefile
-@@ -85,7 +85,6 @@ OBJCOPYFLAGS	:= -O binary -R .note -R .note.gnu.build-id -R .comment \
+@@ -81,7 +81,6 @@ OBJCOPYFLAGS	:= -O binary -R .note -R .n
  
  # Give the various platforms the opportunity to set default image types
  defaultimage-y					:= zImage
@@ -21,6 +19,3 @@ index da9cf952f33c..974bbd9dcfcf 100644
  defaultimage-$(CONFIG_SH_RSK)			:= uImage
  defaultimage-$(CONFIG_SH_URQUELL)		:= uImage
  defaultimage-$(CONFIG_SH_MIGOR)			:= uImage
--- 
-2.27.0
-

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

@@ -20,15 +20,12 @@ implementation went from disk-io.c to super.c; forwarded the issue]
  fs/btrfs/super.c | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
-diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
-index 101f786963d4..2c409bce1bf5 100644
 --- a/fs/btrfs/super.c
 +++ b/fs/btrfs/super.c
-@@ -731,6 +731,18 @@ static void set_device_specific_options(struct btrfs_fs_info *fs_info)
- 	    !fs_info->fs_devices->rotating)
+@@ -765,6 +765,18 @@ static void set_device_specific_options(
  		btrfs_set_opt(fs_info->mount_opt, SSD);
  
-+	/*
+ 	/*
 +	 * Warn about RAID5/6 being experimental at mount time
 +	 */
 +	if ((fs_info->avail_data_alloc_bits |
@@ -40,6 +37,7 @@ index 101f786963d4..2c409bce1bf5 100644
 +		add_taint(TAINT_AUX, LOCKDEP_STILL_OK);
 +	}
 +
- 	/*
++	/*
  	 * For devices supporting discard turn on discard=async automatically,
  	 * unless it's already set or disabled. This could be turned off by
+ 	 * nodiscard for the same mount.

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

@@ -15,7 +15,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 ---
 --- a/net/dccp/ipv4.c
 +++ b/net/dccp/ipv4.c
-@@ -1071,8 +1071,8 @@ module_exit(dccp_v4_exit);
+@@ -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
   */
@@ -28,7 +28,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  MODULE_DESCRIPTION("DCCP - Datagram Congestion Controlled Protocol");
 --- a/net/dccp/ipv6.c
 +++ b/net/dccp/ipv6.c
-@@ -1125,8 +1125,8 @@ module_exit(dccp_v6_exit);
+@@ -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
   */

debian/patches/debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch

@@ -3,11 +3,9 @@ Date: Mon, 13 Apr 2009 17:34:00 +0100
 Subject: Remove microcode patches for mgsuvd (not enabled in Debian configs)
 Forwarded: not-needed
 
-diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig
-index 48a920a..81570b6 100644
 --- a/arch/powerpc/platforms/8xx/Kconfig
 +++ b/arch/powerpc/platforms/8xx/Kconfig
-@@ -160,16 +160,19 @@ config NO_UCODE_PATCH
+@@ -136,16 +136,19 @@ config NO_UCODE_PATCH
  
  config USB_SOF_UCODE_PATCH
  	bool "USB SOF patch"

debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch

@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/drivers/media/usb/dvb-usb/Kconfig
 +++ b/drivers/media/usb/dvb-usb/Kconfig
-@@ -227,6 +227,7 @@ config DVB_USB_OPERA1
+@@ -35,6 +35,7 @@ config DVB_USB_A800
  
  config DVB_USB_AF9005
  	tristate "Afatech AF9005 DVB-T USB1.1 support"

debian/patches/debian/export-symbols-needed-by-android-drivers.patch

@@ -22,7 +22,7 @@ Export the currently un-exported symbols it depends on.
 
 --- a/fs/file.c
 +++ b/fs/file.c
-@@ -823,6 +823,7 @@ struct file *file_close_fd(unsigned int
+@@ -837,6 +837,7 @@ struct file *file_close_fd(unsigned int
  
  	return file;
  }
@@ -42,7 +42,7 @@ Export the currently un-exported symbols it depends on.
  	struct msg_msgseg *next;
 --- a/ipc/namespace.c
 +++ b/ipc/namespace.c
-@@ -205,6 +205,7 @@ void put_ipc_ns(struct ipc_namespace *ns
+@@ -207,6 +207,7 @@ void put_ipc_ns(struct ipc_namespace *ns
  			schedule_work(&free_ipc_work);
  	}
  }
@@ -72,7 +72,7 @@ Export the currently un-exported symbols it depends on.
   * Note: we use "set_current_state()" _after_ the wait-queue add,
 --- a/kernel/task_work.c
 +++ b/kernel/task_work.c
-@@ -97,6 +97,7 @@ int task_work_add(struct task_struct *ta
+@@ -96,6 +96,7 @@ int task_work_add(struct task_struct *ta
  
  	return 0;
  }
@@ -82,7 +82,7 @@ Export the currently un-exported symbols it depends on.
   * task_work_cancel_match - cancel a pending work added by task_work_add()
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -1934,6 +1934,7 @@ void zap_page_range_single(struct vm_are
+@@ -2030,6 +2030,7 @@ void zap_page_range_single(struct vm_are
  	tlb_finish_mmu(&tlb);
  	hugetlb_zap_end(vma, details);
  }
@@ -92,7 +92,7 @@ Export the currently un-exported symbols it depends on.
   * zap_vma_ptes - remove ptes mapping the vma
 --- a/security/security.c
 +++ b/security/security.c
-@@ -890,6 +890,7 @@ int security_binder_set_context_mgr(cons
+@@ -996,6 +996,7 @@ int security_binder_set_context_mgr(cons
  {
  	return call_int_hook(binder_set_context_mgr, mgr);
  }
@@ -100,7 +100,7 @@ Export the currently un-exported symbols it depends on.
  
  /**
   * security_binder_transaction() - Check if a binder transaction is allowed
-@@ -905,6 +906,7 @@ int security_binder_transaction(const st
+@@ -1011,6 +1012,7 @@ int security_binder_transaction(const st
  {
  	return call_int_hook(binder_transaction, from, to);
  }
@@ -108,7 +108,7 @@ Export the currently un-exported symbols it depends on.
  
  /**
   * security_binder_transfer_binder() - Check if a binder transfer is allowed
-@@ -920,6 +922,7 @@ int security_binder_transfer_binder(cons
+@@ -1026,6 +1028,7 @@ int security_binder_transfer_binder(cons
  {
  	return call_int_hook(binder_transfer_binder, from, to);
  }
@@ -116,7 +116,7 @@ Export the currently un-exported symbols it depends on.
  
  /**
   * security_binder_transfer_file() - Check if a binder file xfer is allowed
-@@ -936,6 +939,7 @@ int security_binder_transfer_file(const
+@@ -1042,6 +1045,7 @@ int security_binder_transfer_file(const
  {
  	return call_int_hook(binder_transfer_file, from, to, file);
  }

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
-@@ -1756,6 +1756,14 @@ static int do_fanotify_mark(int fanotify
+@@ -1838,6 +1838,14 @@ static int do_fanotify_mark(int fanotify
  		umask = FANOTIFY_EVENT_FLAGS;
  	}
  

debian/patches/debian/fjes-disable-autoload.patch

@@ -11,11 +11,9 @@ all the other systems where the same device ID appears, so disable
 auto-loading.
 
 ---
-Index: linux/drivers/net/fjes/fjes_main.c
-===================================================================
---- linux.orig/drivers/net/fjes/fjes_main.c
-+++ linux/drivers/net/fjes/fjes_main.c
-@@ -36,7 +36,7 @@ static const struct acpi_device_id fjes_
+--- a/drivers/net/fjes/fjes_main.c
++++ b/drivers/net/fjes/fjes_main.c
+@@ -34,7 +34,7 @@ static const struct acpi_device_id fjes_
  	{ACPI_MOTHERBOARD_RESOURCE_HID, 0},
  	{"", 0},
  };

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
-@@ -1020,8 +1020,8 @@ static inline void put_link(struct namei
+@@ -1094,8 +1094,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

@@ -15,7 +15,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 ---
 --- a/net/ax25/af_ax25.c
 +++ b/net/ax25/af_ax25.c
-@@ -1986,7 +1986,7 @@ module_init(ax25_init);
+@@ -2077,7 +2077,7 @@ module_init(ax25_init);
  MODULE_AUTHOR("Jonathan Naylor G4KLX <g4klx@g4klx.demon.co.uk>");
  MODULE_DESCRIPTION("The amateur radio AX.25 link layer protocol");
  MODULE_LICENSE("GPL");
@@ -26,7 +26,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  {
 --- a/net/netrom/af_netrom.c
 +++ b/net/netrom/af_netrom.c
-@@ -1486,7 +1486,7 @@ MODULE_PARM_DESC(nr_ndevs, "number of NE
+@@ -1498,7 +1498,7 @@ MODULE_PARM_DESC(nr_ndevs, "number of NE
  MODULE_AUTHOR("Jonathan Naylor G4KLX <g4klx@g4klx.demon.co.uk>");
  MODULE_DESCRIPTION("The amateur radio NET/ROM network and transport layer protocol");
  MODULE_LICENSE("GPL");
@@ -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
-@@ -1577,7 +1577,7 @@ MODULE_PARM_DESC(rose_ndevs, "number of
+@@ -1638,7 +1638,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/iwlwifi-do-not-request-unreleased-firmware.patch

@@ -15,7 +15,7 @@ requesting the unreleased firmware.
 
 --- a/drivers/net/wireless/intel/iwlwifi/cfg/6000.c
 +++ b/drivers/net/wireless/intel/iwlwifi/cfg/6000.c
-@@ -31,7 +31,7 @@
+@@ -12,7 +12,7 @@
  #include "dvm/commands.h" /* needed for BT for now */
  
  /* Highest firmware API version supported */

debian/patches/debian/kernelvariables.patch

@@ -19,7 +19,7 @@ use of $(ARCH) needs to be moved after this.
 ---
 --- a/Makefile
 +++ b/Makefile
-@@ -406,36 +406,6 @@ include $(srctree)/scripts/subarch.inclu
+@@ -405,36 +405,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
  
-@@ -551,6 +521,35 @@ RUSTFLAGS_KERNEL =
+@@ -555,6 +525,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
-@@ -662,10 +662,12 @@ static int report__browse_hists(struct r
+@@ -660,10 +660,12 @@ static int report__browse_hists(struct r
  
  	path = system_path(TIPDIR);
  	if (perf_tip(&help, path) || help == NULL) {

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

@@ -20,7 +20,7 @@ is non-empty.
 ---
 --- a/Makefile
 +++ b/Makefile
-@@ -1753,7 +1753,7 @@ PHONY += prepare
+@@ -1873,7 +1873,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/perf-traceevent-support-asciidoctor-for-documentatio.patch

@@ -9,8 +9,6 @@ Forwarded: not-needed
  tools/perf/Documentation/Makefile           | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/tools/lib/perf/Documentation/Makefile b/tools/lib/perf/Documentation/Makefile
-index 972754082a85..272d06173a3e 100644
 --- a/tools/lib/perf/Documentation/Makefile
 +++ b/tools/lib/perf/Documentation/Makefile
 @@ -35,7 +35,7 @@ htmldir  = $(docdir)/html
@@ -22,11 +20,9 @@ index 972754082a85..272d06173a3e 100644
  ASCIIDOC_HTML   = xhtml11
  MANPAGE_XSL     = manpage-normal.xsl
  XMLTO_EXTRA     =
-diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
-index 6e54979c2124..7bfa6ae971ab 100644
 --- a/tools/perf/Documentation/Makefile
 +++ b/tools/perf/Documentation/Makefile
-@@ -48,7 +48,7 @@ man5dir=$(mandir)/man5
+@@ -45,7 +45,7 @@ man5dir=$(mandir)/man5
  man7dir=$(mandir)/man7
  
  ASCIIDOC=asciidoc
@@ -35,6 +31,3 @@ index 6e54979c2124..7bfa6ae971ab 100644
  ASCIIDOC_HTML = xhtml11
  MANPAGE_XSL = manpage-normal.xsl
  XMLTO_EXTRA =
--- 
-2.28.0
-

debian/patches/debian/rds-Disable-auto-loading-as-mitigation-against-local.patch

@@ -19,16 +19,11 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  net/rds/af_rds.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c
-index 98e0538..d8d4525 100644
 --- a/net/rds/af_rds.c
 +++ b/net/rds/af_rds.c
-@@ -574,4 +574,4 @@ MODULE_DESCRIPTION("RDS: Reliable Datagram Sockets"
+@@ -959,4 +959,4 @@ MODULE_DESCRIPTION("RDS: Reliable Datagr
  		   " v" DRV_VERSION " (" DRV_RELDATE ")");
  MODULE_VERSION(DRV_VERSION);
  MODULE_LICENSE("Dual BSD/GPL");
 -MODULE_ALIAS_NETPROTO(PF_RDS);
 +/* MODULE_ALIAS_NETPROTO(PF_RDS); */
--- 
-1.7.2.3
-

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

@@ -8,11 +8,9 @@ Forwarded: not-needed
  tools/perf/Makefile.perf | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
-index 80522bcfafe0..b011c7aae742 100644
 --- a/tools/perf/Makefile.perf
 +++ b/tools/perf/Makefile.perf
-@@ -1026,7 +1026,7 @@ install-bin: install-tools install-tests install-traceevent-plugins
+@@ -1139,7 +1139,7 @@ install-bin: install-tools install-tests
  install: install-bin try-install-man
  
  install-python_ext:
@@ -21,6 +19,3 @@ index 80522bcfafe0..b011c7aae742 100644
  
  # 'make install-doc' should call 'make -C Documentation install'
  $(INSTALL_DOC_TARGETS):
--- 
-2.30.2
-

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
-@@ -943,21 +943,21 @@ install-tools: all install-gtk
+@@ -1067,21 +1067,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

@@ -11,10 +11,8 @@ kernel image reproducible.
 Make mkcompile_h use $KBUILD_BUILD_VERSION_TIMESTAMP in preference to
 $KBUILD_BUILD_TIMESTAMP.
 
-Index: linux/init/Makefile
-===================================================================
---- linux.orig/init/Makefile
-+++ linux/init/Makefile
+--- a/init/Makefile
++++ b/init/Makefile
 @@ -29,7 +29,7 @@ preempt-flag-$(CONFIG_PREEMPT_DYNAMIC)	:
  preempt-flag-$(CONFIG_PREEMPT_RT)	:= PREEMPT_RT
  

debian/patches/debian/wireless-add-debian-wireless-regdb-certificates.patch

@@ -15,9 +15,6 @@ This hex dump is generated using:
  1 file changed, 1426 insertions(+)
  create mode 100644 net/wireless/certs/debian.hex
 
-diff --git a/net/wireless/certs/debian.hex b/net/wireless/certs/debian.hex
-new file mode 100644
-index 000000000000..c5ab03f8c500
 --- /dev/null
 +++ b/net/wireless/certs/debian.hex
 @@ -0,0 +1,1426 @@
@@ -1447,6 +1444,3 @@ index 000000000000..c5ab03f8c500
 +0x44,
 +0x9f,
 +0x21,
--- 
-2.25.1
-

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

@@ -8,8 +8,6 @@ Forwarded: not-needed
  security/yama/yama_lsm.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
-index efac68556b45..95ff3e778a17 100644
 --- a/security/yama/yama_lsm.c
 +++ b/security/yama/yama_lsm.c
 @@ -25,7 +25,7 @@
@@ -21,7 +19,7 @@ index efac68556b45..95ff3e778a17 100644
  
  /* describe a ptrace relationship for potential exception */
  struct ptrace_relation {
-@@ -476,7 +476,7 @@ static inline void yama_init_sysctl(void) { }
+@@ -474,7 +474,7 @@ static inline void yama_init_sysctl(void
  
  static int __init yama_init(void)
  {

debian/patches/features/all/db-mok-keyring/0003-MODSIGN-checking-the-blacklisted-hash-before-loading-a-kernel-module.patch

@@ -39,7 +39,7 @@ Signed-off-by: "Lee, Chun-Yi" <jlee@suse.com>
  #include <uapi/linux/module.h>
  #include "internal.h"
  
-@@ -37,13 +39,60 @@
+@@ -37,13 +39,60 @@ void set_module_sig_enforced(void)
  	sig_enforce = true;
  }
  
@@ -101,7 +101,7 @@ Signed-off-by: "Lee, Chun-Yi" <jlee@suse.com>
  	int ret;
  
  	pr_devel("==>%s(,%zu)\n", __func__, modlen);
-@@ -51,6 +100,7 @@
+@@ -51,6 +100,7 @@ int mod_verify_sig(const void *mod, stru
  	if (modlen <= sizeof(ms))
  		return -EBADMSG;
  
@@ -109,7 +109,7 @@ Signed-off-by: "Lee, Chun-Yi" <jlee@suse.com>
  	memcpy(&ms, mod + (modlen - sizeof(ms)), sizeof(ms));
  
  	ret = mod_check_sig(&ms, modlen, "module");
-@@ -61,10 +111,17 @@
+@@ -61,10 +111,17 @@ int mod_verify_sig(const void *mod, stru
  	modlen -= sig_len + sizeof(ms);
  	info->len = modlen;
  

debian/patches/features/all/db-mok-keyring/trust-machine-keyring-by-default.patch

@@ -11,8 +11,6 @@ To keep backward compatibility skip this check.
  security/integrity/platform_certs/machine_keyring.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
-diff --git a/security/integrity/platform_certs/machine_keyring.c b/security/integrity/platform_certs/machine_keyring.c
-index a401640a63cd..0627f14eacbe 100644
 --- a/security/integrity/platform_certs/machine_keyring.c
 +++ b/security/integrity/platform_certs/machine_keyring.c
 @@ -68,10 +68,7 @@ static bool __init trust_moklist(void)

debian/patches/features/all/drivers-media-dvb-usb-af9005-request_firmware.patch

@@ -11,11 +11,9 @@ a version of the script which is directly derived from the driver.
  drivers/media/dvb/dvb-usb/af9005-fe.c |   66 ++++++++++++++++++++++++++------
  2 files changed, 54 insertions(+), 14 deletions(-)
 
-Index: debian-kernel/drivers/media/usb/dvb-usb/Kconfig
-===================================================================
---- debian-kernel.orig/drivers/media/usb/dvb-usb/Kconfig
-+++ debian-kernel/drivers/media/usb/dvb-usb/Kconfig
-@@ -260,10 +260,10 @@ config DVB_USB_OPERA1
+--- a/drivers/media/usb/dvb-usb/Kconfig
++++ b/drivers/media/usb/dvb-usb/Kconfig
+@@ -35,10 +35,10 @@ config DVB_USB_A800
  
  config DVB_USB_AF9005
  	tristate "Afatech AF9005 DVB-T USB1.1 support"
@@ -27,10 +25,8 @@ Index: debian-kernel/drivers/media/usb/dvb-usb/Kconfig
  	help
  	  Say Y here to support the Afatech AF9005 based DVB-T USB1.1 receiver
  	  and the TerraTec Cinergy T USB XE (Rev.1)
-Index: debian-kernel/drivers/media/usb/dvb-usb/af9005-fe.c
-===================================================================
---- debian-kernel.orig/drivers/media/usb/dvb-usb/af9005-fe.c
-+++ debian-kernel/drivers/media/usb/dvb-usb/af9005-fe.c
+--- a/drivers/media/usb/dvb-usb/af9005-fe.c
++++ b/drivers/media/usb/dvb-usb/af9005-fe.c
 @@ -9,10 +9,26 @@
   * see Documentation/driver-api/media/drivers/dvb-usb.rst for more information
   */

debian/patches/features/all/lockdown/arm64-add-kernel-config-option-to-lock-down-when.patch

@@ -1,153 +0,0 @@
-From: Linn Crosetto <linn@hpe.com>
-Date: Tue, 30 Aug 2016 11:54:38 -0600
-Subject: arm64: add kernel config option to lock down when in Secure Boot mode
-Bug-Debian: https://bugs.debian.org/831827
-Forwarded: no
-
-Add a kernel configuration option to lock down the kernel, to restrict
-userspace's ability to modify the running kernel when UEFI Secure Boot is
-enabled. Based on the x86 patch by Matthew Garrett.
-
-Determine the state of Secure Boot in the EFI stub and pass this to the
-kernel using the FDT.
-
-Signed-off-by: Linn Crosetto <linn@hpe.com>
-[bwh: Forward-ported to 4.10: adjust context]
-[Lukas Wunner: Forward-ported to 4.11: drop parts applied upstream]
-[bwh: Forward-ported to 4.15 and lockdown patch set:
- - Pass result of efi_get_secureboot() in stub through to
-   efi_set_secure_boot() in main kernel
- - Use lockdown API and naming]
-[bwh: Forward-ported to 4.19.3: adjust context in update_fdt()]
-[dannf: Moved init_lockdown() call after uefi_init(), fixing SB detection]
-[bwh: Drop call to init_lockdown(), as efi_set_secure_boot() now calls this]
-[bwh: Forward-ported to 5.6: efi_get_secureboot() no longer takes a
- sys_table parameter]
-[bwh: Forward-ported to 5.7: EFI initialisation from FDT was rewritten, so:
- - Add Secure Boot mode to the parameter enumeration in fdtparams.c
- - Add a parameter to efi_get_fdt_params() to return the Secure Boot mode
- - Since Xen does not have a property name defined for Secure Boot mode,
-   change efi_get_fdt_prop() to handle a missing property name by clearing
-   the output variable]
-[Salvatore Bonaccorso: Forward-ported to 5.10: f30f242fb131 ("efi: Rename
-arm-init to efi-init common for all arch") renamed arm-init.c to efi-init.c]
----
- drivers/firmware/efi/efi-init.c    |    5 ++++-
- drivers/firmware/efi/fdtparams.c   |   12 +++++++++++-
- drivers/firmware/efi/libstub/fdt.c |    6 ++++++
- include/linux/efi.h                |    3 ++-
- 4 files changed, 23 insertions(+), 3 deletions(-)
-
---- a/drivers/firmware/efi/efi-init.c
-+++ b/drivers/firmware/efi/efi-init.c
-@@ -213,9 +213,10 @@ void __init efi_init(void)
- {
- 	struct efi_memory_map_data data;
- 	u64 efi_system_table;
-+	u32 secure_boot;
- 
- 	/* Grab UEFI information placed in FDT by stub */
--	efi_system_table = efi_get_fdt_params(&data);
-+	efi_system_table = efi_get_fdt_params(&data, &secure_boot);
- 	if (!efi_system_table)
- 		return;
- 
-@@ -237,6 +238,8 @@ void __init efi_init(void)
- 		return;
- 	}
- 
-+	efi_set_secure_boot(secure_boot);
-+
- 	reserve_regions();
- 	/*
- 	 * For memblock manipulation, the cap should come after the memblock_add().
---- a/drivers/firmware/efi/fdtparams.c
-+++ b/drivers/firmware/efi/fdtparams.c
-@@ -16,6 +16,7 @@ enum {
- 	MMSIZE,
- 	DCSIZE,
- 	DCVERS,
-+	SBMODE,
- 
- 	PARAMCOUNT
- };
-@@ -26,6 +27,7 @@ static __initconst const char name[][22]
- 	[MMSIZE] = "MemMap Size          ",
- 	[DCSIZE] = "MemMap Desc. Size    ",
- 	[DCVERS] = "MemMap Desc. Version ",
-+	[SBMODE] = "Secure Boot Enabled  ",
- };
- 
- static __initconst const struct {
-@@ -43,6 +45,7 @@ static __initconst const struct {
- 			[MMSIZE] = "xen,uefi-mmap-size",
- 			[DCSIZE] = "xen,uefi-mmap-desc-size",
- 			[DCVERS] = "xen,uefi-mmap-desc-ver",
-+			[SBMODE] = "",
- 		}
- 	}, {
- #endif
-@@ -53,6 +56,7 @@ static __initconst const struct {
- 			[MMSIZE] = "linux,uefi-mmap-size",
- 			[DCSIZE] = "linux,uefi-mmap-desc-size",
- 			[DCVERS] = "linux,uefi-mmap-desc-ver",
-+			[SBMODE] = "linux,uefi-secure-boot",
- 		}
- 	}
- };
-@@ -64,6 +68,11 @@ static int __init efi_get_fdt_prop(const
- 	int len;
- 	u64 val;
- 
-+	if (!pname[0]) {
-+		memset(var, 0, size);
-+		return 0;
-+	}
-+
- 	prop = fdt_getprop(fdt, node, pname, &len);
- 	if (!prop)
- 		return 1;
-@@ -81,7 +90,7 @@ static int __init efi_get_fdt_prop(const
- 	return 0;
- }
- 
--u64 __init efi_get_fdt_params(struct efi_memory_map_data *mm)
-+u64 __init efi_get_fdt_params(struct efi_memory_map_data *mm, u32 *secure_boot)
- {
- 	const void *fdt = initial_boot_params;
- 	unsigned long systab;
-@@ -95,6 +104,7 @@ u64 __init efi_get_fdt_params(struct efi
- 		[MMSIZE] = { &mm->size,		sizeof(mm->size) },
- 		[DCSIZE] = { &mm->desc_size,	sizeof(mm->desc_size) },
- 		[DCVERS] = { &mm->desc_version,	sizeof(mm->desc_version) },
-+		[SBMODE] = { secure_boot,       sizeof(*secure_boot) },
- 	};
- 
- 	BUILD_BUG_ON(ARRAY_SIZE(target) != ARRAY_SIZE(name));
---- a/drivers/firmware/efi/libstub/fdt.c
-+++ b/drivers/firmware/efi/libstub/fdt.c
-@@ -132,6 +132,12 @@ static efi_status_t update_fdt(void *ori
- 		}
- 	}
- 
-+	fdt_val32 = cpu_to_fdt32(efi_get_secureboot());
-+	status = fdt_setprop(fdt, node, "linux,uefi-secure-boot",
-+			     &fdt_val32, sizeof(fdt_val32));
-+	if (status)
-+		goto fdt_set_fail;
-+
- 	/* Shrink the FDT back to its minimum size: */
- 	fdt_pack(fdt);
- 
---- a/include/linux/efi.h
-+++ b/include/linux/efi.h
-@@ -764,7 +764,8 @@ extern int efi_mem_desc_lookup(u64 phys_
- extern int __efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md);
- extern void efi_mem_reserve(phys_addr_t addr, u64 size);
- extern int efi_mem_reserve_persistent(phys_addr_t addr, u64 size);
--extern u64 efi_get_fdt_params(struct efi_memory_map_data *data);
-+extern u64 efi_get_fdt_params(struct efi_memory_map_data *data,
-+			      u32 *secure_boot);
- extern struct kobject *efi_kobj;
- 
- extern int efi_reboot_quirk_mode;

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

@@ -1,153 +0,0 @@
-From: David Howells <dhowells@redhat.com>
-Date: Mon, 18 Feb 2019 12:45:03 +0000
-Subject: [28/30] efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode
-Origin: https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/commit?id=a5d70c55c603233c192b375f72116a395909da28
-
-UEFI machines can be booted in Secure Boot mode.  Add an EFI_SECURE_BOOT
-flag that can be passed to efi_enabled() to find out whether secure boot is
-enabled.
-
-Move the switch-statement in x86's setup_arch() that inteprets the
-secure_boot boot parameter to generic code and set the bit there.
-
-Suggested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-Signed-off-by: David Howells <dhowells@redhat.com>
-Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-cc: linux-efi@vger.kernel.org
-[rperier: Forward-ported to 5.5:
- - Use pr_warn()
- - Adjust context]
-[bwh: Forward-ported to 5.6: adjust context]
-[bwh: Forward-ported to 5.7:
- - Use the next available bit in efi.flags
- - Adjust context]
----
- arch/x86/kernel/setup.c           | 14 +----------
- drivers/firmware/efi/Makefile     |  1 +
- drivers/firmware/efi/secureboot.c | 39 +++++++++++++++++++++++++++++++
- include/linux/efi.h               | 16 ++++++++-----
- 4 files changed, 51 insertions(+), 19 deletions(-)
- create mode 100644 drivers/firmware/efi/secureboot.c
-
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -1070,19 +1070,7 @@ void __init setup_arch(char **cmdline_p)
- 	/* Allocate bigger log buffer */
- 	setup_log_buf(1);
- 
--	if (efi_enabled(EFI_BOOT)) {
--		switch (boot_params.secure_boot) {
--		case efi_secureboot_mode_disabled:
--			pr_info("Secure boot disabled\n");
--			break;
--		case efi_secureboot_mode_enabled:
--			pr_info("Secure boot enabled\n");
--			break;
--		default:
--			pr_info("Secure boot could not be determined\n");
--			break;
--		}
--	}
-+	efi_set_secure_boot(boot_params.secure_boot);
- 
- 	reserve_initrd();
- 
---- a/drivers/firmware/efi/Makefile
-+++ b/drivers/firmware/efi/Makefile
-@@ -25,6 +25,7 @@ subdir-$(CONFIG_EFI_STUB)		+= libstub
- obj-$(CONFIG_EFI_BOOTLOADER_CONTROL)	+= efibc.o
- obj-$(CONFIG_EFI_TEST)			+= test/
- obj-$(CONFIG_EFI_DEV_PATH_PARSER)	+= dev-path-parser.o
-+obj-$(CONFIG_EFI)			+= secureboot.o
- obj-$(CONFIG_APPLE_PROPERTIES)		+= apple-properties.o
- obj-$(CONFIG_EFI_RCI2_TABLE)		+= rci2-table.o
- obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE)	+= embedded-firmware.o
---- /dev/null
-+++ b/drivers/firmware/efi/secureboot.c
-@@ -0,0 +1,39 @@
-+
-+/* Core kernel secure boot support.
-+ *
-+ * Copyright (C) 2017 Red Hat, Inc. All Rights Reserved.
-+ * Written by David Howells (dhowells@redhat.com)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public Licence
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the Licence, or (at your option) any later version.
-+ */
-+
-+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-+
-+#include <linux/efi.h>
-+#include <linux/kernel.h>
-+#include <linux/printk.h>
-+
-+/*
-+ * Decide what to do when UEFI secure boot mode is enabled.
-+ */
-+void __init efi_set_secure_boot(enum efi_secureboot_mode mode)
-+{
-+	if (efi_enabled(EFI_BOOT)) {
-+		switch (mode) {
-+		case efi_secureboot_mode_disabled:
-+			pr_info("Secure boot disabled\n");
-+			break;
-+		case efi_secureboot_mode_enabled:
-+			set_bit(EFI_SECURE_BOOT, &efi.flags);
-+			pr_info("Secure boot enabled\n");
-+			break;
-+		default:
-+			pr_warn("Secure boot could not be determined (mode %u)\n",
-+				mode);
-+			break;
-+		}
-+	}
-+}
---- a/include/linux/efi.h
-+++ b/include/linux/efi.h
-@@ -864,6 +864,14 @@ static inline int efi_range_is_wc(unsign
- #define EFI_MEM_ATTR		9	/* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */
- #define EFI_MEM_NO_SOFT_RESERVE	10	/* Is the kernel configured to ignore soft reservations? */
- #define EFI_PRESERVE_BS_REGIONS	11	/* Are EFI boot-services memory segments available? */
-+#define EFI_SECURE_BOOT		12	/* Are we in Secure Boot mode? */
-+
-+enum efi_secureboot_mode {
-+	efi_secureboot_mode_unset,
-+	efi_secureboot_mode_unknown,
-+	efi_secureboot_mode_disabled,
-+	efi_secureboot_mode_enabled,
-+};
- 
- #ifdef CONFIG_EFI
- /*
-@@ -888,6 +896,7 @@ static inline bool efi_rt_services_suppo
- 	return (efi.runtime_supported_mask & mask) == mask;
- }
- extern void efi_find_mirror(void);
-+extern void __init efi_set_secure_boot(enum efi_secureboot_mode mode);
- #else
- static inline bool efi_enabled(int feature)
- {
-@@ -907,6 +916,7 @@ static inline bool efi_rt_services_suppo
- }
- 
- static inline void efi_find_mirror(void) {}
-+static inline void efi_set_secure_boot(enum efi_secureboot_mode mode) {}
- #endif
- 
- extern int efi_status_to_err(efi_status_t status);
-@@ -1125,13 +1135,6 @@ static inline bool efi_runtime_disabled(
- extern void efi_call_virt_check_flags(unsigned long flags, const void *caller);
- extern unsigned long efi_call_virt_save_flags(void);
- 
--enum efi_secureboot_mode {
--	efi_secureboot_mode_unset,
--	efi_secureboot_mode_unknown,
--	efi_secureboot_mode_disabled,
--	efi_secureboot_mode_enabled,
--};
--
- static inline
- enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var)
- {

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

@@ -1,121 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Tue, 10 Sep 2019 11:54:28 +0100
-Subject: efi: Lock down the kernel if booted in secure boot mode
-
-Based on an earlier patch by David Howells, who wrote the following
-description:
-
-> UEFI Secure Boot provides a mechanism for ensuring that the firmware will
-> only load signed bootloaders and kernels.  Certain use cases may also
-> require that all kernel modules also be signed.  Add a configuration option
-> that to lock down the kernel - which includes requiring validly signed
-> modules - if the kernel is secure-booted.
-
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-[Salvatore Bonaccorso: After fixing https://bugs.debian.org/956197 the
-help text for LOCK_DOWN_IN_EFI_SECURE_BOOT was adjusted to mention that
-lockdown is triggered in integrity mode (https://bugs.debian.org/1025417)]
-Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
----
- arch/x86/kernel/setup.c           |    4 ++--
- drivers/firmware/efi/secureboot.c |    3 +++
- include/linux/security.h          |    6 ++++++
- security/lockdown/Kconfig         |   15 +++++++++++++++
- security/lockdown/lockdown.c      |    2 +-
- 5 files changed, 27 insertions(+), 3 deletions(-)
-
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -904,6 +904,8 @@ void __init setup_arch(char **cmdline_p)
- 	if (efi_enabled(EFI_BOOT))
- 		efi_init();
- 
-+	efi_set_secure_boot(boot_params.secure_boot);
-+
- 	reserve_ibft_region();
- 	x86_init.resources.dmi_setup();
- 
-@@ -1070,8 +1072,6 @@ void __init setup_arch(char **cmdline_p)
- 	/* Allocate bigger log buffer */
- 	setup_log_buf(1);
- 
--	efi_set_secure_boot(boot_params.secure_boot);
--
- 	reserve_initrd();
- 
- 	acpi_table_upgrade();
---- a/drivers/firmware/efi/secureboot.c
-+++ b/drivers/firmware/efi/secureboot.c
-@@ -15,6 +15,7 @@
- #include <linux/efi.h>
- #include <linux/kernel.h>
- #include <linux/printk.h>
-+#include <linux/security.h>
- 
- /*
-  * Decide what to do when UEFI secure boot mode is enabled.
-@@ -28,6 +29,10 @@ void __init efi_set_secure_boot(enum efi
- 			break;
- 		case efi_secureboot_mode_enabled:
- 			set_bit(EFI_SECURE_BOOT, &efi.flags);
-+#ifdef CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT
-+			lock_kernel_down("EFI Secure Boot",
-+					 LOCKDOWN_INTEGRITY_MAX);
-+#endif
- 			pr_info("Secure boot enabled\n");
- 			break;
- 		default:
---- a/include/linux/security.h
-+++ b/include/linux/security.h
-@@ -522,6 +522,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, void **ctx, u32 *ctxlen);
- int security_locked_down(enum lockdown_reason what);
-+int lock_kernel_down(const char *where, enum lockdown_reason level);
- 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);
-@@ -1504,6 +1505,11 @@ static inline int security_locked_down(e
- {
- 	return 0;
- }
-+static inline int
-+lock_kernel_down(const char *where, enum lockdown_reason level)
-+{
-+	return -EOPNOTSUPP;
-+}
- static inline int lsm_fill_user_ctx(struct lsm_ctx __user *uctx,
- 				    u32 *uctx_len, void *val, size_t val_len,
- 				    u64 id, u64 flags)
---- a/security/lockdown/Kconfig
-+++ b/security/lockdown/Kconfig
-@@ -45,3 +45,18 @@ config LOCK_DOWN_KERNEL_FORCE_CONFIDENTI
- 	 disabled.
- 
- endchoice
-+
-+config LOCK_DOWN_IN_EFI_SECURE_BOOT
-+	bool "Lock down the kernel in EFI Secure Boot mode"
-+	default n
-+	depends on SECURITY_LOCKDOWN_LSM
-+	depends on EFI
-+	select SECURITY_LOCKDOWN_LSM_EARLY
-+	help
-+	  UEFI Secure Boot provides a mechanism for ensuring that the firmware
-+	  will only load signed bootloaders and kernels.  Secure boot mode may
-+	  be determined from EFI variables provided by the system firmware if
-+	  not indicated by the boot parameters.
-+
-+	  Enabling this option results in kernel lockdown being
-+	  triggered in integrity mode if EFI Secure Boot is set.
---- a/security/lockdown/lockdown.c
-+++ b/security/lockdown/lockdown.c
-@@ -24,7 +24,7 @@ static const enum lockdown_reason lockdo
- /*
-  * Put the kernel into lock-down mode.
-  */
--static int lock_kernel_down(const char *where, enum lockdown_reason level)
-+int lock_kernel_down(const char *where, enum lockdown_reason level)
- {
- 	if (kernel_locked_down >= level)
- 		return -EPERM;

debian/patches/features/all/lockdown/mtd-disable-slram-and-phram-when-locked-down.patch

@@ -1,75 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Fri, 30 Aug 2019 15:54:24 +0100
-Subject: mtd: phram,slram: Disable when the kernel is locked down
-Forwarded: https://lore.kernel.org/linux-security-module/20190830154720.eekfjt6c4jzvlbfz@decadent.org.uk/
-
-These drivers allow mapping arbitrary memory ranges as MTD devices.
-This should be disabled to preserve the kernel's integrity when it is
-locked down.
-
-* Add the HWPARAM flag to the module parameters
-* When slram is built-in, it uses __setup() to read kernel parameters,
-  so add an explicit check security_locked_down() check
-
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-Cc: Matthew Garrett <mjg59@google.com>
-Cc: David Howells <dhowells@redhat.com>
-Cc: Joern Engel <joern@lazybastard.org>
-Cc: linux-mtd@lists.infradead.org
----
- drivers/mtd/devices/phram.c | 6 +++++-
- drivers/mtd/devices/slram.c | 9 ++++++++-
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
---- a/drivers/mtd/devices/phram.c
-+++ b/drivers/mtd/devices/phram.c
-@@ -364,7 +364,11 @@ static int phram_param_call(const char *
- #endif
- }
- 
--module_param_call(phram, phram_param_call, NULL, NULL, 0200);
-+static const struct kernel_param_ops phram_param_ops = {
-+	.set = phram_param_call
-+};
-+__module_param_call(MODULE_PARAM_PREFIX, phram, &phram_param_ops, NULL,
-+		    0200, -1, KERNEL_PARAM_FL_HWPARAM | hwparam_iomem);
- MODULE_PARM_DESC(phram, "Memory region to map. \"phram=<name>,<start>,<length>[,<erasesize>]\"");
- 
- #ifdef CONFIG_OF
---- a/drivers/mtd/devices/slram.c
-+++ b/drivers/mtd/devices/slram.c
-@@ -43,6 +43,7 @@
- #include <linux/ioctl.h>
- #include <linux/init.h>
- #include <linux/io.h>
-+#include <linux/security.h>
- 
- #include <linux/mtd/mtd.h>
- 
-@@ -65,7 +66,7 @@ typedef struct slram_mtd_list {
- #ifdef MODULE
- static char *map[SLRAM_MAX_DEVICES_PARAMS];
- 
--module_param_array(map, charp, NULL, 0);
-+module_param_hw_array(map, charp, iomem, NULL, 0);
- MODULE_PARM_DESC(map, "List of memory regions to map. \"map=<name>, <start>, <length / end>\"");
- #else
- static char *map;
-@@ -281,11 +282,17 @@ static int __init init_slram(void)
- #ifndef MODULE
- 	char *devstart;
- 	char *devlength;
-+	int ret;
- 
- 	if (!map) {
- 		E("slram: not enough parameters.\n");
- 		return(-EINVAL);
- 	}
-+
-+	ret = security_locked_down(LOCKDOWN_MODULE_PARAMETERS);
-+	if (ret)
-+		return ret;
-+
- 	while (map) {
- 		devname = devstart = devlength = NULL;
- 

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

@@ -22,7 +22,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/include/linux/perf_event.h
 +++ b/include/linux/perf_event.h
-@@ -1617,6 +1617,11 @@ int perf_cpu_time_max_percent_handler(co
+@@ -1659,6 +1659,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);
  
@@ -50,7 +50,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  
  /* Minimum for 512 kiB + 1 user control page */
  int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
-@@ -12681,6 +12686,9 @@ SYSCALL_DEFINE5(perf_event_open,
+@@ -12821,6 +12826,9 @@ SYSCALL_DEFINE5(perf_event_open,
  	if (err)
  		return err;
  

debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch

@@ -15,7 +15,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 ---
 --- a/drivers/iommu/intel/Kconfig
 +++ b/drivers/iommu/intel/Kconfig
-@@ -57,13 +57,24 @@ config INTEL_IOMMU_SVM
+@@ -56,13 +56,24 @@ config INTEL_IOMMU_SVM
  	  to access DMA resources through process address space by
  	  means of a Process Address Space ID (PASID).
  
@@ -48,7 +48,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  	def_bool y
 --- a/drivers/iommu/intel/iommu.c
 +++ b/drivers/iommu/intel/iommu.c
-@@ -218,13 +218,13 @@ static LIST_HEAD(dmar_satc_units);
+@@ -204,13 +204,13 @@ static LIST_HEAD(dmar_satc_units);
  
  static void intel_iommu_domain_free(struct iommu_domain *domain);
  
@@ -64,7 +64,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  static int intel_iommu_superpage = 1;
  static int iommu_identity_mapping;
  static int iommu_skip_te_disable;
-@@ -263,6 +263,7 @@ static int __init intel_iommu_setup(char
+@@ -249,6 +249,7 @@ static int __init intel_iommu_setup(char
  	while (*str) {
  		if (!strncmp(str, "on", 2)) {
  			dmar_disabled = 0;

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
-@@ -2218,6 +2218,8 @@
+@@ -2247,6 +2247,8 @@
  			bypassed by not enabling DMAR with this option. In
  			this case, gfx device will use physical address for
  			DMA.
@@ -33,7 +33,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  		sp_off [Default Off]
 --- a/drivers/iommu/intel/iommu.c
 +++ b/drivers/iommu/intel/iommu.c
-@@ -36,6 +36,9 @@
+@@ -35,6 +35,9 @@
  #define CONTEXT_SIZE		VTD_PAGE_SIZE
  
  #define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY)
@@ -43,7 +43,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  #define IS_USB_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_SERIAL_USB)
  #define IS_ISA_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA)
  #define IS_AZALIA(pdev) ((pdev)->vendor == 0x8086 && (pdev)->device == 0x3a3e)
-@@ -208,12 +211,14 @@ int intel_iommu_sm = IS_ENABLED(CONFIG_I
+@@ -207,12 +210,14 @@ int intel_iommu_sm = IS_ENABLED(CONFIG_I
  int intel_iommu_enabled = 0;
  EXPORT_SYMBOL_GPL(intel_iommu_enabled);
  
@@ -58,7 +58,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  
  const struct iommu_ops intel_iommu_ops;
  static const struct iommu_dirty_ops intel_dirty_ops;
-@@ -253,6 +258,9 @@ static int __init intel_iommu_setup(char
+@@ -252,6 +257,9 @@ static int __init intel_iommu_setup(char
  		} else if (!strncmp(str, "igfx_off", 8)) {
  			disable_igfx_iommu = 1;
  			pr_info("Disable GFX device mapping\n");
@@ -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;
-@@ -2034,6 +2042,9 @@ static int device_def_domain_type(struct
+@@ -1902,6 +1910,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;
-@@ -2332,6 +2343,9 @@ static int __init init_dmars(void)
+@@ -2196,6 +2207,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
-@@ -6498,6 +6498,10 @@
+@@ -6982,6 +6982,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
-@@ -3058,6 +3058,14 @@ config COMPAT_32
+@@ -3186,6 +3186,14 @@ config COMPAT_32
  	select HAVE_UID16
  	select OLD_SIGSUSPEND3
  
@@ -80,7 +80,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  #include <linux/syscalls.h>
  #include <asm/syscall.h>
  
-@@ -20,3 +23,46 @@
+@@ -23,3 +26,46 @@ long x32_sys_call(const struct pt_regs *
  	default: return __x64_sys_ni_syscall(regs);
  	}
  };
@@ -159,7 +159,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  #include <asm/thread_info.h>	/* for TS_COMPAT */
  #include <asm/unistd.h>
  
-@@ -28,6 +29,18 @@ extern const sys_call_ptr_t ia32_sys_cal
+@@ -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);
  

debian/patches/features/x86/x86-memtest-WARN-if-bad-RAM-found.patch

@@ -15,7 +15,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/mm/memtest.c
 +++ b/mm/memtest.c
-@@ -26,6 +26,10 @@ static u64 patterns[] __initdata = {
+@@ -31,6 +31,10 @@ static u64 patterns[] __initdata = {
  
  static void __init reserve_bad_mem(u64 pattern, phys_addr_t start_bad, phys_addr_t end_bad)
  {

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

@@ -30,7 +30,7 @@ this reverts following commit:
 
 --- a/tools/objtool/check.c
 +++ b/tools/objtool/check.c
-@@ -4897,10 +4897,14 @@ int check(struct objtool_file *file)
+@@ -4771,10 +4771,14 @@ int check(struct objtool_file *file)
  	}
  
  out:

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

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

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

@@ -1,9 +1,9 @@
 --- a/net/bridge/br_input.c
 +++ b/net/bridge/br_input.c
-@@ -374,7 +374,11 @@ static rx_handler_result_t br_handle_fra
- 			return RX_HANDLER_PASS;
+@@ -383,7 +383,11 @@ static rx_handler_result_t br_handle_fra
  
  		case 0x01:	/* IEEE MAC (Pause) */
+ 			reason = SKB_DROP_REASON_MAC_IEEE_MAC_CONTROL;
 -			goto drop;
 +			fwd_mask |= p->br->group_fwd_mask;
 +			if (fwd_mask & (1u << dest[5]))

debian/patches/misc-bbr3/0019-x86-cfi-bpf-Add-tso_segs-and-skb_marked_lost-to-bpf_.patch

@@ -1,42 +0,0 @@
-From d53b209e5fcee3b3c53c30a4cc4fcc8e392a8fce Mon Sep 17 00:00:00 2001
-From: Alexandre Frade <kernel@xanmod.org>
-Date: Mon, 11 Mar 2024 12:01:13 -0300
-Subject: [PATCH 19/19] x86/cfi,bpf: Add tso_segs and skb_marked_lost to
- bpf_struct_ops CFI
-
-Rebased-by: Oleksandr Natalenko <oleksandr@natalenko.name>
-[ https://github.com/sirlucjan/kernel-patches/blob/master/6.8/bbr3-patches/0001-tcp-bbr3-initial-import.patch ]
-Signed-off-by: Alexandre Frade <kernel@xanmod.org>
----
- net/ipv4/bpf_tcp_ca.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
---- a/net/ipv4/bpf_tcp_ca.c
-+++ b/net/ipv4/bpf_tcp_ca.c
-@@ -280,11 +280,15 @@ static void bpf_tcp_ca_pkts_acked(struct
- {
- }
- 
--static u32 bpf_tcp_ca_min_tso_segs(struct sock *sk)
-+static u32 bpf_tcp_ca_tso_segs(struct sock *sk, unsigned int mss_now)
- {
- 	return 0;
- }
- 
-+static void bpf_tcp_ca_skb_marked_lost(struct sock *sk, const struct sk_buff *skb)
-+{
-+}
-+
- static void bpf_tcp_ca_cong_control(struct sock *sk, u32 ack, int flag,
- 				    const struct rate_sample *rs)
- {
-@@ -315,7 +319,8 @@ static struct tcp_congestion_ops __bpf_o
- 	.cwnd_event = bpf_tcp_ca_cwnd_event,
- 	.in_ack_event = bpf_tcp_ca_in_ack_event,
- 	.pkts_acked = bpf_tcp_ca_pkts_acked,
--	.min_tso_segs = bpf_tcp_ca_min_tso_segs,
-+	.tso_segs = bpf_tcp_ca_tso_segs,
-+	.skb_marked_lost = bpf_tcp_ca_skb_marked_lost,
- 	.cong_control = bpf_tcp_ca_cong_control,
- 	.undo_cwnd = bpf_tcp_ca_undo_cwnd,
- 	.sndbuf_expand = bpf_tcp_ca_sndbuf_expand,

debian/patches/misc-ntsync7/0001-ntsync-Return-the-fd-from-NTSYNC_IOC_CREATE_SEM.patch

@@ -1,55 +0,0 @@
-From e50ffd43b88d64b8063a9fce59f1d03b56f6144c Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:34:42 -0600
-Subject: ntsync: Return the fd from NTSYNC_IOC_CREATE_SEM.
-
-Simplify the user API a bit by returning the fd as return value from the ioctl
-instead of through the argument pointer.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/ntsync.c       | 7 ++-----
- include/uapi/linux/ntsync.h | 3 +--
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -165,7 +165,6 @@ static int ntsync_obj_get_fd(struct ntsy
- 
- static int ntsync_create_sem(struct ntsync_device *dev, void __user *argp)
- {
--	struct ntsync_sem_args __user *user_args = argp;
- 	struct ntsync_sem_args args;
- 	struct ntsync_obj *sem;
- 	int fd;
-@@ -182,12 +181,10 @@ static int ntsync_create_sem(struct ntsy
- 	sem->u.sem.count = args.count;
- 	sem->u.sem.max = args.max;
- 	fd = ntsync_obj_get_fd(sem);
--	if (fd < 0) {
-+	if (fd < 0)
- 		kfree(sem);
--		return fd;
--	}
- 
--	return put_user(fd, &user_args->sem);
-+	return fd;
- }
- 
- static int ntsync_char_open(struct inode *inode, struct file *file)
---- a/include/uapi/linux/ntsync.h
-+++ b/include/uapi/linux/ntsync.h
-@@ -11,12 +11,11 @@
- #include <linux/types.h>
- 
- struct ntsync_sem_args {
--	__u32 sem;
- 	__u32 count;
- 	__u32 max;
- };
- 
--#define NTSYNC_IOC_CREATE_SEM		_IOWR('N', 0x80, struct ntsync_sem_args)
-+#define NTSYNC_IOC_CREATE_SEM		_IOW ('N', 0x80, struct ntsync_sem_args)
- 
- #define NTSYNC_IOC_SEM_POST		_IOWR('N', 0x81, __u32)
- 

debian/patches/misc-ntsync7/0002-ntsync-Rename-NTSYNC_IOC_SEM_POST-to-NTSYNC_IOC_SEM_.patch

@@ -1,64 +0,0 @@
-From 160e9bf7826da868ae4de261753a03cce2208ff6 Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:34:43 -0600
-Subject: ntsync: Rename NTSYNC_IOC_SEM_POST to NTSYNC_IOC_SEM_RELEASE.
-
-Use the more common "release" terminology, which is also the term used by NT,
-instead of "post" (which is used by POSIX).
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/ntsync.c       | 10 +++++-----
- include/uapi/linux/ntsync.h |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -57,7 +57,7 @@ struct ntsync_device {
-  * Actually change the semaphore state, returning -EOVERFLOW if it is made
-  * invalid.
-  */
--static int post_sem_state(struct ntsync_obj *sem, __u32 count)
-+static int release_sem_state(struct ntsync_obj *sem, __u32 count)
- {
- 	__u32 sum;
- 
-@@ -71,7 +71,7 @@ static int post_sem_state(struct ntsync_
- 	return 0;
- }
- 
--static int ntsync_sem_post(struct ntsync_obj *sem, void __user *argp)
-+static int ntsync_sem_release(struct ntsync_obj *sem, void __user *argp)
- {
- 	__u32 __user *user_args = argp;
- 	__u32 prev_count;
-@@ -87,7 +87,7 @@ static int ntsync_sem_post(struct ntsync
- 	spin_lock(&sem->lock);
- 
- 	prev_count = sem->u.sem.count;
--	ret = post_sem_state(sem, args);
-+	ret = release_sem_state(sem, args);
- 
- 	spin_unlock(&sem->lock);
- 
-@@ -114,8 +114,8 @@ static long ntsync_obj_ioctl(struct file
- 	void __user *argp = (void __user *)parm;
- 
- 	switch (cmd) {
--	case NTSYNC_IOC_SEM_POST:
--		return ntsync_sem_post(obj, argp);
-+	case NTSYNC_IOC_SEM_RELEASE:
-+		return ntsync_sem_release(obj, argp);
- 	default:
- 		return -ENOIOCTLCMD;
- 	}
---- a/include/uapi/linux/ntsync.h
-+++ b/include/uapi/linux/ntsync.h
-@@ -17,6 +17,6 @@ struct ntsync_sem_args {
- 
- #define NTSYNC_IOC_CREATE_SEM		_IOW ('N', 0x80, struct ntsync_sem_args)
- 
--#define NTSYNC_IOC_SEM_POST		_IOWR('N', 0x81, __u32)
-+#define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
- 
- #endif

debian/patches/misc-ntsync7/0003-ntsync-Introduce-NTSYNC_IOC_WAIT_ANY.patch

@@ -1,377 +0,0 @@
-From e855a17ec837cdee9047e6e23e47ed7b4312a265 Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:34:44 -0600
-Subject: ntsync: Introduce NTSYNC_IOC_WAIT_ANY.
-
-This corresponds to part of the functionality of the NT syscall
-NtWaitForMultipleObjects(). Specifically, it implements the behaviour where
-the third argument (wait_any) is TRUE, and it does not handle alertable waits.
-Those features have been split out into separate patches to ease review.
-
-This patch therefore implements the wait/wake infrastructure which comprises the
-core of ntsync's functionality.
-
-NTSYNC_IOC_WAIT_ANY is a vectored wait function similar to poll(). Unlike
-poll(), it "consumes" objects when they are signaled. For semaphores, this means
-decreasing one from the internal counter. At most one object can be consumed by
-this function.
-
-This wait/wake model is fundamentally different from that used anywhere else in
-the kernel, and for that reason ntsync does not use any existing infrastructure,
-such as futexes, kernel mutexes or semaphores, or wait_event().
-
-Up to 64 objects can be waited on at once. As soon as one is signaled, the
-object with the lowest index is consumed, and that index is returned via the
-"index" field.
-
-A timeout is supported. The timeout is passed as a u64 nanosecond value, which
-represents absolute time measured against either the MONOTONIC or REALTIME clock
-(controlled by the flags argument). If U64_MAX is passed, the ioctl waits
-indefinitely.
-
-This ioctl validates that all objects belong to the relevant device. This is not
-necessary for any technical reason related to NTSYNC_IOC_WAIT_ANY, but will be
-necessary for NTSYNC_IOC_WAIT_ALL introduced in the following patch.
-
-Some padding fields are added for alignment and for fields which will be added
-in future patches (split out to ease review).
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/ntsync.c       | 247 +++++++++++++++++++++++++++++++++++-
- include/uapi/linux/ntsync.h |  14 ++
- 2 files changed, 260 insertions(+), 1 deletion(-)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -6,11 +6,16 @@
-  */
- 
- #include <linux/anon_inodes.h>
-+#include <linux/atomic.h>
- #include <linux/file.h>
- #include <linux/fs.h>
-+#include <linux/hrtimer.h>
-+#include <linux/ktime.h>
- #include <linux/miscdevice.h>
- #include <linux/module.h>
- #include <linux/overflow.h>
-+#include <linux/sched.h>
-+#include <linux/sched/signal.h>
- #include <linux/slab.h>
- #include <linux/spinlock.h>
- #include <uapi/linux/ntsync.h>
-@@ -30,6 +35,8 @@ enum ntsync_type {
-  *
-  * Both rely on struct file for reference counting. Individual
-  * ntsync_obj objects take a reference to the device when created.
-+ * Wait operations take a reference to each object being waited on for
-+ * the duration of the wait.
-  */
- 
- struct ntsync_obj {
-@@ -47,12 +54,55 @@ struct ntsync_obj {
- 			__u32 max;
- 		} sem;
- 	} u;
-+
-+	struct list_head any_waiters;
-+};
-+
-+struct ntsync_q_entry {
-+	struct list_head node;
-+	struct ntsync_q *q;
-+	struct ntsync_obj *obj;
-+	__u32 index;
-+};
-+
-+struct ntsync_q {
-+	struct task_struct *task;
-+
-+	/*
-+	 * Protected via atomic_try_cmpxchg(). Only the thread that wins the
-+	 * compare-and-swap may actually change object states and wake this
-+	 * task.
-+	 */
-+	atomic_t signaled;
-+
-+	__u32 count;
-+	struct ntsync_q_entry entries[];
- };
- 
- struct ntsync_device {
- 	struct file *file;
- };
- 
-+static void try_wake_any_sem(struct ntsync_obj *sem)
-+{
-+	struct ntsync_q_entry *entry;
-+
-+	lockdep_assert_held(&sem->lock);
-+
-+	list_for_each_entry(entry, &sem->any_waiters, node) {
-+		struct ntsync_q *q = entry->q;
-+		int signaled = -1;
-+
-+		if (!sem->u.sem.count)
-+			break;
-+
-+		if (atomic_try_cmpxchg(&q->signaled, &signaled, entry->index)) {
-+			sem->u.sem.count--;
-+			wake_up_process(q->task);
-+		}
-+	}
-+}
-+
- /*
-  * Actually change the semaphore state, returning -EOVERFLOW if it is made
-  * invalid.
-@@ -87,7 +137,9 @@ static int ntsync_sem_release(struct nts
- 	spin_lock(&sem->lock);
- 
- 	prev_count = sem->u.sem.count;
--	ret = release_sem_state(sem, args);
-+	ret = post_sem_state(sem, args);
-+	if (!ret)
-+		try_wake_any_sem(sem);
- 
- 	spin_unlock(&sem->lock);
- 
-@@ -140,6 +192,7 @@ static struct ntsync_obj *ntsync_alloc_o
- 	obj->dev = dev;
- 	get_file(dev->file);
- 	spin_lock_init(&obj->lock);
-+	INIT_LIST_HEAD(&obj->any_waiters);
- 
- 	return obj;
- }
-@@ -187,6 +240,196 @@ static int ntsync_create_sem(struct ntsy
- 	return fd;
- }
- 
-+static struct ntsync_obj *get_obj(struct ntsync_device *dev, int fd)
-+{
-+	struct file *file = fget(fd);
-+	struct ntsync_obj *obj;
-+
-+	if (!file)
-+		return NULL;
-+
-+	if (file->f_op != &ntsync_obj_fops) {
-+		fput(file);
-+		return NULL;
-+	}
-+
-+	obj = file->private_data;
-+	if (obj->dev != dev) {
-+		fput(file);
-+		return NULL;
-+	}
-+
-+	return obj;
-+}
-+
-+static void put_obj(struct ntsync_obj *obj)
-+{
-+	fput(obj->file);
-+}
-+
-+static int ntsync_schedule(const struct ntsync_q *q, const struct ntsync_wait_args *args)
-+{
-+	ktime_t timeout = ns_to_ktime(args->timeout);
-+	clockid_t clock = CLOCK_MONOTONIC;
-+	ktime_t *timeout_ptr;
-+	int ret = 0;
-+
-+	timeout_ptr = (args->timeout == U64_MAX ? NULL : &timeout);
-+
-+	if (args->flags & NTSYNC_WAIT_REALTIME)
-+		clock = CLOCK_REALTIME;
-+
-+	do {
-+		if (signal_pending(current)) {
-+			ret = -ERESTARTSYS;
-+			break;
-+		}
-+
-+		set_current_state(TASK_INTERRUPTIBLE);
-+		if (atomic_read(&q->signaled) != -1) {
-+			ret = 0;
-+			break;
-+		}
-+		ret = schedule_hrtimeout_range_clock(timeout_ptr, 0, HRTIMER_MODE_ABS, clock);
-+	} while (ret < 0);
-+	__set_current_state(TASK_RUNNING);
-+
-+	return ret;
-+}
-+
-+/*
-+ * Allocate and initialize the ntsync_q structure, but do not queue us yet.
-+ */
-+static int setup_wait(struct ntsync_device *dev,
-+		      const struct ntsync_wait_args *args,
-+		      struct ntsync_q **ret_q)
-+{
-+	const __u32 count = args->count;
-+	int fds[NTSYNC_MAX_WAIT_COUNT];
-+	struct ntsync_q *q;
-+	__u32 i, j;
-+
-+	if (args->pad[0] || args->pad[1] || args->pad[2] || (args->flags & ~NTSYNC_WAIT_REALTIME))
-+		return -EINVAL;
-+
-+	if (args->count > NTSYNC_MAX_WAIT_COUNT)
-+		return -EINVAL;
-+
-+	if (copy_from_user(fds, u64_to_user_ptr(args->objs),
-+			   array_size(count, sizeof(*fds))))
-+		return -EFAULT;
-+
-+	q = kmalloc(struct_size(q, entries, count), GFP_KERNEL);
-+	if (!q)
-+		return -ENOMEM;
-+	q->task = current;
-+	atomic_set(&q->signaled, -1);
-+	q->count = count;
-+
-+	for (i = 0; i < count; i++) {
-+		struct ntsync_q_entry *entry = &q->entries[i];
-+		struct ntsync_obj *obj = get_obj(dev, fds[i]);
-+
-+		if (!obj)
-+			goto err;
-+
-+		entry->obj = obj;
-+		entry->q = q;
-+		entry->index = i;
-+	}
-+
-+	*ret_q = q;
-+	return 0;
-+
-+err:
-+	for (j = 0; j < i; j++)
-+		put_obj(q->entries[j].obj);
-+	kfree(q);
-+	return -EINVAL;
-+}
-+
-+static void try_wake_any_obj(struct ntsync_obj *obj)
-+{
-+	switch (obj->type) {
-+	case NTSYNC_TYPE_SEM:
-+		try_wake_any_sem(obj);
-+		break;
-+	}
-+}
-+
-+static int ntsync_wait_any(struct ntsync_device *dev, void __user *argp)
-+{
-+	struct ntsync_wait_args args;
-+	struct ntsync_q *q;
-+	int signaled;
-+	__u32 i;
-+	int ret;
-+
-+	if (copy_from_user(&args, argp, sizeof(args)))
-+		return -EFAULT;
-+
-+	ret = setup_wait(dev, &args, &q);
-+	if (ret < 0)
-+		return ret;
-+
-+	/* queue ourselves */
-+
-+	for (i = 0; i < args.count; i++) {
-+		struct ntsync_q_entry *entry = &q->entries[i];
-+		struct ntsync_obj *obj = entry->obj;
-+
-+		spin_lock(&obj->lock);
-+		list_add_tail(&entry->node, &obj->any_waiters);
-+		spin_unlock(&obj->lock);
-+	}
-+
-+	/* check if we are already signaled */
-+
-+	for (i = 0; i < args.count; i++) {
-+		struct ntsync_obj *obj = q->entries[i].obj;
-+
-+		if (atomic_read(&q->signaled) != -1)
-+			break;
-+
-+		spin_lock(&obj->lock);
-+		try_wake_any_obj(obj);
-+		spin_unlock(&obj->lock);
-+	}
-+
-+	/* sleep */
-+
-+	ret = ntsync_schedule(q, &args);
-+
-+	/* and finally, unqueue */
-+
-+	for (i = 0; i < args.count; i++) {
-+		struct ntsync_q_entry *entry = &q->entries[i];
-+		struct ntsync_obj *obj = entry->obj;
-+
-+		spin_lock(&obj->lock);
-+		list_del(&entry->node);
-+		spin_unlock(&obj->lock);
-+
-+		put_obj(obj);
-+	}
-+
-+	signaled = atomic_read(&q->signaled);
-+	if (signaled != -1) {
-+		struct ntsync_wait_args __user *user_args = argp;
-+
-+		/* even if we caught a signal, we need to communicate success */
-+		ret = 0;
-+
-+		if (put_user(signaled, &user_args->index))
-+			ret = -EFAULT;
-+	} else if (!ret) {
-+		ret = -ETIMEDOUT;
-+	}
-+
-+	kfree(q);
-+	return ret;
-+}
-+
- static int ntsync_char_open(struct inode *inode, struct file *file)
- {
- 	struct ntsync_device *dev;
-@@ -218,6 +461,8 @@ static long ntsync_char_ioctl(struct fil
- 	switch (cmd) {
- 	case NTSYNC_IOC_CREATE_SEM:
- 		return ntsync_create_sem(dev, argp);
-+	case NTSYNC_IOC_WAIT_ANY:
-+		return ntsync_wait_any(dev, argp);
- 	default:
- 		return -ENOIOCTLCMD;
- 	}
---- a/include/uapi/linux/ntsync.h
-+++ b/include/uapi/linux/ntsync.h
-@@ -15,7 +15,21 @@ struct ntsync_sem_args {
- 	__u32 max;
- };
- 
-+#define NTSYNC_WAIT_REALTIME	0x1
-+
-+struct ntsync_wait_args {
-+	__u64 timeout;
-+	__u64 objs;
-+	__u32 count;
-+	__u32 index;
-+	__u32 flags;
-+	__u32 pad[3];
-+};
-+
-+#define NTSYNC_MAX_WAIT_COUNT 64
-+
- #define NTSYNC_IOC_CREATE_SEM		_IOW ('N', 0x80, struct ntsync_sem_args)
-+#define NTSYNC_IOC_WAIT_ANY		_IOWR('N', 0x82, struct ntsync_wait_args)
- 
- #define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
- 

debian/patches/misc-ntsync7/0004-ntsync-Introduce-NTSYNC_IOC_WAIT_ALL.patch

@@ -1,533 +0,0 @@
-From 6c1dac87ff835a48a067fe75bd0a6965921dac78 Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:34:45 -0600
-Subject: ntsync: Introduce NTSYNC_IOC_WAIT_ALL.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is similar to NTSYNC_IOC_WAIT_ANY, but waits until all of the objects are
-simultaneously signaled, and then acquires all of them as a single atomic
-operation.
-
-Because acquisition of multiple objects is atomic, some complex locking is
-required. We cannot simply spin-lock multiple objects simultaneously, as that
-may disable preëmption for a problematically long time.
-
-Instead, modifying any object which may be involved in a wait-all operation takes
-a device-wide sleeping mutex, "wait_all_lock", instead of the normal object
-spinlock.
-
-Because wait-for-all is a rare operation, in order to optimize wait-for-any,
-this lock is only taken when necessary. "all_hint" is used to mark objects which
-are involved in a wait-for-all operation, and if an object is not, only its
-spinlock is taken.
-
-The locking scheme used here was written by Peter Zijlstra.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/ntsync.c       | 336 ++++++++++++++++++++++++++++++++++--
- include/uapi/linux/ntsync.h |   1 +
- 2 files changed, 323 insertions(+), 14 deletions(-)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -13,6 +13,7 @@
- #include <linux/ktime.h>
- #include <linux/miscdevice.h>
- #include <linux/module.h>
-+#include <linux/mutex.h>
- #include <linux/overflow.h>
- #include <linux/sched.h>
- #include <linux/sched/signal.h>
-@@ -41,6 +42,7 @@ enum ntsync_type {
- 
- struct ntsync_obj {
- 	spinlock_t lock;
-+	int dev_locked;
- 
- 	enum ntsync_type type;
- 
-@@ -55,7 +57,30 @@ struct ntsync_obj {
- 		} sem;
- 	} u;
- 
-+	/*
-+	 * any_waiters is protected by the object lock, but all_waiters is
-+	 * protected by the device wait_all_lock.
-+	 */
- 	struct list_head any_waiters;
-+	struct list_head all_waiters;
-+
-+	/*
-+	 * Hint describing how many tasks are queued on this object in a
-+	 * wait-all operation.
-+	 *
-+	 * Any time we do a wake, we may need to wake "all" waiters as well as
-+	 * "any" waiters. In order to atomically wake "all" waiters, we must
-+	 * lock all of the objects, and that means grabbing the wait_all_lock
-+	 * below (and, due to lock ordering rules, before locking this object).
-+	 * However, wait-all is a rare operation, and grabbing the wait-all
-+	 * lock for every wake would create unnecessary contention.
-+	 * Therefore we first check whether all_hint is zero, and, if it is,
-+	 * we skip trying to wake "all" waiters.
-+	 *
-+	 * Since wait requests must originate from user-space threads, we're
-+	 * limited here by PID_MAX_LIMIT, so there's no risk of overflow.
-+	 */
-+	atomic_t all_hint;
- };
- 
- struct ntsync_q_entry {
-@@ -75,19 +100,198 @@ struct ntsync_q {
- 	 */
- 	atomic_t signaled;
- 
-+	bool all;
- 	__u32 count;
- 	struct ntsync_q_entry entries[];
- };
- 
- struct ntsync_device {
-+	/*
-+	 * Wait-all operations must atomically grab all objects, and be totally
-+	 * ordered with respect to each other and wait-any operations.
-+	 * If one thread is trying to acquire several objects, another thread
-+	 * cannot touch the object at the same time.
-+	 *
-+	 * This device-wide lock is used to serialize wait-for-all
-+	 * operations, and operations on an object that is involved in a
-+	 * wait-for-all.
-+	 */
-+	struct mutex wait_all_lock;
-+
- 	struct file *file;
- };
- 
-+/*
-+ * Single objects are locked using obj->lock.
-+ *
-+ * Multiple objects are 'locked' while holding dev->wait_all_lock.
-+ * In this case however, individual objects are not locked by holding
-+ * obj->lock, but by setting obj->dev_locked.
-+ *
-+ * This means that in order to lock a single object, the sequence is slightly
-+ * more complicated than usual. Specifically it needs to check obj->dev_locked
-+ * after acquiring obj->lock, if set, it needs to drop the lock and acquire
-+ * dev->wait_all_lock in order to serialize against the multi-object operation.
-+ */
-+
-+static void dev_lock_obj(struct ntsync_device *dev, struct ntsync_obj *obj)
-+{
-+	lockdep_assert_held(&dev->wait_all_lock);
-+	lockdep_assert(obj->dev == dev);
-+	spin_lock(&obj->lock);
-+	/*
-+	 * By setting obj->dev_locked inside obj->lock, it is ensured that
-+	 * anyone holding obj->lock must see the value.
-+	 */
-+	obj->dev_locked = 1;
-+	spin_unlock(&obj->lock);
-+}
-+
-+static void dev_unlock_obj(struct ntsync_device *dev, struct ntsync_obj *obj)
-+{
-+	lockdep_assert_held(&dev->wait_all_lock);
-+	lockdep_assert(obj->dev == dev);
-+	spin_lock(&obj->lock);
-+	obj->dev_locked = 0;
-+	spin_unlock(&obj->lock);
-+}
-+
-+static void obj_lock(struct ntsync_obj *obj)
-+{
-+	struct ntsync_device *dev = obj->dev;
-+
-+	for (;;) {
-+		spin_lock(&obj->lock);
-+		if (likely(!obj->dev_locked))
-+			break;
-+
-+		spin_unlock(&obj->lock);
-+		mutex_lock(&dev->wait_all_lock);
-+		spin_lock(&obj->lock);
-+		/*
-+		 * obj->dev_locked should be set and released under the same
-+		 * wait_all_lock section, since we now own this lock, it should
-+		 * be clear.
-+		 */
-+		lockdep_assert(!obj->dev_locked);
-+		spin_unlock(&obj->lock);
-+		mutex_unlock(&dev->wait_all_lock);
-+	}
-+}
-+
-+static void obj_unlock(struct ntsync_obj *obj)
-+{
-+	spin_unlock(&obj->lock);
-+}
-+
-+static bool ntsync_lock_obj(struct ntsync_device *dev, struct ntsync_obj *obj)
-+{
-+	bool all;
-+
-+	obj_lock(obj);
-+	all = atomic_read(&obj->all_hint);
-+	if (unlikely(all)) {
-+		obj_unlock(obj);
-+		mutex_lock(&dev->wait_all_lock);
-+		dev_lock_obj(dev, obj);
-+	}
-+
-+	return all;
-+}
-+
-+static void ntsync_unlock_obj(struct ntsync_device *dev, struct ntsync_obj *obj, bool all)
-+{
-+	if (all) {
-+		dev_unlock_obj(dev, obj);
-+		mutex_unlock(&dev->wait_all_lock);
-+	} else {
-+		obj_unlock(obj);
-+	}
-+}
-+
-+#define ntsync_assert_held(obj) \
-+	lockdep_assert((lockdep_is_held(&(obj)->lock) != LOCK_STATE_NOT_HELD) || \
-+		       ((lockdep_is_held(&(obj)->dev->wait_all_lock) != LOCK_STATE_NOT_HELD) && \
-+			(obj)->dev_locked))
-+
-+static bool is_signaled(struct ntsync_obj *obj)
-+{
-+	ntsync_assert_held(obj);
-+
-+	switch (obj->type) {
-+	case NTSYNC_TYPE_SEM:
-+		return !!obj->u.sem.count;
-+	}
-+
-+	WARN(1, "bad object type %#x\n", obj->type);
-+	return false;
-+}
-+
-+/*
-+ * "locked_obj" is an optional pointer to an object which is already locked and
-+ * should not be locked again. This is necessary so that changing an object's
-+ * state and waking it can be a single atomic operation.
-+ */
-+static void try_wake_all(struct ntsync_device *dev, struct ntsync_q *q,
-+			 struct ntsync_obj *locked_obj)
-+{
-+	__u32 count = q->count;
-+	bool can_wake = true;
-+	int signaled = -1;
-+	__u32 i;
-+
-+	lockdep_assert_held(&dev->wait_all_lock);
-+	if (locked_obj)
-+		lockdep_assert(locked_obj->dev_locked);
-+
-+	for (i = 0; i < count; i++) {
-+		if (q->entries[i].obj != locked_obj)
-+			dev_lock_obj(dev, q->entries[i].obj);
-+	}
-+
-+	for (i = 0; i < count; i++) {
-+		if (!is_signaled(q->entries[i].obj)) {
-+			can_wake = false;
-+			break;
-+		}
-+	}
-+
-+	if (can_wake && atomic_try_cmpxchg(&q->signaled, &signaled, 0)) {
-+		for (i = 0; i < count; i++) {
-+			struct ntsync_obj *obj = q->entries[i].obj;
-+
-+			switch (obj->type) {
-+			case NTSYNC_TYPE_SEM:
-+				obj->u.sem.count--;
-+				break;
-+			}
-+		}
-+		wake_up_process(q->task);
-+	}
-+
-+	for (i = 0; i < count; i++) {
-+		if (q->entries[i].obj != locked_obj)
-+			dev_unlock_obj(dev, q->entries[i].obj);
-+	}
-+}
-+
-+static void try_wake_all_obj(struct ntsync_device *dev, struct ntsync_obj *obj)
-+{
-+	struct ntsync_q_entry *entry;
-+
-+	lockdep_assert_held(&dev->wait_all_lock);
-+	lockdep_assert(obj->dev_locked);
-+
-+	list_for_each_entry(entry, &obj->all_waiters, node)
-+		try_wake_all(dev, entry->q, obj);
-+}
-+
- static void try_wake_any_sem(struct ntsync_obj *sem)
- {
- 	struct ntsync_q_entry *entry;
- 
--	lockdep_assert_held(&sem->lock);
-+	ntsync_assert_held(sem);
-+	lockdep_assert(sem->type == NTSYNC_TYPE_SEM);
- 
- 	list_for_each_entry(entry, &sem->any_waiters, node) {
- 		struct ntsync_q *q = entry->q;
-@@ -111,7 +315,7 @@ static int release_sem_state(struct ntsy
- {
- 	__u32 sum;
- 
--	lockdep_assert_held(&sem->lock);
-+	ntsync_assert_held(sem);
- 
- 	if (check_add_overflow(sem->u.sem.count, count, &sum) ||
- 	    sum > sem->u.sem.max)
-@@ -123,9 +327,11 @@ static int release_sem_state(struct ntsy
- 
- static int ntsync_sem_release(struct ntsync_obj *sem, void __user *argp)
- {
-+	struct ntsync_device *dev = sem->dev;
- 	__u32 __user *user_args = argp;
- 	__u32 prev_count;
- 	__u32 args;
-+	bool all;
- 	int ret;
- 
- 	if (copy_from_user(&args, argp, sizeof(args)))
-@@ -134,14 +340,17 @@ static int ntsync_sem_release(struct nts
- 	if (sem->type != NTSYNC_TYPE_SEM)
- 		return -EINVAL;
- 
--	spin_lock(&sem->lock);
-+	all = ntsync_lock_obj(dev, sem);
- 
- 	prev_count = sem->u.sem.count;
--	ret = post_sem_state(sem, args);
--	if (!ret)
-+	ret = release_sem_state(sem, args);
-+	if (!ret) {
-+		if (all)
-+			try_wake_all_obj(dev, sem);
- 		try_wake_any_sem(sem);
-+	}
- 
--	spin_unlock(&sem->lock);
-+	ntsync_unlock_obj(dev, sem, all);
- 
- 	if (!ret && put_user(prev_count, user_args))
- 		ret = -EFAULT;
-@@ -193,6 +402,8 @@ static struct ntsync_obj *ntsync_alloc_o
- 	get_file(dev->file);
- 	spin_lock_init(&obj->lock);
- 	INIT_LIST_HEAD(&obj->any_waiters);
-+	INIT_LIST_HEAD(&obj->all_waiters);
-+	atomic_set(&obj->all_hint, 0);
- 
- 	return obj;
- }
-@@ -301,7 +512,7 @@ static int ntsync_schedule(const struct
-  * Allocate and initialize the ntsync_q structure, but do not queue us yet.
-  */
- static int setup_wait(struct ntsync_device *dev,
--		      const struct ntsync_wait_args *args,
-+		      const struct ntsync_wait_args *args, bool all,
- 		      struct ntsync_q **ret_q)
- {
- 	const __u32 count = args->count;
-@@ -324,6 +535,7 @@ static int setup_wait(struct ntsync_devi
- 		return -ENOMEM;
- 	q->task = current;
- 	atomic_set(&q->signaled, -1);
-+	q->all = all;
- 	q->count = count;
- 
- 	for (i = 0; i < count; i++) {
-@@ -333,6 +545,16 @@ static int setup_wait(struct ntsync_devi
- 		if (!obj)
- 			goto err;
- 
-+		if (all) {
-+			/* Check that the objects are all distinct. */
-+			for (j = 0; j < i; j++) {
-+				if (obj == q->entries[j].obj) {
-+					put_obj(obj);
-+					goto err;
-+				}
-+			}
-+		}
-+
- 		entry->obj = obj;
- 		entry->q = q;
- 		entry->index = i;
-@@ -362,13 +584,14 @@ static int ntsync_wait_any(struct ntsync
- 	struct ntsync_wait_args args;
- 	struct ntsync_q *q;
- 	int signaled;
-+	bool all;
- 	__u32 i;
- 	int ret;
- 
- 	if (copy_from_user(&args, argp, sizeof(args)))
- 		return -EFAULT;
- 
--	ret = setup_wait(dev, &args, &q);
-+	ret = setup_wait(dev, &args, false, &q);
- 	if (ret < 0)
- 		return ret;
- 
-@@ -378,9 +601,9 @@ static int ntsync_wait_any(struct ntsync
- 		struct ntsync_q_entry *entry = &q->entries[i];
- 		struct ntsync_obj *obj = entry->obj;
- 
--		spin_lock(&obj->lock);
-+		all = ntsync_lock_obj(dev, obj);
- 		list_add_tail(&entry->node, &obj->any_waiters);
--		spin_unlock(&obj->lock);
-+		ntsync_unlock_obj(dev, obj, all);
- 	}
- 
- 	/* check if we are already signaled */
-@@ -391,9 +614,9 @@ static int ntsync_wait_any(struct ntsync
- 		if (atomic_read(&q->signaled) != -1)
- 			break;
- 
--		spin_lock(&obj->lock);
-+		all = ntsync_lock_obj(dev, obj);
- 		try_wake_any_obj(obj);
--		spin_unlock(&obj->lock);
-+		ntsync_unlock_obj(dev, obj, all);
- 	}
- 
- 	/* sleep */
-@@ -406,13 +629,94 @@ static int ntsync_wait_any(struct ntsync
- 		struct ntsync_q_entry *entry = &q->entries[i];
- 		struct ntsync_obj *obj = entry->obj;
- 
--		spin_lock(&obj->lock);
-+		all = ntsync_lock_obj(dev, obj);
- 		list_del(&entry->node);
--		spin_unlock(&obj->lock);
-+		ntsync_unlock_obj(dev, obj, all);
-+
-+		put_obj(obj);
-+	}
-+
-+	signaled = atomic_read(&q->signaled);
-+	if (signaled != -1) {
-+		struct ntsync_wait_args __user *user_args = argp;
-+
-+		/* even if we caught a signal, we need to communicate success */
-+		ret = 0;
-+
-+		if (put_user(signaled, &user_args->index))
-+			ret = -EFAULT;
-+	} else if (!ret) {
-+		ret = -ETIMEDOUT;
-+	}
-+
-+	kfree(q);
-+	return ret;
-+}
-+
-+static int ntsync_wait_all(struct ntsync_device *dev, void __user *argp)
-+{
-+	struct ntsync_wait_args args;
-+	struct ntsync_q *q;
-+	int signaled;
-+	__u32 i;
-+	int ret;
-+
-+	if (copy_from_user(&args, argp, sizeof(args)))
-+		return -EFAULT;
-+
-+	ret = setup_wait(dev, &args, true, &q);
-+	if (ret < 0)
-+		return ret;
-+
-+	/* queue ourselves */
-+
-+	mutex_lock(&dev->wait_all_lock);
-+
-+	for (i = 0; i < args.count; i++) {
-+		struct ntsync_q_entry *entry = &q->entries[i];
-+		struct ntsync_obj *obj = entry->obj;
-+
-+		atomic_inc(&obj->all_hint);
-+
-+		/*
-+		 * obj->all_waiters is protected by dev->wait_all_lock rather
-+		 * than obj->lock, so there is no need to acquire obj->lock
-+		 * here.
-+		 */
-+		list_add_tail(&entry->node, &obj->all_waiters);
-+	}
-+
-+	/* check if we are already signaled */
-+
-+	try_wake_all(dev, q, NULL);
-+
-+	mutex_unlock(&dev->wait_all_lock);
-+
-+	/* sleep */
-+
-+	ret = ntsync_schedule(q, &args);
-+
-+	/* and finally, unqueue */
-+
-+	mutex_lock(&dev->wait_all_lock);
-+
-+	for (i = 0; i < args.count; i++) {
-+		struct ntsync_q_entry *entry = &q->entries[i];
-+		struct ntsync_obj *obj = entry->obj;
-+
-+		/*
-+		 * obj->all_waiters is protected by dev->wait_all_lock rather
-+		 * than obj->lock, so there is no need to acquire it here.
-+		 */
-+		list_del(&entry->node);
-+
-+		atomic_dec(&obj->all_hint);
- 
- 		put_obj(obj);
- 	}
- 
-+	mutex_unlock(&dev->wait_all_lock);
-+
- 	signaled = atomic_read(&q->signaled);
- 	if (signaled != -1) {
- 		struct ntsync_wait_args __user *user_args = argp;
-@@ -438,6 +742,8 @@ static int ntsync_char_open(struct inode
- 	if (!dev)
- 		return -ENOMEM;
- 
-+	mutex_init(&dev->wait_all_lock);
-+
- 	file->private_data = dev;
- 	dev->file = file;
- 	return nonseekable_open(inode, file);
-@@ -461,6 +767,8 @@ static long ntsync_char_ioctl(struct fil
- 	switch (cmd) {
- 	case NTSYNC_IOC_CREATE_SEM:
- 		return ntsync_create_sem(dev, argp);
-+	case NTSYNC_IOC_WAIT_ALL:
-+		return ntsync_wait_all(dev, argp);
- 	case NTSYNC_IOC_WAIT_ANY:
- 		return ntsync_wait_any(dev, argp);
- 	default:
---- a/include/uapi/linux/ntsync.h
-+++ b/include/uapi/linux/ntsync.h
-@@ -30,6 +30,7 @@ struct ntsync_wait_args {
- 
- #define NTSYNC_IOC_CREATE_SEM		_IOW ('N', 0x80, struct ntsync_sem_args)
- #define NTSYNC_IOC_WAIT_ANY		_IOWR('N', 0x82, struct ntsync_wait_args)
-+#define NTSYNC_IOC_WAIT_ALL		_IOWR('N', 0x83, struct ntsync_wait_args)
- 
- #define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
- 

debian/patches/misc-ntsync7/0005-ntsync-Introduce-NTSYNC_IOC_CREATE_MUTEX.patch

@@ -1,222 +0,0 @@
-From bcdeaefdc4b60e7845232c201427717df3a83277 Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:34:46 -0600
-Subject: ntsync: Introduce NTSYNC_IOC_CREATE_MUTEX.
-
-This corresponds to the NT syscall NtCreateMutant().
-
-An NT mutex is recursive, with a 32-bit recursion counter. When acquired via
-NtWaitForMultipleObjects(), the recursion counter is incremented by one. The OS
-records the thread which acquired it.
-
-The OS records the thread which acquired it. However, in order to keep this
-driver self-contained, the owning thread ID is managed by user-space, and passed
-as a parameter to all relevant ioctls.
-
-The initial owner and recursion count, if any, are specified when the mutex is
-created.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/ntsync.c       | 74 +++++++++++++++++++++++++++++++++++--
- include/uapi/linux/ntsync.h |  9 ++++-
- 2 files changed, 79 insertions(+), 4 deletions(-)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -25,6 +25,7 @@
- 
- enum ntsync_type {
- 	NTSYNC_TYPE_SEM,
-+	NTSYNC_TYPE_MUTEX,
- };
- 
- /*
-@@ -55,6 +56,10 @@ struct ntsync_obj {
- 			__u32 count;
- 			__u32 max;
- 		} sem;
-+		struct {
-+			__u32 count;
-+			pid_t owner;
-+		} mutex;
- 	} u;
- 
- 	/*
-@@ -92,6 +97,7 @@ struct ntsync_q_entry {
- 
- struct ntsync_q {
- 	struct task_struct *task;
-+	__u32 owner;
- 
- 	/*
- 	 * Protected via atomic_try_cmpxchg(). Only the thread that wins the
-@@ -214,13 +220,17 @@ static void ntsync_unlock_obj(struct nts
- 		       ((lockdep_is_held(&(obj)->dev->wait_all_lock) != LOCK_STATE_NOT_HELD) && \
- 			(obj)->dev_locked))
- 
--static bool is_signaled(struct ntsync_obj *obj)
-+static bool is_signaled(struct ntsync_obj *obj, __u32 owner)
- {
- 	ntsync_assert_held(obj);
- 
- 	switch (obj->type) {
- 	case NTSYNC_TYPE_SEM:
- 		return !!obj->u.sem.count;
-+	case NTSYNC_TYPE_MUTEX:
-+		if (obj->u.mutex.owner && obj->u.mutex.owner != owner)
-+			return false;
-+		return obj->u.mutex.count < UINT_MAX;
- 	}
- 
- 	WARN(1, "bad object type %#x\n", obj->type);
-@@ -250,7 +260,7 @@ static void try_wake_all(struct ntsync_d
- 	}
- 
- 	for (i = 0; i < count; i++) {
--		if (!is_signaled(q->entries[i].obj)) {
-+		if (!is_signaled(q->entries[i].obj, q->owner)) {
- 			can_wake = false;
- 			break;
- 		}
-@@ -264,6 +274,10 @@ static void try_wake_all(struct ntsync_d
- 			case NTSYNC_TYPE_SEM:
- 				obj->u.sem.count--;
- 				break;
-+			case NTSYNC_TYPE_MUTEX:
-+				obj->u.mutex.count++;
-+				obj->u.mutex.owner = q->owner;
-+				break;
- 			}
- 		}
- 		wake_up_process(q->task);
-@@ -307,6 +321,30 @@ static void try_wake_any_sem(struct ntsy
- 	}
- }
- 
-+static void try_wake_any_mutex(struct ntsync_obj *mutex)
-+{
-+	struct ntsync_q_entry *entry;
-+
-+	ntsync_assert_held(mutex);
-+	lockdep_assert(mutex->type == NTSYNC_TYPE_MUTEX);
-+
-+	list_for_each_entry(entry, &mutex->any_waiters, node) {
-+		struct ntsync_q *q = entry->q;
-+		int signaled = -1;
-+
-+		if (mutex->u.mutex.count == UINT_MAX)
-+			break;
-+		if (mutex->u.mutex.owner && mutex->u.mutex.owner != q->owner)
-+			continue;
-+
-+		if (atomic_try_cmpxchg(&q->signaled, &signaled, entry->index)) {
-+			mutex->u.mutex.count++;
-+			mutex->u.mutex.owner = q->owner;
-+			wake_up_process(q->task);
-+		}
-+	}
-+}
-+
- /*
-  * Actually change the semaphore state, returning -EOVERFLOW if it is made
-  * invalid.
-@@ -451,6 +489,30 @@ static int ntsync_create_sem(struct ntsy
- 	return fd;
- }
- 
-+static int ntsync_create_mutex(struct ntsync_device *dev, void __user *argp)
-+{
-+	struct ntsync_mutex_args args;
-+	struct ntsync_obj *mutex;
-+	int fd;
-+
-+	if (copy_from_user(&args, argp, sizeof(args)))
-+		return -EFAULT;
-+
-+	if (!args.owner != !args.count)
-+		return -EINVAL;
-+
-+	mutex = ntsync_alloc_obj(dev, NTSYNC_TYPE_MUTEX);
-+	if (!mutex)
-+		return -ENOMEM;
-+	mutex->u.mutex.count = args.count;
-+	mutex->u.mutex.owner = args.owner;
-+	fd = ntsync_obj_get_fd(mutex);
-+	if (fd < 0)
-+		kfree(mutex);
-+
-+	return fd;
-+}
-+
- static struct ntsync_obj *get_obj(struct ntsync_device *dev, int fd)
- {
- 	struct file *file = fget(fd);
-@@ -520,7 +582,7 @@ static int setup_wait(struct ntsync_devi
- 	struct ntsync_q *q;
- 	__u32 i, j;
- 
--	if (args->pad[0] || args->pad[1] || args->pad[2] || (args->flags & ~NTSYNC_WAIT_REALTIME))
-+	if (args->pad[0] || args->pad[1] || (args->flags & ~NTSYNC_WAIT_REALTIME))
- 		return -EINVAL;
- 
- 	if (args->count > NTSYNC_MAX_WAIT_COUNT)
-@@ -534,6 +596,7 @@ static int setup_wait(struct ntsync_devi
- 	if (!q)
- 		return -ENOMEM;
- 	q->task = current;
-+	q->owner = args->owner;
- 	atomic_set(&q->signaled, -1);
- 	q->all = all;
- 	q->count = count;
-@@ -576,6 +639,9 @@ static void try_wake_any_obj(struct ntsy
- 	case NTSYNC_TYPE_SEM:
- 		try_wake_any_sem(obj);
- 		break;
-+	case NTSYNC_TYPE_MUTEX:
-+		try_wake_any_mutex(obj);
-+		break;
- 	}
- }
- 
-@@ -765,6 +831,8 @@ static long ntsync_char_ioctl(struct fil
- 	void __user *argp = (void __user *)parm;
- 
- 	switch (cmd) {
-+	case NTSYNC_IOC_CREATE_MUTEX:
-+		return ntsync_create_mutex(dev, argp);
- 	case NTSYNC_IOC_CREATE_SEM:
- 		return ntsync_create_sem(dev, argp);
- 	case NTSYNC_IOC_WAIT_ALL:
---- a/include/uapi/linux/ntsync.h
-+++ b/include/uapi/linux/ntsync.h
-@@ -15,6 +15,11 @@ struct ntsync_sem_args {
- 	__u32 max;
- };
- 
-+struct ntsync_mutex_args {
-+	__u32 owner;
-+	__u32 count;
-+};
-+
- #define NTSYNC_WAIT_REALTIME	0x1
- 
- struct ntsync_wait_args {
-@@ -23,7 +28,8 @@ struct ntsync_wait_args {
- 	__u32 count;
- 	__u32 index;
- 	__u32 flags;
--	__u32 pad[3];
-+	__u32 owner;
-+	__u32 pad[2];
- };
- 
- #define NTSYNC_MAX_WAIT_COUNT 64
-@@ -31,6 +37,7 @@ struct ntsync_wait_args {
- #define NTSYNC_IOC_CREATE_SEM		_IOW ('N', 0x80, struct ntsync_sem_args)
- #define NTSYNC_IOC_WAIT_ANY		_IOWR('N', 0x82, struct ntsync_wait_args)
- #define NTSYNC_IOC_WAIT_ALL		_IOWR('N', 0x83, struct ntsync_wait_args)
-+#define NTSYNC_IOC_CREATE_MUTEX		_IOW ('N', 0x84, struct ntsync_mutex_args)
- 
- #define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
- 

debian/patches/misc-ntsync7/0006-ntsync-Introduce-NTSYNC_IOC_MUTEX_UNLOCK.patch

@@ -1,95 +0,0 @@
-From e349279c9dc7fc2136a764a16074a90ef3039f38 Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:34:47 -0600
-Subject: ntsync: Introduce NTSYNC_IOC_MUTEX_UNLOCK.
-
-This corresponds to the NT syscall NtReleaseMutant().
-
-This syscall decrements the mutex's recursion count by one, and returns the
-previous value. If the mutex is not owned by the current task, the function
-instead fails and returns -EPERM.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/ntsync.c       | 53 +++++++++++++++++++++++++++++++++++++
- include/uapi/linux/ntsync.h |  1 +
- 2 files changed, 54 insertions(+)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -396,6 +396,57 @@ static int ntsync_sem_release(struct nts
- 	return ret;
- }
- 
-+/*
-+ * Actually change the mutex state, returning -EPERM if not the owner.
-+ */
-+static int unlock_mutex_state(struct ntsync_obj *mutex,
-+			      const struct ntsync_mutex_args *args)
-+{
-+	ntsync_assert_held(mutex);
-+
-+	if (mutex->u.mutex.owner != args->owner)
-+		return -EPERM;
-+
-+	if (!--mutex->u.mutex.count)
-+		mutex->u.mutex.owner = 0;
-+	return 0;
-+}
-+
-+static int ntsync_mutex_unlock(struct ntsync_obj *mutex, void __user *argp)
-+{
-+	struct ntsync_mutex_args __user *user_args = argp;
-+	struct ntsync_device *dev = mutex->dev;
-+	struct ntsync_mutex_args args;
-+	__u32 prev_count;
-+	bool all;
-+	int ret;
-+
-+	if (copy_from_user(&args, argp, sizeof(args)))
-+		return -EFAULT;
-+	if (!args.owner)
-+		return -EINVAL;
-+
-+	if (mutex->type != NTSYNC_TYPE_MUTEX)
-+		return -EINVAL;
-+
-+	all = ntsync_lock_obj(dev, mutex);
-+
-+	prev_count = mutex->u.mutex.count;
-+	ret = unlock_mutex_state(mutex, &args);
-+	if (!ret) {
-+		if (all)
-+			try_wake_all_obj(dev, mutex);
-+		try_wake_any_mutex(mutex);
-+	}
-+
-+	ntsync_unlock_obj(dev, mutex, all);
-+
-+	if (!ret && put_user(prev_count, &user_args->count))
-+		ret = -EFAULT;
-+
-+	return ret;
-+}
-+
- static int ntsync_obj_release(struct inode *inode, struct file *file)
- {
- 	struct ntsync_obj *obj = file->private_data;
-@@ -415,6 +466,8 @@ static long ntsync_obj_ioctl(struct file
- 	switch (cmd) {
- 	case NTSYNC_IOC_SEM_RELEASE:
- 		return ntsync_sem_release(obj, argp);
-+	case NTSYNC_IOC_MUTEX_UNLOCK:
-+		return ntsync_mutex_unlock(obj, argp);
- 	default:
- 		return -ENOIOCTLCMD;
- 	}
---- a/include/uapi/linux/ntsync.h
-+++ b/include/uapi/linux/ntsync.h
-@@ -40,5 +40,6 @@ struct ntsync_wait_args {
- #define NTSYNC_IOC_CREATE_MUTEX		_IOW ('N', 0x84, struct ntsync_mutex_args)
- 
- #define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
-+#define NTSYNC_IOC_MUTEX_UNLOCK		_IOWR('N', 0x85, struct ntsync_mutex_args)
- 
- #endif

debian/patches/misc-ntsync7/0007-ntsync-Introduce-NTSYNC_IOC_MUTEX_KILL.patch

@@ -1,156 +0,0 @@
-From ebb60a10ac3c6b28ba7a46aa67b279d41ad9356d Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:34:48 -0600
-Subject: ntsync: Introduce NTSYNC_IOC_MUTEX_KILL.
-
-This does not correspond to any NT syscall. Rather, when a thread dies, it
-should be called by the NT emulator for each mutex, with the TID of the dying
-thread.
-
-NT mutexes are robust (in the pthread sense). When an NT thread dies, any
-mutexes it owned are immediately released. Acquisition of those mutexes by other
-threads will return a special value indicating that the mutex was abandoned,
-like EOWNERDEAD returned from pthread_mutex_lock(), and EOWNERDEAD is indeed
-used here for that purpose.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/ntsync.c       | 61 +++++++++++++++++++++++++++++++++++--
- include/uapi/linux/ntsync.h |  1 +
- 2 files changed, 60 insertions(+), 2 deletions(-)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -59,6 +59,7 @@ struct ntsync_obj {
- 		struct {
- 			__u32 count;
- 			pid_t owner;
-+			bool ownerdead;
- 		} mutex;
- 	} u;
- 
-@@ -107,6 +108,7 @@ struct ntsync_q {
- 	atomic_t signaled;
- 
- 	bool all;
-+	bool ownerdead;
- 	__u32 count;
- 	struct ntsync_q_entry entries[];
- };
-@@ -275,6 +277,9 @@ static void try_wake_all(struct ntsync_d
- 				obj->u.sem.count--;
- 				break;
- 			case NTSYNC_TYPE_MUTEX:
-+				if (obj->u.mutex.ownerdead)
-+					q->ownerdead = true;
-+				obj->u.mutex.ownerdead = false;
- 				obj->u.mutex.count++;
- 				obj->u.mutex.owner = q->owner;
- 				break;
-@@ -338,6 +343,9 @@ static void try_wake_any_mutex(struct nt
- 			continue;
- 
- 		if (atomic_try_cmpxchg(&q->signaled, &signaled, entry->index)) {
-+			if (mutex->u.mutex.ownerdead)
-+				q->ownerdead = true;
-+			mutex->u.mutex.ownerdead = false;
- 			mutex->u.mutex.count++;
- 			mutex->u.mutex.owner = q->owner;
- 			wake_up_process(q->task);
-@@ -447,6 +455,52 @@ static int ntsync_mutex_unlock(struct nt
- 	return ret;
- }
- 
-+/*
-+ * Actually change the mutex state to mark its owner as dead,
-+ * returning -EPERM if not the owner.
-+ */
-+static int kill_mutex_state(struct ntsync_obj *mutex, __u32 owner)
-+{
-+	ntsync_assert_held(mutex);
-+
-+	if (mutex->u.mutex.owner != owner)
-+		return -EPERM;
-+
-+	mutex->u.mutex.ownerdead = true;
-+	mutex->u.mutex.owner = 0;
-+	mutex->u.mutex.count = 0;
-+	return 0;
-+}
-+
-+static int ntsync_mutex_kill(struct ntsync_obj *mutex, void __user *argp)
-+{
-+	struct ntsync_device *dev = mutex->dev;
-+	__u32 owner;
-+	bool all;
-+	int ret;
-+
-+	if (get_user(owner, (__u32 __user *)argp))
-+		return -EFAULT;
-+	if (!owner)
-+		return -EINVAL;
-+
-+	if (mutex->type != NTSYNC_TYPE_MUTEX)
-+		return -EINVAL;
-+
-+	all = ntsync_lock_obj(dev, mutex);
-+
-+	ret = kill_mutex_state(mutex, owner);
-+	if (!ret) {
-+		if (all)
-+			try_wake_all_obj(dev, mutex);
-+		try_wake_any_mutex(mutex);
-+	}
-+
-+	ntsync_unlock_obj(dev, mutex, all);
-+
-+	return ret;
-+}
-+
- static int ntsync_obj_release(struct inode *inode, struct file *file)
- {
- 	struct ntsync_obj *obj = file->private_data;
-@@ -468,6 +522,8 @@ static long ntsync_obj_ioctl(struct file
- 		return ntsync_sem_release(obj, argp);
- 	case NTSYNC_IOC_MUTEX_UNLOCK:
- 		return ntsync_mutex_unlock(obj, argp);
-+	case NTSYNC_IOC_MUTEX_KILL:
-+		return ntsync_mutex_kill(obj, argp);
- 	default:
- 		return -ENOIOCTLCMD;
- 	}
-@@ -652,6 +708,7 @@ static int setup_wait(struct ntsync_devi
- 	q->owner = args->owner;
- 	atomic_set(&q->signaled, -1);
- 	q->all = all;
-+	q->ownerdead = false;
- 	q->count = count;
- 
- 	for (i = 0; i < count; i++) {
-@@ -760,7 +817,7 @@ static int ntsync_wait_any(struct ntsync
- 		struct ntsync_wait_args __user *user_args = argp;
- 
- 		/* even if we caught a signal, we need to communicate success */
--		ret = 0;
-+		ret = q->ownerdead ? -EOWNERDEAD : 0;
- 
- 		if (put_user(signaled, &user_args->index))
- 			ret = -EFAULT;
-@@ -841,7 +898,7 @@ static int ntsync_wait_all(struct ntsync
- 		struct ntsync_wait_args __user *user_args = argp;
- 
- 		/* even if we caught a signal, we need to communicate success */
--		ret = 0;
-+		ret = q->ownerdead ? -EOWNERDEAD : 0;
- 
- 		if (put_user(signaled, &user_args->index))
- 			ret = -EFAULT;
---- a/include/uapi/linux/ntsync.h
-+++ b/include/uapi/linux/ntsync.h
-@@ -41,5 +41,6 @@ struct ntsync_wait_args {
- 
- #define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
- #define NTSYNC_IOC_MUTEX_UNLOCK		_IOWR('N', 0x85, struct ntsync_mutex_args)
-+#define NTSYNC_IOC_MUTEX_KILL		_IOW ('N', 0x86, __u32)
- 
- #endif

debian/patches/misc-ntsync7/0008-ntsync-Introduce-NTSYNC_IOC_CREATE_EVENT.patch

@@ -1,162 +0,0 @@
-From f74c8259d49ea4c0e679902da9c7c95ec06ae65c Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:34:49 -0600
-Subject: ntsync: Introduce NTSYNC_IOC_CREATE_EVENT.
-
-This correspond to the NT syscall NtCreateEvent().
-
-An NT event holds a single bit of state denoting whether it is signaled or
-unsignaled.
-
-There are two types of events: manual-reset and automatic-reset. When an
-automatic-reset event is acquired via a wait function, its state is reset to
-unsignaled. Manual-reset events are not affected by wait functions.
-
-Whether the event is manual-reset, and its initial state, are specified at
-creation time.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/ntsync.c       | 59 +++++++++++++++++++++++++++++++++++++
- include/uapi/linux/ntsync.h |  6 ++++
- 2 files changed, 65 insertions(+)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -26,6 +26,7 @@
- enum ntsync_type {
- 	NTSYNC_TYPE_SEM,
- 	NTSYNC_TYPE_MUTEX,
-+	NTSYNC_TYPE_EVENT,
- };
- 
- /*
-@@ -61,6 +62,10 @@ struct ntsync_obj {
- 			pid_t owner;
- 			bool ownerdead;
- 		} mutex;
-+		struct {
-+			bool manual;
-+			bool signaled;
-+		} event;
- 	} u;
- 
- 	/*
-@@ -233,6 +238,8 @@ static bool is_signaled(struct ntsync_ob
- 		if (obj->u.mutex.owner && obj->u.mutex.owner != owner)
- 			return false;
- 		return obj->u.mutex.count < UINT_MAX;
-+	case NTSYNC_TYPE_EVENT:
-+		return obj->u.event.signaled;
- 	}
- 
- 	WARN(1, "bad object type %#x\n", obj->type);
-@@ -283,6 +290,10 @@ static void try_wake_all(struct ntsync_d
- 				obj->u.mutex.count++;
- 				obj->u.mutex.owner = q->owner;
- 				break;
-+			case NTSYNC_TYPE_EVENT:
-+				if (!obj->u.event.manual)
-+					obj->u.event.signaled = false;
-+				break;
- 			}
- 		}
- 		wake_up_process(q->task);
-@@ -353,6 +364,28 @@ static void try_wake_any_mutex(struct nt
- 	}
- }
- 
-+static void try_wake_any_event(struct ntsync_obj *event)
-+{
-+	struct ntsync_q_entry *entry;
-+
-+	ntsync_assert_held(event);
-+	lockdep_assert(event->type == NTSYNC_TYPE_EVENT);
-+
-+	list_for_each_entry(entry, &event->any_waiters, node) {
-+		struct ntsync_q *q = entry->q;
-+		int signaled = -1;
-+
-+		if (!event->u.event.signaled)
-+			break;
-+
-+		if (atomic_try_cmpxchg(&q->signaled, &signaled, entry->index)) {
-+			if (!event->u.event.manual)
-+				event->u.event.signaled = false;
-+			wake_up_process(q->task);
-+		}
-+	}
-+}
-+
- /*
-  * Actually change the semaphore state, returning -EOVERFLOW if it is made
-  * invalid.
-@@ -622,6 +655,27 @@ static int ntsync_create_mutex(struct nt
- 	return fd;
- }
- 
-+static int ntsync_create_event(struct ntsync_device *dev, void __user *argp)
-+{
-+	struct ntsync_event_args args;
-+	struct ntsync_obj *event;
-+	int fd;
-+
-+	if (copy_from_user(&args, argp, sizeof(args)))
-+		return -EFAULT;
-+
-+	event = ntsync_alloc_obj(dev, NTSYNC_TYPE_EVENT);
-+	if (!event)
-+		return -ENOMEM;
-+	event->u.event.manual = args.manual;
-+	event->u.event.signaled = args.signaled;
-+	fd = ntsync_obj_get_fd(event);
-+	if (fd < 0)
-+		kfree(event);
-+
-+	return fd;
-+}
-+
- static struct ntsync_obj *get_obj(struct ntsync_device *dev, int fd)
- {
- 	struct file *file = fget(fd);
-@@ -752,6 +806,9 @@ static void try_wake_any_obj(struct ntsy
- 	case NTSYNC_TYPE_MUTEX:
- 		try_wake_any_mutex(obj);
- 		break;
-+	case NTSYNC_TYPE_EVENT:
-+		try_wake_any_event(obj);
-+		break;
- 	}
- }
- 
-@@ -941,6 +998,8 @@ static long ntsync_char_ioctl(struct fil
- 	void __user *argp = (void __user *)parm;
- 
- 	switch (cmd) {
-+	case NTSYNC_IOC_CREATE_EVENT:
-+		return ntsync_create_event(dev, argp);
- 	case NTSYNC_IOC_CREATE_MUTEX:
- 		return ntsync_create_mutex(dev, argp);
- 	case NTSYNC_IOC_CREATE_SEM:
---- a/include/uapi/linux/ntsync.h
-+++ b/include/uapi/linux/ntsync.h
-@@ -20,6 +20,11 @@ struct ntsync_mutex_args {
- 	__u32 count;
- };
- 
-+struct ntsync_event_args {
-+	__u32 manual;
-+	__u32 signaled;
-+};
-+
- #define NTSYNC_WAIT_REALTIME	0x1
- 
- struct ntsync_wait_args {
-@@ -38,6 +43,7 @@ struct ntsync_wait_args {
- #define NTSYNC_IOC_WAIT_ANY		_IOWR('N', 0x82, struct ntsync_wait_args)
- #define NTSYNC_IOC_WAIT_ALL		_IOWR('N', 0x83, struct ntsync_wait_args)
- #define NTSYNC_IOC_CREATE_MUTEX		_IOW ('N', 0x84, struct ntsync_mutex_args)
-+#define NTSYNC_IOC_CREATE_EVENT		_IOW ('N', 0x87, struct ntsync_event_args)
- 
- #define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
- #define NTSYNC_IOC_MUTEX_UNLOCK		_IOWR('N', 0x85, struct ntsync_mutex_args)

debian/patches/misc-ntsync7/0009-ntsync-Introduce-NTSYNC_IOC_EVENT_SET.patch

@@ -1,67 +0,0 @@
-From bf60db9cfeccc8f92636b6dcf2eccd7fcd8d84f3 Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:34:50 -0600
-Subject: ntsync: Introduce NTSYNC_IOC_EVENT_SET.
-
-This corresponds to the NT syscall NtSetEvent().
-
-This sets the event to the signaled state, and returns its previous state.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/ntsync.c       | 27 +++++++++++++++++++++++++++
- include/uapi/linux/ntsync.h |  1 +
- 2 files changed, 28 insertions(+)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -534,6 +534,31 @@ static int ntsync_mutex_kill(struct ntsy
- 	return ret;
- }
- 
-+static int ntsync_event_set(struct ntsync_obj *event, void __user *argp)
-+{
-+	struct ntsync_device *dev = event->dev;
-+	__u32 prev_state;
-+	bool all;
-+
-+	if (event->type != NTSYNC_TYPE_EVENT)
-+		return -EINVAL;
-+
-+	all = ntsync_lock_obj(dev, event);
-+
-+	prev_state = event->u.event.signaled;
-+	event->u.event.signaled = true;
-+	if (all)
-+		try_wake_all_obj(dev, event);
-+	try_wake_any_event(event);
-+
-+	ntsync_unlock_obj(dev, event, all);
-+
-+	if (put_user(prev_state, (__u32 __user *)argp))
-+		return -EFAULT;
-+
-+	return 0;
-+}
-+
- static int ntsync_obj_release(struct inode *inode, struct file *file)
- {
- 	struct ntsync_obj *obj = file->private_data;
-@@ -557,6 +582,8 @@ static long ntsync_obj_ioctl(struct file
- 		return ntsync_mutex_unlock(obj, argp);
- 	case NTSYNC_IOC_MUTEX_KILL:
- 		return ntsync_mutex_kill(obj, argp);
-+	case NTSYNC_IOC_EVENT_SET:
-+		return ntsync_event_set(obj, argp);
- 	default:
- 		return -ENOIOCTLCMD;
- 	}
---- a/include/uapi/linux/ntsync.h
-+++ b/include/uapi/linux/ntsync.h
-@@ -48,5 +48,6 @@ struct ntsync_wait_args {
- #define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
- #define NTSYNC_IOC_MUTEX_UNLOCK		_IOWR('N', 0x85, struct ntsync_mutex_args)
- #define NTSYNC_IOC_MUTEX_KILL		_IOW ('N', 0x86, __u32)
-+#define NTSYNC_IOC_EVENT_SET		_IOR ('N', 0x88, __u32)
- 
- #endif

debian/patches/misc-ntsync7/0010-ntsync-Introduce-NTSYNC_IOC_EVENT_RESET.patch

@@ -1,64 +0,0 @@
-From f2de3c99a840cac45446515dd268cb9d64f9f892 Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:34:51 -0600
-Subject: ntsync: Introduce NTSYNC_IOC_EVENT_RESET.
-
-This corresponds to the NT syscall NtResetEvent().
-
-This sets the event to the unsignaled state, and returns its previous state.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/ntsync.c       | 24 ++++++++++++++++++++++++
- include/uapi/linux/ntsync.h |  1 +
- 2 files changed, 25 insertions(+)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -559,6 +559,28 @@ static int ntsync_event_set(struct ntsyn
- 	return 0;
- }
- 
-+static int ntsync_event_reset(struct ntsync_obj *event, void __user *argp)
-+{
-+	struct ntsync_device *dev = event->dev;
-+	__u32 prev_state;
-+	bool all;
-+
-+	if (event->type != NTSYNC_TYPE_EVENT)
-+		return -EINVAL;
-+
-+	all = ntsync_lock_obj(dev, event);
-+
-+	prev_state = event->u.event.signaled;
-+	event->u.event.signaled = false;
-+
-+	ntsync_unlock_obj(dev, event, all);
-+
-+	if (put_user(prev_state, (__u32 __user *)argp))
-+		return -EFAULT;
-+
-+	return 0;
-+}
-+
- static int ntsync_obj_release(struct inode *inode, struct file *file)
- {
- 	struct ntsync_obj *obj = file->private_data;
-@@ -584,6 +606,8 @@ static long ntsync_obj_ioctl(struct file
- 		return ntsync_mutex_kill(obj, argp);
- 	case NTSYNC_IOC_EVENT_SET:
- 		return ntsync_event_set(obj, argp);
-+	case NTSYNC_IOC_EVENT_RESET:
-+		return ntsync_event_reset(obj, argp);
- 	default:
- 		return -ENOIOCTLCMD;
- 	}
---- a/include/uapi/linux/ntsync.h
-+++ b/include/uapi/linux/ntsync.h
-@@ -49,5 +49,6 @@ struct ntsync_wait_args {
- #define NTSYNC_IOC_MUTEX_UNLOCK		_IOWR('N', 0x85, struct ntsync_mutex_args)
- #define NTSYNC_IOC_MUTEX_KILL		_IOW ('N', 0x86, __u32)
- #define NTSYNC_IOC_EVENT_SET		_IOR ('N', 0x88, __u32)
-+#define NTSYNC_IOC_EVENT_RESET		_IOR ('N', 0x89, __u32)
- 
- #endif

debian/patches/misc-ntsync7/0011-ntsync-Introduce-NTSYNC_IOC_EVENT_PULSE.patch

@@ -1,60 +0,0 @@
-From 50c791dde217f9fdc1785de77fa2ae888d6bdb4e Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:34:52 -0600
-Subject: ntsync: Introduce NTSYNC_IOC_EVENT_PULSE.
-
-This corresponds to the NT syscall NtPulseEvent().
-
-This wakes up any waiters as if the event had been set, but does not set the
-event, instead resetting it if it had been signalled. Thus, for a manual-reset
-event, all waiters are woken, whereas for an auto-reset event, at most one
-waiter is woken.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/ntsync.c       | 8 ++++++--
- include/uapi/linux/ntsync.h | 1 +
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -534,7 +534,7 @@ static int ntsync_mutex_kill(struct ntsy
- 	return ret;
- }
- 
--static int ntsync_event_set(struct ntsync_obj *event, void __user *argp)
-+static int ntsync_event_set(struct ntsync_obj *event, void __user *argp, bool pulse)
- {
- 	struct ntsync_device *dev = event->dev;
- 	__u32 prev_state;
-@@ -550,6 +550,8 @@ static int ntsync_event_set(struct ntsyn
- 	if (all)
- 		try_wake_all_obj(dev, event);
- 	try_wake_any_event(event);
-+	if (pulse)
-+		event->u.event.signaled = false;
- 
- 	ntsync_unlock_obj(dev, event, all);
- 
-@@ -605,9 +607,11 @@ static long ntsync_obj_ioctl(struct file
- 	case NTSYNC_IOC_MUTEX_KILL:
- 		return ntsync_mutex_kill(obj, argp);
- 	case NTSYNC_IOC_EVENT_SET:
--		return ntsync_event_set(obj, argp);
-+		return ntsync_event_set(obj, argp, false);
- 	case NTSYNC_IOC_EVENT_RESET:
- 		return ntsync_event_reset(obj, argp);
-+	case NTSYNC_IOC_EVENT_PULSE:
-+		return ntsync_event_set(obj, argp, true);
- 	default:
- 		return -ENOIOCTLCMD;
- 	}
---- a/include/uapi/linux/ntsync.h
-+++ b/include/uapi/linux/ntsync.h
-@@ -50,5 +50,6 @@ struct ntsync_wait_args {
- #define NTSYNC_IOC_MUTEX_KILL		_IOW ('N', 0x86, __u32)
- #define NTSYNC_IOC_EVENT_SET		_IOR ('N', 0x88, __u32)
- #define NTSYNC_IOC_EVENT_RESET		_IOR ('N', 0x89, __u32)
-+#define NTSYNC_IOC_EVENT_PULSE		_IOR ('N', 0x8a, __u32)
- 
- #endif

debian/patches/misc-ntsync7/0012-ntsync-Introduce-NTSYNC_IOC_SEM_READ.patch

@@ -1,64 +0,0 @@
-From 248013d9877d47dc5219344268c10b62de1f52f2 Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:34:53 -0600
-Subject: ntsync: Introduce NTSYNC_IOC_SEM_READ.
-
-This corresponds to the NT syscall NtQuerySemaphore().
-
-This returns the current count and maximum count of the semaphore.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/ntsync.c       | 24 ++++++++++++++++++++++++
- include/uapi/linux/ntsync.h |  1 +
- 2 files changed, 25 insertions(+)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -583,6 +583,28 @@ static int ntsync_event_reset(struct nts
- 	return 0;
- }
- 
-+static int ntsync_sem_read(struct ntsync_obj *sem, void __user *argp)
-+{
-+	struct ntsync_sem_args __user *user_args = argp;
-+	struct ntsync_device *dev = sem->dev;
-+	struct ntsync_sem_args args;
-+	bool all;
-+
-+	if (sem->type != NTSYNC_TYPE_SEM)
-+		return -EINVAL;
-+
-+	all = ntsync_lock_obj(dev, sem);
-+
-+	args.count = sem->u.sem.count;
-+	args.max = sem->u.sem.max;
-+
-+	ntsync_unlock_obj(dev, sem, all);
-+
-+	if (copy_to_user(user_args, &args, sizeof(args)))
-+		return -EFAULT;
-+	return 0;
-+}
-+
- static int ntsync_obj_release(struct inode *inode, struct file *file)
- {
- 	struct ntsync_obj *obj = file->private_data;
-@@ -602,6 +624,8 @@ static long ntsync_obj_ioctl(struct file
- 	switch (cmd) {
- 	case NTSYNC_IOC_SEM_RELEASE:
- 		return ntsync_sem_release(obj, argp);
-+	case NTSYNC_IOC_SEM_READ:
-+		return ntsync_sem_read(obj, argp);
- 	case NTSYNC_IOC_MUTEX_UNLOCK:
- 		return ntsync_mutex_unlock(obj, argp);
- 	case NTSYNC_IOC_MUTEX_KILL:
---- a/include/uapi/linux/ntsync.h
-+++ b/include/uapi/linux/ntsync.h
-@@ -51,5 +51,6 @@ struct ntsync_wait_args {
- #define NTSYNC_IOC_EVENT_SET		_IOR ('N', 0x88, __u32)
- #define NTSYNC_IOC_EVENT_RESET		_IOR ('N', 0x89, __u32)
- #define NTSYNC_IOC_EVENT_PULSE		_IOR ('N', 0x8a, __u32)
-+#define NTSYNC_IOC_SEM_READ		_IOR ('N', 0x8b, struct ntsync_sem_args)
- 
- #endif

debian/patches/misc-ntsync7/0013-ntsync-Introduce-NTSYNC_IOC_MUTEX_READ.patch

@@ -1,66 +0,0 @@
-From 8fc7a993fd8bc6b1a09b4b965bee7d16bb2156cc Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:34:54 -0600
-Subject: ntsync: Introduce NTSYNC_IOC_MUTEX_READ.
-
-This corresponds to the NT syscall NtQueryMutant().
-
-This returns the recursion count, owner, and abandoned state of the mutex.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/ntsync.c       | 26 ++++++++++++++++++++++++++
- include/uapi/linux/ntsync.h |  1 +
- 2 files changed, 27 insertions(+)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -605,6 +605,30 @@ static int ntsync_sem_read(struct ntsync
- 	return 0;
- }
- 
-+static int ntsync_mutex_read(struct ntsync_obj *mutex, void __user *argp)
-+{
-+	struct ntsync_mutex_args __user *user_args = argp;
-+	struct ntsync_device *dev = mutex->dev;
-+	struct ntsync_mutex_args args;
-+	bool all;
-+	int ret;
-+
-+	if (mutex->type != NTSYNC_TYPE_MUTEX)
-+		return -EINVAL;
-+
-+	all = ntsync_lock_obj(dev, mutex);
-+
-+	args.count = mutex->u.mutex.count;
-+	args.owner = mutex->u.mutex.owner;
-+	ret = mutex->u.mutex.ownerdead ? -EOWNERDEAD : 0;
-+
-+	ntsync_unlock_obj(dev, mutex, all);
-+
-+	if (copy_to_user(user_args, &args, sizeof(args)))
-+		return -EFAULT;
-+	return ret;
-+}
-+
- static int ntsync_obj_release(struct inode *inode, struct file *file)
- {
- 	struct ntsync_obj *obj = file->private_data;
-@@ -630,6 +654,8 @@ static long ntsync_obj_ioctl(struct file
- 		return ntsync_mutex_unlock(obj, argp);
- 	case NTSYNC_IOC_MUTEX_KILL:
- 		return ntsync_mutex_kill(obj, argp);
-+	case NTSYNC_IOC_MUTEX_READ:
-+		return ntsync_mutex_read(obj, argp);
- 	case NTSYNC_IOC_EVENT_SET:
- 		return ntsync_event_set(obj, argp, false);
- 	case NTSYNC_IOC_EVENT_RESET:
---- a/include/uapi/linux/ntsync.h
-+++ b/include/uapi/linux/ntsync.h
-@@ -52,5 +52,6 @@ struct ntsync_wait_args {
- #define NTSYNC_IOC_EVENT_RESET		_IOR ('N', 0x89, __u32)
- #define NTSYNC_IOC_EVENT_PULSE		_IOR ('N', 0x8a, __u32)
- #define NTSYNC_IOC_SEM_READ		_IOR ('N', 0x8b, struct ntsync_sem_args)
-+#define NTSYNC_IOC_MUTEX_READ		_IOR ('N', 0x8c, struct ntsync_mutex_args)
- 
- #endif

debian/patches/misc-ntsync7/0014-ntsync-Introduce-NTSYNC_IOC_EVENT_READ.patch

@@ -1,64 +0,0 @@
-From aed34cc9c28dba5e3735d7c59e1970a32eefc5f4 Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:34:55 -0600
-Subject: ntsync: Introduce NTSYNC_IOC_EVENT_READ.
-
-This corresponds to the NT syscall NtQueryEvent().
-
-This returns the signaled state of the event and whether it is manual-reset.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/ntsync.c       | 24 ++++++++++++++++++++++++
- include/uapi/linux/ntsync.h |  1 +
- 2 files changed, 25 insertions(+)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -629,6 +629,28 @@ static int ntsync_mutex_read(struct ntsy
- 	return ret;
- }
- 
-+static int ntsync_event_read(struct ntsync_obj *event, void __user *argp)
-+{
-+	struct ntsync_event_args __user *user_args = argp;
-+	struct ntsync_device *dev = event->dev;
-+	struct ntsync_event_args args;
-+	bool all;
-+
-+	if (event->type != NTSYNC_TYPE_EVENT)
-+		return -EINVAL;
-+
-+	all = ntsync_lock_obj(dev, event);
-+
-+	args.manual = event->u.event.manual;
-+	args.signaled = event->u.event.signaled;
-+
-+	ntsync_unlock_obj(dev, event, all);
-+
-+	if (copy_to_user(user_args, &args, sizeof(args)))
-+		return -EFAULT;
-+	return 0;
-+}
-+
- static int ntsync_obj_release(struct inode *inode, struct file *file)
- {
- 	struct ntsync_obj *obj = file->private_data;
-@@ -662,6 +684,8 @@ static long ntsync_obj_ioctl(struct file
- 		return ntsync_event_reset(obj, argp);
- 	case NTSYNC_IOC_EVENT_PULSE:
- 		return ntsync_event_set(obj, argp, true);
-+	case NTSYNC_IOC_EVENT_READ:
-+		return ntsync_event_read(obj, argp);
- 	default:
- 		return -ENOIOCTLCMD;
- 	}
---- a/include/uapi/linux/ntsync.h
-+++ b/include/uapi/linux/ntsync.h
-@@ -53,5 +53,6 @@ struct ntsync_wait_args {
- #define NTSYNC_IOC_EVENT_PULSE		_IOR ('N', 0x8a, __u32)
- #define NTSYNC_IOC_SEM_READ		_IOR ('N', 0x8b, struct ntsync_sem_args)
- #define NTSYNC_IOC_MUTEX_READ		_IOR ('N', 0x8c, struct ntsync_mutex_args)
-+#define NTSYNC_IOC_EVENT_READ		_IOR ('N', 0x8d, struct ntsync_event_args)
- 
- #endif

debian/patches/misc-ntsync7/0015-ntsync-Introduce-alertable-waits.patch

@@ -1,187 +0,0 @@
-From 361a7fb848ba9cac87855cb68f9ab000ed1027be Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:34:56 -0600
-Subject: ntsync: Introduce alertable waits.
-
-NT waits can optionally be made "alertable". This is a special channel for
-thread wakeup that is mildly similar to SIGIO. A thread has an internal single
-bit of "alerted" state, and if a thread is alerted while an alertable wait, the
-wait will return a special value, consume the "alerted" state, and will not
-consume any of its objects.
-
-Alerts are implemented using events; the user-space NT emulator is expected to
-create an internal ntsync event for each thread and pass that event to wait
-functions.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/ntsync.c       | 70 ++++++++++++++++++++++++++++++++-----
- include/uapi/linux/ntsync.h |  3 +-
- 2 files changed, 63 insertions(+), 10 deletions(-)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -869,22 +869,29 @@ static int setup_wait(struct ntsync_devi
- 		      const struct ntsync_wait_args *args, bool all,
- 		      struct ntsync_q **ret_q)
- {
-+	int fds[NTSYNC_MAX_WAIT_COUNT + 1];
- 	const __u32 count = args->count;
--	int fds[NTSYNC_MAX_WAIT_COUNT];
- 	struct ntsync_q *q;
-+	__u32 total_count;
- 	__u32 i, j;
- 
--	if (args->pad[0] || args->pad[1] || (args->flags & ~NTSYNC_WAIT_REALTIME))
-+	if (args->pad || (args->flags & ~NTSYNC_WAIT_REALTIME))
- 		return -EINVAL;
- 
- 	if (args->count > NTSYNC_MAX_WAIT_COUNT)
- 		return -EINVAL;
- 
-+	total_count = count;
-+	if (args->alert)
-+		total_count++;
-+
- 	if (copy_from_user(fds, u64_to_user_ptr(args->objs),
- 			   array_size(count, sizeof(*fds))))
- 		return -EFAULT;
-+	if (args->alert)
-+		fds[count] = args->alert;
- 
--	q = kmalloc(struct_size(q, entries, count), GFP_KERNEL);
-+	q = kmalloc(struct_size(q, entries, total_count), GFP_KERNEL);
- 	if (!q)
- 		return -ENOMEM;
- 	q->task = current;
-@@ -894,7 +901,7 @@ static int setup_wait(struct ntsync_devi
- 	q->ownerdead = false;
- 	q->count = count;
- 
--	for (i = 0; i < count; i++) {
-+	for (i = 0; i < total_count; i++) {
- 		struct ntsync_q_entry *entry = &q->entries[i];
- 		struct ntsync_obj *obj = get_obj(dev, fds[i]);
- 
-@@ -944,10 +951,10 @@ static void try_wake_any_obj(struct ntsy
- static int ntsync_wait_any(struct ntsync_device *dev, void __user *argp)
- {
- 	struct ntsync_wait_args args;
-+	__u32 i, total_count;
- 	struct ntsync_q *q;
- 	int signaled;
- 	bool all;
--	__u32 i;
- 	int ret;
- 
- 	if (copy_from_user(&args, argp, sizeof(args)))
-@@ -957,9 +964,13 @@ static int ntsync_wait_any(struct ntsync
- 	if (ret < 0)
- 		return ret;
- 
-+	total_count = args.count;
-+	if (args.alert)
-+		total_count++;
-+
- 	/* queue ourselves */
- 
--	for (i = 0; i < args.count; i++) {
-+	for (i = 0; i < total_count; i++) {
- 		struct ntsync_q_entry *entry = &q->entries[i];
- 		struct ntsync_obj *obj = entry->obj;
- 
-@@ -968,9 +979,15 @@ static int ntsync_wait_any(struct ntsync
- 		ntsync_unlock_obj(dev, obj, all);
- 	}
- 
--	/* check if we are already signaled */
-+	/*
-+	 * Check if we are already signaled.
-+	 *
-+	 * Note that the API requires that normal objects are checked before
-+	 * the alert event. Hence we queue the alert event last, and check
-+	 * objects in order.
-+	 */
- 
--	for (i = 0; i < args.count; i++) {
-+	for (i = 0; i < total_count; i++) {
- 		struct ntsync_obj *obj = q->entries[i].obj;
- 
- 		if (atomic_read(&q->signaled) != -1)
-@@ -987,7 +1004,7 @@ static int ntsync_wait_any(struct ntsync
- 
- 	/* and finally, unqueue */
- 
--	for (i = 0; i < args.count; i++) {
-+	for (i = 0; i < total_count; i++) {
- 		struct ntsync_q_entry *entry = &q->entries[i];
- 		struct ntsync_obj *obj = entry->obj;
- 
-@@ -1047,6 +1064,14 @@ static int ntsync_wait_all(struct ntsync
- 		 */
- 		list_add_tail(&entry->node, &obj->all_waiters);
- 	}
-+	if (args.alert) {
-+		struct ntsync_q_entry *entry = &q->entries[args.count];
-+		struct ntsync_obj *obj = entry->obj;
-+
-+		dev_lock_obj(dev, obj);
-+		list_add_tail(&entry->node, &obj->any_waiters);
-+		dev_unlock_obj(dev, obj);
-+	}
- 
- 	/* check if we are already signaled */
- 
-@@ -1054,6 +1079,21 @@ static int ntsync_wait_all(struct ntsync
- 
- 	mutex_unlock(&dev->wait_all_lock);
- 
-+	/*
-+	 * Check if the alert event is signaled, making sure to do so only
-+	 * after checking if the other objects are signaled.
-+	 */
-+
-+	if (args.alert) {
-+		struct ntsync_obj *obj = q->entries[args.count].obj;
-+
-+		if (atomic_read(&q->signaled) == -1) {
-+			bool all = ntsync_lock_obj(dev, obj);
-+			try_wake_any_obj(obj);
-+			ntsync_unlock_obj(dev, obj, all);
-+		}
-+	}
-+
- 	/* sleep */
- 
- 	ret = ntsync_schedule(q, &args);
-@@ -1079,6 +1119,18 @@ static int ntsync_wait_all(struct ntsync
- 
- 	mutex_unlock(&dev->wait_all_lock);
- 
-+	if (args.alert) {
-+		struct ntsync_q_entry *entry = &q->entries[args.count];
-+		struct ntsync_obj *obj = entry->obj;
-+		bool all;
-+
-+		all = ntsync_lock_obj(dev, obj);
-+		list_del(&entry->node);
-+		ntsync_unlock_obj(dev, obj, all);
-+
-+		put_obj(obj);
-+	}
-+
- 	signaled = atomic_read(&q->signaled);
- 	if (signaled != -1) {
- 		struct ntsync_wait_args __user *user_args = argp;
---- a/include/uapi/linux/ntsync.h
-+++ b/include/uapi/linux/ntsync.h
-@@ -34,7 +34,8 @@ struct ntsync_wait_args {
- 	__u32 index;
- 	__u32 flags;
- 	__u32 owner;
--	__u32 pad[2];
-+	__u32 alert;
-+	__u32 pad;
- };
- 
- #define NTSYNC_MAX_WAIT_COUNT 64

debian/patches/misc-ntsync7/0016-maintainers-Add-an-entry-for-ntsync.patch

@@ -1,30 +0,0 @@
-From b240b27e5348d38acbc4a12f1dc762dd1845f391 Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:35:09 -0600
-Subject: maintainers: Add an entry for ntsync.
-
-Add myself as maintainer, supported by CodeWeavers.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- MAINTAINERS | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -16486,6 +16486,15 @@ T:	git https://github.com/Paragon-Softwa
- F:	Documentation/filesystems/ntfs3.rst
- F:	fs/ntfs3/
- 
-+NTSYNC SYNCHRONIZATION PRIMITIVE DRIVER
-+M:	Elizabeth Figura <zfigura@codeweavers.com>
-+L:	wine-devel@winehq.org
-+S:	Supported
-+F:	Documentation/userspace-api/ntsync.rst
-+F:	drivers/misc/ntsync.c
-+F:	include/uapi/linux/ntsync.h
-+F:	tools/testing/selftests/drivers/ntsync/
-+
- NUBUS SUBSYSTEM
- M:	Finn Thain <fthain@linux-m68k.org>
- L:	linux-m68k@lists.linux-m68k.org

debian/patches/misc-ntsync7/0017-docs-ntsync-Add-documentation-for-the-ntsync-uAPI.patch

@@ -1,413 +0,0 @@
-From 733e310bb840117593a0eb4726fa63b34fea9cc3 Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:35:10 -0600
-Subject: docs: ntsync: Add documentation for the ntsync uAPI.
-
-Add an overall explanation of the driver architecture, and complete and precise
-specification for its intended behaviour.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- Documentation/userspace-api/index.rst  |   1 +
- Documentation/userspace-api/ntsync.rst | 385 +++++++++++++++++++++++++
- 2 files changed, 386 insertions(+)
- create mode 100644 Documentation/userspace-api/ntsync.rst
-
---- a/Documentation/userspace-api/index.rst
-+++ b/Documentation/userspace-api/index.rst
-@@ -63,6 +63,7 @@ Everything else
-    vduse
-    futex2
-    perf_ring_buffer
-+   ntsync
- 
- .. only::  subproject and html
- 
---- /dev/null
-+++ b/Documentation/userspace-api/ntsync.rst
-@@ -0,0 +1,385 @@
-+===================================
-+NT synchronization primitive driver
-+===================================
-+
-+This page documents the user-space API for the ntsync driver.
-+
-+ntsync is a support driver for emulation of NT synchronization
-+primitives by user-space NT emulators. It exists because implementation
-+in user-space, using existing tools, cannot match Windows performance
-+while offering accurate semantics. It is implemented entirely in
-+software, and does not drive any hardware device.
-+
-+This interface is meant as a compatibility tool only, and should not
-+be used for general synchronization. Instead use generic, versatile
-+interfaces such as futex(2) and poll(2).
-+
-+Synchronization primitives
-+==========================
-+
-+The ntsync driver exposes three types of synchronization primitives:
-+semaphores, mutexes, and events.
-+
-+A semaphore holds a single volatile 32-bit counter, and a static 32-bit
-+integer denoting the maximum value. It is considered signaled (that is,
-+can be acquired without contention, or will wake up a waiting thread)
-+when the counter is nonzero. The counter is decremented by one when a
-+wait is satisfied. Both the initial and maximum count are established
-+when the semaphore is created.
-+
-+A mutex holds a volatile 32-bit recursion count, and a volatile 32-bit
-+identifier denoting its owner. A mutex is considered signaled when its
-+owner is zero (indicating that it is not owned). The recursion count is
-+incremented when a wait is satisfied, and ownership is set to the given
-+identifier.
-+
-+A mutex also holds an internal flag denoting whether its previous owner
-+has died; such a mutex is said to be abandoned. Owner death is not
-+tracked automatically based on thread death, but rather must be
-+communicated using ``NTSYNC_IOC_MUTEX_KILL``. An abandoned mutex is
-+inherently considered unowned.
-+
-+Except for the "unowned" semantics of zero, the actual value of the
-+owner identifier is not interpreted by the ntsync driver at all. The
-+intended use is to store a thread identifier; however, the ntsync
-+driver does not actually validate that a calling thread provides
-+consistent or unique identifiers.
-+
-+An event is similar to a semaphore with a maximum count of one. It holds
-+a volatile boolean state denoting whether it is signaled or not. There
-+are two types of events, auto-reset and manual-reset. An auto-reset
-+event is designaled when a wait is satisfied; a manual-reset event is
-+not. The event type is specified when the event is created.
-+
-+Unless specified otherwise, all operations on an object are atomic and
-+totally ordered with respect to other operations on the same object.
-+
-+Objects are represented by files. When all file descriptors to an
-+object are closed, that object is deleted.
-+
-+Char device
-+===========
-+
-+The ntsync driver creates a single char device /dev/ntsync. Each file
-+description opened on the device represents a unique instance intended
-+to back an individual NT virtual machine. Objects created by one ntsync
-+instance may only be used with other objects created by the same
-+instance.
-+
-+ioctl reference
-+===============
-+
-+All operations on the device are done through ioctls. There are four
-+structures used in ioctl calls::
-+
-+   struct ntsync_sem_args {
-+   	__u32 count;
-+   	__u32 max;
-+   };
-+
-+   struct ntsync_mutex_args {
-+   	__u32 owner;
-+   	__u32 count;
-+   };
-+
-+   struct ntsync_event_args {
-+   	__u32 signaled;
-+   	__u32 manual;
-+   };
-+
-+   struct ntsync_wait_args {
-+   	__u64 timeout;
-+   	__u64 objs;
-+   	__u32 count;
-+   	__u32 owner;
-+   	__u32 index;
-+   	__u32 alert;
-+   	__u32 flags;
-+   	__u32 pad;
-+   };
-+
-+Depending on the ioctl, members of the structure may be used as input,
-+output, or not at all.
-+
-+The ioctls on the device file are as follows:
-+
-+.. c:macro:: NTSYNC_IOC_CREATE_SEM
-+
-+  Create a semaphore object. Takes a pointer to struct
-+  :c:type:`ntsync_sem_args`, which is used as follows:
-+
-+  .. list-table::
-+
-+     * - ``count``
-+       - Initial count of the semaphore.
-+     * - ``max``
-+       - Maximum count of the semaphore.
-+
-+  Fails with ``EINVAL`` if ``count`` is greater than ``max``.
-+  On success, returns a file descriptor the created semaphore.
-+
-+.. c:macro:: NTSYNC_IOC_CREATE_MUTEX
-+
-+  Create a mutex object. Takes a pointer to struct
-+  :c:type:`ntsync_mutex_args`, which is used as follows:
-+
-+  .. list-table::
-+
-+     * - ``count``
-+       - Initial recursion count of the mutex.
-+     * - ``owner``
-+       - Initial owner of the mutex.
-+
-+  If ``owner`` is nonzero and ``count`` is zero, or if ``owner`` is
-+  zero and ``count`` is nonzero, the function fails with ``EINVAL``.
-+  On success, returns a file descriptor the created mutex.
-+
-+.. c:macro:: NTSYNC_IOC_CREATE_EVENT
-+
-+  Create an event object. Takes a pointer to struct
-+  :c:type:`ntsync_event_args`, which is used as follows:
-+
-+  .. list-table::
-+
-+     * - ``signaled``
-+       - If nonzero, the event is initially signaled, otherwise
-+         nonsignaled.
-+     * - ``manual``
-+       - If nonzero, the event is a manual-reset event, otherwise
-+         auto-reset.
-+
-+  On success, returns a file descriptor the created event.
-+
-+The ioctls on the individual objects are as follows:
-+
-+.. c:macro:: NTSYNC_IOC_SEM_POST
-+
-+  Post to a semaphore object. Takes a pointer to a 32-bit integer,
-+  which on input holds the count to be added to the semaphore, and on
-+  output contains its previous count.
-+
-+  If adding to the semaphore's current count would raise the latter
-+  past the semaphore's maximum count, the ioctl fails with
-+  ``EOVERFLOW`` and the semaphore is not affected. If raising the
-+  semaphore's count causes it to become signaled, eligible threads
-+  waiting on this semaphore will be woken and the semaphore's count
-+  decremented appropriately.
-+
-+.. c:macro:: NTSYNC_IOC_MUTEX_UNLOCK
-+
-+  Release a mutex object. Takes a pointer to struct
-+  :c:type:`ntsync_mutex_args`, which is used as follows:
-+
-+  .. list-table::
-+
-+     * - ``owner``
-+       - Specifies the owner trying to release this mutex.
-+     * - ``count``
-+       - On output, contains the previous recursion count.
-+
-+  If ``owner`` is zero, the ioctl fails with ``EINVAL``. If ``owner``
-+  is not the current owner of the mutex, the ioctl fails with
-+  ``EPERM``.
-+
-+  The mutex's count will be decremented by one. If decrementing the
-+  mutex's count causes it to become zero, the mutex is marked as
-+  unowned and signaled, and eligible threads waiting on it will be
-+  woken as appropriate.
-+
-+.. c:macro:: NTSYNC_IOC_SET_EVENT
-+
-+  Signal an event object. Takes a pointer to a 32-bit integer, which on
-+  output contains the previous state of the event.
-+
-+  Eligible threads will be woken, and auto-reset events will be
-+  designaled appropriately.
-+
-+.. c:macro:: NTSYNC_IOC_RESET_EVENT
-+
-+  Designal an event object. Takes a pointer to a 32-bit integer, which
-+  on output contains the previous state of the event.
-+
-+.. c:macro:: NTSYNC_IOC_PULSE_EVENT
-+
-+  Wake threads waiting on an event object while leaving it in an
-+  unsignaled state. Takes a pointer to a 32-bit integer, which on
-+  output contains the previous state of the event.
-+
-+  A pulse operation can be thought of as a set followed by a reset,
-+  performed as a single atomic operation. If two threads are waiting on
-+  an auto-reset event which is pulsed, only one will be woken. If two
-+  threads are waiting a manual-reset event which is pulsed, both will
-+  be woken. However, in both cases, the event will be unsignaled
-+  afterwards, and a simultaneous read operation will always report the
-+  event as unsignaled.
-+
-+.. c:macro:: NTSYNC_IOC_READ_SEM
-+
-+  Read the current state of a semaphore object. Takes a pointer to
-+  struct :c:type:`ntsync_sem_args`, which is used as follows:
-+
-+  .. list-table::
-+
-+     * - ``count``
-+       - On output, contains the current count of the semaphore.
-+     * - ``max``
-+       - On output, contains the maximum count of the semaphore.
-+
-+.. c:macro:: NTSYNC_IOC_READ_MUTEX
-+
-+  Read the current state of a mutex object. Takes a pointer to struct
-+  :c:type:`ntsync_mutex_args`, which is used as follows:
-+
-+  .. list-table::
-+
-+     * - ``owner``
-+       - On output, contains the current owner of the mutex, or zero
-+         if the mutex is not currently owned.
-+     * - ``count``
-+       - On output, contains the current recursion count of the mutex.
-+
-+  If the mutex is marked as abandoned, the function fails with
-+  ``EOWNERDEAD``. In this case, ``count`` and ``owner`` are set to
-+  zero.
-+
-+.. c:macro:: NTSYNC_IOC_READ_EVENT
-+
-+  Read the current state of an event object. Takes a pointer to struct
-+  :c:type:`ntsync_event_args`, which is used as follows:
-+
-+  .. list-table::
-+
-+     * - ``signaled``
-+       - On output, contains the current state of the event.
-+     * - ``manual``
-+       - On output, contains 1 if the event is a manual-reset event,
-+         and 0 otherwise.
-+
-+.. c:macro:: NTSYNC_IOC_KILL_OWNER
-+
-+  Mark a mutex as unowned and abandoned if it is owned by the given
-+  owner. Takes an input-only pointer to a 32-bit integer denoting the
-+  owner. If the owner is zero, the ioctl fails with ``EINVAL``. If the
-+  owner does not own the mutex, the function fails with ``EPERM``.
-+
-+  Eligible threads waiting on the mutex will be woken as appropriate
-+  (and such waits will fail with ``EOWNERDEAD``, as described below).
-+
-+.. c:macro:: NTSYNC_IOC_WAIT_ANY
-+
-+  Poll on any of a list of objects, atomically acquiring at most one.
-+  Takes a pointer to struct :c:type:`ntsync_wait_args`, which is
-+  used as follows:
-+
-+  .. list-table::
-+
-+     * - ``timeout``
-+       - Absolute timeout in nanoseconds. If ``NTSYNC_WAIT_REALTIME``
-+         is set, the timeout is measured against the REALTIME clock;
-+         otherwise it is measured against the MONOTONIC clock. If the
-+         timeout is equal to or earlier than the current time, the
-+         function returns immediately without sleeping. If ``timeout``
-+         is U64_MAX, the function will sleep until an object is
-+         signaled, and will not fail with ``ETIMEDOUT``.
-+     * - ``objs``
-+       - Pointer to an array of ``count`` file descriptors
-+         (specified as an integer so that the structure has the same
-+         size regardless of architecture). If any object is
-+         invalid, the function fails with ``EINVAL``.
-+     * - ``count``
-+       - Number of objects specified in the ``objs`` array.
-+         If greater than ``NTSYNC_MAX_WAIT_COUNT``, the function fails
-+         with ``EINVAL``.
-+     * - ``owner``
-+       - Mutex owner identifier. If any object in ``objs`` is a mutex,
-+         the ioctl will attempt to acquire that mutex on behalf of
-+         ``owner``. If ``owner`` is zero, the ioctl fails with
-+         ``EINVAL``.
-+     * - ``index``
-+       - On success, contains the index (into ``objs``) of the object
-+         which was signaled. If ``alert`` was signaled instead,
-+         this contains ``count``.
-+     * - ``alert``
-+       - Optional event object file descriptor. If nonzero, this
-+         specifies an "alert" event object which, if signaled, will
-+         terminate the wait. If nonzero, the identifier must point to a
-+         valid event.
-+     * - ``flags``
-+       - Zero or more flags. Currently the only flag is
-+         ``NTSYNC_WAIT_REALTIME``, which causes the timeout to be
-+         measured against the REALTIME clock instead of MONOTONIC.
-+     * - ``pad``
-+       - Unused, must be set to zero.
-+
-+  This function attempts to acquire one of the given objects. If unable
-+  to do so, it sleeps until an object becomes signaled, subsequently
-+  acquiring it, or the timeout expires. In the latter case the ioctl
-+  fails with ``ETIMEDOUT``. The function only acquires one object, even
-+  if multiple objects are signaled.
-+
-+  A semaphore is considered to be signaled if its count is nonzero, and
-+  is acquired by decrementing its count by one. A mutex is considered
-+  to be signaled if it is unowned or if its owner matches the ``owner``
-+  argument, and is acquired by incrementing its recursion count by one
-+  and setting its owner to the ``owner`` argument. An auto-reset event
-+  is acquired by designaling it; a manual-reset event is not affected
-+  by acquisition.
-+
-+  Acquisition is atomic and totally ordered with respect to other
-+  operations on the same object. If two wait operations (with different
-+  ``owner`` identifiers) are queued on the same mutex, only one is
-+  signaled. If two wait operations are queued on the same semaphore,
-+  and a value of one is posted to it, only one is signaled.
-+
-+  If an abandoned mutex is acquired, the ioctl fails with
-+  ``EOWNERDEAD``. Although this is a failure return, the function may
-+  otherwise be considered successful. The mutex is marked as owned by
-+  the given owner (with a recursion count of 1) and as no longer
-+  abandoned, and ``index`` is still set to the index of the mutex.
-+
-+  The ``alert`` argument is an "extra" event which can terminate the
-+  wait, independently of all other objects.
-+
-+  It is valid to pass the same object more than once, including by
-+  passing the same event in the ``objs`` array and in ``alert``. If a
-+  wakeup occurs due to that object being signaled, ``index`` is set to
-+  the lowest index corresponding to that object.
-+
-+  The function may fail with ``EINTR`` if a signal is received.
-+
-+.. c:macro:: NTSYNC_IOC_WAIT_ALL
-+
-+  Poll on a list of objects, atomically acquiring all of them. Takes a
-+  pointer to struct :c:type:`ntsync_wait_args`, which is used
-+  identically to ``NTSYNC_IOC_WAIT_ANY``, except that ``index`` is
-+  always filled with zero on success if not woken via alert.
-+
-+  This function attempts to simultaneously acquire all of the given
-+  objects. If unable to do so, it sleeps until all objects become
-+  simultaneously signaled, subsequently acquiring them, or the timeout
-+  expires. In the latter case the ioctl fails with ``ETIMEDOUT`` and no
-+  objects are modified.
-+
-+  Objects may become signaled and subsequently designaled (through
-+  acquisition by other threads) while this thread is sleeping. Only
-+  once all objects are simultaneously signaled does the ioctl acquire
-+  them and return. The entire acquisition is atomic and totally ordered
-+  with respect to other operations on any of the given objects.
-+
-+  If an abandoned mutex is acquired, the ioctl fails with
-+  ``EOWNERDEAD``. Similarly to ``NTSYNC_IOC_WAIT_ANY``, all objects are
-+  nevertheless marked as acquired. Note that if multiple mutex objects
-+  are specified, there is no way to know which were marked as
-+  abandoned.
-+
-+  As with "any" waits, the ``alert`` argument is an "extra" event which
-+  can terminate the wait. Critically, however, an "all" wait will
-+  succeed if all members in ``objs`` are signaled, *or* if ``alert`` is
-+  signaled. In the latter case ``index`` will be set to ``count``. As
-+  with "any" waits, if both conditions are filled, the former takes
-+  priority, and objects in ``objs`` will be acquired.
-+
-+  Unlike ``NTSYNC_IOC_WAIT_ANY``, it is not valid to pass the same
-+  object more than once, nor is it valid to pass the same object in
-+  ``objs`` and in ``alert``. If this is attempted, the function fails
-+  with ``EINVAL``.

debian/patches/misc-ntsync7/0018-ntsync-No-longer-depend-on-BROKEN.patch

@@ -1,25 +0,0 @@
-From 4871bb89577d78a3d55b44e47c3a4f677dbdc89b Mon Sep 17 00:00:00 2001
-From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Fri, 13 Dec 2024 13:35:11 -0600
-Subject: ntsync: No longer depend on BROKEN.
-
-f5b335dc025cfee90957efa90dc72fada0d5abb4 ("misc: ntsync: mark driver as "broken"
-to prevent from building") was committed to avoid the driver being used while
-only part of its functionality was released. Since the rest of the functionality
-has now been committed, revert this.
-
-Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
----
- drivers/misc/Kconfig | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/misc/Kconfig
-+++ b/drivers/misc/Kconfig
-@@ -517,7 +517,6 @@ config OPEN_DICE
- 
- config NTSYNC
- 	tristate "NT synchronization primitive emulation"
--	depends on BROKEN
- 	help
- 	  This module provides kernel support for emulation of Windows NT
- 	  synchronization primitives. It is not a hardware driver.

debian/patches/misc-ntsync7/0019-ntsync-Set-the-permissions-to-be-0666.patch

@@ -1,22 +0,0 @@
-From 2aa0cab3a568e6adccbe708ee2e79185638860ed Mon Sep 17 00:00:00 2001
-From: Mike Lothian <mike@fireburn.co.uk>
-Date: Fri, 14 Feb 2025 12:28:00 +0000
-Subject: ntsync: Set the permissions to be 0666
-
-This allows ntsync to be usuable by non-root processes out of the box
-
-Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
----
- drivers/misc/ntsync.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -1206,6 +1206,7 @@ static struct miscdevice ntsync_misc = {
- 	.minor		= MISC_DYNAMIC_MINOR,
- 	.name		= NTSYNC_NAME,
- 	.fops		= &ntsync_fops,
-+	.mode		= 0666, // Setting file permissions to 0666
- };
- 
- module_misc_device(ntsync_misc);

debian/patches/misc-openwrt/0001-mac80211-ignore-AP-power-level-when-tx-power-type-is.patch

@@ -21,12 +21,12 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
 @@ -62,7 +62,8 @@ bool __ieee80211_recalc_txpower(struct i
- 	if (sdata->deflink.user_power_level != IEEE80211_UNSET_POWER_LEVEL)
- 		power = min(power, sdata->deflink.user_power_level);
+ 	if (link->user_power_level != IEEE80211_UNSET_POWER_LEVEL)
+ 		power = min(power, link->user_power_level);
  
--	if (sdata->deflink.ap_power_level != IEEE80211_UNSET_POWER_LEVEL)
-+	if (sdata->deflink.ap_power_level != IEEE80211_UNSET_POWER_LEVEL &&
-+	    sdata->vif.bss_conf.txpower_type != NL80211_TX_POWER_FIXED)
- 		power = min(power, sdata->deflink.ap_power_level);
+-	if (link->ap_power_level != IEEE80211_UNSET_POWER_LEVEL)
++	if (link->ap_power_level != IEEE80211_UNSET_POWER_LEVEL &&
++	    link->conf->txpower_type != NL80211_TX_POWER_FIXED)
+ 		power = min(power, link->ap_power_level);
  
- 	if (power != sdata->vif.bss_conf.txpower) {
+ 	if (power != link->conf->txpower) {

debian/patches/mixed-arch/0001-ZEN-Add-graysky-s-more-ISA-levels-and-uarches.patch

@@ -1,4 +1,4 @@
-From 421120bda34d994c5e0e07a89e2f9c40c53e8e87 Mon Sep 17 00:00:00 2001
+From 90b69178f6a866c7f3330c2006f6b5396146192c 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
@@ -123,10 +123,10 @@ REFERENCES
 3.  https://github.com/graysky2/kernel_gcc_patch/issues/15
 4.  http://www.linuxforge.net/docs/linux/linux-gcc.php
 ---
- arch/x86/Kconfig.cpu            | 359 ++++++++++++++++++++++++++++++--
- arch/x86/Makefile               |  87 +++++++-
- arch/x86/include/asm/vermagic.h |  70 +++++++
- 3 files changed, 499 insertions(+), 17 deletions(-)
+ arch/x86/Kconfig.cpu            | 367 ++++++++++++++++++++++++++++++--
+ arch/x86/Makefile               |  89 +++++++-
+ arch/x86/include/asm/vermagic.h |  72 +++++++
+ 3 files changed, 511 insertions(+), 17 deletions(-)
 
 --- a/arch/x86/Kconfig.cpu
 +++ b/arch/x86/Kconfig.cpu
@@ -257,7 +257,7 @@ REFERENCES
 +
 +config MZEN5
 +	bool "AMD Zen 5"
-+	depends on (CC_IS_GCC && GCC_VERSION > 140000) || (CC_IS_CLANG && CLANG_VERSION >= 191000)
++	depends on (CC_IS_GCC && GCC_VERSION > 140000) || (CC_IS_CLANG && CLANG_VERSION >= 190100)
 +	help
 +	  Select this for AMD Family 19h Zen 5 processors.
 +
@@ -285,7 +285,7 @@ REFERENCES
  	help
  
  	  Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and
-@@ -278,14 +388,191 @@ config MCORE2
+@@ -278,14 +388,199 @@ config MCORE2
  	  family in /proc/cpuinfo. Newer ones have 6 and older ones 15
  	  (not a typo)
  
@@ -393,14 +393,22 @@ REFERENCES
 +
 +	  Enables -march=cannonlake
 +
-+config MICELAKE
++config MICELAKE_CLIENT
 +	bool "Intel Ice Lake"
 +	help
 +
-+	  Select this for 10th Gen Core processors in the Ice Lake family.
++	  Select this for 10th Gen Core client processors in the Ice Lake family.
 +
 +	  Enables -march=icelake-client
 +
++config MICELAKE_SERVER
++	bool "Intel Ice Lake Server"
++	help
++
++	  Select this for 10th Gen Core server processors in the Ice Lake family.
++
++	  Enables -march=icelake-server
++
 +config MCASCADELAKE
 +	bool "Intel Cascade Lake"
 +	help
@@ -483,7 +491,7 @@ REFERENCES
  
  config GENERIC_CPU
  	bool "Generic-x86-64"
-@@ -294,6 +581,26 @@ config GENERIC_CPU
+@@ -294,6 +589,26 @@ config GENERIC_CPU
  	  Generic x86-64 CPU.
  	  Run equally well on all x86-64 CPUs.
  
@@ -510,7 +518,7 @@ REFERENCES
  endchoice
  
  config X86_GENERIC
-@@ -308,6 +615,30 @@ config X86_GENERIC
+@@ -308,6 +623,30 @@ config X86_GENERIC
  	  This is really intended for distributors who need more
  	  generic optimizations.
  
@@ -541,32 +549,32 @@ REFERENCES
  #
  # Define implied options from the CPU selection here
  config X86_INTERNODE_CACHE_SHIFT
-@@ -318,7 +649,7 @@ config X86_INTERNODE_CACHE_SHIFT
+@@ -318,7 +657,7 @@ 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 || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MNATIVE_INTEL || MNATIVE_AMD
++	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 "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 +667,11 @@ config X86_ALIGNMENT_16
+@@ -336,11 +675,11 @@ 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 || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MNATIVE_INTEL
++	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
  
  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 || 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 || 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
  
  #
  # P6_NOPs are a relatively minor optimization that require a family >=
 --- a/arch/x86/Makefile
 +++ b/arch/x86/Makefile
-@@ -182,15 +182,96 @@ else
+@@ -182,15 +182,98 @@ else
          cflags-$(CONFIG_MK8)		+= -march=k8
          cflags-$(CONFIG_MPSC)		+= -march=nocona
          cflags-$(CONFIG_MCORE2)		+= -march=core2
@@ -608,7 +616,8 @@ REFERENCES
 +        cflags-$(CONFIG_MSKYLAKE) 	+= -march=skylake
 +        cflags-$(CONFIG_MSKYLAKEX) 	+= -march=skylake-avx512
 +        cflags-$(CONFIG_MCANNONLAKE) 	+= -march=cannonlake
-+        cflags-$(CONFIG_MICELAKE) 	+= -march=icelake-client
++        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
@@ -653,7 +662,8 @@ REFERENCES
 +        rustflags-$(CONFIG_MSKYLAKE) 	+= -Ctarget-cpu=skylake
 +        rustflags-$(CONFIG_MSKYLAKEX) 	+= -Ctarget-cpu=skylake-avx512
 +        rustflags-$(CONFIG_MCANNONLAKE) 	+= -Ctarget-cpu=cannonlake
-+        rustflags-$(CONFIG_MICELAKE) 	+= -Ctarget-cpu=icelake-client
++        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
@@ -668,7 +678,7 @@ REFERENCES
          KBUILD_CFLAGS += -mno-red-zone
 --- a/arch/x86/include/asm/vermagic.h
 +++ b/arch/x86/include/asm/vermagic.h
-@@ -17,6 +17,54 @@
+@@ -17,6 +17,56 @@
  #define MODULE_PROC_FAMILY "586MMX "
  #elif defined CONFIG_MCORE2
  #define MODULE_PROC_FAMILY "CORE2 "
@@ -700,8 +710,10 @@ REFERENCES
 +#define MODULE_PROC_FAMILY "SKYLAKEX "
 +#elif defined CONFIG_MCANNONLAKE
 +#define MODULE_PROC_FAMILY "CANNONLAKE "
-+#elif defined CONFIG_MICELAKE
-+#define MODULE_PROC_FAMILY "ICELAKE "
++#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
@@ -723,7 +735,7 @@ REFERENCES
  #elif defined CONFIG_MATOM
  #define MODULE_PROC_FAMILY "ATOM "
  #elif defined CONFIG_M686
-@@ -35,6 +83,28 @@
+@@ -35,6 +85,28 @@
  #define MODULE_PROC_FAMILY "K7 "
  #elif defined CONFIG_MK8
  #define MODULE_PROC_FAMILY "K8 "

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

@@ -1,4 +1,4 @@
-From 1fc1195e784540ad1966b57267fc927a87c5d21d Mon Sep 17 00:00:00 2001
+From f4f448a305e9d705b9a0da102ddfd58bfaac5cc0 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
-@@ -820,6 +820,9 @@ KBUILD_CFLAGS	+= -fno-delete-null-pointe
+@@ -872,6 +872,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
-@@ -1451,6 +1451,12 @@ config CC_OPTIMIZE_FOR_PERFORMANCE
+@@ -1465,6 +1465,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
-@@ -828,6 +828,10 @@ KBUILD_CFLAGS += -Os
+@@ -880,6 +880,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,8 +1,7 @@
 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: [PATCH 01/19] XANMOD: x86/build: Prevent generating avx2 and avx512
- floating-point code
+Subject: XANMOD: x86/build: Prevent generating avx2 and avx512 floating-point code
 
 Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 ---

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

@@ -1,17 +1,16 @@
-From dccbc0ca6c05ae315967a603870d553c231a68a1 Mon Sep 17 00:00:00 2001
+From b1a99a2a9675f80b7c04a239a6b047373ccf3a17 Mon Sep 17 00:00:00 2001
 From: Alexandre Frade <kernel@xanmod.org>
 Date: Mon, 16 Sep 2024 00:55:35 +0000
-Subject: [PATCH 02/18] XANMOD: kbuild: Add GCC SMS-based modulo scheduling
- flags
+Subject: XANMOD: kbuild: Add GCC SMS-based modulo scheduling flags
 
 Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 ---
- Makefile | 7 ++++
- 1 file changed, 7 insertions(+)
+ Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 --- a/Makefile
 +++ b/Makefile
-@@ -832,6 +832,13 @@ ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
+@@ -884,6 +884,13 @@ ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
  KBUILD_CFLAGS += $(call cc-option,-fivopts)
  endif
  

debian/patches/mixed-arch/0007-PF-kbuild-6.12-adopt-proposed-upstream-change-for-gener.patch

@@ -1,24 +0,0 @@
-From 578cb97f41beb5d2dde81b8a4c1db6e01e8bcc6a Mon Sep 17 00:00:00 2001
-From: Oleksandr Natalenko <oleksandr@natalenko.name>
-Date: Wed, 11 Dec 2024 08:50:50 +0100
-Subject: kbuild-6.12: adopt proposed upstream change for generic CPUs
-
-Link: https://lore.kernel.org/lkml/20241210144945.2325330-4-arnd@kernel.org/
-Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
----
- arch/x86/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/x86/Makefile
-+++ b/arch/x86/Makefile
-@@ -184,8 +184,8 @@ else
-         cflags-$(CONFIG_MCORE2)		+= -march=core2
-         cflags-$(CONFIG_MATOM)		+= -march=bonnell
-         ifeq ($(CONFIG_X86_64_VERSION),1)
--          cflags-$(CONFIG_GENERIC_CPU)		+= -mtune=generic
--          rustflags-$(CONFIG_GENERIC_CPU)	+= -Ztune-cpu=generic
-+          cflags-$(CONFIG_GENERIC_CPU)		+= -march=x86-64 -mtune=generic
-+          rustflags-$(CONFIG_GENERIC_CPU)	+= -Ctarget-cpu=x86-64 -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)

debian/patches/patchset-pf/amd-pstate/0001-cpufreq-amd-pstate-Modify-the-min_perf-calculation-i.patch

@@ -0,0 +1,59 @@
+From b6c0305214154bc26d20b130266fc1ba8341b58c Mon Sep 17 00:00:00 2001
+From: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
+Date: Wed, 5 Feb 2025 11:25:14 +0000
+Subject: cpufreq/amd-pstate: Modify the min_perf calculation in adjust_perf
+ callback
+
+Instead of setting a fixed floor at lowest_nonlinear_perf, use the
+min_limit_perf value, so that it gives the user the freedom to lower the
+floor further.
+
+There are two minimum frequency/perf limits that we need to consider in
+the adjust_perf callback. One provided by schedutil i.e. the sg_cpu->bw_min
+value passed in _min_perf arg, another is the effective value of
+min_freq_qos request that is updated in cpudata->min_limit_perf. Modify the
+code to use the bigger of these two values.
+
+Signed-off-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
+Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
+---
+ drivers/cpufreq/amd-pstate.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/drivers/cpufreq/amd-pstate.c
++++ b/drivers/cpufreq/amd-pstate.c
+@@ -672,7 +672,7 @@ static void amd_pstate_adjust_perf(unsig
+ 				   unsigned long capacity)
+ {
+ 	unsigned long max_perf, min_perf, des_perf,
+-		      cap_perf, lowest_nonlinear_perf;
++		      cap_perf, min_limit_perf;
+ 	struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
+ 	struct amd_cpudata *cpudata;
+ 
+@@ -684,20 +684,20 @@ 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);
+-	lowest_nonlinear_perf = READ_ONCE(cpudata->lowest_nonlinear_perf);
++	min_limit_perf = READ_ONCE(cpudata->min_limit_perf);
+ 
+ 	des_perf = cap_perf;
+ 	if (target_perf < capacity)
+ 		des_perf = DIV_ROUND_UP(cap_perf * target_perf, capacity);
+ 
+-	min_perf = READ_ONCE(cpudata->lowest_perf);
+ 	if (_min_perf < capacity)
+ 		min_perf = DIV_ROUND_UP(cap_perf * _min_perf, capacity);
++	else
++		min_perf = cap_perf;
+ 
+-	if (min_perf < lowest_nonlinear_perf)
+-		min_perf = lowest_nonlinear_perf;
++	if (min_perf < min_limit_perf)
++		min_perf = min_limit_perf;
+ 
+ 	max_perf = cpudata->max_limit_perf;
+ 	if (max_perf < min_perf)

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

@@ -0,0 +1,27 @@
+From 6e51c53b5e940312c71ce5ea68cf94a000beab01 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
+@@ -703,8 +703,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/0003-cpufreq-amd-pstate-Pass-min-max_limit_perf-as-min-ma.patch

@@ -0,0 +1,51 @@
+From ad3fffe8ff1f18ad437d8b0d0bb602ba3c24adf7 Mon Sep 17 00:00:00 2001
+From: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
+Date: Wed, 5 Feb 2025 11:25:16 +0000
+Subject: cpufreq/amd-pstate: Pass min/max_limit_perf as min/max_perf to
+ amd_pstate_update
+
+Currently, amd_pstate_update_freq passes the hardware perf limits as
+min/max_perf to amd_pstate_update, which eventually gets programmed into
+the min/max_perf fields of the CPPC_REQ register.
+
+Instead pass the effective perf limits i.e. min/max_limit_perf values to
+amd_pstate_update as min/max_perf.
+
+Signed-off-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
+Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
+---
+ drivers/cpufreq/amd-pstate.c | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+--- a/drivers/cpufreq/amd-pstate.c
++++ b/drivers/cpufreq/amd-pstate.c
+@@ -615,7 +615,7 @@ static int amd_pstate_update_freq(struct
+ {
+ 	struct cpufreq_freqs freqs;
+ 	struct amd_cpudata *cpudata = policy->driver_data;
+-	unsigned long max_perf, min_perf, des_perf, cap_perf;
++	unsigned long des_perf, cap_perf;
+ 
+ 	if (!cpudata->max_freq)
+ 		return -ENODEV;
+@@ -624,8 +624,6 @@ static int amd_pstate_update_freq(struct
+ 		amd_pstate_update_min_max_limit(policy);
+ 
+ 	cap_perf = READ_ONCE(cpudata->highest_perf);
+-	min_perf = READ_ONCE(cpudata->lowest_perf);
+-	max_perf = cap_perf;
+ 
+ 	freqs.old = policy->cur;
+ 	freqs.new = target_freq;
+@@ -642,8 +640,9 @@ static int amd_pstate_update_freq(struct
+ 	if (!fast_switch)
+ 		cpufreq_freq_transition_begin(policy, &freqs);
+ 
+-	amd_pstate_update(cpudata, min_perf, des_perf,
+-			max_perf, fast_switch, policy->governor->flags);
++	amd_pstate_update(cpudata, cpudata->min_limit_perf, des_perf,
++			  cpudata->max_limit_perf, fast_switch,
++			  policy->governor->flags);
+ 
+ 	if (!fast_switch)
+ 		cpufreq_freq_transition_end(policy, &freqs, false);

debian/patches/patchset-pf/amd-pstate/0004-cpufreq-amd-pstate-Convert-all-perf-values-to-u8.patch

@@ -0,0 +1,355 @@
+From 300686c32b77583f45c6763535da85f2242bf820 Mon Sep 17 00:00:00 2001
+From: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
+Date: Wed, 5 Feb 2025 11:25:17 +0000
+Subject: cpufreq/amd-pstate: Convert all perf values to u8
+
+All perf values are always within 0-255 range, hence convert their
+datatype to u8 everywhere.
+
+Signed-off-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
+Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
+---
+ drivers/cpufreq/amd-pstate-trace.h | 46 +++++++++++------------
+ drivers/cpufreq/amd-pstate.c       | 60 +++++++++++++++---------------
+ drivers/cpufreq/amd-pstate.h       | 18 ++++-----
+ 3 files changed, 62 insertions(+), 62 deletions(-)
+
+--- a/drivers/cpufreq/amd-pstate-trace.h
++++ b/drivers/cpufreq/amd-pstate-trace.h
+@@ -24,9 +24,9 @@
+ 
+ TRACE_EVENT(amd_pstate_perf,
+ 
+-	TP_PROTO(unsigned long min_perf,
+-		 unsigned long target_perf,
+-		 unsigned long capacity,
++	TP_PROTO(u8 min_perf,
++		 u8 target_perf,
++		 u8 capacity,
+ 		 u64 freq,
+ 		 u64 mperf,
+ 		 u64 aperf,
+@@ -47,9 +47,9 @@ TRACE_EVENT(amd_pstate_perf,
+ 		),
+ 
+ 	TP_STRUCT__entry(
+-		__field(unsigned long, min_perf)
+-		__field(unsigned long, target_perf)
+-		__field(unsigned long, capacity)
++		__field(u8, min_perf)
++		__field(u8, target_perf)
++		__field(u8, capacity)
+ 		__field(unsigned long long, freq)
+ 		__field(unsigned long long, mperf)
+ 		__field(unsigned long long, aperf)
+@@ -70,10 +70,10 @@ TRACE_EVENT(amd_pstate_perf,
+ 		__entry->fast_switch = fast_switch;
+ 		),
+ 
+-	TP_printk("amd_min_perf=%lu amd_des_perf=%lu amd_max_perf=%lu freq=%llu mperf=%llu aperf=%llu tsc=%llu cpu_id=%u fast_switch=%s",
+-		  (unsigned long)__entry->min_perf,
+-		  (unsigned long)__entry->target_perf,
+-		  (unsigned long)__entry->capacity,
++	TP_printk("amd_min_perf=%hhu amd_des_perf=%hhu amd_max_perf=%hhu freq=%llu mperf=%llu aperf=%llu tsc=%llu cpu_id=%u fast_switch=%s",
++		  (u8)__entry->min_perf,
++		  (u8)__entry->target_perf,
++		  (u8)__entry->capacity,
+ 		  (unsigned long long)__entry->freq,
+ 		  (unsigned long long)__entry->mperf,
+ 		  (unsigned long long)__entry->aperf,
+@@ -86,10 +86,10 @@ TRACE_EVENT(amd_pstate_perf,
+ TRACE_EVENT(amd_pstate_epp_perf,
+ 
+ 	TP_PROTO(unsigned int cpu_id,
+-		 unsigned int highest_perf,
+-		 unsigned int epp,
+-		 unsigned int min_perf,
+-		 unsigned int max_perf,
++		 u8 highest_perf,
++		 u8 epp,
++		 u8 min_perf,
++		 u8 max_perf,
+ 		 bool boost
+ 		 ),
+ 
+@@ -102,10 +102,10 @@ TRACE_EVENT(amd_pstate_epp_perf,
+ 
+ 	TP_STRUCT__entry(
+ 		__field(unsigned int, cpu_id)
+-		__field(unsigned int, highest_perf)
+-		__field(unsigned int, epp)
+-		__field(unsigned int, min_perf)
+-		__field(unsigned int, max_perf)
++		__field(u8, highest_perf)
++		__field(u8, epp)
++		__field(u8, min_perf)
++		__field(u8, max_perf)
+ 		__field(bool, boost)
+ 		),
+ 
+@@ -118,12 +118,12 @@ TRACE_EVENT(amd_pstate_epp_perf,
+ 		__entry->boost = boost;
+ 		),
+ 
+-	TP_printk("cpu%u: [%u<->%u]/%u, epp=%u, boost=%u",
++	TP_printk("cpu%u: [%hhu<->%hhu]/%hhu, epp=%hhu, boost=%u",
+ 		  (unsigned int)__entry->cpu_id,
+-		  (unsigned int)__entry->min_perf,
+-		  (unsigned int)__entry->max_perf,
+-		  (unsigned int)__entry->highest_perf,
+-		  (unsigned int)__entry->epp,
++		  (u8)__entry->min_perf,
++		  (u8)__entry->max_perf,
++		  (u8)__entry->highest_perf,
++		  (u8)__entry->epp,
+ 		  (bool)__entry->boost
+ 		 )
+ );
+--- a/drivers/cpufreq/amd-pstate.c
++++ b/drivers/cpufreq/amd-pstate.c
+@@ -186,7 +186,7 @@ static inline int get_mode_idx_from_str(
+ static DEFINE_MUTEX(amd_pstate_limits_lock);
+ static DEFINE_MUTEX(amd_pstate_driver_lock);
+ 
+-static s16 msr_get_epp(struct amd_cpudata *cpudata)
++static u8 msr_get_epp(struct amd_cpudata *cpudata)
+ {
+ 	u64 value;
+ 	int ret;
+@@ -207,7 +207,7 @@ static inline s16 amd_pstate_get_epp(str
+ 	return static_call(amd_pstate_get_epp)(cpudata);
+ }
+ 
+-static s16 shmem_get_epp(struct amd_cpudata *cpudata)
++static u8 shmem_get_epp(struct amd_cpudata *cpudata)
+ {
+ 	u64 epp;
+ 	int ret;
+@@ -218,11 +218,11 @@ static s16 shmem_get_epp(struct amd_cpud
+ 		return ret;
+ 	}
+ 
+-	return (s16)(epp & 0xff);
++	return FIELD_GET(AMD_CPPC_EPP_PERF_MASK, epp);
+ }
+ 
+-static int msr_update_perf(struct amd_cpudata *cpudata, u32 min_perf,
+-			   u32 des_perf, u32 max_perf, u32 epp, bool fast_switch)
++static int msr_update_perf(struct amd_cpudata *cpudata, u8 min_perf,
++			   u8 des_perf, u8 max_perf, u8 epp, bool fast_switch)
+ {
+ 	u64 value, prev;
+ 
+@@ -257,15 +257,15 @@ static int msr_update_perf(struct amd_cp
+ DEFINE_STATIC_CALL(amd_pstate_update_perf, msr_update_perf);
+ 
+ static inline int amd_pstate_update_perf(struct amd_cpudata *cpudata,
+-					  u32 min_perf, u32 des_perf,
+-					  u32 max_perf, u32 epp,
++					  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,
+ 						   max_perf, epp, fast_switch);
+ }
+ 
+-static int msr_set_epp(struct amd_cpudata *cpudata, u32 epp)
++static int msr_set_epp(struct amd_cpudata *cpudata, u8 epp)
+ {
+ 	u64 value, prev;
+ 	int ret;
+@@ -292,12 +292,12 @@ 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, u32 epp)
++static inline int amd_pstate_set_epp(struct amd_cpudata *cpudata, u8 epp)
+ {
+ 	return static_call(amd_pstate_set_epp)(cpudata, epp);
+ }
+ 
+-static int shmem_set_epp(struct amd_cpudata *cpudata, u32 epp)
++static int shmem_set_epp(struct amd_cpudata *cpudata, u8 epp)
+ {
+ 	int ret;
+ 	struct cppc_perf_ctrls perf_ctrls;
+@@ -320,7 +320,7 @@ static int amd_pstate_set_energy_pref_in
+ 					    int pref_index)
+ {
+ 	struct amd_cpudata *cpudata = policy->driver_data;
+-	int epp;
++	u8 epp;
+ 
+ 	if (!pref_index)
+ 		epp = cpudata->epp_default;
+@@ -479,8 +479,8 @@ 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, u32 min_perf,
+-			     u32 des_perf, u32 max_perf, u32 epp, bool fast_switch)
++static int shmem_update_perf(struct amd_cpudata *cpudata, u8 min_perf,
++			     u8 des_perf, u8 max_perf, u8 epp, bool fast_switch)
+ {
+ 	struct cppc_perf_ctrls perf_ctrls;
+ 
+@@ -531,14 +531,14 @@ static inline bool amd_pstate_sample(str
+ 	return true;
+ }
+ 
+-static void amd_pstate_update(struct amd_cpudata *cpudata, u32 min_perf,
+-			      u32 des_perf, u32 max_perf, bool fast_switch, int gov_flags)
++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);
+-	u32 nominal_perf = READ_ONCE(cpudata->nominal_perf);
++	u8 nominal_perf = READ_ONCE(cpudata->nominal_perf);
+ 
+-	des_perf = clamp_t(unsigned long, des_perf, min_perf, max_perf);
++	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);
+@@ -550,7 +550,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(unsigned long, nominal_perf, max_perf);
++		max_perf = min_t(u8, 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,
+@@ -591,7 +591,8 @@ static int amd_pstate_verify(struct cpuf
+ 
+ static int amd_pstate_update_min_max_limit(struct cpufreq_policy *policy)
+ {
+-	u32 max_limit_perf, min_limit_perf, max_perf, max_freq;
++	u8 max_limit_perf, min_limit_perf, max_perf;
++	u32 max_freq;
+ 	struct amd_cpudata *cpudata = policy->driver_data;
+ 
+ 	max_perf = READ_ONCE(cpudata->highest_perf);
+@@ -615,7 +616,7 @@ static int amd_pstate_update_freq(struct
+ {
+ 	struct cpufreq_freqs freqs;
+ 	struct amd_cpudata *cpudata = policy->driver_data;
+-	unsigned long des_perf, cap_perf;
++	u8 des_perf, cap_perf;
+ 
+ 	if (!cpudata->max_freq)
+ 		return -ENODEV;
+@@ -670,8 +671,7 @@ static void amd_pstate_adjust_perf(unsig
+ 				   unsigned long target_perf,
+ 				   unsigned long capacity)
+ {
+-	unsigned long max_perf, min_perf, des_perf,
+-		      cap_perf, min_limit_perf;
++	u8 max_perf, min_perf, des_perf, cap_perf, min_limit_perf;
+ 	struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
+ 	struct amd_cpudata *cpudata;
+ 
+@@ -905,8 +905,8 @@ static int amd_pstate_init_freq(struct a
+ {
+ 	int ret;
+ 	u32 min_freq, max_freq;
+-	u32 highest_perf, nominal_perf, nominal_freq;
+-	u32 lowest_nonlinear_perf, lowest_nonlinear_freq;
++	u8 highest_perf, nominal_perf, lowest_nonlinear_perf;
++	u32 nominal_freq, lowest_nonlinear_freq;
+ 	struct cppc_perf_caps cppc_perf;
+ 
+ 	ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
+@@ -1113,7 +1113,7 @@ static ssize_t show_amd_pstate_lowest_no
+ static ssize_t show_amd_pstate_highest_perf(struct cpufreq_policy *policy,
+ 					    char *buf)
+ {
+-	u32 perf;
++	u8 perf;
+ 	struct amd_cpudata *cpudata = policy->driver_data;
+ 
+ 	perf = READ_ONCE(cpudata->highest_perf);
+@@ -1124,7 +1124,7 @@ static ssize_t show_amd_pstate_highest_p
+ static ssize_t show_amd_pstate_prefcore_ranking(struct cpufreq_policy *policy,
+ 						char *buf)
+ {
+-	u32 perf;
++	u8 perf;
+ 	struct amd_cpudata *cpudata = policy->driver_data;
+ 
+ 	perf = READ_ONCE(cpudata->prefcore_ranking);
+@@ -1187,7 +1187,7 @@ static ssize_t show_energy_performance_p
+ 				struct cpufreq_policy *policy, char *buf)
+ {
+ 	struct amd_cpudata *cpudata = policy->driver_data;
+-	int preference;
++	u8 preference;
+ 
+ 	switch (cpudata->epp_cached) {
+ 	case AMD_CPPC_EPP_PERFORMANCE:
+@@ -1549,7 +1549,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;
+-	u32 epp;
++	u8 epp;
+ 
+ 	amd_pstate_update_min_max_limit(policy);
+ 
+@@ -1598,7 +1598,7 @@ 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;
+-	u64 max_perf;
++	u8 max_perf;
+ 	int ret;
+ 
+ 	ret = amd_pstate_cppc_enable(true);
+@@ -1635,7 +1635,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;
+-	int min_perf;
++	u8 min_perf;
+ 
+ 	if (cpudata->suspended)
+ 		return 0;
+--- a/drivers/cpufreq/amd-pstate.h
++++ b/drivers/cpufreq/amd-pstate.h
+@@ -70,13 +70,13 @@ struct amd_cpudata {
+ 	struct	freq_qos_request req[2];
+ 	u64	cppc_req_cached;
+ 
+-	u32	highest_perf;
+-	u32	nominal_perf;
+-	u32	lowest_nonlinear_perf;
+-	u32	lowest_perf;
+-	u32     prefcore_ranking;
+-	u32     min_limit_perf;
+-	u32     max_limit_perf;
++	u8	highest_perf;
++	u8	nominal_perf;
++	u8	lowest_nonlinear_perf;
++	u8	lowest_perf;
++	u8	prefcore_ranking;
++	u8	min_limit_perf;
++	u8	max_limit_perf;
+ 	u32     min_limit_freq;
+ 	u32     max_limit_freq;
+ 
+@@ -93,11 +93,11 @@ struct amd_cpudata {
+ 	bool	hw_prefcore;
+ 
+ 	/* EPP feature related attributes*/
+-	s16	epp_cached;
++	u8	epp_cached;
+ 	u32	policy;
+ 	u64	cppc_cap1_cached;
+ 	bool	suspended;
+-	s16	epp_default;
++	u8	epp_default;
+ };
+ 
+ /*

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

@@ -0,0 +1,131 @@
+From 8b87350a2e336e54b4d2638ac042bb2f7416312a 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,14 +548,12 @@ 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);
+ 
+ 	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;
+@@ -591,14 +603,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);
+@@ -616,21 +625,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);
+ 	/*
+@@ -905,7 +908,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;
+ 
+@@ -923,16 +925,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/0006-cpufreq-amd-pstate-Remove-the-unnecessary-cpufreq_up.patch

@@ -0,0 +1,37 @@
+From b638a74c3b16e0781bb25478c135726862c9271d 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
+@@ -853,10 +853,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/0007-cpufreq-amd-pstate-Add-missing-NULL-ptr-check-in-amd.patch

@@ -0,0 +1,26 @@
+From 156278367fd2c0863dc06f9a7df0a654ae336726 Mon Sep 17 00:00:00 2001
+From: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
+Date: Wed, 5 Feb 2025 11:25:21 +0000
+Subject: cpufreq/amd-pstate: Add missing NULL ptr check in amd_pstate_update
+
+Check if policy is NULL before dereferencing it in amd_pstate_update.
+
+Fixes: e8f555daacd3 ("cpufreq/amd-pstate: fix setting policy current frequency value")
+Signed-off-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
+Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
+---
+ drivers/cpufreq/amd-pstate.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/cpufreq/amd-pstate.c
++++ b/drivers/cpufreq/amd-pstate.c
+@@ -551,6 +551,9 @@ static void amd_pstate_update(struct amd
+ 	struct cpufreq_policy *policy = cpufreq_cpu_get(cpudata->cpu);
+ 	u8 nominal_perf = READ_ONCE(cpudata->nominal_perf);
+ 
++	if (!policy)
++		return;
++
+ 	des_perf = clamp_t(u8, des_perf, min_perf, max_perf);
+ 
+ 	policy->cur = perf_to_freq(cpudata, des_perf);

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

@@ -0,0 +1,124 @@
+From e36868a11daa43eff94abd32f19b1783e89298d4 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)
+@@ -824,28 +821,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);
+@@ -855,7 +847,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
+@@ -210,6 +210,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/0009-cpufreq-amd-pstate-Remove-the-unncecessary-driver_lo.patch

@@ -0,0 +1,26 @@
+From 9b7b7d59c5425246ffda281e761ef3ec3b0e4fbc 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
+@@ -832,8 +832,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/0010-cpufreq-amd-pstate-Fix-the-clamping-of-perf-values.patch

@@ -0,0 +1,35 @@
+From f09ef5b8aacd5b16ac1ea93103b41a7e88b174ed 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/0011-cpufreq-amd-pstate-Invalidate-cppc_req_cached-during.patch

@@ -0,0 +1,42 @@
+From 210d043d7b244588c911e355f2d5339bda9c8209 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <mario.limonciello@amd.com>
+Date: Wed, 26 Feb 2025 01:49:16 -0600
+Subject: cpufreq/amd-pstate: Invalidate cppc_req_cached during suspend
+
+During resume it's possible the firmware didn't restore the CPPC request
+MSR but the kernel thinks the values line up. This leads to incorrect
+performance after resume from suspend.
+
+To fix the issue invalidate the cached value at suspend. During resume use
+the saved values programmed as cached limits.
+
+Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
+Reviewed-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com>
+Reported-by: Miroslav Pavleski <miroslav@pavleski.net>
+Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217931
+Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
+---
+ drivers/cpufreq/amd-pstate.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/drivers/cpufreq/amd-pstate.c
++++ b/drivers/cpufreq/amd-pstate.c
+@@ -1605,7 +1605,7 @@ static int amd_pstate_epp_reenable(struc
+ 					  max_perf, policy->boost_enabled);
+ 	}
+ 
+-	return amd_pstate_update_perf(cpudata, 0, 0, max_perf, cpudata->epp_cached, false);
++	return amd_pstate_epp_update_limit(policy);
+ }
+ 
+ static int amd_pstate_epp_cpu_online(struct cpufreq_policy *policy)
+@@ -1654,6 +1654,9 @@ static int amd_pstate_epp_suspend(struct
+ 	if (cppc_state != AMD_PSTATE_ACTIVE)
+ 		return 0;
+ 
++	/* invalidate to ensure it's rewritten during resume */
++	cpudata->cppc_req_cached = 0;
++
+ 	/* set this flag to avoid setting core offline*/
+ 	cpudata->suspended = true;
+ 

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

@@ -0,0 +1,35 @@
+From a0233b8c2c01e98ddeb2e80768d4c7172311b200 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
+@@ -1028,6 +1028,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;
+ }
+@@ -1521,6 +1522,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/0013-cpufreq-amd-pstate-Drop-min-and-max-cached-frequenci.patch

@@ -0,0 +1,209 @@
+From ad672c3336331cab028c27e4a73153f517bb1844 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;
+@@ -917,13 +917,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
+@@ -948,9 +945,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,
+@@ -981,17 +978,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);
+ 
+@@ -1015,9 +1006,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)
+@@ -1075,14 +1063,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,
+@@ -1440,10 +1424,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,
+@@ -1474,19 +1458,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);
+ 
+ 	/*
+@@ -1544,7 +1522,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;
+