From 8afe06fe6bac35df1d0e62de8941cba9a12ee2cc Mon Sep 17 00:00:00 2001 From: ferreo Date: Mon, 2 Sep 2024 18:07:39 +0200 Subject: [PATCH] Update patches/0001-cachyos-base-all.patch --- patches/0001-cachyos-base-all.patch | 906 ++++++++++++++-------------- 1 file changed, 444 insertions(+), 462 deletions(-) diff --git a/patches/0001-cachyos-base-all.patch b/patches/0001-cachyos-base-all.patch index bcfb3ae..ed38f92 100644 --- a/patches/0001-cachyos-base-all.patch +++ b/patches/0001-cachyos-base-all.patch @@ -1,6 +1,6 @@ -From 1bd3c44f6cf328cab75909660c54190f77de2940 Mon Sep 17 00:00:00 2001 +From 89404bebea127570b279beb4ed0a30ace5403370 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Tue, 27 Aug 2024 15:34:50 +0200 +Date: Sun, 1 Sep 2024 10:38:28 +0200 Subject: [PATCH 01/11] amd-pstate Signed-off-by: Peter Jung @@ -9,12 +9,12 @@ Signed-off-by: Peter Jung arch/x86/kernel/acpi/cppc.c | 159 ++++++++++++++++++++++++++++++- arch/x86/kernel/cpu/amd.c | 16 ---- drivers/cpufreq/acpi-cpufreq.c | 12 ++- - drivers/cpufreq/amd-pstate.c | 132 ++++++------------------- + drivers/cpufreq/amd-pstate.c | 143 +++++++-------------------- include/acpi/cppc_acpi.h | 10 ++ - 6 files changed, 202 insertions(+), 130 deletions(-) + 6 files changed, 208 insertions(+), 135 deletions(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h -index a75a07f4931fd..775acbdea1a96 100644 +index a75a07f4931f..775acbdea1a9 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -691,8 +691,6 @@ static inline u32 per_cpu_l2c_id(unsigned int cpu) @@ -35,7 +35,7 @@ index a75a07f4931fd..775acbdea1a96 100644 static inline void amd_check_microcode(void) { } #endif diff --git a/arch/x86/kernel/acpi/cppc.c b/arch/x86/kernel/acpi/cppc.c -index ff8f25faca3dd..44b13a4e28740 100644 +index ff8f25faca3d..44b13a4e2874 100644 --- a/arch/x86/kernel/acpi/cppc.c +++ b/arch/x86/kernel/acpi/cppc.c @@ -9,6 +9,17 @@ @@ -228,7 +228,7 @@ index ff8f25faca3dd..44b13a4e28740 100644 +} +EXPORT_SYMBOL_GPL(amd_get_boost_ratio_numerator); diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c -index 1e0fe5f8ab84e..015971adadfc7 100644 +index 1e0fe5f8ab84..015971adadfc 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -1190,22 +1190,6 @@ unsigned long amd_get_dr_addr_mask(unsigned int dr) @@ -255,7 +255,7 @@ index 1e0fe5f8ab84e..015971adadfc7 100644 { struct cpuinfo_x86 *c = &cpu_data(smp_processor_id()); diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c -index a8ca625a98b89..0f04feb6cafaf 100644 +index a8ca625a98b8..0f04feb6cafa 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -642,10 +642,16 @@ static u64 get_max_boost_ratio(unsigned int cpu) @@ -279,7 +279,7 @@ index a8ca625a98b89..0f04feb6cafaf 100644 nominal_perf = perf_caps.nominal_perf; diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c -index 68c616b572f22..65a80ad9e747c 100644 +index 89bda7a2bb8d..93cac81e1cbe 100644 --- a/drivers/cpufreq/amd-pstate.c +++ b/drivers/cpufreq/amd-pstate.c @@ -52,8 +52,6 @@ @@ -351,7 +351,24 @@ index 68c616b572f22..65a80ad9e747c 100644 WRITE_ONCE(cpudata->max_limit_perf, highest_perf); WRITE_ONCE(cpudata->nominal_perf, cppc_perf.nominal_perf); WRITE_ONCE(cpudata->lowest_nonlinear_perf, -@@ -803,66 +770,22 @@ static void amd_pstste_sched_prefcore_workfn(struct work_struct *work) +@@ -554,12 +521,15 @@ static void amd_pstate_update(struct amd_cpudata *cpudata, u32 min_perf, + } + + if (value == prev) +- return; ++ goto cpufreq_policy_put; + + WRITE_ONCE(cpudata->cppc_req_cached, value); + + amd_pstate_update_perf(cpudata, min_perf, des_perf, + max_perf, fast_switch); ++ ++cpufreq_policy_put: ++ cpufreq_cpu_put(policy); + } + + static int amd_pstate_verify(struct cpufreq_policy_data *policy) +@@ -803,66 +773,22 @@ static void amd_pstste_sched_prefcore_workfn(struct work_struct *work) } static DECLARE_WORK(sched_prefcore_work, amd_pstste_sched_prefcore_workfn); @@ -421,7 +438,7 @@ index 68c616b572f22..65a80ad9e747c 100644 schedule_work(&sched_prefcore_work); } -@@ -875,17 +798,17 @@ static void amd_pstate_update_limits(unsigned int cpu) +@@ -875,17 +801,17 @@ static void amd_pstate_update_limits(unsigned int cpu) int ret; bool highest_perf_changed = false; @@ -445,7 +462,7 @@ index 68c616b572f22..65a80ad9e747c 100644 WRITE_ONCE(cpudata->prefcore_ranking, cur_high); if (cur_high < CPPC_MAX_PERF) -@@ -949,8 +872,8 @@ static u32 amd_pstate_get_transition_latency(unsigned int cpu) +@@ -949,8 +875,8 @@ static u32 amd_pstate_get_transition_latency(unsigned int cpu) static int amd_pstate_init_freq(struct amd_cpudata *cpudata) { int ret; @@ -456,7 +473,7 @@ index 68c616b572f22..65a80ad9e747c 100644 u32 nominal_perf, nominal_freq; u32 lowest_nonlinear_perf, lowest_nonlinear_freq; u32 boost_ratio, lowest_nonlinear_ratio; -@@ -972,8 +895,10 @@ static int amd_pstate_init_freq(struct amd_cpudata *cpudata) +@@ -972,8 +898,10 @@ static int amd_pstate_init_freq(struct amd_cpudata *cpudata) nominal_perf = READ_ONCE(cpudata->nominal_perf); @@ -469,7 +486,7 @@ index 68c616b572f22..65a80ad9e747c 100644 max_freq = (nominal_freq * boost_ratio >> SCHED_CAPACITY_SHIFT) * 1000; lowest_nonlinear_perf = READ_ONCE(cpudata->lowest_nonlinear_perf); -@@ -1028,12 +953,12 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy) +@@ -1028,12 +956,12 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy) cpudata->cpu = policy->cpu; @@ -484,7 +501,7 @@ index 68c616b572f22..65a80ad9e747c 100644 ret = amd_pstate_init_freq(cpudata); if (ret) goto free_cpudata1; -@@ -1187,12 +1112,7 @@ static ssize_t show_amd_pstate_prefcore_ranking(struct cpufreq_policy *policy, +@@ -1187,12 +1115,7 @@ static ssize_t show_amd_pstate_prefcore_ranking(struct cpufreq_policy *policy, static ssize_t show_amd_pstate_hw_prefcore(struct cpufreq_policy *policy, char *buf) { @@ -498,7 +515,7 @@ index 68c616b572f22..65a80ad9e747c 100644 } static ssize_t show_energy_performance_available_preferences( -@@ -1483,12 +1403,12 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy) +@@ -1483,12 +1406,12 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy) cpudata->cpu = policy->cpu; cpudata->epp_policy = 0; @@ -513,7 +530,20 @@ index 68c616b572f22..65a80ad9e747c 100644 ret = amd_pstate_init_freq(cpudata); if (ret) goto free_cpudata1; -@@ -1933,6 +1853,12 @@ static int __init amd_pstate_init(void) +@@ -1841,10 +1764,8 @@ static bool amd_cppc_supported(void) + * the code is added for debugging purposes. + */ + if (!cpu_feature_enabled(X86_FEATURE_CPPC)) { +- if (cpu_feature_enabled(X86_FEATURE_ZEN1) || cpu_feature_enabled(X86_FEATURE_ZEN2)) { +- if (c->x86_model > 0x60 && c->x86_model < 0xaf) +- warn = true; +- } else if (cpu_feature_enabled(X86_FEATURE_ZEN3) || cpu_feature_enabled(X86_FEATURE_ZEN4)) { ++ if (cpu_feature_enabled(X86_FEATURE_ZEN3) || ++ cpu_feature_enabled(X86_FEATURE_ZEN4)) { + if ((c->x86_model > 0x10 && c->x86_model < 0x1F) || + (c->x86_model > 0x40 && c->x86_model < 0xaf)) + warn = true; +@@ -1933,6 +1854,12 @@ static int __init amd_pstate_init(void) static_call_update(amd_pstate_update_perf, cppc_update_perf); } @@ -527,7 +557,7 @@ index 68c616b572f22..65a80ad9e747c 100644 ret = amd_pstate_enable(true); if (ret) { diff --git a/include/acpi/cppc_acpi.h b/include/acpi/cppc_acpi.h -index 930b6afba6f4d..1d79320a23490 100644 +index 930b6afba6f4..1d79320a2349 100644 --- a/include/acpi/cppc_acpi.h +++ b/include/acpi/cppc_acpi.h @@ -136,6 +136,16 @@ struct cppc_cpudata { @@ -550,9 +580,9 @@ index 930b6afba6f4d..1d79320a23490 100644 -- 2.46.0 -From 1abc966c38e4501f044751497edd300c3716038a Mon Sep 17 00:00:00 2001 +From c03b9d435583136f64f0b91d4ac79f27d0e176cd Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Sun, 25 Aug 2024 10:30:05 +0200 +Date: Sun, 1 Sep 2024 10:38:38 +0200 Subject: [PATCH 02/11] bbr3 Signed-off-by: Peter Jung @@ -576,7 +606,7 @@ Signed-off-by: Peter Jung 16 files changed, 1940 insertions(+), 553 deletions(-) diff --git a/include/linux/tcp.h b/include/linux/tcp.h -index 6a5e08b937b31..27aab715490ea 100644 +index 6a5e08b937b3..27aab715490e 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -369,7 +369,9 @@ struct tcp_sock { @@ -591,7 +621,7 @@ index 6a5e08b937b31..27aab715490ea 100644 fastopen_connect:1, /* FASTOPEN_CONNECT sockopt */ fastopen_no_cookie:1, /* Allow send/recv SYN+data without a cookie */ diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h -index c0deaafebfdc0..d53f042d936e8 100644 +index c0deaafebfdc..d53f042d936e 100644 --- a/include/net/inet_connection_sock.h +++ b/include/net/inet_connection_sock.h @@ -137,8 +137,8 @@ struct inet_connection_sock { @@ -606,7 +636,7 @@ index c0deaafebfdc0..d53f042d936e8 100644 #define ICSK_TIME_RETRANS 1 /* Retransmit timer */ diff --git a/include/net/tcp.h b/include/net/tcp.h -index 2aac11e7e1cc5..482dcea8f5074 100644 +index 2aac11e7e1cc..482dcea8f507 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -375,6 +375,8 @@ static inline void tcp_dec_quickack_mode(struct sock *sk) @@ -778,7 +808,7 @@ index 2aac11e7e1cc5..482dcea8f5074 100644 static inline void tcp_plb_init(const struct sock *sk, struct tcp_plb_state *plb) diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h -index 50655de04c9b6..82f8bd8f0d161 100644 +index 50655de04c9b..82f8bd8f0d16 100644 --- a/include/uapi/linux/inet_diag.h +++ b/include/uapi/linux/inet_diag.h @@ -229,6 +229,29 @@ struct tcp_bbr_info { @@ -812,7 +842,7 @@ index 50655de04c9b6..82f8bd8f0d161 100644 union tcp_cc_info { diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h -index 3b687d20c9ed3..a7c30c243b546 100644 +index 3b687d20c9ed..a7c30c243b54 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -507,12 +507,14 @@ enum { @@ -832,7 +862,7 @@ index 3b687d20c9ed3..a7c30c243b546 100644 struct rta_session { __u8 proto; diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h -index dbf896f3146c5..4702cd2f1ffcd 100644 +index dbf896f3146c..4702cd2f1ffc 100644 --- a/include/uapi/linux/tcp.h +++ b/include/uapi/linux/tcp.h @@ -178,6 +178,7 @@ enum tcp_fastopen_client_fail { @@ -844,7 +874,7 @@ index dbf896f3146c5..4702cd2f1ffcd 100644 /* * Sender's congestion state indicating normal or abnormal situations diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig -index 8e94ed7c56a0e..50dc9970cad28 100644 +index 8e94ed7c56a0..50dc9970cad2 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -668,15 +668,18 @@ config TCP_CONG_BBR @@ -876,7 +906,7 @@ index 8e94ed7c56a0e..50dc9970cad28 100644 choice prompt "Default TCP congestion control" diff --git a/net/ipv4/bpf_tcp_ca.c b/net/ipv4/bpf_tcp_ca.c -index 3f88d0961e5b2..4273cac333f66 100644 +index 3f88d0961e5b..4273cac333f6 100644 --- a/net/ipv4/bpf_tcp_ca.c +++ b/net/ipv4/bpf_tcp_ca.c @@ -305,11 +305,15 @@ static void bpf_tcp_ca_pkts_acked(struct sock *sk, const struct ack_sample *samp @@ -907,7 +937,7 @@ index 3f88d0961e5b2..4273cac333f66 100644 .undo_cwnd = bpf_tcp_ca_undo_cwnd, .sndbuf_expand = bpf_tcp_ca_sndbuf_expand, diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c -index e03a342c9162b..f26fde6d7f0ab 100644 +index 831a18dc7aa6..d9faa8fef55e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3123,6 +3123,7 @@ int tcp_disconnect(struct sock *sk, int flags) @@ -928,7 +958,7 @@ index e03a342c9162b..f26fde6d7f0ab 100644 info->tcpi_options |= TCPI_OPT_SYN_DATA; if (tp->tcp_usec_ts) diff --git a/net/ipv4/tcp_bbr.c b/net/ipv4/tcp_bbr.c -index 760941e55153e..a180fa648d5e6 100644 +index 760941e55153..a180fa648d5e 100644 --- a/net/ipv4/tcp_bbr.c +++ b/net/ipv4/tcp_bbr.c @@ -1,18 +1,19 @@ @@ -3572,7 +3602,7 @@ index 760941e55153e..a180fa648d5e6 100644 MODULE_DESCRIPTION("TCP BBR (Bottleneck Bandwidth and RTT)"); +MODULE_VERSION(__stringify(BBR_VERSION)); diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c -index 0306d257fa646..28f581c0dab76 100644 +index 0306d257fa64..28f581c0dab7 100644 --- a/net/ipv4/tcp_cong.c +++ b/net/ipv4/tcp_cong.c @@ -237,6 +237,7 @@ void tcp_init_congestion_control(struct sock *sk) @@ -3584,7 +3614,7 @@ index 0306d257fa646..28f581c0dab76 100644 icsk->icsk_ca_ops->init(sk); if (tcp_ca_needs_ecn(sk)) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c -index e37488d3453f0..62eef7d067c21 100644 +index e37488d3453f..62eef7d067c2 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -370,7 +370,7 @@ static void __tcp_ecn_check_ce(struct sock *sk, const struct sk_buff *skb) @@ -3718,7 +3748,7 @@ index e37488d3453f0..62eef7d067c21 100644 tcp_in_quickack_mode(sk) || /* Protocol state mandates a one-time immediate ACK */ diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c -index a19a9dbd3409f..e0ef8406a3264 100644 +index a19a9dbd3409..e0ef8406a326 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -459,6 +459,8 @@ void tcp_ca_openreq_child(struct sock *sk, const struct dst_entry *dst) @@ -3731,7 +3761,7 @@ index a19a9dbd3409f..e0ef8406a3264 100644 const struct tcp_congestion_ops *ca; diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c -index 16c48df8df4cc..6c3a1895238eb 100644 +index 16c48df8df4c..6c3a1895238e 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -336,10 +336,9 @@ static void tcp_ecn_send_syn(struct sock *sk, struct sk_buff *skb) @@ -3842,7 +3872,7 @@ index 16c48df8df4cc..6c3a1895238eb 100644 goto rearm_timer; diff --git a/net/ipv4/tcp_rate.c b/net/ipv4/tcp_rate.c -index a8f6d9d06f2eb..8737f21346481 100644 +index a8f6d9d06f2e..8737f2134648 100644 --- a/net/ipv4/tcp_rate.c +++ b/net/ipv4/tcp_rate.c @@ -34,6 +34,24 @@ @@ -3922,7 +3952,7 @@ index a8f6d9d06f2eb..8737f21346481 100644 rs->interval_us = max(snd_us, ack_us); diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c -index 4d40615dc8fc2..f27941201ef20 100644 +index 4d40615dc8fc..f27941201ef2 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -689,6 +689,7 @@ void tcp_write_timer_handler(struct sock *sk) @@ -3936,9 +3966,9 @@ index 4d40615dc8fc2..f27941201ef20 100644 -- 2.46.0 -From 72faf7dfc00f35aebf029333943613dbf86b509c Mon Sep 17 00:00:00 2001 +From cfadd59d3bf4eb2ba75e1b778510b13bd2299f1f Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Sun, 25 Aug 2024 10:30:15 +0200 +Date: Sun, 1 Sep 2024 10:38:49 +0200 Subject: [PATCH 03/11] block Signed-off-by: Peter Jung @@ -3949,7 +3979,7 @@ Signed-off-by: Peter Jung 3 files changed, 203 insertions(+), 43 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c -index 36a4998c4b378..f9bc95f4488de 100644 +index 36a4998c4b37..f9bc95f4488d 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -467,6 +467,21 @@ static struct bfq_io_cq *bfq_bic_lookup(struct request_queue *q) @@ -4167,7 +4197,7 @@ index 36a4998c4b378..f9bc95f4488de 100644 * The invocation of the next bfq_create_group_hierarchy * function is the head of a chain of function calls diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h -index 08ddf2cfae5b1..a5cb9b6436995 100644 +index 08ddf2cfae5b..a5cb9b643699 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -504,12 +504,26 @@ struct bfq_io_cq { @@ -4207,7 +4237,7 @@ index 08ddf2cfae5b1..a5cb9b6436995 100644 * bic associated with the task issuing current bio for * merging. This and the next field are used as a support to diff --git a/block/mq-deadline.c b/block/mq-deadline.c -index acdc28756d9d7..8b214233a061e 100644 +index acdc28756d9d..8b214233a061 100644 --- a/block/mq-deadline.c +++ b/block/mq-deadline.c @@ -79,10 +79,23 @@ struct dd_per_prio { @@ -4421,9 +4451,9 @@ index acdc28756d9d7..8b214233a061e 100644 -- 2.46.0 -From 51a4830d92d06240274ece527ef6f4bcf16c242a Mon Sep 17 00:00:00 2001 +From 0dbaf3e34fbdd41800ee182694dc6b4a16bd5021 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Tue, 27 Aug 2024 15:35:14 +0200 +Date: Sun, 1 Sep 2024 10:38:57 +0200 Subject: [PATCH 04/11] cachy Signed-off-by: Peter Jung @@ -4486,8 +4516,9 @@ Signed-off-by: Peter Jung mm/swap.c | 5 + mm/vmpressure.c | 4 + mm/vmscan.c | 142 + - scripts/package/PKGBUILD | 18 +- - 59 files changed, 6086 insertions(+), 100 deletions(-) + scripts/Makefile.package | 3 +- + scripts/package/PKGBUILD | 39 +- + 60 files changed, 6100 insertions(+), 110 deletions(-) create mode 100644 drivers/i2c/busses/i2c-nct6775.c create mode 100644 drivers/media/v4l2-core/v4l2loopback.c create mode 100644 drivers/media/v4l2-core/v4l2loopback.h @@ -4495,7 +4526,7 @@ Signed-off-by: Peter Jung create mode 100644 drivers/pci/controller/intel-nvme-remap.c diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 09126bb8cc9ff..43305af6b3643 100644 +index 09126bb8cc9f..43305af6b364 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -2231,6 +2231,9 @@ @@ -4525,7 +4556,7 @@ index 09126bb8cc9ff..43305af6b3643 100644 Safety option to keep boot IRQs enabled. This should never be necessary. diff --git a/Documentation/admin-guide/sysctl/vm.rst b/Documentation/admin-guide/sysctl/vm.rst -index f48eaa98d22d2..fc777c14cff6a 100644 +index f48eaa98d22d..fc777c14cff6 100644 --- a/Documentation/admin-guide/sysctl/vm.rst +++ b/Documentation/admin-guide/sysctl/vm.rst @@ -25,6 +25,9 @@ files can be found in mm/swap.c. @@ -4622,7 +4653,7 @@ index f48eaa98d22d2..fc777c14cff6a 100644 unprivileged_userfaultfd ======================== diff --git a/Makefile b/Makefile -index 7b60eb103c5d3..68f1424712a10 100644 +index d57cfc6896b8..e280a998f618 100644 --- a/Makefile +++ b/Makefile @@ -802,6 +802,9 @@ KBUILD_CFLAGS += -fno-delete-null-pointer-checks @@ -4648,7 +4679,7 @@ index 7b60eb103c5d3..68f1424712a10 100644 # change __FILE__ to the relative path from the srctree diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu -index 2a7279d80460a..3b077b9f92913 100644 +index 2a7279d80460..3b077b9f9291 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -157,7 +157,7 @@ config MPENTIUM4 @@ -5185,7 +5216,7 @@ index 2a7279d80460a..3b077b9f92913 100644 default "4" diff --git a/arch/x86/Makefile b/arch/x86/Makefile -index 801fd85c3ef69..93cc88b59cbb8 100644 +index 801fd85c3ef6..93cc88b59cbb 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -176,8 +176,49 @@ else @@ -5241,7 +5272,7 @@ index 801fd85c3ef69..93cc88b59cbb8 100644 KBUILD_CFLAGS += $(cflags-y) diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h -index b3ab80a03365c..5e883b397ff3f 100644 +index b3ab80a03365..5e883b397ff3 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -26,6 +26,7 @@ struct pci_sysdata { @@ -5265,7 +5296,7 @@ index b3ab80a03365c..5e883b397ff3f 100644 already-configured bus numbers - to be used for buggy BIOSes or architectures with incomplete PCI setup by the loader */ diff --git a/arch/x86/include/asm/vermagic.h b/arch/x86/include/asm/vermagic.h -index 75884d2cdec37..7acca9b5a9d56 100644 +index 75884d2cdec3..7acca9b5a9d5 100644 --- a/arch/x86/include/asm/vermagic.h +++ b/arch/x86/include/asm/vermagic.h @@ -17,6 +17,54 @@ @@ -5359,7 +5390,7 @@ index 75884d2cdec37..7acca9b5a9d56 100644 #define MODULE_PROC_FAMILY "ELAN " #elif defined CONFIG_MCRUSOE diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c -index ddb798603201e..7c20387d82029 100644 +index ddb798603201..7c20387d8202 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -723,12 +723,15 @@ int pci_ext_cfg_avail(void) @@ -5381,7 +5412,7 @@ index ddb798603201e..7c20387d82029 100644 } -#endif diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c -index f9bc95f4488de..e85dd2bf39ed0 100644 +index f9bc95f4488d..e85dd2bf39ed 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -7705,6 +7705,7 @@ MODULE_ALIAS("bfq-iosched"); @@ -5405,7 +5436,7 @@ index f9bc95f4488de..e85dd2bf39ed0 100644 slab_kill: diff --git a/block/elevator.c b/block/elevator.c -index f13d552a32c8b..c9422523e3932 100644 +index f13d552a32c8..c9422523e393 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -567,9 +567,19 @@ static struct elevator_type *elevator_get_default(struct request_queue *q) @@ -5429,7 +5460,7 @@ index f13d552a32c8b..c9422523e3932 100644 /* diff --git a/drivers/Makefile b/drivers/Makefile -index fe9ceb0d2288a..b58955caf19bf 100644 +index fe9ceb0d2288..b58955caf19b 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -61,14 +61,8 @@ obj-y += char/ @@ -5462,7 +5493,7 @@ index fe9ceb0d2288a..b58955caf19bf 100644 obj-$(CONFIG_MTD) += mtd/ obj-$(CONFIG_SPI) += spi/ diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c -index a05c172494481..be4b54ff7e893 100644 +index a05c17249448..be4b54ff7e89 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1618,7 +1618,7 @@ static irqreturn_t ahci_thunderx_irq_handler(int irq, void *dev_instance) @@ -5518,7 +5549,7 @@ index a05c172494481..be4b54ff7e893 100644 sysfs_add_file_to_group(&pdev->dev.kobj, &dev_attr_remapped_nvme.attr, diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86 -index 97c2d4f15d76e..5a3af44d785a1 100644 +index 97c2d4f15d76..5a3af44d785a 100644 --- a/drivers/cpufreq/Kconfig.x86 +++ b/drivers/cpufreq/Kconfig.x86 @@ -9,7 +9,6 @@ config X86_INTEL_PSTATE @@ -5538,7 +5569,7 @@ index 97c2d4f15d76e..5a3af44d785a1 100644 This driver adds a CPUFreq driver which utilizes a fine grain processor performance frequency control range instead of legacy diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c -index 04fc786dd2c09..f98c9438760c9 100644 +index 04fc786dd2c0..f98c9438760c 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -575,30 +575,11 @@ unsigned int cpufreq_policy_transition_delay_us(struct cpufreq_policy *policy) @@ -5577,7 +5608,7 @@ index 04fc786dd2c09..f98c9438760c9 100644 EXPORT_SYMBOL_GPL(cpufreq_policy_transition_delay_us); diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c -index c0278d023cfce..7d92f16a430a8 100644 +index c0278d023cfc..7d92f16a430a 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -3568,6 +3568,8 @@ static int __init intel_pstate_setup(char *str) @@ -5590,7 +5621,7 @@ index c0278d023cfce..7d92f16a430a8 100644 default_driver = &intel_pstate; else if (!strcmp(str, "passive")) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -index 137a88b8de453..233c175374928 100644 +index 137a88b8de45..233c17537492 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -162,6 +162,7 @@ struct amdgpu_watchdog_timer { @@ -5602,7 +5633,7 @@ index 137a88b8de453..233c175374928 100644 extern int amdgpu_gart_size; extern int amdgpu_gtt_size; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -index 094498a0964b5..cddc33970d750 100644 +index 094498a0964b..cddc33970d75 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -134,6 +134,7 @@ enum AMDGPU_DEBUG_MASK { @@ -5630,7 +5661,7 @@ index 094498a0964b5..cddc33970d750 100644 * DOC: vramlimit (int) * Restrict the total amount of VRAM in MiB for testing. The default is 0 (Use full VRAM). diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig -index df17e79c45c76..e454488c1a312 100644 +index df17e79c45c7..e454488c1a31 100644 --- a/drivers/gpu/drm/amd/display/Kconfig +++ b/drivers/gpu/drm/amd/display/Kconfig @@ -53,4 +53,10 @@ config DRM_AMD_SECURE_DISPLAY @@ -5645,7 +5676,7 @@ index df17e79c45c76..e454488c1a312 100644 + endmenu diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -index 983a977632ff4..68357fb6b551e 100644 +index 983a977632ff..68357fb6b551 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4384,7 +4384,7 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev) @@ -5658,7 +5689,7 @@ index 983a977632ff4..68357fb6b551e 100644 dc_state_release(state->context); kfree(state); diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c -index ebabfe3a512f4..4d3ebcaacca1b 100644 +index ebabfe3a512f..4d3ebcaacca1 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c @@ -97,7 +97,7 @@ static inline struct fixed31_32 amdgpu_dm_fixpt_from_s3132(__u64 x) @@ -5671,7 +5702,7 @@ index ebabfe3a512f4..4d3ebcaacca1b 100644 * * AMD driver supports pre-defined mathematical functions for transferring diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c -index 99014339aaa39..222f72b4c44fc 100644 +index 99014339aaa3..222f72b4c44f 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c @@ -426,7 +426,7 @@ static int amdgpu_dm_crtc_late_register(struct drm_crtc *crtc) @@ -5702,10 +5733,10 @@ index 99014339aaa39..222f72b4c44fc 100644 #endif return 0; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c -index a83bd0331c3b7..21cc5fd470d67 100644 +index 5cb11cc2d063..7e2020b0c0e8 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c -@@ -1563,7 +1563,7 @@ static void amdgpu_dm_plane_drm_plane_destroy_state(struct drm_plane *plane, +@@ -1568,7 +1568,7 @@ static void amdgpu_dm_plane_drm_plane_destroy_state(struct drm_plane *plane, drm_atomic_helper_plane_destroy_state(plane, state); } @@ -5714,7 +5745,7 @@ index a83bd0331c3b7..21cc5fd470d67 100644 static void dm_atomic_plane_attach_color_mgmt_properties(struct amdgpu_display_manager *dm, struct drm_plane *plane) -@@ -1754,7 +1754,7 @@ static const struct drm_plane_funcs dm_plane_funcs = { +@@ -1759,7 +1759,7 @@ static const struct drm_plane_funcs dm_plane_funcs = { .atomic_duplicate_state = amdgpu_dm_plane_drm_plane_duplicate_state, .atomic_destroy_state = amdgpu_dm_plane_drm_plane_destroy_state, .format_mod_supported = amdgpu_dm_plane_format_mod_supported, @@ -5723,7 +5754,7 @@ index a83bd0331c3b7..21cc5fd470d67 100644 .atomic_set_property = dm_atomic_plane_set_property, .atomic_get_property = dm_atomic_plane_get_property, #endif -@@ -1847,7 +1847,7 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm, +@@ -1852,7 +1852,7 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm, drm_plane_helper_add(plane, &dm_plane_helper_funcs); @@ -5733,7 +5764,7 @@ index a83bd0331c3b7..21cc5fd470d67 100644 #endif /* Create (reset) the plane state */ diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c -index d5d6ab484e5ad..dccba7bcdf97c 100644 +index d5d6ab484e5a..dccba7bcdf97 100644 --- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c @@ -3272,6 +3272,9 @@ static ssize_t amdgpu_hwmon_show_power_cap_min(struct device *dev, @@ -5747,10 +5778,10 @@ index d5d6ab484e5ad..dccba7bcdf97c 100644 } diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c -index 9d7454b3c3143..f26dd67109009 100644 +index 74e35f8ddefc..c2c2c915db99 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c -@@ -2759,7 +2759,10 @@ int smu_get_power_limit(void *handle, +@@ -2760,7 +2760,10 @@ int smu_get_power_limit(void *handle, *limit = smu->max_power_limit; break; case SMU_PPT_LIMIT_MIN: @@ -5762,7 +5793,7 @@ index 9d7454b3c3143..f26dd67109009 100644 break; default: return -EINVAL; -@@ -2783,7 +2786,14 @@ static int smu_set_power_limit(void *handle, uint32_t limit) +@@ -2784,7 +2787,14 @@ static int smu_set_power_limit(void *handle, uint32_t limit) if (smu->ppt_funcs->set_power_limit) return smu->ppt_funcs->set_power_limit(smu, limit_type, limit); @@ -5779,7 +5810,7 @@ index 9d7454b3c3143..f26dd67109009 100644 "New power limit (%d) is out of range [%d,%d]\n", limit, smu->min_power_limit, smu->max_power_limit); diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig -index a22f9125322a7..44d863e0175e9 100644 +index a22f9125322a..44d863e0175e 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -240,6 +240,15 @@ config I2C_CHT_WC @@ -5799,7 +5830,7 @@ index a22f9125322a7..44d863e0175e9 100644 tristate "Nvidia nForce2, nForce3 and nForce4" depends on PCI && HAS_IOPORT diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile -index 78d0561339e5b..9ea3a294f9f02 100644 +index 78d0561339e5..9ea3a294f9f0 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -20,6 +20,7 @@ obj-$(CONFIG_I2C_CHT_WC) += i2c-cht-wc.o @@ -5812,7 +5843,7 @@ index 78d0561339e5b..9ea3a294f9f02 100644 obj-$(CONFIG_I2C_NVIDIA_GPU) += i2c-nvidia-gpu.o diff --git a/drivers/i2c/busses/i2c-nct6775.c b/drivers/i2c/busses/i2c-nct6775.c new file mode 100644 -index 0000000000000..fdbd9a1c8d7ae +index 000000000000..fdbd9a1c8d7a --- /dev/null +++ b/drivers/i2c/busses/i2c-nct6775.c @@ -0,0 +1,648 @@ @@ -6465,7 +6496,7 @@ index 0000000000000..fdbd9a1c8d7ae +module_init(i2c_nct6775_init); +module_exit(i2c_nct6775_exit); diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c -index 4e32d57ae0bf3..a2deb73799047 100644 +index 4e32d57ae0bf..a2deb7379904 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c @@ -569,11 +569,11 @@ static int piix4_transaction(struct i2c_adapter *piix4_adapter) @@ -6483,7 +6514,7 @@ index 4e32d57ae0bf3..a2deb73799047 100644 /* If the SMBus is still busy, we give up */ if (timeout == MAX_TIMEOUT) { diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c -index a8ce3d1407223..49729cf8c12f8 100644 +index a8ce3d140722..49729cf8c12f 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -46,6 +46,7 @@ struct evdev_client { @@ -6547,7 +6578,7 @@ index a8ce3d1407223..49729cf8c12f8 100644 } diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c -index 348b4b26c2723..708405b166873 100644 +index 348b4b26c272..708405b16687 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -3310,6 +3310,11 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) @@ -6563,7 +6594,7 @@ index 348b4b26c2723..708405b166873 100644 if (ret < 0) goto bad; diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig -index 331b8e535e5bb..80dabeebf5804 100644 +index 331b8e535e5b..80dabeebf580 100644 --- a/drivers/media/v4l2-core/Kconfig +++ b/drivers/media/v4l2-core/Kconfig @@ -40,6 +40,11 @@ config VIDEO_TUNER @@ -6579,7 +6610,7 @@ index 331b8e535e5bb..80dabeebf5804 100644 config V4L2_H264 tristate diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile -index 2177b9d63a8ff..c179507cedc49 100644 +index 2177b9d63a8f..c179507cedc4 100644 --- a/drivers/media/v4l2-core/Makefile +++ b/drivers/media/v4l2-core/Makefile @@ -33,5 +33,7 @@ obj-$(CONFIG_V4L2_JPEG_HELPER) += v4l2-jpeg.o @@ -6592,7 +6623,7 @@ index 2177b9d63a8ff..c179507cedc49 100644 obj-$(CONFIG_VIDEO_DEV) += v4l2-dv-timings.o videodev.o diff --git a/drivers/media/v4l2-core/v4l2loopback.c b/drivers/media/v4l2-core/v4l2loopback.c new file mode 100644 -index 0000000000000..25cb1beb26e50 +index 000000000000..25cb1beb26e5 --- /dev/null +++ b/drivers/media/v4l2-core/v4l2loopback.c @@ -0,0 +1,3184 @@ @@ -9782,7 +9813,7 @@ index 0000000000000..25cb1beb26e50 +module_exit(v4l2loopback_cleanup_module); diff --git a/drivers/media/v4l2-core/v4l2loopback.h b/drivers/media/v4l2-core/v4l2loopback.h new file mode 100644 -index 0000000000000..1bc7e6b747a40 +index 000000000000..1bc7e6b747a4 --- /dev/null +++ b/drivers/media/v4l2-core/v4l2loopback.h @@ -0,0 +1,98 @@ @@ -9886,7 +9917,7 @@ index 0000000000000..1bc7e6b747a40 +#endif /* _V4L2LOOPBACK_H */ diff --git a/drivers/media/v4l2-core/v4l2loopback_formats.h b/drivers/media/v4l2-core/v4l2loopback_formats.h new file mode 100644 -index 0000000000000..d855a37965541 +index 000000000000..d855a3796554 --- /dev/null +++ b/drivers/media/v4l2-core/v4l2loopback_formats.h @@ -0,0 +1,445 @@ @@ -10336,7 +10367,7 @@ index 0000000000000..d855a37965541 +#endif /* V4L2_PIX_FMT_HEVC */ +}; diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile -index 038ccbd9e3ba2..de5e4f5145af8 100644 +index 038ccbd9e3ba..de5e4f5145af 100644 --- a/drivers/pci/controller/Makefile +++ b/drivers/pci/controller/Makefile @@ -1,4 +1,10 @@ @@ -10352,7 +10383,7 @@ index 038ccbd9e3ba2..de5e4f5145af8 100644 obj-$(CONFIG_PCI_IXP4XX) += pci-ixp4xx.o diff --git a/drivers/pci/controller/intel-nvme-remap.c b/drivers/pci/controller/intel-nvme-remap.c new file mode 100644 -index 0000000000000..e105e6f5cc91d +index 000000000000..e105e6f5cc91 --- /dev/null +++ b/drivers/pci/controller/intel-nvme-remap.c @@ -0,0 +1,462 @@ @@ -10819,7 +10850,7 @@ index 0000000000000..e105e6f5cc91d +MODULE_AUTHOR("Daniel Drake "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index a2ce4e08edf5a..7db97a14b34a3 100644 +index a2ce4e08edf5..7db97a14b34a 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -3732,6 +3732,106 @@ static void quirk_no_bus_reset(struct pci_dev *dev) @@ -10938,7 +10969,7 @@ index a2ce4e08edf5a..7db97a14b34a3 100644 }; diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h -index d4d2f4d1d7cbd..e0e19d9c13231 100644 +index d4d2f4d1d7cb..e0e19d9c1323 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -577,12 +577,6 @@ static inline unsigned long cpufreq_scale(unsigned long old, u_int div, @@ -10955,7 +10986,7 @@ index d4d2f4d1d7cbd..e0e19d9c13231 100644 char name[CPUFREQ_NAME_LEN]; int (*init)(struct cpufreq_policy *policy); diff --git a/include/linux/mm.h b/include/linux/mm.h -index 6549d0979b28f..dca9a4444101f 100644 +index 6549d0979b28..dca9a4444101 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -197,6 +197,14 @@ static inline void __mm_zero_struct_page(struct page *page) @@ -10974,7 +11005,7 @@ index 6549d0979b28f..dca9a4444101f 100644 extern unsigned long sysctl_admin_reserve_kbytes; diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h -index d9c7edb6422bd..b57c72793580b 100644 +index d9c7edb6422b..b57c72793580 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -1264,7 +1264,7 @@ struct readahead_control { @@ -10987,7 +11018,7 @@ index d9c7edb6422bd..b57c72793580b 100644 void page_cache_ra_unbounded(struct readahead_control *, unsigned long nr_to_read, unsigned long lookahead_count); diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h -index 6030a82356173..60b7fe5fa74ad 100644 +index 6030a8235617..60b7fe5fa74a 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h @@ -156,6 +156,8 @@ static inline void set_userns_rlimit_max(struct user_namespace *ns, @@ -11009,7 +11040,7 @@ index 6030a82356173..60b7fe5fa74ad 100644 { return &init_user_ns; diff --git a/init/Kconfig b/init/Kconfig -index 5783a0b875172..08a0d51afaae4 100644 +index 5783a0b87517..08a0d51afaae 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -134,6 +134,10 @@ config THREAD_INFO_IN_TASK @@ -11060,7 +11091,7 @@ index 5783a0b875172..08a0d51afaae4 100644 bool "Optimize for size (-Os)" help diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz -index 38ef6d06888ef..0f78364efd4f2 100644 +index 38ef6d06888e..0f78364efd4f 100644 --- a/kernel/Kconfig.hz +++ b/kernel/Kconfig.hz @@ -40,6 +40,27 @@ choice @@ -11102,7 +11133,7 @@ index 38ef6d06888ef..0f78364efd4f2 100644 config SCHED_HRTICK diff --git a/kernel/fork.c b/kernel/fork.c -index 18bdc87209d05..b37be61bedd2f 100644 +index cc760491f201..238695afc630 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -105,6 +105,10 @@ @@ -11116,7 +11147,7 @@ index 18bdc87209d05..b37be61bedd2f 100644 #include #include #include -@@ -2151,6 +2155,10 @@ __latent_entropy struct task_struct *copy_process( +@@ -2138,6 +2142,10 @@ __latent_entropy struct task_struct *copy_process( if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -11127,7 +11158,7 @@ index 18bdc87209d05..b37be61bedd2f 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -3306,6 +3314,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -3287,6 +3295,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -11141,7 +11172,7 @@ index 18bdc87209d05..b37be61bedd2f 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 9057584ec06de..5dc714fd8a226 100644 +index 9057584ec06d..5dc714fd8a22 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -73,10 +73,19 @@ unsigned int sysctl_sched_tunable_scaling = SCHED_TUNABLESCALING_LOG; @@ -11178,7 +11209,7 @@ index 9057584ec06de..5dc714fd8a226 100644 #ifdef CONFIG_NUMA_BALANCING /* Restrict the NUMA promotion throughput (MB/s) for each target node. */ diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h -index 4c36cc6803617..432b43aa091cd 100644 +index 4c36cc680361..432b43aa091c 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2591,7 +2591,7 @@ extern void deactivate_task(struct rq *rq, struct task_struct *p, int flags); @@ -11191,7 +11222,7 @@ index 4c36cc6803617..432b43aa091cd 100644 #else # define SCHED_NR_MIGRATE_BREAK 32 diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 79e6cb1d5c48f..4a62ae02a2c03 100644 +index 79e6cb1d5c48..4a62ae02a2c0 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -80,6 +80,9 @@ @@ -11262,7 +11293,7 @@ index 79e6cb1d5c48f..4a62ae02a2c03 100644 .procname = "user_reserve_kbytes", .data = &sysctl_user_reserve_kbytes, diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index 0b0b95418b16a..c4b835b91fc00 100644 +index 0b0b95418b16..c4b835b91fc0 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -22,6 +22,13 @@ @@ -11280,7 +11311,7 @@ index 0b0b95418b16a..c4b835b91fc00 100644 static DEFINE_MUTEX(userns_state_mutex); diff --git a/mm/Kconfig b/mm/Kconfig -index b72e7d040f789..432f517fef8c4 100644 +index b72e7d040f78..432f517fef8c 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -492,6 +492,69 @@ config ARCH_WANT_OPTIMIZE_DAX_VMEMMAP @@ -11363,7 +11394,7 @@ index b72e7d040f789..432f517fef8c4 100644 # diff --git a/mm/compaction.c b/mm/compaction.c -index eb95e9b435d0f..ae03cdc3e76e4 100644 +index eb95e9b435d0..ae03cdc3e76e 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1950,7 +1950,11 @@ static int sysctl_compact_unevictable_allowed __read_mostly = CONFIG_COMPACT_UNE @@ -11379,7 +11410,7 @@ index eb95e9b435d0f..ae03cdc3e76e4 100644 static int __read_mostly sysctl_compact_memory; diff --git a/mm/huge_memory.c b/mm/huge_memory.c -index 67c86a5d64a6a..90bc49d1ca922 100644 +index 67c86a5d64a6..90bc49d1ca92 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -64,7 +64,11 @@ unsigned long transparent_hugepage_flags __read_mostly = @@ -11395,7 +11426,7 @@ index 67c86a5d64a6a..90bc49d1ca922 100644 (1< -Date: Tue, 27 Aug 2024 15:35:25 +0200 +Date: Sun, 1 Sep 2024 10:39:07 +0200 Subject: [PATCH 05/11] fixes Signed-off-by: Peter Jung @@ -11760,12 +11854,11 @@ Signed-off-by: Peter Jung arch/x86/include/asm/apic.h | 8 -- arch/x86/kernel/amd_nb.c | 4 + arch/x86/kernel/apic/apic_flat_64.c | 119 ++------------------------- - drivers/cpufreq/amd-pstate.c | 10 +-- drivers/powercap/intel_rapl_common.c | 1 + - 6 files changed, 18 insertions(+), 128 deletions(-) + 5 files changed, 14 insertions(+), 122 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig -index 975dd22a2dbd2..de69b8f5b5be8 100644 +index 975dd22a2dbd..de69b8f5b5be 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -1050,7 +1050,7 @@ config ARCH_MMAP_RND_BITS @@ -11787,7 +11880,7 @@ index 975dd22a2dbd2..de69b8f5b5be8 100644 help This value can be used to select the number of bits to use to diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h -index 9327eb00e96d0..be2045a18e69b 100644 +index 9327eb00e96d..be2045a18e69 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -345,20 +345,12 @@ extern struct apic *apic; @@ -11812,7 +11905,7 @@ index 9327eb00e96d0..be2045a18e69b 100644 /* diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c -index 059e5c16af054..e8c3d65aee60b 100644 +index 059e5c16af05..e8c3d65aee60 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -43,6 +43,8 @@ @@ -11834,7 +11927,7 @@ index 059e5c16af054..e8c3d65aee60b 100644 { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_DF_F4) }, {} diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c -index f37ad3392fec9..e0308d8c4e6c2 100644 +index f37ad3392fec..e0308d8c4e6c 100644 --- a/arch/x86/kernel/apic/apic_flat_64.c +++ b/arch/x86/kernel/apic/apic_flat_64.c @@ -8,129 +8,25 @@ @@ -11991,43 +12084,8 @@ index f37ad3392fec9..e0308d8c4e6c2 100644 -apic_drivers(apic_physflat, apic_flat); +struct apic *apic __ro_after_init = &apic_physflat; +EXPORT_SYMBOL_GPL(apic); -diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c -index 65a80ad9e747c..4e8880f422bba 100644 ---- a/drivers/cpufreq/amd-pstate.c -+++ b/drivers/cpufreq/amd-pstate.c -@@ -319,7 +319,7 @@ static inline int pstate_enable(bool enable) - return 0; - - for_each_present_cpu(cpu) { -- unsigned long logical_id = topology_logical_die_id(cpu); -+ unsigned long logical_id = topology_logical_package_id(cpu); - - if (test_bit(logical_id, &logical_proc_id_mask)) - continue; -@@ -659,7 +659,7 @@ static int amd_pstate_cpu_boost_update(struct cpufreq_policy *policy, bool on) - struct amd_cpudata *cpudata = policy->driver_data; - struct cppc_perf_ctrls perf_ctrls; - u32 highest_perf, nominal_perf, nominal_freq, max_freq; -- int ret; -+ int ret = 0; - - highest_perf = READ_ONCE(cpudata->highest_perf); - nominal_perf = READ_ONCE(cpudata->nominal_perf); -@@ -1761,10 +1761,8 @@ static bool amd_cppc_supported(void) - * the code is added for debugging purposes. - */ - if (!cpu_feature_enabled(X86_FEATURE_CPPC)) { -- if (cpu_feature_enabled(X86_FEATURE_ZEN1) || cpu_feature_enabled(X86_FEATURE_ZEN2)) { -- if (c->x86_model > 0x60 && c->x86_model < 0xaf) -- warn = true; -- } else if (cpu_feature_enabled(X86_FEATURE_ZEN3) || cpu_feature_enabled(X86_FEATURE_ZEN4)) { -+ if (cpu_feature_enabled(X86_FEATURE_ZEN3) || -+ cpu_feature_enabled(X86_FEATURE_ZEN4)) { - if ((c->x86_model > 0x10 && c->x86_model < 0x1F) || - (c->x86_model > 0x40 && c->x86_model < 0xaf)) - warn = true; diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c -index 3cffa6c795388..8b7a5a31e8c17 100644 +index 3cffa6c79538..8b7a5a31e8c1 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1285,6 +1285,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { @@ -12041,64 +12099,47 @@ index 3cffa6c795388..8b7a5a31e8c17 100644 -- 2.46.0 -From bbeb1b23f3b376b3aa0a1cfbb79e34b55a84f272 Mon Sep 17 00:00:00 2001 +From ce9f099c5a2244989b1cb027580ead7a80d4fa55 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Sun, 25 Aug 2024 10:30:52 +0200 +Date: Sun, 1 Sep 2024 10:39:19 +0200 Subject: [PATCH 06/11] intel-pstate Signed-off-by: Peter Jung --- - arch/x86/include/asm/topology.h | 19 ++- - arch/x86/kernel/cpu/aperfmperf.c | 87 +++++++++++- - arch/x86/kernel/itmt.c | 12 +- - arch/x86/kernel/smpboot.c | 10 +- - drivers/cpufreq/intel_pstate.c | 220 ++++++++++++++++++++++++++++++- - 5 files changed, 332 insertions(+), 16 deletions(-) + arch/x86/include/asm/topology.h | 13 ++ + arch/x86/kernel/cpu/aperfmperf.c | 89 +++++++++++- + drivers/cpufreq/intel_pstate.c | 232 ++++++++++++++++++++++++++++++- + 3 files changed, 328 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h -index abe3a8f22cbd9..e5b203fe7956c 100644 +index abe3a8f22cbd..aef70336d624 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h -@@ -235,8 +235,6 @@ struct pci_bus; - int x86_pci_root_bus_node(int bus); - void x86_pci_root_bus_resources(int bus, struct list_head *resources); - --extern bool x86_topology_update; -- - #ifdef CONFIG_SCHED_MC_PRIO - #include - -@@ -282,11 +280,28 @@ static inline long arch_scale_freq_capacity(int cpu) +@@ -282,9 +282,22 @@ static inline long arch_scale_freq_capacity(int cpu) } #define arch_scale_freq_capacity arch_scale_freq_capacity +bool arch_enable_hybrid_capacity_scale(void); -+void arch_set_cpu_capacity(int cpu, unsigned long cap, unsigned long base_cap, -+ unsigned long max_freq, unsigned long base_freq); ++void arch_set_cpu_capacity(int cpu, unsigned long cap, unsigned long max_cap, ++ unsigned long cap_freq, unsigned long base_freq); + +unsigned long arch_scale_cpu_capacity(int cpu); +#define arch_scale_cpu_capacity arch_scale_cpu_capacity + extern void arch_set_max_freq_ratio(bool turbo_disabled); extern void freq_invariance_set_perf_ratio(u64 ratio, bool turbo_disabled); -+ -+void arch_rebuild_sched_domains(void); #else +static inline bool arch_enable_hybrid_capacity_scale(void) { return false; } +static inline void arch_set_cpu_capacity(int cpu, unsigned long cap, -+ unsigned long base_cap, -+ unsigned long max_freq, ++ unsigned long max_cap, ++ unsigned long cap_freq, + unsigned long base_freq) { } + static inline void arch_set_max_freq_ratio(bool turbo_disabled) { } static inline void freq_invariance_set_perf_ratio(u64 ratio, bool turbo_disabled) { } -+ -+static inline void arch_rebuild_sched_domains(void) { } #endif - - extern void arch_scale_freq_tick(void); diff --git a/arch/x86/kernel/cpu/aperfmperf.c b/arch/x86/kernel/cpu/aperfmperf.c -index 0b69bfbf345d0..ee8e1f51ef108 100644 +index 0b69bfbf345d..ec07678c641b 100644 --- a/arch/x86/kernel/cpu/aperfmperf.c +++ b/arch/x86/kernel/cpu/aperfmperf.c @@ -349,9 +349,89 @@ static DECLARE_WORK(disable_freq_invariance_work, @@ -12130,6 +12171,7 @@ index 0b69bfbf345d0..ee8e1f51ef108 100644 + WARN_ONCE(1, "Hybrid CPU capacity scaling already enabled"); + return true; + } ++ + arch_cpu_scale = alloc_percpu(struct arch_hybrid_cpu_scale); + if (!arch_cpu_scale) + return false; @@ -12149,27 +12191,27 @@ index 0b69bfbf345d0..ee8e1f51ef108 100644 +/** + * arch_set_cpu_capacity - Set scale-invariance parameters for a CPU + * @cpu: Target CPU. -+ * @cap: Capacity of @cpu, relative to @base_cap, at its maximum frequency. -+ * @base_cap: System-wide maximum CPU capacity. -+ * @max_freq: Frequency of @cpu corresponding to @cap. ++ * @cap: Capacity of @cpu at its maximum frequency, relative to @max_cap. ++ * @max_cap: System-wide maximum CPU capacity. ++ * @cap_freq: Frequency of @cpu corresponding to @cap. + * @base_freq: Frequency of @cpu at which MPERF counts. + * -+ * The units in which @cap and @base_cap are expressed do not matter, so long ++ * The units in which @cap and @max_cap are expressed do not matter, so long + * as they are consistent, because the former is effectively divided by the -+ * latter. Analogously for @max_freq and @base_freq. ++ * latter. Analogously for @cap_freq and @base_freq. + * + * After calling this function for all CPUs, call arch_rebuild_sched_domains() + * to let the scheduler know that capacity-aware scheduling can be used going + * forward. + */ -+void arch_set_cpu_capacity(int cpu, unsigned long cap, unsigned long base_cap, -+ unsigned long max_freq, unsigned long base_freq) ++void arch_set_cpu_capacity(int cpu, unsigned long cap, unsigned long max_cap, ++ unsigned long cap_freq, unsigned long base_freq) +{ + if (static_branch_likely(&arch_hybrid_cap_scale_key)) { + WRITE_ONCE(per_cpu_ptr(arch_cpu_scale, cpu)->capacity, -+ div_u64(cap << SCHED_CAPACITY_SHIFT, base_cap)); ++ div_u64(cap << SCHED_CAPACITY_SHIFT, max_cap)); + WRITE_ONCE(per_cpu_ptr(arch_cpu_scale, cpu)->freq_ratio, -+ div_u64(max_freq << SCHED_CAPACITY_SHIFT, base_freq)); ++ div_u64(cap_freq << SCHED_CAPACITY_SHIFT, base_freq)); + } else { + WARN_ONCE(1, "Hybrid CPU capacity scaling not enabled"); + } @@ -12186,8 +12228,8 @@ index 0b69bfbf345d0..ee8e1f51ef108 100644 + static void scale_freq_tick(u64 acnt, u64 mcnt) { - u64 freq_scale; -+ u64 freq_ratio; +- u64 freq_scale; ++ u64 freq_scale, freq_ratio; if (!arch_scale_freq_invariant()) return; @@ -12205,80 +12247,8 @@ index 0b69bfbf345d0..ee8e1f51ef108 100644 goto error; freq_scale = div64_u64(acnt, mcnt); -diff --git a/arch/x86/kernel/itmt.c b/arch/x86/kernel/itmt.c -index 51b805c727fc8..1cf248a57a034 100644 ---- a/arch/x86/kernel/itmt.c -+++ b/arch/x86/kernel/itmt.c -@@ -54,10 +54,8 @@ static int sched_itmt_update_handler(const struct ctl_table *table, int write, - old_sysctl = sysctl_sched_itmt_enabled; - ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos); - -- if (!ret && write && old_sysctl != sysctl_sched_itmt_enabled) { -- x86_topology_update = true; -- rebuild_sched_domains(); -- } -+ if (!ret && write && old_sysctl != sysctl_sched_itmt_enabled) -+ arch_rebuild_sched_domains(); - - mutex_unlock(&itmt_update_mutex); - -@@ -114,8 +112,7 @@ int sched_set_itmt_support(void) - - sysctl_sched_itmt_enabled = 1; - -- x86_topology_update = true; -- rebuild_sched_domains(); -+ arch_rebuild_sched_domains(); - - mutex_unlock(&itmt_update_mutex); - -@@ -150,8 +147,7 @@ void sched_clear_itmt_support(void) - if (sysctl_sched_itmt_enabled) { - /* disable sched_itmt if we are no longer ITMT capable */ - sysctl_sched_itmt_enabled = 0; -- x86_topology_update = true; -- rebuild_sched_domains(); -+ arch_rebuild_sched_domains(); - } - - mutex_unlock(&itmt_update_mutex); -diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c -index 0c35207320cb4..90a6fb54a1283 100644 ---- a/arch/x86/kernel/smpboot.c -+++ b/arch/x86/kernel/smpboot.c -@@ -39,6 +39,7 @@ - - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include -@@ -125,7 +126,7 @@ static DEFINE_PER_CPU_ALIGNED(struct mwait_cpu_dead, mwait_cpu_dead); - int __read_mostly __max_smt_threads = 1; - - /* Flag to indicate if a complete sched domain rebuild is required */ --bool x86_topology_update; -+static bool x86_topology_update; - - int arch_update_cpu_topology(void) - { -@@ -135,6 +136,13 @@ int arch_update_cpu_topology(void) - return retval; - } - -+#ifdef CONFIG_X86_64 -+void arch_rebuild_sched_domains(void) { -+ x86_topology_update = true; -+ rebuild_sched_domains(); -+} -+#endif -+ - static unsigned int smpboot_warm_reset_vector_count; - - static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip) diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c -index 7d92f16a430a8..c8fd0e986cecf 100644 +index 7d92f16a430a..86ad1fed71f1 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -16,6 +16,7 @@ @@ -12313,7 +12283,7 @@ index 7d92f16a430a8..c8fd0e986cecf 100644 static struct cpufreq_driver *intel_pstate_driver __read_mostly; -@@ -934,6 +938,111 @@ static struct freq_attr *hwp_cpufreq_attrs[] = { +@@ -934,6 +938,135 @@ static struct freq_attr *hwp_cpufreq_attrs[] = { NULL, }; @@ -12415,17 +12385,41 @@ index 7d92f16a430a8..c8fd0e986cecf 100644 + +static void hybrid_init_cpu_scaling(void) +{ ++ bool disable_itmt = false; ++ + mutex_lock(&hybrid_capacity_lock); + -+ __hybrid_init_cpu_scaling(); ++ /* ++ * If hybrid_max_perf_cpu is set at this point, the hybrid CPU capacity ++ * scaling has been enabled already and the driver is just changing the ++ * operation mode. ++ */ ++ if (hybrid_max_perf_cpu) { ++ __hybrid_init_cpu_scaling(); ++ goto unlock; ++ } + ++ /* ++ * On hybrid systems, use asym capacity instead of ITMT, but because ++ * the capacity of SMT threads is not deterministic even approximately, ++ * do not do that when SMT is in use. ++ */ ++ if (hwp_is_hybrid && !sched_smt_active() && arch_enable_hybrid_capacity_scale()) { ++ __hybrid_init_cpu_scaling(); ++ disable_itmt = true; ++ } ++ ++unlock: + mutex_unlock(&hybrid_capacity_lock); ++ ++ if (disable_itmt) ++ sched_clear_itmt_support(); +} + static void __intel_pstate_get_hwp_cap(struct cpudata *cpu) { u64 cap; -@@ -962,6 +1071,43 @@ static void intel_pstate_get_hwp_cap(struct cpudata *cpu) +@@ -962,6 +1095,43 @@ static void intel_pstate_get_hwp_cap(struct cpudata *cpu) } } @@ -12469,7 +12463,7 @@ index 7d92f16a430a8..c8fd0e986cecf 100644 static void intel_pstate_hwp_set(unsigned int cpu) { struct cpudata *cpu_data = all_cpu_data[cpu]; -@@ -1070,6 +1216,22 @@ static void intel_pstate_hwp_offline(struct cpudata *cpu) +@@ -1070,6 +1240,22 @@ static void intel_pstate_hwp_offline(struct cpudata *cpu) value |= HWP_ENERGY_PERF_PREFERENCE(HWP_EPP_POWERSAVE); wrmsrl_on_cpu(cpu->cpu, MSR_HWP_REQUEST, value); @@ -12492,7 +12486,7 @@ index 7d92f16a430a8..c8fd0e986cecf 100644 } #define POWER_CTL_EE_ENABLE 1 -@@ -1165,21 +1327,46 @@ static void __intel_pstate_update_max_freq(struct cpudata *cpudata, +@@ -1165,21 +1351,46 @@ static void __intel_pstate_update_max_freq(struct cpudata *cpudata, static void intel_pstate_update_limits(unsigned int cpu) { struct cpufreq_policy *policy = cpufreq_cpu_acquire(cpu); @@ -12542,7 +12536,7 @@ index 7d92f16a430a8..c8fd0e986cecf 100644 } /************************** sysfs begin ************************/ -@@ -1618,6 +1805,13 @@ static void intel_pstate_notify_work(struct work_struct *work) +@@ -1618,6 +1829,13 @@ static void intel_pstate_notify_work(struct work_struct *work) __intel_pstate_update_max_freq(cpudata, policy); cpufreq_cpu_release(policy); @@ -12556,7 +12550,7 @@ index 7d92f16a430a8..c8fd0e986cecf 100644 } wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_STATUS, 0); -@@ -2034,8 +2228,10 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu) +@@ -2034,8 +2252,10 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu) if (pstate_funcs.get_cpu_scaling) { cpu->pstate.scaling = pstate_funcs.get_cpu_scaling(cpu->cpu); @@ -12568,7 +12562,7 @@ index 7d92f16a430a8..c8fd0e986cecf 100644 } else { cpu->pstate.scaling = perf_ctl_scaling; } -@@ -2703,6 +2899,8 @@ static int intel_pstate_cpu_online(struct cpufreq_policy *policy) +@@ -2703,6 +2923,8 @@ static int intel_pstate_cpu_online(struct cpufreq_policy *policy) */ intel_pstate_hwp_reenable(cpu); cpu->suspended = false; @@ -12577,23 +12571,11 @@ index 7d92f16a430a8..c8fd0e986cecf 100644 } return 0; -@@ -3143,6 +3341,20 @@ static int intel_pstate_register_driver(struct cpufreq_driver *driver) +@@ -3143,6 +3365,8 @@ static int intel_pstate_register_driver(struct cpufreq_driver *driver) global.min_perf_pct = min_perf_pct_min(); -+ /* -+ * On hybrid systems, use asym capacity instead of ITMT, but because -+ * the capacity of SMT threads is not deterministic even approximately, -+ * do not do that when SMT is in use. -+ */ -+ if (hwp_is_hybrid && !sched_smt_active() && -+ arch_enable_hybrid_capacity_scale()) { -+ sched_clear_itmt_support(); -+ -+ hybrid_init_cpu_scaling(); -+ -+ arch_rebuild_sched_domains(); -+ } ++ hybrid_init_cpu_scaling(); + return 0; } @@ -12601,9 +12583,9 @@ index 7d92f16a430a8..c8fd0e986cecf 100644 -- 2.46.0 -From c3bff6605e4eb4d534d9530313e609d009f6e516 Mon Sep 17 00:00:00 2001 +From f9f37e11d53bf4044bb8bf7b8a74e19090fc9bda Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Sun, 25 Aug 2024 10:31:16 +0200 +Date: Sun, 1 Sep 2024 10:39:28 +0200 Subject: [PATCH 07/11] ksm Signed-off-by: Peter Jung @@ -12633,7 +12615,7 @@ Signed-off-by: Peter Jung 22 files changed, 215 insertions(+), 1 deletion(-) diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl -index 74720667fe091..e6a11f3c0a2e3 100644 +index 74720667fe09..e6a11f3c0a2e 100644 --- a/arch/alpha/kernel/syscalls/syscall.tbl +++ b/arch/alpha/kernel/syscalls/syscall.tbl @@ -502,3 +502,6 @@ @@ -12644,7 +12626,7 @@ index 74720667fe091..e6a11f3c0a2e3 100644 +574 common process_ksm_disable sys_process_ksm_disable +575 common process_ksm_status sys_process_ksm_status diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl -index 23c98203c40fe..10a3099decbe3 100644 +index 23c98203c40f..10a3099decbe 100644 --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl @@ -477,3 +477,6 @@ @@ -12655,7 +12637,7 @@ index 23c98203c40fe..10a3099decbe3 100644 +464 common process_ksm_disable sys_process_ksm_disable +465 common process_ksm_status sys_process_ksm_status diff --git a/arch/m68k/kernel/syscalls/syscall.tbl b/arch/m68k/kernel/syscalls/syscall.tbl -index 22a3cbd4c6029..12d2c7594bf0b 100644 +index 22a3cbd4c602..12d2c7594bf0 100644 --- a/arch/m68k/kernel/syscalls/syscall.tbl +++ b/arch/m68k/kernel/syscalls/syscall.tbl @@ -462,3 +462,6 @@ @@ -12666,7 +12648,7 @@ index 22a3cbd4c6029..12d2c7594bf0b 100644 +464 common process_ksm_disable sys_process_ksm_disable +465 common process_ksm_status sys_process_ksm_status diff --git a/arch/microblaze/kernel/syscalls/syscall.tbl b/arch/microblaze/kernel/syscalls/syscall.tbl -index 2b81a6bd78b29..e2a93c856eede 100644 +index 2b81a6bd78b2..e2a93c856eed 100644 --- a/arch/microblaze/kernel/syscalls/syscall.tbl +++ b/arch/microblaze/kernel/syscalls/syscall.tbl @@ -468,3 +468,6 @@ @@ -12677,7 +12659,7 @@ index 2b81a6bd78b29..e2a93c856eede 100644 +464 common process_ksm_disable sys_process_ksm_disable +465 common process_ksm_status sys_process_ksm_status diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/syscalls/syscall_n32.tbl -index 953f5b7dc723f..b921fbf56fa6d 100644 +index 953f5b7dc723..b921fbf56fa6 100644 --- a/arch/mips/kernel/syscalls/syscall_n32.tbl +++ b/arch/mips/kernel/syscalls/syscall_n32.tbl @@ -401,3 +401,6 @@ @@ -12688,7 +12670,7 @@ index 953f5b7dc723f..b921fbf56fa6d 100644 +464 n32 process_ksm_disable sys_process_ksm_disable +465 n32 process_ksm_status sys_process_ksm_status diff --git a/arch/mips/kernel/syscalls/syscall_n64.tbl b/arch/mips/kernel/syscalls/syscall_n64.tbl -index 1464c6be6eb3c..8d7f9ddd66f4b 100644 +index 1464c6be6eb3..8d7f9ddd66f4 100644 --- a/arch/mips/kernel/syscalls/syscall_n64.tbl +++ b/arch/mips/kernel/syscalls/syscall_n64.tbl @@ -377,3 +377,6 @@ @@ -12699,7 +12681,7 @@ index 1464c6be6eb3c..8d7f9ddd66f4b 100644 +464 n64 process_ksm_disable sys_process_ksm_disable +465 n64 process_ksm_status sys_process_ksm_status diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/syscalls/syscall_o32.tbl -index 2439a2491cffe..9d6142739954d 100644 +index 2439a2491cff..9d6142739954 100644 --- a/arch/mips/kernel/syscalls/syscall_o32.tbl +++ b/arch/mips/kernel/syscalls/syscall_o32.tbl @@ -450,3 +450,6 @@ @@ -12710,7 +12692,7 @@ index 2439a2491cffe..9d6142739954d 100644 +464 o32 process_ksm_disable sys_process_ksm_disable +465 o32 process_ksm_status sys_process_ksm_status diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl -index 66dc406b12e44..9d46476fd9083 100644 +index 66dc406b12e4..9d46476fd908 100644 --- a/arch/parisc/kernel/syscalls/syscall.tbl +++ b/arch/parisc/kernel/syscalls/syscall.tbl @@ -461,3 +461,6 @@ @@ -12721,7 +12703,7 @@ index 66dc406b12e44..9d46476fd9083 100644 +464 common process_ksm_disable sys_process_ksm_disable +465 common process_ksm_status sys_process_ksm_status diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl -index ebae8415dfbba..16f71bc2f6f01 100644 +index ebae8415dfbb..16f71bc2f6f0 100644 --- a/arch/powerpc/kernel/syscalls/syscall.tbl +++ b/arch/powerpc/kernel/syscalls/syscall.tbl @@ -553,3 +553,6 @@ @@ -12732,7 +12714,7 @@ index ebae8415dfbba..16f71bc2f6f01 100644 +464 common process_ksm_disable sys_process_ksm_disable +465 common process_ksm_status sys_process_ksm_status diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl -index 01071182763e9..7394bad8178e6 100644 +index 01071182763e..7394bad8178e 100644 --- a/arch/s390/kernel/syscalls/syscall.tbl +++ b/arch/s390/kernel/syscalls/syscall.tbl @@ -465,3 +465,6 @@ @@ -12743,7 +12725,7 @@ index 01071182763e9..7394bad8178e6 100644 +464 common process_ksm_disable sys_process_ksm_disable sys_process_ksm_disable +465 common process_ksm_status sys_process_ksm_status sys_process_ksm_status diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscalls/syscall.tbl -index c55fd7696d40f..b9fc31221b874 100644 +index c55fd7696d40..b9fc31221b87 100644 --- a/arch/sh/kernel/syscalls/syscall.tbl +++ b/arch/sh/kernel/syscalls/syscall.tbl @@ -466,3 +466,6 @@ @@ -12754,7 +12736,7 @@ index c55fd7696d40f..b9fc31221b874 100644 +464 common process_ksm_disable sys_process_ksm_disable +465 common process_ksm_status sys_process_ksm_status diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/syscalls/syscall.tbl -index cfdfb3707c167..0d79fd7728540 100644 +index cfdfb3707c16..0d79fd772854 100644 --- a/arch/sparc/kernel/syscalls/syscall.tbl +++ b/arch/sparc/kernel/syscalls/syscall.tbl @@ -508,3 +508,6 @@ @@ -12765,7 +12747,7 @@ index cfdfb3707c167..0d79fd7728540 100644 +464 common process_ksm_disable sys_process_ksm_disable +465 common process_ksm_status sys_process_ksm_status diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl -index 534c74b14fab5..c546a30575f1c 100644 +index 534c74b14fab..c546a30575f1 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -468,3 +468,6 @@ @@ -12776,7 +12758,7 @@ index 534c74b14fab5..c546a30575f1c 100644 +464 i386 process_ksm_disable sys_process_ksm_disable +465 i386 process_ksm_status sys_process_ksm_status diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl -index 7093ee21c0d1c..0fcd10ba8dfeb 100644 +index 7093ee21c0d1..0fcd10ba8dfe 100644 --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl @@ -386,6 +386,9 @@ @@ -12790,7 +12772,7 @@ index 7093ee21c0d1c..0fcd10ba8dfeb 100644 # # Due to a historical design error, certain syscalls are numbered differently diff --git a/arch/xtensa/kernel/syscalls/syscall.tbl b/arch/xtensa/kernel/syscalls/syscall.tbl -index 67083fc1b2f56..c1aecee4ad9b6 100644 +index 67083fc1b2f5..c1aecee4ad9b 100644 --- a/arch/xtensa/kernel/syscalls/syscall.tbl +++ b/arch/xtensa/kernel/syscalls/syscall.tbl @@ -433,3 +433,6 @@ @@ -12801,7 +12783,7 @@ index 67083fc1b2f56..c1aecee4ad9b6 100644 +464 common process_ksm_disable sys_process_ksm_disable +465 common process_ksm_status sys_process_ksm_status diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h -index 4bcf6754738d4..b3ea08e920f70 100644 +index 4bcf6754738d..b3ea08e920f7 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -818,6 +818,9 @@ asmlinkage long sys_madvise(unsigned long start, size_t len, int behavior); @@ -12815,7 +12797,7 @@ index 4bcf6754738d4..b3ea08e920f70 100644 unsigned long prot, unsigned long pgoff, unsigned long flags); diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h -index 5bf6148cac2b9..613e559ad6e0a 100644 +index 5bf6148cac2b..613e559ad6e0 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -841,8 +841,15 @@ __SYSCALL(__NR_lsm_list_modules, sys_lsm_list_modules) @@ -12836,7 +12818,7 @@ index 5bf6148cac2b9..613e559ad6e0a 100644 /* * 32 bit systems traditionally used different diff --git a/kernel/sys.c b/kernel/sys.c -index 3a2df1bd9f640..86c6dd9d8c847 100644 +index 3a2df1bd9f64..86c6dd9d8c84 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2789,6 +2789,153 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, @@ -12994,7 +12976,7 @@ index 3a2df1bd9f640..86c6dd9d8c847 100644 struct getcpu_cache __user *, unused) { diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c -index c00a86931f8c6..d82213d68522c 100644 +index c00a86931f8c..d82213d68522 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c @@ -186,6 +186,9 @@ COND_SYSCALL(mincore); @@ -13008,7 +12990,7 @@ index c00a86931f8c6..d82213d68522c 100644 COND_SYSCALL(mbind); COND_SYSCALL(get_mempolicy); diff --git a/scripts/syscall.tbl b/scripts/syscall.tbl -index 845e24eb372e7..227d9cc123651 100644 +index 845e24eb372e..227d9cc12365 100644 --- a/scripts/syscall.tbl +++ b/scripts/syscall.tbl @@ -403,3 +403,6 @@ @@ -13019,7 +13001,7 @@ index 845e24eb372e7..227d9cc123651 100644 +464 common process_ksm_disable sys_process_ksm_disable +465 common process_ksm_status sys_process_ksm_status diff --git a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl -index ebae8415dfbba..16f71bc2f6f01 100644 +index ebae8415dfbb..16f71bc2f6f0 100644 --- a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl @@ -553,3 +553,6 @@ @@ -13030,7 +13012,7 @@ index ebae8415dfbba..16f71bc2f6f01 100644 +464 common process_ksm_disable sys_process_ksm_disable +465 common process_ksm_status sys_process_ksm_status diff --git a/tools/perf/arch/s390/entry/syscalls/syscall.tbl b/tools/perf/arch/s390/entry/syscalls/syscall.tbl -index 01071182763e9..7394bad8178e6 100644 +index 01071182763e..7394bad8178e 100644 --- a/tools/perf/arch/s390/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/s390/entry/syscalls/syscall.tbl @@ -465,3 +465,6 @@ @@ -13043,9 +13025,9 @@ index 01071182763e9..7394bad8178e6 100644 -- 2.46.0 -From 5d85dd8141ae3f520576b4cc5605ce1e06e1b21e Mon Sep 17 00:00:00 2001 +From 374d5a89939e019d2d3abd22f683486c82230791 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Sun, 25 Aug 2024 10:31:45 +0200 +Date: Sun, 1 Sep 2024 10:39:38 +0200 Subject: [PATCH 08/11] ntsync Signed-off-by: Peter Jung @@ -13069,7 +13051,7 @@ Signed-off-by: Peter Jung create mode 100644 tools/testing/selftests/drivers/ntsync/ntsync.c diff --git a/Documentation/userspace-api/index.rst b/Documentation/userspace-api/index.rst -index 274cc7546efc2..9c1b15cd89ab0 100644 +index 274cc7546efc..9c1b15cd89ab 100644 --- a/Documentation/userspace-api/index.rst +++ b/Documentation/userspace-api/index.rst @@ -63,6 +63,7 @@ Everything else @@ -13082,7 +13064,7 @@ index 274cc7546efc2..9c1b15cd89ab0 100644 diff --git a/Documentation/userspace-api/ntsync.rst b/Documentation/userspace-api/ntsync.rst new file mode 100644 -index 0000000000000..767844637a7df +index 000000000000..767844637a7d --- /dev/null +++ b/Documentation/userspace-api/ntsync.rst @@ -0,0 +1,398 @@ @@ -13485,10 +13467,10 @@ index 0000000000000..767844637a7df + ``objs`` and in ``alert``. If this is attempted, the function fails + with ``EINVAL``. diff --git a/MAINTAINERS b/MAINTAINERS -index 878dcd23b3317..c3be6a6661fd1 100644 +index fe83ba7194ea..d9681e662200 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -16303,6 +16303,15 @@ T: git https://github.com/Paragon-Software-Group/linux-ntfs3.git +@@ -16306,6 +16306,15 @@ T: git https://github.com/Paragon-Software-Group/linux-ntfs3.git F: Documentation/filesystems/ntfs3.rst F: fs/ntfs3/ @@ -13505,7 +13487,7 @@ index 878dcd23b3317..c3be6a6661fd1 100644 M: Finn Thain L: linux-m68k@lists.linux-m68k.org diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig -index 41c54051347ab..bde398e12696e 100644 +index 41c54051347a..bde398e12696 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -507,7 +507,6 @@ config OPEN_DICE @@ -13517,7 +13499,7 @@ index 41c54051347ab..bde398e12696e 100644 This module provides kernel support for emulation of Windows NT synchronization primitives. It is not a hardware driver. diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c -index 3c2f743c58b00..87a24798a5c7b 100644 +index 3c2f743c58b0..87a24798a5c7 100644 --- a/drivers/misc/ntsync.c +++ b/drivers/misc/ntsync.c @@ -6,11 +6,17 @@ @@ -14626,7 +14608,7 @@ index 3c2f743c58b00..87a24798a5c7b 100644 return -ENOIOCTLCMD; } diff --git a/include/uapi/linux/ntsync.h b/include/uapi/linux/ntsync.h -index dcfa38fdc93c6..4a8095a3fc34c 100644 +index dcfa38fdc93c..4a8095a3fc34 100644 --- a/include/uapi/linux/ntsync.h +++ b/include/uapi/linux/ntsync.h @@ -16,8 +16,47 @@ struct ntsync_sem_args { @@ -14678,7 +14660,7 @@ index dcfa38fdc93c6..4a8095a3fc34c 100644 #endif diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile -index bc8fe9e8f7f20..b1296bd8eb3f7 100644 +index bc8fe9e8f7f2..b1296bd8eb3f 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -17,6 +17,7 @@ TARGETS += devices/error_logs @@ -14691,14 +14673,14 @@ index bc8fe9e8f7f20..b1296bd8eb3f7 100644 TARGETS += drivers/net/bonding diff --git a/tools/testing/selftests/drivers/ntsync/.gitignore b/tools/testing/selftests/drivers/ntsync/.gitignore new file mode 100644 -index 0000000000000..848573a3d3eaf +index 000000000000..848573a3d3ea --- /dev/null +++ b/tools/testing/selftests/drivers/ntsync/.gitignore @@ -0,0 +1 @@ +ntsync diff --git a/tools/testing/selftests/drivers/ntsync/Makefile b/tools/testing/selftests/drivers/ntsync/Makefile new file mode 100644 -index 0000000000000..dbf2b055c0b28 +index 000000000000..dbf2b055c0b2 --- /dev/null +++ b/tools/testing/selftests/drivers/ntsync/Makefile @@ -0,0 +1,7 @@ @@ -14711,14 +14693,14 @@ index 0000000000000..dbf2b055c0b28 +include ../../lib.mk diff --git a/tools/testing/selftests/drivers/ntsync/config b/tools/testing/selftests/drivers/ntsync/config new file mode 100644 -index 0000000000000..60539c826d062 +index 000000000000..60539c826d06 --- /dev/null +++ b/tools/testing/selftests/drivers/ntsync/config @@ -0,0 +1 @@ +CONFIG_WINESYNC=y diff --git a/tools/testing/selftests/drivers/ntsync/ntsync.c b/tools/testing/selftests/drivers/ntsync/ntsync.c new file mode 100644 -index 0000000000000..5fa2c9a0768c0 +index 000000000000..5fa2c9a0768c --- /dev/null +++ b/tools/testing/selftests/drivers/ntsync/ntsync.c @@ -0,0 +1,1407 @@ @@ -16132,9 +16114,9 @@ index 0000000000000..5fa2c9a0768c0 -- 2.46.0 -From eaeeec65a8f36476061473a9dc41078fda0d0a61 Mon Sep 17 00:00:00 2001 +From 99b646a36247a68818da737fd76441bdfe531213 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Sun, 25 Aug 2024 10:31:57 +0200 +Date: Sun, 1 Sep 2024 10:39:50 +0200 Subject: [PATCH 09/11] perf-per-core Signed-off-by: Peter Jung @@ -16148,7 +16130,7 @@ Signed-off-by: Peter Jung 6 files changed, 305 insertions(+), 121 deletions(-) diff --git a/Documentation/arch/x86/topology.rst b/Documentation/arch/x86/topology.rst -index 7352ab89a55ae..c12837e61bda5 100644 +index 7352ab89a55a..c12837e61bda 100644 --- a/Documentation/arch/x86/topology.rst +++ b/Documentation/arch/x86/topology.rst @@ -135,6 +135,10 @@ Thread-related topology information in the kernel: @@ -16163,7 +16145,7 @@ index 7352ab89a55ae..c12837e61bda5 100644 System topology examples diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c -index b985ca79cf97b..8206038a01ac2 100644 +index b985ca79cf97..8206038a01ac 100644 --- a/arch/x86/events/rapl.c +++ b/arch/x86/events/rapl.c @@ -39,6 +39,10 @@ @@ -16990,7 +16972,7 @@ index b985ca79cf97b..8206038a01ac2 100644 } module_exit(intel_rapl_exit); diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h -index 775acbdea1a96..86b22e7e5acb8 100644 +index 775acbdea1a9..86b22e7e5acb 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -98,6 +98,7 @@ struct cpuinfo_topology { @@ -17002,7 +16984,7 @@ index 775acbdea1a96..86b22e7e5acb8 100644 // AMD Node ID and Nodes per Package info u32 amd_node_id; diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h -index e5b203fe7956c..8c2fea7dd065f 100644 +index aef70336d624..672fccf9f845 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -137,6 +137,7 @@ extern const struct cpumask *cpu_clustergroup_mask(int cpu); @@ -17014,7 +16996,7 @@ index e5b203fe7956c..8c2fea7dd065f 100644 #define topology_core_id(cpu) (cpu_data(cpu).topo.core_id) #define topology_ppin(cpu) (cpu_data(cpu).ppin) diff --git a/arch/x86/kernel/cpu/debugfs.c b/arch/x86/kernel/cpu/debugfs.c -index 3baf3e4358347..b1eb6d7828dbd 100644 +index 3baf3e435834..b1eb6d7828db 100644 --- a/arch/x86/kernel/cpu/debugfs.c +++ b/arch/x86/kernel/cpu/debugfs.c @@ -24,6 +24,7 @@ static int cpu_debug_show(struct seq_file *m, void *p) @@ -17026,7 +17008,7 @@ index 3baf3e4358347..b1eb6d7828dbd 100644 seq_printf(m, "l2c_id: %u\n", c->topo.l2c_id); seq_printf(m, "amd_node_id: %u\n", c->topo.amd_node_id); diff --git a/arch/x86/kernel/cpu/topology_common.c b/arch/x86/kernel/cpu/topology_common.c -index 9a6069e7133c9..23722aa21e2f6 100644 +index 9a6069e7133c..23722aa21e2f 100644 --- a/arch/x86/kernel/cpu/topology_common.c +++ b/arch/x86/kernel/cpu/topology_common.c @@ -151,6 +151,7 @@ static void topo_set_ids(struct topo_scan *tscan, bool early) @@ -17040,9 +17022,9 @@ index 9a6069e7133c9..23722aa21e2f6 100644 -- 2.46.0 -From f01a577c156b79a1188b118a3d29c39ebc38df61 Mon Sep 17 00:00:00 2001 +From ca5746bedb2da2feb67f1cfed4e80ace86b3c240 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Tue, 27 Aug 2024 16:20:27 +0200 +Date: Sun, 1 Sep 2024 10:40:01 +0200 Subject: [PATCH 10/11] t2 Signed-off-by: Peter Jung @@ -17140,7 +17122,7 @@ Signed-off-by: Peter Jung diff --git a/Documentation/ABI/testing/sysfs-driver-hid-appletb-kbd b/Documentation/ABI/testing/sysfs-driver-hid-appletb-kbd new file mode 100644 -index 0000000000000..2a19584d091e4 +index 000000000000..2a19584d091e --- /dev/null +++ b/Documentation/ABI/testing/sysfs-driver-hid-appletb-kbd @@ -0,0 +1,13 @@ @@ -17158,7 +17140,7 @@ index 0000000000000..2a19584d091e4 + 3 None + == ================= diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst -index 4451ef5019361..c726a846f752e 100644 +index 4451ef501936..c726a846f752 100644 --- a/Documentation/core-api/printk-formats.rst +++ b/Documentation/core-api/printk-formats.rst @@ -632,6 +632,38 @@ Examples:: @@ -17201,10 +17183,10 @@ index 4451ef5019361..c726a846f752e 100644 ---- diff --git a/MAINTAINERS b/MAINTAINERS -index c3be6a6661fd1..f1a4df03b2bfa 100644 +index d9681e662200..67ef02a08b8b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -6891,6 +6891,12 @@ S: Supported +@@ -6894,6 +6894,12 @@ S: Supported T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/sun4i/sun8i* @@ -17218,7 +17200,7 @@ index c3be6a6661fd1..f1a4df03b2bfa 100644 S: Orphan T: git https://gitlab.freedesktop.org/drm/misc/kernel.git diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -index cddc33970d750..30a18ebd05baf 100644 +index cddc33970d75..30a18ebd05ba 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -2236,6 +2236,9 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, @@ -17232,7 +17214,7 @@ index cddc33970d750..30a18ebd05baf 100644 for (i = 0; i < ARRAY_SIZE(amdgpu_unsupported_pciidlist); i++) { if (amdgpu_unsupported_pciidlist[i] == pdev->device) diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c -index b1be458ed4dda..28c0e76a1e889 100644 +index b1be458ed4dd..28c0e76a1e88 100644 --- a/drivers/gpu/drm/drm_format_helper.c +++ b/drivers/gpu/drm/drm_format_helper.c @@ -702,6 +702,57 @@ void drm_fb_xrgb8888_to_rgb888(struct iosys_map *dst, const unsigned int *dst_pi @@ -17304,7 +17286,7 @@ index b1be458ed4dda..28c0e76a1e889 100644 drm_fb_xrgb8888_to_argb8888(dst, dst_pitch, src, fb, clip, state); return 0; diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c -index a07aca96e5517..210e20b03aabe 100644 +index a07aca96e551..210e20b03aab 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4640,6 +4640,7 @@ intel_ddi_init_hdmi_connector(struct intel_digital_port *dig_port) @@ -17326,7 +17308,7 @@ index a07aca96e5517..210e20b03aabe 100644 * supported configuration */ diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c -index 49a1ac4f54919..c8c10a6104c4e 100644 +index 49a1ac4f5491..c8c10a6104c4 100644 --- a/drivers/gpu/drm/i915/display/intel_fbdev.c +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c @@ -199,10 +199,10 @@ static int intelfb_create(struct drm_fb_helper *helper, @@ -17344,7 +17326,7 @@ index 49a1ac4f54919..c8c10a6104c4e 100644 fb->base.width, fb->base.height, sizes->fb_width, sizes->fb_height); diff --git a/drivers/gpu/drm/i915/display/intel_quirks.c b/drivers/gpu/drm/i915/display/intel_quirks.c -index 14d5fefc9c5b2..727639b8f6a65 100644 +index 14d5fefc9c5b..727639b8f6a6 100644 --- a/drivers/gpu/drm/i915/display/intel_quirks.c +++ b/drivers/gpu/drm/i915/display/intel_quirks.c @@ -59,6 +59,18 @@ static void quirk_increase_ddi_disabled_time(struct intel_display *display) @@ -17377,7 +17359,7 @@ index 14d5fefc9c5b2..727639b8f6a65 100644 void intel_init_quirks(struct intel_display *display) diff --git a/drivers/gpu/drm/i915/display/intel_quirks.h b/drivers/gpu/drm/i915/display/intel_quirks.h -index 151c8f4ae5760..46e7feba88f4d 100644 +index 151c8f4ae576..46e7feba88f4 100644 --- a/drivers/gpu/drm/i915/display/intel_quirks.h +++ b/drivers/gpu/drm/i915/display/intel_quirks.h @@ -17,6 +17,7 @@ enum intel_quirk_id { @@ -17389,7 +17371,7 @@ index 151c8f4ae5760..46e7feba88f4d 100644 void intel_init_quirks(struct intel_display *display); diff --git a/drivers/gpu/drm/tests/drm_format_helper_test.c b/drivers/gpu/drm/tests/drm_format_helper_test.c -index 08992636ec05f..35cd3405d0450 100644 +index 08992636ec05..35cd3405d045 100644 --- a/drivers/gpu/drm/tests/drm_format_helper_test.c +++ b/drivers/gpu/drm/tests/drm_format_helper_test.c @@ -60,6 +60,11 @@ struct convert_to_rgb888_result { @@ -17530,7 +17512,7 @@ index 08992636ec05f..35cd3405d0450 100644 KUNIT_CASE_PARAM(drm_test_fb_xrgb8888_to_xrgb2101010, convert_xrgb8888_gen_params), KUNIT_CASE_PARAM(drm_test_fb_xrgb8888_to_argb2101010, convert_xrgb8888_gen_params), diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig -index f6889f649bc18..559a97bce12c6 100644 +index f6889f649bc1..559a97bce12c 100644 --- a/drivers/gpu/drm/tiny/Kconfig +++ b/drivers/gpu/drm/tiny/Kconfig @@ -1,5 +1,17 @@ @@ -17552,7 +17534,7 @@ index f6889f649bc18..559a97bce12c6 100644 tristate "ARC PGU" depends on DRM && OF diff --git a/drivers/gpu/drm/tiny/Makefile b/drivers/gpu/drm/tiny/Makefile -index 76dde89a044b7..9a1b412e764ae 100644 +index 76dde89a044b..9a1b412e764a 100644 --- a/drivers/gpu/drm/tiny/Makefile +++ b/drivers/gpu/drm/tiny/Makefile @@ -1,5 +1,6 @@ @@ -17564,7 +17546,7 @@ index 76dde89a044b7..9a1b412e764ae 100644 obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus.o diff --git a/drivers/gpu/drm/tiny/appletbdrm.c b/drivers/gpu/drm/tiny/appletbdrm.c new file mode 100644 -index 0000000000000..b9440ce0064e0 +index 000000000000..b9440ce0064e --- /dev/null +++ b/drivers/gpu/drm/tiny/appletbdrm.c @@ -0,0 +1,624 @@ @@ -18193,7 +18175,7 @@ index 0000000000000..b9440ce0064e0 +MODULE_DESCRIPTION("Apple Touch Bar DRM Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c -index 365e6ddbe90fe..cf357cd3389db 100644 +index 365e6ddbe90f..cf357cd3389d 100644 --- a/drivers/gpu/vga/vga_switcheroo.c +++ b/drivers/gpu/vga/vga_switcheroo.c @@ -438,12 +438,7 @@ find_active_client(struct list_head *head) @@ -18211,7 +18193,7 @@ index 365e6ddbe90fe..cf357cd3389db 100644 } diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig -index 08446c89eff6e..35ef5d4ef068e 100644 +index 08446c89eff6..35ef5d4ef068 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -148,6 +148,27 @@ config HID_APPLEIR @@ -18251,7 +18233,7 @@ index 08446c89eff6e..35ef5d4ef068e 100644 - Cando dual touch panels - Chunghwa panels diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile -index e40f1ddebbb71..d903c9a2629d9 100644 +index e40f1ddebbb7..d903c9a2629d 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -29,6 +29,8 @@ obj-$(CONFIG_HID_ALPS) += hid-alps.o @@ -18265,7 +18247,7 @@ index e40f1ddebbb71..d903c9a2629d9 100644 obj-$(CONFIG_HID_AUREAL) += hid-aureal.o diff --git a/drivers/hid/hid-appletb-bl.c b/drivers/hid/hid-appletb-bl.c new file mode 100644 -index 0000000000000..819157686e59d +index 000000000000..819157686e59 --- /dev/null +++ b/drivers/hid/hid-appletb-bl.c @@ -0,0 +1,207 @@ @@ -18478,7 +18460,7 @@ index 0000000000000..819157686e59d +MODULE_LICENSE("GPL"); diff --git a/drivers/hid/hid-appletb-kbd.c b/drivers/hid/hid-appletb-kbd.c new file mode 100644 -index 0000000000000..c26b7a19a5e4a +index 000000000000..c26b7a19a5e4 --- /dev/null +++ b/drivers/hid/hid-appletb-kbd.c @@ -0,0 +1,501 @@ @@ -18984,7 +18966,7 @@ index 0000000000000..c26b7a19a5e4a +MODULE_DESCRIPTION("MacBookPro Touch Bar Keyboard Mode Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c -index 988d0acbdf04d..caeba5487b69b 100644 +index 988d0acbdf04..caeba5487b69 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1912,6 +1912,31 @@ int hid_set_field(struct hid_field *field, unsigned offset, __s32 value) @@ -19020,7 +19002,7 @@ index 988d0acbdf04d..caeba5487b69b 100644 const u8 *data) { diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c -index 6e4ebc349e452..4e79fafeeafa8 100644 +index 6e4ebc349e45..4e79fafeeafa 100644 --- a/drivers/hid/hid-google-hammer.c +++ b/drivers/hid/hid-google-hammer.c @@ -418,38 +418,15 @@ static int hammer_event(struct hid_device *hid, struct hid_field *field, @@ -19065,7 +19047,7 @@ index 6e4ebc349e452..4e79fafeeafa8 100644 } diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c -index 99812c0f830b5..bb845947585f4 100644 +index 99812c0f830b..bb845947585f 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -72,6 +72,7 @@ MODULE_LICENSE("GPL"); @@ -19239,7 +19221,7 @@ index 99812c0f830b5..bb845947585f4 100644 { .driver_data = MT_CLS_GOOGLE, HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE, diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index e0bbf0c6345d6..7c576d6540fed 100644 +index e0bbf0c6345d..7c576d6540fe 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -328,8 +328,6 @@ static const struct hid_device_id hid_have_special_driver[] = { @@ -19265,7 +19247,7 @@ index e0bbf0c6345d6..7c576d6540fed 100644 { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD) }, { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD) }, diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c -index fc6d6a9053cee..698f44794453f 100644 +index fc6d6a9053ce..698f44794453 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c @@ -6,6 +6,7 @@ @@ -21251,7 +21233,7 @@ index fc6d6a9053cee..698f44794453f 100644 MODULE_LICENSE("GPL v2"); MODULE_DEVICE_TABLE(dmi, applesmc_whitelist); diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c -index 10a03a5669058..8c3ccd98ba937 100644 +index 10a03a566905..8c3ccd98ba93 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c @@ -83,6 +83,24 @@ @@ -21414,7 +21396,7 @@ index 10a03a5669058..8c3ccd98ba937 100644 }; diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c -index 78748e8d2dbae..2b2b558cebe68 100644 +index 78748e8d2dba..2b2b558cebe6 100644 --- a/drivers/pci/vgaarb.c +++ b/drivers/pci/vgaarb.c @@ -143,6 +143,7 @@ void vga_set_default_device(struct pci_dev *pdev) @@ -21426,7 +21408,7 @@ index 78748e8d2dbae..2b2b558cebe68 100644 /** * vga_remove_vgacon - deactivate VGA console diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c -index 1417e230edbd8..e69785af8e1d7 100644 +index 1417e230edbd..e69785af8e1d 100644 --- a/drivers/platform/x86/apple-gmux.c +++ b/drivers/platform/x86/apple-gmux.c @@ -21,6 +21,7 @@ @@ -21469,7 +21451,7 @@ index 1417e230edbd8..e69785af8e1d7 100644 * Retina MacBook Pros cannot switch the panel's AUX separately * and need eDP pre-calibration. They are distinguishable from diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig -index db4a392841b16..580df4ce4f9fa 100644 +index db4a392841b1..580df4ce4f9f 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -66,4 +66,6 @@ source "drivers/staging/fieldbus/Kconfig" @@ -21480,7 +21462,7 @@ index db4a392841b16..580df4ce4f9fa 100644 + endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile -index 5390879b5d1b7..528be2d3b5462 100644 +index 5390879b5d1b..528be2d3b546 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -22,3 +22,4 @@ obj-$(CONFIG_GREYBUS) += greybus/ @@ -21490,7 +21472,7 @@ index 5390879b5d1b7..528be2d3b5462 100644 +obj-$(CONFIG_APPLE_BCE) += apple-bce/ diff --git a/drivers/staging/apple-bce/Kconfig b/drivers/staging/apple-bce/Kconfig new file mode 100644 -index 0000000000000..fe92bc441e89a +index 000000000000..fe92bc441e89 --- /dev/null +++ b/drivers/staging/apple-bce/Kconfig @@ -0,0 +1,18 @@ @@ -21514,7 +21496,7 @@ index 0000000000000..fe92bc441e89a + If "M" is selected, the module will be called apple-bce.' diff --git a/drivers/staging/apple-bce/Makefile b/drivers/staging/apple-bce/Makefile new file mode 100644 -index 0000000000000..8cfbd3f64af69 +index 000000000000..8cfbd3f64af6 --- /dev/null +++ b/drivers/staging/apple-bce/Makefile @@ -0,0 +1,28 @@ @@ -21548,7 +21530,7 @@ index 0000000000000..8cfbd3f64af69 + $(MAKE) -C $(KDIR) M=$(PWD) modules_install diff --git a/drivers/staging/apple-bce/apple_bce.c b/drivers/staging/apple-bce/apple_bce.c new file mode 100644 -index 0000000000000..4fd2415d70288 +index 000000000000..4fd2415d7028 --- /dev/null +++ b/drivers/staging/apple-bce/apple_bce.c @@ -0,0 +1,445 @@ @@ -21999,7 +21981,7 @@ index 0000000000000..4fd2415d70288 +module_exit(apple_bce_module_exit); diff --git a/drivers/staging/apple-bce/apple_bce.h b/drivers/staging/apple-bce/apple_bce.h new file mode 100644 -index 0000000000000..f13ab8d5742e3 +index 000000000000..f13ab8d5742e --- /dev/null +++ b/drivers/staging/apple-bce/apple_bce.h @@ -0,0 +1,38 @@ @@ -22044,7 +22026,7 @@ index 0000000000000..f13ab8d5742e3 \ No newline at end of file diff --git a/drivers/staging/apple-bce/audio/audio.c b/drivers/staging/apple-bce/audio/audio.c new file mode 100644 -index 0000000000000..bd16ddd16c1da +index 000000000000..bd16ddd16c1d --- /dev/null +++ b/drivers/staging/apple-bce/audio/audio.c @@ -0,0 +1,711 @@ @@ -22761,7 +22743,7 @@ index 0000000000000..bd16ddd16c1da +MODULE_PARM_DESC(id, "ID string for Apple Internal Audio soundcard."); diff --git a/drivers/staging/apple-bce/audio/audio.h b/drivers/staging/apple-bce/audio/audio.h new file mode 100644 -index 0000000000000..004bc1e22ea4a +index 000000000000..004bc1e22ea4 --- /dev/null +++ b/drivers/staging/apple-bce/audio/audio.h @@ -0,0 +1,125 @@ @@ -22892,7 +22874,7 @@ index 0000000000000..004bc1e22ea4a +#endif //AAUDIO_H diff --git a/drivers/staging/apple-bce/audio/description.h b/drivers/staging/apple-bce/audio/description.h new file mode 100644 -index 0000000000000..dfef3ab68f279 +index 000000000000..dfef3ab68f27 --- /dev/null +++ b/drivers/staging/apple-bce/audio/description.h @@ -0,0 +1,42 @@ @@ -22940,7 +22922,7 @@ index 0000000000000..dfef3ab68f279 +#endif //AAUDIO_DESCRIPTION_H diff --git a/drivers/staging/apple-bce/audio/pcm.c b/drivers/staging/apple-bce/audio/pcm.c new file mode 100644 -index 0000000000000..1026e10a9ac58 +index 000000000000..1026e10a9ac5 --- /dev/null +++ b/drivers/staging/apple-bce/audio/pcm.c @@ -0,0 +1,308 @@ @@ -23254,7 +23236,7 @@ index 0000000000000..1026e10a9ac58 +} diff --git a/drivers/staging/apple-bce/audio/pcm.h b/drivers/staging/apple-bce/audio/pcm.h new file mode 100644 -index 0000000000000..ea5f35fbe4085 +index 000000000000..ea5f35fbe408 --- /dev/null +++ b/drivers/staging/apple-bce/audio/pcm.h @@ -0,0 +1,16 @@ @@ -23276,7 +23258,7 @@ index 0000000000000..ea5f35fbe4085 +#endif //AAUDIO_PCM_H diff --git a/drivers/staging/apple-bce/audio/protocol.c b/drivers/staging/apple-bce/audio/protocol.c new file mode 100644 -index 0000000000000..2314813aeeadc +index 000000000000..2314813aeead --- /dev/null +++ b/drivers/staging/apple-bce/audio/protocol.c @@ -0,0 +1,347 @@ @@ -23630,7 +23612,7 @@ index 0000000000000..2314813aeeadc \ No newline at end of file diff --git a/drivers/staging/apple-bce/audio/protocol.h b/drivers/staging/apple-bce/audio/protocol.h new file mode 100644 -index 0000000000000..3427486f3f570 +index 000000000000..3427486f3f57 --- /dev/null +++ b/drivers/staging/apple-bce/audio/protocol.h @@ -0,0 +1,147 @@ @@ -23783,7 +23765,7 @@ index 0000000000000..3427486f3f570 +#endif //AAUDIO_PROTOCOL_H diff --git a/drivers/staging/apple-bce/audio/protocol_bce.c b/drivers/staging/apple-bce/audio/protocol_bce.c new file mode 100644 -index 0000000000000..28f2dfd44d676 +index 000000000000..28f2dfd44d67 --- /dev/null +++ b/drivers/staging/apple-bce/audio/protocol_bce.c @@ -0,0 +1,226 @@ @@ -24015,7 +23997,7 @@ index 0000000000000..28f2dfd44d676 +} diff --git a/drivers/staging/apple-bce/audio/protocol_bce.h b/drivers/staging/apple-bce/audio/protocol_bce.h new file mode 100644 -index 0000000000000..14d26c05ddf9d +index 000000000000..14d26c05ddf9 --- /dev/null +++ b/drivers/staging/apple-bce/audio/protocol_bce.h @@ -0,0 +1,72 @@ @@ -24093,7 +24075,7 @@ index 0000000000000..14d26c05ddf9d +#endif //AAUDIO_PROTOCOL_BCE_H diff --git a/drivers/staging/apple-bce/mailbox.c b/drivers/staging/apple-bce/mailbox.c new file mode 100644 -index 0000000000000..e24bd35215c00 +index 000000000000..e24bd35215c0 --- /dev/null +++ b/drivers/staging/apple-bce/mailbox.c @@ -0,0 +1,151 @@ @@ -24251,7 +24233,7 @@ index 0000000000000..e24bd35215c00 \ No newline at end of file diff --git a/drivers/staging/apple-bce/mailbox.h b/drivers/staging/apple-bce/mailbox.h new file mode 100644 -index 0000000000000..f3323f95ba51d +index 000000000000..f3323f95ba51 --- /dev/null +++ b/drivers/staging/apple-bce/mailbox.h @@ -0,0 +1,53 @@ @@ -24310,7 +24292,7 @@ index 0000000000000..f3323f95ba51d +#endif //BCEDRIVER_MAILBOX_H diff --git a/drivers/staging/apple-bce/queue.c b/drivers/staging/apple-bce/queue.c new file mode 100644 -index 0000000000000..bc9cd3bc6f0ca +index 000000000000..bc9cd3bc6f0c --- /dev/null +++ b/drivers/staging/apple-bce/queue.c @@ -0,0 +1,390 @@ @@ -24707,7 +24689,7 @@ index 0000000000000..bc9cd3bc6f0ca \ No newline at end of file diff --git a/drivers/staging/apple-bce/queue.h b/drivers/staging/apple-bce/queue.h new file mode 100644 -index 0000000000000..8368ac5dfca82 +index 000000000000..8368ac5dfca8 --- /dev/null +++ b/drivers/staging/apple-bce/queue.h @@ -0,0 +1,177 @@ @@ -24890,7 +24872,7 @@ index 0000000000000..8368ac5dfca82 +#endif //BCEDRIVER_MAILBOX_H diff --git a/drivers/staging/apple-bce/queue_dma.c b/drivers/staging/apple-bce/queue_dma.c new file mode 100644 -index 0000000000000..b236613285c0f +index 000000000000..b236613285c0 --- /dev/null +++ b/drivers/staging/apple-bce/queue_dma.c @@ -0,0 +1,220 @@ @@ -25117,7 +25099,7 @@ index 0000000000000..b236613285c0f \ No newline at end of file diff --git a/drivers/staging/apple-bce/queue_dma.h b/drivers/staging/apple-bce/queue_dma.h new file mode 100644 -index 0000000000000..f8a57e50e7a30 +index 000000000000..f8a57e50e7a3 --- /dev/null +++ b/drivers/staging/apple-bce/queue_dma.h @@ -0,0 +1,50 @@ @@ -25173,7 +25155,7 @@ index 0000000000000..f8a57e50e7a30 +#endif //BCE_QUEUE_DMA_H diff --git a/drivers/staging/apple-bce/vhci/command.h b/drivers/staging/apple-bce/vhci/command.h new file mode 100644 -index 0000000000000..26619e0bccfa1 +index 000000000000..26619e0bccfa --- /dev/null +++ b/drivers/staging/apple-bce/vhci/command.h @@ -0,0 +1,204 @@ @@ -25383,7 +25365,7 @@ index 0000000000000..26619e0bccfa1 +#endif //BCE_VHCI_COMMAND_H diff --git a/drivers/staging/apple-bce/vhci/queue.c b/drivers/staging/apple-bce/vhci/queue.c new file mode 100644 -index 0000000000000..7b0b5027157ba +index 000000000000..7b0b5027157b --- /dev/null +++ b/drivers/staging/apple-bce/vhci/queue.c @@ -0,0 +1,268 @@ @@ -25657,7 +25639,7 @@ index 0000000000000..7b0b5027157ba +} diff --git a/drivers/staging/apple-bce/vhci/queue.h b/drivers/staging/apple-bce/vhci/queue.h new file mode 100644 -index 0000000000000..adb705b6ba1d2 +index 000000000000..adb705b6ba1d --- /dev/null +++ b/drivers/staging/apple-bce/vhci/queue.h @@ -0,0 +1,76 @@ @@ -25739,7 +25721,7 @@ index 0000000000000..adb705b6ba1d2 +#endif //BCE_VHCI_QUEUE_H diff --git a/drivers/staging/apple-bce/vhci/transfer.c b/drivers/staging/apple-bce/vhci/transfer.c new file mode 100644 -index 0000000000000..8226363d69c81 +index 000000000000..8226363d69c8 --- /dev/null +++ b/drivers/staging/apple-bce/vhci/transfer.c @@ -0,0 +1,661 @@ @@ -26406,7 +26388,7 @@ index 0000000000000..8226363d69c81 +} diff --git a/drivers/staging/apple-bce/vhci/transfer.h b/drivers/staging/apple-bce/vhci/transfer.h new file mode 100644 -index 0000000000000..89ecad6bcf8f6 +index 000000000000..89ecad6bcf8f --- /dev/null +++ b/drivers/staging/apple-bce/vhci/transfer.h @@ -0,0 +1,73 @@ @@ -26485,7 +26467,7 @@ index 0000000000000..89ecad6bcf8f6 +#endif //BCEDRIVER_TRANSFER_H diff --git a/drivers/staging/apple-bce/vhci/vhci.c b/drivers/staging/apple-bce/vhci/vhci.c new file mode 100644 -index 0000000000000..eb26f55000d84 +index 000000000000..eb26f55000d8 --- /dev/null +++ b/drivers/staging/apple-bce/vhci/vhci.c @@ -0,0 +1,759 @@ @@ -27250,7 +27232,7 @@ index 0000000000000..eb26f55000d84 +MODULE_PARM_DESC(vhci_port_mask, "Specifies which VHCI ports are enabled"); diff --git a/drivers/staging/apple-bce/vhci/vhci.h b/drivers/staging/apple-bce/vhci/vhci.h new file mode 100644 -index 0000000000000..6c2e22622f4c1 +index 000000000000..6c2e22622f4c --- /dev/null +++ b/drivers/staging/apple-bce/vhci/vhci.h @@ -0,0 +1,52 @@ @@ -27307,7 +27289,7 @@ index 0000000000000..6c2e22622f4c1 + +#endif //BCE_VHCI_H diff --git a/include/drm/drm_format_helper.h b/include/drm/drm_format_helper.h -index 428d81afe2151..aa1604d92c1a7 100644 +index 428d81afe215..aa1604d92c1a 100644 --- a/include/drm/drm_format_helper.h +++ b/include/drm/drm_format_helper.h @@ -96,6 +96,9 @@ void drm_fb_xrgb8888_to_rgba5551(struct iosys_map *dst, const unsigned int *dst_ @@ -27321,7 +27303,7 @@ index 428d81afe2151..aa1604d92c1a7 100644 const struct iosys_map *src, const struct drm_framebuffer *fb, const struct drm_rect *clip, struct drm_format_conv_state *state); diff --git a/include/linux/hid.h b/include/linux/hid.h -index 1533c9dcd3a67..2deff79f39a15 100644 +index 1533c9dcd3a6..2deff79f39a1 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -940,6 +940,8 @@ extern void hidinput_report_event(struct hid_device *hid, struct hid_report *rep @@ -27334,7 +27316,7 @@ index 1533c9dcd3a67..2deff79f39a15 100644 int hid_input_report(struct hid_device *hid, enum hid_report_type type, u8 *data, u32 size, int interrupt); diff --git a/lib/test_printf.c b/lib/test_printf.c -index 965cb6f285272..db99014b8c135 100644 +index 965cb6f28527..db99014b8c13 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -745,18 +745,26 @@ static void __init fwnode_pointer(void) @@ -27371,7 +27353,7 @@ index 965cb6f285272..db99014b8c135 100644 static void __init diff --git a/lib/vsprintf.c b/lib/vsprintf.c -index 2d71b11159161..5274e3c881de8 100644 +index 2d71b1115916..5274e3c881de 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1760,27 +1760,50 @@ char *fourcc_string(char *buf, char *end, const u32 *fourcc, @@ -27440,10 +27422,10 @@ index 2d71b11159161..5274e3c881de8 100644 * a certain separator (' ' by default): * C colon diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl -index 39032224d504f..00623368c66f6 100755 +index 4427572b2477..b60c99d61882 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl -@@ -6927,7 +6927,7 @@ sub process { +@@ -6917,7 +6917,7 @@ sub process { ($extension eq "f" && defined $qualifier && $qualifier !~ /^w/) || ($extension eq "4" && @@ -27455,9 +27437,9 @@ index 39032224d504f..00623368c66f6 100755 -- 2.46.0 -From a6e608f2e71f0def448a07ad58cf2518626aa9ad Mon Sep 17 00:00:00 2001 +From dec2bed6cdefc145bc1bc816f59c2bb833070742 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Sun, 25 Aug 2024 10:32:40 +0200 +Date: Sun, 1 Sep 2024 10:40:12 +0200 Subject: [PATCH 11/11] zstd Signed-off-by: Peter Jung @@ -27525,7 +27507,7 @@ Signed-off-by: Peter Jung create mode 100644 lib/zstd/common/bits.h diff --git a/include/linux/zstd.h b/include/linux/zstd.h -index 113408eef6ece..f109d49f43f80 100644 +index 113408eef6ec..f109d49f43f8 100644 --- a/include/linux/zstd.h +++ b/include/linux/zstd.h @@ -1,6 +1,6 @@ @@ -27537,7 +27519,7 @@ index 113408eef6ece..f109d49f43f80 100644 * * This source code is licensed under both the BSD-style license (found in the diff --git a/include/linux/zstd_errors.h b/include/linux/zstd_errors.h -index 58b6dd45a969f..6d5cf55f0bf3e 100644 +index 58b6dd45a969..6d5cf55f0bf3 100644 --- a/include/linux/zstd_errors.h +++ b/include/linux/zstd_errors.h @@ -1,5 +1,6 @@ @@ -27603,7 +27585,7 @@ index 58b6dd45a969f..6d5cf55f0bf3e 100644 } ZSTD_ErrorCode; diff --git a/include/linux/zstd_lib.h b/include/linux/zstd_lib.h -index 79d55465d5c1d..6320fedcf8a43 100644 +index 79d55465d5c1..6320fedcf8a4 100644 --- a/include/linux/zstd_lib.h +++ b/include/linux/zstd_lib.h @@ -1,5 +1,6 @@ @@ -29084,7 +29066,7 @@ index 79d55465d5c1d..6320fedcf8a43 100644 #endif /* ZSTD_H_ZSTD_STATIC_LINKING_ONLY */ diff --git a/lib/zstd/Makefile b/lib/zstd/Makefile -index 20f08c644b71a..464c410b2768c 100644 +index 20f08c644b71..464c410b2768 100644 --- a/lib/zstd/Makefile +++ b/lib/zstd/Makefile @@ -1,6 +1,6 @@ @@ -29097,7 +29079,7 @@ index 20f08c644b71a..464c410b2768c 100644 # This source code is licensed under both the BSD-style license (found in the diff --git a/lib/zstd/common/allocations.h b/lib/zstd/common/allocations.h new file mode 100644 -index 0000000000000..16c3d08e8d1a6 +index 000000000000..16c3d08e8d1a --- /dev/null +++ b/lib/zstd/common/allocations.h @@ -0,0 +1,56 @@ @@ -29159,7 +29141,7 @@ index 0000000000000..16c3d08e8d1a6 +#endif /* ZSTD_ALLOCATIONS_H */ diff --git a/lib/zstd/common/bits.h b/lib/zstd/common/bits.h new file mode 100644 -index 0000000000000..aa3487ec4b6a7 +index 000000000000..aa3487ec4b6a --- /dev/null +++ b/lib/zstd/common/bits.h @@ -0,0 +1,149 @@ @@ -29313,7 +29295,7 @@ index 0000000000000..aa3487ec4b6a7 + +#endif /* ZSTD_BITS_H */ diff --git a/lib/zstd/common/bitstream.h b/lib/zstd/common/bitstream.h -index feef3a1b1d600..6a13f1f0f1e84 100644 +index feef3a1b1d60..6a13f1f0f1e8 100644 --- a/lib/zstd/common/bitstream.h +++ b/lib/zstd/common/bitstream.h @@ -1,7 +1,8 @@ @@ -29602,7 +29584,7 @@ index feef3a1b1d600..6a13f1f0f1e84 100644 BIT_DStream_status result = BIT_DStream_unfinished; if (bitD->ptr - nbBytes < bitD->start) { diff --git a/lib/zstd/common/compiler.h b/lib/zstd/common/compiler.h -index c42d39faf9bd8..508ee25537bb8 100644 +index c42d39faf9bd..508ee25537bb 100644 --- a/lib/zstd/common/compiler.h +++ b/lib/zstd/common/compiler.h @@ -1,5 +1,6 @@ @@ -29800,7 +29782,7 @@ index c42d39faf9bd8..508ee25537bb8 100644 #endif /* ZSTD_COMPILER_H */ diff --git a/lib/zstd/common/cpu.h b/lib/zstd/common/cpu.h -index 0db7b42407eea..d8319a2bef4ce 100644 +index 0db7b42407ee..d8319a2bef4c 100644 --- a/lib/zstd/common/cpu.h +++ b/lib/zstd/common/cpu.h @@ -1,5 +1,6 @@ @@ -29812,7 +29794,7 @@ index 0db7b42407eea..d8319a2bef4ce 100644 * * This source code is licensed under both the BSD-style license (found in the diff --git a/lib/zstd/common/debug.c b/lib/zstd/common/debug.c -index bb863c9ea6164..8eb6aa9a3b205 100644 +index bb863c9ea616..8eb6aa9a3b20 100644 --- a/lib/zstd/common/debug.c +++ b/lib/zstd/common/debug.c @@ -1,7 +1,8 @@ @@ -29837,7 +29819,7 @@ index bb863c9ea6164..8eb6aa9a3b205 100644 int g_debuglevel = DEBUGLEVEL; +#endif diff --git a/lib/zstd/common/debug.h b/lib/zstd/common/debug.h -index 6dd88d1fbd02c..226ba3c57ec34 100644 +index 6dd88d1fbd02..226ba3c57ec3 100644 --- a/lib/zstd/common/debug.h +++ b/lib/zstd/common/debug.h @@ -1,7 +1,8 @@ @@ -29890,7 +29872,7 @@ index 6dd88d1fbd02c..226ba3c57ec34 100644 diff --git a/lib/zstd/common/entropy_common.c b/lib/zstd/common/entropy_common.c -index fef67056f0524..6cdd82233fb59 100644 +index fef67056f052..6cdd82233fb5 100644 --- a/lib/zstd/common/entropy_common.c +++ b/lib/zstd/common/entropy_common.c @@ -1,6 +1,7 @@ @@ -30008,7 +29990,7 @@ index fef67056f0524..6cdd82233fb59 100644 return HUF_readStats_body_default(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, workSpace, wkspSize); } diff --git a/lib/zstd/common/error_private.c b/lib/zstd/common/error_private.c -index 6d1135f8c3733..a4062d30d1703 100644 +index 6d1135f8c373..a4062d30d170 100644 --- a/lib/zstd/common/error_private.c +++ b/lib/zstd/common/error_private.c @@ -1,5 +1,6 @@ @@ -30056,7 +30038,7 @@ index 6d1135f8c3733..a4062d30d1703 100644 default: return notErrorCode; } diff --git a/lib/zstd/common/error_private.h b/lib/zstd/common/error_private.h -index ca5101e542faa..0410ca415b547 100644 +index ca5101e542fa..0410ca415b54 100644 --- a/lib/zstd/common/error_private.h +++ b/lib/zstd/common/error_private.h @@ -1,5 +1,6 @@ @@ -30182,7 +30164,7 @@ index ca5101e542faa..0410ca415b547 100644 #endif /* ERROR_H_MODULE */ diff --git a/lib/zstd/common/fse.h b/lib/zstd/common/fse.h -index 4507043b2287c..2185a578617de 100644 +index 4507043b2287..2185a578617d 100644 --- a/lib/zstd/common/fse.h +++ b/lib/zstd/common/fse.h @@ -1,7 +1,8 @@ @@ -30357,7 +30339,7 @@ index 4507043b2287c..2185a578617de 100644 * note 2 : if freq[symbolValue]==0, @return a fake cost of tableLog+1 bits */ MEM_STATIC U32 FSE_getMaxNbBits(const void* symbolTTPtr, U32 symbolValue) diff --git a/lib/zstd/common/fse_decompress.c b/lib/zstd/common/fse_decompress.c -index 8dcb8ca39767c..3a17e84f27bfc 100644 +index 8dcb8ca39767..3a17e84f27bf 100644 --- a/lib/zstd/common/fse_decompress.c +++ b/lib/zstd/common/fse_decompress.c @@ -1,6 +1,7 @@ @@ -30591,7 +30573,7 @@ index 8dcb8ca39767c..3a17e84f27bfc 100644 - #endif /* FSE_COMMONDEFS_ONLY */ diff --git a/lib/zstd/common/huf.h b/lib/zstd/common/huf.h -index 5042ff8703087..57462466e188c 100644 +index 5042ff870308..57462466e188 100644 --- a/lib/zstd/common/huf.h +++ b/lib/zstd/common/huf.h @@ -1,7 +1,8 @@ @@ -30942,7 +30924,7 @@ index 5042ff8703087..57462466e188c 100644 +#endif /* HUF_H_298734234 */ diff --git a/lib/zstd/common/mem.h b/lib/zstd/common/mem.h -index 1d9cc03924ca9..2e91e7780c1fd 100644 +index 1d9cc03924ca..2e91e7780c1f 100644 --- a/lib/zstd/common/mem.h +++ b/lib/zstd/common/mem.h @@ -1,6 +1,6 @@ @@ -30962,7 +30944,7 @@ index 1d9cc03924ca9..2e91e7780c1fd 100644 /*-************************************************************** diff --git a/lib/zstd/common/portability_macros.h b/lib/zstd/common/portability_macros.h -index 0e3b2c0a527db..f08638cced6c3 100644 +index 0e3b2c0a527d..f08638cced6c 100644 --- a/lib/zstd/common/portability_macros.h +++ b/lib/zstd/common/portability_macros.h @@ -1,5 +1,6 @@ @@ -31025,7 +31007,7 @@ index 0e3b2c0a527db..f08638cced6c3 100644 + #endif /* ZSTD_PORTABILITY_MACROS_H */ diff --git a/lib/zstd/common/zstd_common.c b/lib/zstd/common/zstd_common.c -index 3d7e35b309b5d..44b95b25344a1 100644 +index 3d7e35b309b5..44b95b25344a 100644 --- a/lib/zstd/common/zstd_common.c +++ b/lib/zstd/common/zstd_common.c @@ -1,5 +1,6 @@ @@ -31083,7 +31065,7 @@ index 3d7e35b309b5d..44b95b25344a1 100644 - } -} diff --git a/lib/zstd/common/zstd_deps.h b/lib/zstd/common/zstd_deps.h -index 2c34e8a33a1c1..f931f7d0e2947 100644 +index 2c34e8a33a1c..f931f7d0e294 100644 --- a/lib/zstd/common/zstd_deps.h +++ b/lib/zstd/common/zstd_deps.h @@ -1,6 +1,6 @@ @@ -31113,7 +31095,7 @@ index 2c34e8a33a1c1..f931f7d0e2947 100644 +#endif /* ZSTD_DEPS_STDINT */ +#endif /* ZSTD_DEPS_NEED_STDINT */ diff --git a/lib/zstd/common/zstd_internal.h b/lib/zstd/common/zstd_internal.h -index 93305d9b41bba..11da1233e8909 100644 +index 93305d9b41bb..11da1233e890 100644 --- a/lib/zstd/common/zstd_internal.h +++ b/lib/zstd/common/zstd_internal.h @@ -1,5 +1,6 @@ @@ -31342,7 +31324,7 @@ index 93305d9b41bba..11da1233e8909 100644 const void* src, size_t srcSize); diff --git a/lib/zstd/compress/clevels.h b/lib/zstd/compress/clevels.h -index d9a76112ec3af..6ab8be6532efc 100644 +index d9a76112ec3a..6ab8be6532ef 100644 --- a/lib/zstd/compress/clevels.h +++ b/lib/zstd/compress/clevels.h @@ -1,5 +1,6 @@ @@ -31354,7 +31336,7 @@ index d9a76112ec3af..6ab8be6532efc 100644 * * This source code is licensed under both the BSD-style license (found in the diff --git a/lib/zstd/compress/fse_compress.c b/lib/zstd/compress/fse_compress.c -index ec5b1ca6d71af..44a3c10becf26 100644 +index ec5b1ca6d71a..44a3c10becf2 100644 --- a/lib/zstd/compress/fse_compress.c +++ b/lib/zstd/compress/fse_compress.c @@ -1,6 +1,7 @@ @@ -31523,7 +31505,7 @@ index ec5b1ca6d71af..44a3c10becf26 100644 - #endif /* FSE_COMMONDEFS_ONLY */ diff --git a/lib/zstd/compress/hist.c b/lib/zstd/compress/hist.c -index 3ddc6dfb68948..0b12587cc14b1 100644 +index 3ddc6dfb6894..0b12587cc14b 100644 --- a/lib/zstd/compress/hist.c +++ b/lib/zstd/compress/hist.c @@ -1,7 +1,8 @@ @@ -31537,7 +31519,7 @@ index 3ddc6dfb68948..0b12587cc14b1 100644 * You can contact the author at : * - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy diff --git a/lib/zstd/compress/hist.h b/lib/zstd/compress/hist.h -index fc1830abc9c63..f7687b0fc20a0 100644 +index fc1830abc9c6..f7687b0fc20a 100644 --- a/lib/zstd/compress/hist.h +++ b/lib/zstd/compress/hist.h @@ -1,7 +1,8 @@ @@ -31551,7 +31533,7 @@ index fc1830abc9c63..f7687b0fc20a0 100644 * You can contact the author at : * - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy diff --git a/lib/zstd/compress/huf_compress.c b/lib/zstd/compress/huf_compress.c -index 74ef0db476210..0b229f5d2ae22 100644 +index 74ef0db47621..0b229f5d2ae2 100644 --- a/lib/zstd/compress/huf_compress.c +++ b/lib/zstd/compress/huf_compress.c @@ -1,6 +1,7 @@ @@ -32422,7 +32404,7 @@ index 74ef0db476210..0b229f5d2ae22 100644 } - diff --git a/lib/zstd/compress/zstd_compress.c b/lib/zstd/compress/zstd_compress.c -index f620cafca633b..0d139727cd392 100644 +index f620cafca633..0d139727cd39 100644 --- a/lib/zstd/compress/zstd_compress.c +++ b/lib/zstd/compress/zstd_compress.c @@ -1,5 +1,6 @@ @@ -36330,7 +36312,7 @@ index f620cafca633b..0d139727cd392 100644 + } +} diff --git a/lib/zstd/compress/zstd_compress_internal.h b/lib/zstd/compress/zstd_compress_internal.h -index 71697a11ae305..53cb582a8d2b5 100644 +index 71697a11ae30..53cb582a8d2b 100644 --- a/lib/zstd/compress/zstd_compress_internal.h +++ b/lib/zstd/compress/zstd_compress_internal.h @@ -1,5 +1,6 @@ @@ -36947,7 +36929,7 @@ index 71697a11ae305..53cb582a8d2b5 100644 + #endif /* ZSTD_COMPRESS_H */ diff --git a/lib/zstd/compress/zstd_compress_literals.c b/lib/zstd/compress/zstd_compress_literals.c -index 52b0a8059aba9..3e9ea46a670a6 100644 +index 52b0a8059aba..3e9ea46a670a 100644 --- a/lib/zstd/compress/zstd_compress_literals.c +++ b/lib/zstd/compress/zstd_compress_literals.c @@ -1,5 +1,6 @@ @@ -37189,7 +37171,7 @@ index 52b0a8059aba9..3e9ea46a670a6 100644 MEM_writeLE32(ostart, lhc); ostart[4] = (BYTE)(cLitSize >> 10); diff --git a/lib/zstd/compress/zstd_compress_literals.h b/lib/zstd/compress/zstd_compress_literals.h -index 9775fb97cb702..a2a85d6b69e53 100644 +index 9775fb97cb70..a2a85d6b69e5 100644 --- a/lib/zstd/compress/zstd_compress_literals.h +++ b/lib/zstd/compress/zstd_compress_literals.h @@ -1,5 +1,6 @@ @@ -37233,7 +37215,7 @@ index 9775fb97cb702..a2a85d6b69e53 100644 #endif /* ZSTD_COMPRESS_LITERALS_H */ diff --git a/lib/zstd/compress/zstd_compress_sequences.c b/lib/zstd/compress/zstd_compress_sequences.c -index 21ddc1b37acf8..5c028c78d889b 100644 +index 21ddc1b37acf..5c028c78d889 100644 --- a/lib/zstd/compress/zstd_compress_sequences.c +++ b/lib/zstd/compress/zstd_compress_sequences.c @@ -1,5 +1,6 @@ @@ -37263,7 +37245,7 @@ index 21ddc1b37acf8..5c028c78d889b 100644 * If basic encoding isn't possible, always choose RLE. */ diff --git a/lib/zstd/compress/zstd_compress_sequences.h b/lib/zstd/compress/zstd_compress_sequences.h -index 7991364c2f71f..7fe6f4ff5cf25 100644 +index 7991364c2f71..7fe6f4ff5cf2 100644 --- a/lib/zstd/compress/zstd_compress_sequences.h +++ b/lib/zstd/compress/zstd_compress_sequences.h @@ -1,5 +1,6 @@ @@ -37275,7 +37257,7 @@ index 7991364c2f71f..7fe6f4ff5cf25 100644 * * This source code is licensed under both the BSD-style license (found in the diff --git a/lib/zstd/compress/zstd_compress_superblock.c b/lib/zstd/compress/zstd_compress_superblock.c -index 17d836cc84e8f..41f6521b27cd3 100644 +index 17d836cc84e8..41f6521b27cd 100644 --- a/lib/zstd/compress/zstd_compress_superblock.c +++ b/lib/zstd/compress/zstd_compress_superblock.c @@ -1,5 +1,6 @@ @@ -37833,7 +37815,7 @@ index 17d836cc84e8f..41f6521b27cd3 100644 FORWARD_IF_ERROR(ZSTD_buildBlockEntropyStats(&zc->seqStore, diff --git a/lib/zstd/compress/zstd_compress_superblock.h b/lib/zstd/compress/zstd_compress_superblock.h -index 224ece79546eb..826bbc9e029b1 100644 +index 224ece79546e..826bbc9e029b 100644 --- a/lib/zstd/compress/zstd_compress_superblock.h +++ b/lib/zstd/compress/zstd_compress_superblock.h @@ -1,5 +1,6 @@ @@ -37845,7 +37827,7 @@ index 224ece79546eb..826bbc9e029b1 100644 * * This source code is licensed under both the BSD-style license (found in the diff --git a/lib/zstd/compress/zstd_cwksp.h b/lib/zstd/compress/zstd_cwksp.h -index 349fc923c355a..86bc3c2c23c77 100644 +index 349fc923c355..86bc3c2c23c7 100644 --- a/lib/zstd/compress/zstd_cwksp.h +++ b/lib/zstd/compress/zstd_cwksp.h @@ -1,5 +1,6 @@ @@ -38185,7 +38167,7 @@ index 349fc923c355a..86bc3c2c23c77 100644 diff --git a/lib/zstd/compress/zstd_double_fast.c b/lib/zstd/compress/zstd_double_fast.c -index 76933dea2624e..5ff54f17d92f0 100644 +index 76933dea2624..5ff54f17d92f 100644 --- a/lib/zstd/compress/zstd_double_fast.c +++ b/lib/zstd/compress/zstd_double_fast.c @@ -1,5 +1,6 @@ @@ -38534,7 +38516,7 @@ index 76933dea2624e..5ff54f17d92f0 100644 + +#endif /* ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR */ diff --git a/lib/zstd/compress/zstd_double_fast.h b/lib/zstd/compress/zstd_double_fast.h -index 6822bde65a1d8..b7ddc714f13ed 100644 +index 6822bde65a1d..b7ddc714f13e 100644 --- a/lib/zstd/compress/zstd_double_fast.h +++ b/lib/zstd/compress/zstd_double_fast.h @@ -1,5 +1,6 @@ @@ -38575,7 +38557,7 @@ index 6822bde65a1d8..b7ddc714f13ed 100644 #endif /* ZSTD_DOUBLE_FAST_H */ diff --git a/lib/zstd/compress/zstd_fast.c b/lib/zstd/compress/zstd_fast.c -index a752e6beab52e..b7a63ba4ce568 100644 +index a752e6beab52..b7a63ba4ce56 100644 --- a/lib/zstd/compress/zstd_fast.c +++ b/lib/zstd/compress/zstd_fast.c @@ -1,5 +1,6 @@ @@ -39393,7 +39375,7 @@ index a752e6beab52e..b7a63ba4ce568 100644 { default: /* includes case 3 */ diff --git a/lib/zstd/compress/zstd_fast.h b/lib/zstd/compress/zstd_fast.h -index fddc2f532d21d..e64d9e1b2d393 100644 +index fddc2f532d21..e64d9e1b2d39 100644 --- a/lib/zstd/compress/zstd_fast.h +++ b/lib/zstd/compress/zstd_fast.h @@ -1,5 +1,6 @@ @@ -39415,7 +39397,7 @@ index fddc2f532d21d..e64d9e1b2d393 100644 ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], void const* src, size_t srcSize); diff --git a/lib/zstd/compress/zstd_lazy.c b/lib/zstd/compress/zstd_lazy.c -index 0298a01a7504a..3e88d8a1a1365 100644 +index 0298a01a7504..3e88d8a1a136 100644 --- a/lib/zstd/compress/zstd_lazy.c +++ b/lib/zstd/compress/zstd_lazy.c @@ -1,5 +1,6 @@ @@ -40898,7 +40880,7 @@ index 0298a01a7504a..3e88d8a1a1365 100644 } +#endif diff --git a/lib/zstd/compress/zstd_lazy.h b/lib/zstd/compress/zstd_lazy.h -index e5bdf4df8dde0..22c9201f4e632 100644 +index e5bdf4df8dde..22c9201f4e63 100644 --- a/lib/zstd/compress/zstd_lazy.h +++ b/lib/zstd/compress/zstd_lazy.h @@ -1,5 +1,6 @@ @@ -41115,7 +41097,7 @@ index e5bdf4df8dde0..22c9201f4e632 100644 #endif /* ZSTD_LAZY_H */ diff --git a/lib/zstd/compress/zstd_ldm.c b/lib/zstd/compress/zstd_ldm.c -index dd86fc83e7dde..07f3bc6437ce6 100644 +index dd86fc83e7dd..07f3bc6437ce 100644 --- a/lib/zstd/compress/zstd_ldm.c +++ b/lib/zstd/compress/zstd_ldm.c @@ -1,5 +1,6 @@ @@ -41190,7 +41172,7 @@ index dd86fc83e7dde..07f3bc6437ce6 100644 ip += sequence.matchLength; } diff --git a/lib/zstd/compress/zstd_ldm.h b/lib/zstd/compress/zstd_ldm.h -index fbc6a5e88fd7a..c540731abde72 100644 +index fbc6a5e88fd7..c540731abde7 100644 --- a/lib/zstd/compress/zstd_ldm.h +++ b/lib/zstd/compress/zstd_ldm.h @@ -1,5 +1,6 @@ @@ -41202,7 +41184,7 @@ index fbc6a5e88fd7a..c540731abde72 100644 * * This source code is licensed under both the BSD-style license (found in the diff --git a/lib/zstd/compress/zstd_ldm_geartab.h b/lib/zstd/compress/zstd_ldm_geartab.h -index 647f865be2903..cfccfc46f6f7b 100644 +index 647f865be290..cfccfc46f6f7 100644 --- a/lib/zstd/compress/zstd_ldm_geartab.h +++ b/lib/zstd/compress/zstd_ldm_geartab.h @@ -1,5 +1,6 @@ @@ -41214,7 +41196,7 @@ index 647f865be2903..cfccfc46f6f7b 100644 * * This source code is licensed under both the BSD-style license (found in the diff --git a/lib/zstd/compress/zstd_opt.c b/lib/zstd/compress/zstd_opt.c -index fd82acfda62f6..a87b66ac8d248 100644 +index fd82acfda62f..a87b66ac8d24 100644 --- a/lib/zstd/compress/zstd_opt.c +++ b/lib/zstd/compress/zstd_opt.c @@ -1,5 +1,6 @@ @@ -42213,7 +42195,7 @@ index fd82acfda62f6..a87b66ac8d248 100644 /* note : no btultra2 variant for extDict nor dictMatchState, * because btultra2 is not meant to work with dictionaries diff --git a/lib/zstd/compress/zstd_opt.h b/lib/zstd/compress/zstd_opt.h -index 22b862858ba7a..ac1b743d27cd1 100644 +index 22b862858ba7..ac1b743d27cd 100644 --- a/lib/zstd/compress/zstd_opt.h +++ b/lib/zstd/compress/zstd_opt.h @@ -1,5 +1,6 @@ @@ -42294,7 +42276,7 @@ index 22b862858ba7a..ac1b743d27cd1 100644 #endif /* ZSTD_OPT_H */ diff --git a/lib/zstd/decompress/huf_decompress.c b/lib/zstd/decompress/huf_decompress.c -index 60958afebc415..ac8b87f48f847 100644 +index 60958afebc41..ac8b87f48f84 100644 --- a/lib/zstd/decompress/huf_decompress.c +++ b/lib/zstd/decompress/huf_decompress.c @@ -1,7 +1,8 @@ @@ -43685,7 +43667,7 @@ index 60958afebc415..ac8b87f48f847 100644 } - diff --git a/lib/zstd/decompress/zstd_ddict.c b/lib/zstd/decompress/zstd_ddict.c -index dbbc7919de534..30ef65e1ab5ca 100644 +index dbbc7919de53..30ef65e1ab5c 100644 --- a/lib/zstd/decompress/zstd_ddict.c +++ b/lib/zstd/decompress/zstd_ddict.c @@ -1,5 +1,6 @@ @@ -43727,7 +43709,7 @@ index dbbc7919de534..30ef65e1ab5ca 100644 + return ddict->dictID; } diff --git a/lib/zstd/decompress/zstd_ddict.h b/lib/zstd/decompress/zstd_ddict.h -index 8c1a79d666f89..de459a0dacd19 100644 +index 8c1a79d666f8..de459a0dacd1 100644 --- a/lib/zstd/decompress/zstd_ddict.h +++ b/lib/zstd/decompress/zstd_ddict.h @@ -1,5 +1,6 @@ @@ -43739,7 +43721,7 @@ index 8c1a79d666f89..de459a0dacd19 100644 * * This source code is licensed under both the BSD-style license (found in the diff --git a/lib/zstd/decompress/zstd_decompress.c b/lib/zstd/decompress/zstd_decompress.c -index 6b3177c947114..c9cbc45f6ed94 100644 +index 6b3177c94711..c9cbc45f6ed9 100644 --- a/lib/zstd/decompress/zstd_decompress.c +++ b/lib/zstd/decompress/zstd_decompress.c @@ -1,5 +1,6 @@ @@ -44518,7 +44500,7 @@ index 6b3177c947114..c9cbc45f6ed94 100644 + } } diff --git a/lib/zstd/decompress/zstd_decompress_block.c b/lib/zstd/decompress/zstd_decompress_block.c -index c1913b8e7c897..9fe9a12c8a2c0 100644 +index c1913b8e7c89..9fe9a12c8a2c 100644 --- a/lib/zstd/decompress/zstd_decompress_block.c +++ b/lib/zstd/decompress/zstd_decompress_block.c @@ -1,5 +1,6 @@ @@ -45962,7 +45944,7 @@ index c1913b8e7c897..9fe9a12c8a2c0 100644 + return ZSTD_decompressBlock_deprecated(dctx, dst, dstCapacity, src, srcSize); +} diff --git a/lib/zstd/decompress/zstd_decompress_block.h b/lib/zstd/decompress/zstd_decompress_block.h -index 3d2d57a5d25a7..becffbd893642 100644 +index 3d2d57a5d25a..becffbd89364 100644 --- a/lib/zstd/decompress/zstd_decompress_block.h +++ b/lib/zstd/decompress/zstd_decompress_block.h @@ -1,5 +1,6 @@ @@ -45994,7 +45976,7 @@ index 3d2d57a5d25a7..becffbd893642 100644 #endif /* ZSTD_DEC_BLOCK_H */ diff --git a/lib/zstd/decompress/zstd_decompress_internal.h b/lib/zstd/decompress/zstd_decompress_internal.h -index 98102edb6a832..0f02526be7744 100644 +index 98102edb6a83..0f02526be774 100644 --- a/lib/zstd/decompress/zstd_decompress_internal.h +++ b/lib/zstd/decompress/zstd_decompress_internal.h @@ -1,5 +1,6 @@ @@ -46038,7 +46020,7 @@ index 98102edb6a832..0f02526be7744 100644 /* streaming */ ZSTD_dStreamStage streamStage; diff --git a/lib/zstd/decompress_sources.h b/lib/zstd/decompress_sources.h -index a06ca187aab5f..8a47eb2a45145 100644 +index a06ca187aab5..8a47eb2a4514 100644 --- a/lib/zstd/decompress_sources.h +++ b/lib/zstd/decompress_sources.h @@ -1,6 +1,6 @@ @@ -46050,7 +46032,7 @@ index a06ca187aab5f..8a47eb2a45145 100644 * * This source code is licensed under both the BSD-style license (found in the diff --git a/lib/zstd/zstd_common_module.c b/lib/zstd/zstd_common_module.c -index 22686e367e6f0..466828e357525 100644 +index 22686e367e6f..466828e35752 100644 --- a/lib/zstd/zstd_common_module.c +++ b/lib/zstd/zstd_common_module.c @@ -1,6 +1,6 @@ @@ -46072,7 +46054,7 @@ index 22686e367e6f0..466828e357525 100644 MODULE_LICENSE("Dual BSD/GPL"); MODULE_DESCRIPTION("Zstd Common"); diff --git a/lib/zstd/zstd_compress_module.c b/lib/zstd/zstd_compress_module.c -index 04e1b5c01d9b6..8ecf43226af2f 100644 +index 04e1b5c01d9b..8ecf43226af2 100644 --- a/lib/zstd/zstd_compress_module.c +++ b/lib/zstd/zstd_compress_module.c @@ -1,6 +1,6 @@ @@ -46084,7 +46066,7 @@ index 04e1b5c01d9b6..8ecf43226af2f 100644 * * This source code is licensed under both the BSD-style license (found in the diff --git a/lib/zstd/zstd_decompress_module.c b/lib/zstd/zstd_decompress_module.c -index f4ed952ed4852..7d31518e9d5ab 100644 +index f4ed952ed485..7d31518e9d5a 100644 --- a/lib/zstd/zstd_decompress_module.c +++ b/lib/zstd/zstd_decompress_module.c @@ -1,6 +1,6 @@