selftests/sched_ext: fix build after renames in sched_ext API
Subsystems (8)
Sasha Levin
maintainerPATCH 1/8 selftests/sched_ext: fix build after renames in sched_ext API
From: Ihor Solodrai <[email protected]>
[ Upstream commit ef7009decc30eb2515a64253791d61b72229c119 ]
The selftests are falining to build on current tip of bpf-next and sched_ext [1]. This has broken BPF CI [2] after merge from upstream.
Use appropriate function names in the selftests according to the recent changes in the sched_ext API [3].
[1] https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/commit/?id=fc39fb56917bb3cb53e99560ca3612a84456ada2
[2] https://github.com/kernel-patches/bpf/actions/runs/11959327258/job/33340923745
[3] https://lore.kernel.org/all/[email protected]/
--- .../testing/selftests/sched_ext/ddsp_bogus_dsq_fail.bpf.c | 2 +- .../selftests/sched_ext/ddsp_vtimelocal_fail.bpf.c | 4 ++-- tools/testing/selftests/sched_ext/dsp_local_on.bpf.c | 2 +- .../selftests/sched_ext/enq_select_cpu_fails.bpf.c | 2 +- tools/testing/selftests/sched_ext/exit.bpf.c | 4 ++-- tools/testing/selftests/sched_ext/maximal.bpf.c | 4 ++-- tools/testing/selftests/sched_ext/select_cpu_dfl.bpf.c | 2 +- .../selftests/sched_ext/select_cpu_dfl_nodispatch.bpf.c | 2 +- .../testing/selftests/sched_ext/select_cpu_dispatch.bpf.c | 2 +- .../selftests/sched_ext/select_cpu_dispatch_bad_dsq.bpf.c | 2 +- .../selftests/sched_ext/select_cpu_dispatch_dbl_dsp.bpf.c | 4 ++-- tools/testing/selftests/sched_ext/select_cpu_vtime.bpf.c | 8 ++++---- 12 files changed, 19 insertions(+), 19 deletions(-)
tools/testing/selftests/sched_ext/ddsp_bogus_dsq_fail.bpf.c +1 -1
@@ -20,7 +20,7 @@ s32 BPF_STRUCT_OPS(ddsp_bogus_dsq_fail_select_cpu, struct task_struct *p,* If we dispatch to a bogus DSQ that will fall back to the * builtin global DSQ, we fail gracefully. */ -scx_bpf_dispatch_vtime (p,0xcafef00d ,SCX_SLICE_DFL , +scx_bpf_dsq_insert_vtime (p,0xcafef00d ,SCX_SLICE_DFL , p->scx.dsq_vtime,0 );return cpu; }
tools/testing/selftests/sched_ext/ddsp_vtimelocal_fail.bpf.c +2 -2
@@ -17,8 +17,8 @@ s32 BPF_STRUCT_OPS(ddsp_vtimelocal_fail_select_cpu, struct task_struct *p,if (cpu >=0 ) {/* Shouldn't be allowed to vtime dispatch to a builtin DSQ. */ -scx_bpf_dispatch_vtime (p,SCX_DSQ_LOCAL ,SCX_SLICE_DFL , - p->scx.dsq_vtime,0 ); +scx_bpf_dsq_insert_vtime (p,SCX_DSQ_LOCAL ,SCX_SLICE_DFL , + p->scx.dsq_vtime,0 );return cpu; }
tools/testing/selftests/sched_ext/dsp_local_on.bpf.c +1 -1
@@ -45,7 +45,7 @@ void BPF_STRUCT_OPS(dsp_local_on_dispatch, s32 cpu, struct task_struct *prev) target =bpf_get_prandom_u32 () % nr_cpus; -scx_bpf_dispatch (p,SCX_DSQ_LOCAL_ON | target,SCX_SLICE_DFL ,0 ); +scx_bpf_dsq_insert (p,SCX_DSQ_LOCAL_ON | target,SCX_SLICE_DFL ,0 );bpf_task_release (p); }
tools/testing/selftests/sched_ext/enq_select_cpu_fails.bpf.c +1 -1
@@ -31,7 +31,7 @@ void BPF_STRUCT_OPS(enq_select_cpu_fails_enqueue, struct task_struct *p,/* Can only call from ops.select_cpu() */ scx_bpf_select_cpu_dfl (p,0 ,0 , &found); -scx_bpf_dispatch (p,SCX_DSQ_GLOBAL ,SCX_SLICE_DFL , enq_flags); +scx_bpf_dsq_insert (p,SCX_DSQ_GLOBAL ,SCX_SLICE_DFL , enq_flags); }SEC (".struct_ops.link" )
tools/testing/selftests/sched_ext/exit.bpf.c +2 -2
@@ -33,7 +33,7 @@ void BPF_STRUCT_OPS(exit_enqueue, struct task_struct *p, u64 enq_flags)if (exit_point ==EXIT_ENQUEUE )EXIT_CLEANLY (); -scx_bpf_dispatch (p,DSQ_ID ,SCX_SLICE_DFL , enq_flags); +scx_bpf_dsq_insert (p,DSQ_ID ,SCX_SLICE_DFL , enq_flags); }void BPF_STRUCT_OPS (exit_dispatch ,s32 cpu,struct task_struct *p)
@@ -41,7 +41,7 @@ void BPF_STRUCT_OPS(exit_dispatch, s32 cpu, struct task_struct *p)if (exit_point ==EXIT_DISPATCH )EXIT_CLEANLY (); -scx_bpf_consume (DSQ_ID ); +scx_bpf_dsq_move_to_local (DSQ_ID ); }void BPF_STRUCT_OPS (exit_enable ,struct task_struct *p)
tools/testing/selftests/sched_ext/maximal.bpf.c +2 -2
@@ -20,7 +20,7 @@ s32 BPF_STRUCT_OPS(maximal_select_cpu, struct task_struct *p, s32 prev_cpu,void BPF_STRUCT_OPS (maximal_enqueue ,struct task_struct *p,u64 enq_flags) { -scx_bpf_dispatch (p,SCX_DSQ_GLOBAL ,SCX_SLICE_DFL , enq_flags); +scx_bpf_dsq_insert (p,SCX_DSQ_GLOBAL ,SCX_SLICE_DFL , enq_flags); }void BPF_STRUCT_OPS (maximal_dequeue ,struct task_struct *p,u64 deq_flags)
@@ -28,7 +28,7 @@ void BPF_STRUCT_OPS(maximal_dequeue, struct task_struct *p, u64 deq_flags)void BPF_STRUCT_OPS (maximal_dispatch ,s32 cpu,struct task_struct *prev) { -scx_bpf_consume (SCX_DSQ_GLOBAL ); +scx_bpf_dsq_move_to_local (SCX_DSQ_GLOBAL ); }void BPF_STRUCT_OPS (maximal_runnable ,struct task_struct *p,u64 enq_flags)
tools/testing/selftests/sched_ext/select_cpu_dfl.bpf.c +1 -1
@@ -30,7 +30,7 @@ void BPF_STRUCT_OPS(select_cpu_dfl_enqueue, struct task_struct *p, }scx_bpf_put_idle_cpumask (idle_mask); -scx_bpf_dispatch (p,SCX_DSQ_GLOBAL ,SCX_SLICE_DFL , enq_flags); +scx_bpf_dsq_insert (p,SCX_DSQ_GLOBAL ,SCX_SLICE_DFL , enq_flags); }SEC (".struct_ops.link" )
tools/testing/selftests/sched_ext/select_cpu_dfl_nodispatch.bpf.c +1 -1
@@ -67,7 +67,7 @@ void BPF_STRUCT_OPS(select_cpu_dfl_nodispatch_enqueue, struct task_struct *p, saw_local = true; } -scx_bpf_dispatch (p, dsq_id,SCX_SLICE_DFL , enq_flags); +scx_bpf_dsq_insert (p, dsq_id,SCX_SLICE_DFL , enq_flags); } s32 BPF_STRUCT_OPS(select_cpu_dfl_nodispatch_init_task,
tools/testing/selftests/sched_ext/select_cpu_dispatch.bpf.c +1 -1
@@ -29,7 +29,7 @@ s32 BPF_STRUCT_OPS(select_cpu_dispatch_select_cpu, struct task_struct *p, cpu = prev_cpu; dispatch: -scx_bpf_dispatch (p, dsq_id,SCX_SLICE_DFL ,0 ); +scx_bpf_dsq_insert (p, dsq_id,SCX_SLICE_DFL ,0 );return cpu; }
tools/testing/selftests/sched_ext/select_cpu_dispatch_bad_dsq.bpf.c +1 -1
@@ -18,7 +18,7 @@ s32 BPF_STRUCT_OPS(select_cpu_dispatch_bad_dsq_select_cpu, struct task_struct *p s32 prev_cpu, u64 wake_flags) {/* Dispatching to a random DSQ should fail. */ - scx_bpf_dispatch(p, 0xcafef00d, SCX_SLICE_DFL, 0); + scx_bpf_dsq_insert(p, 0xcafef00d, SCX_SLICE_DFL, 0);return prev_cpu; }
tools/testing/selftests/sched_ext/select_cpu_dispatch_dbl_dsp.bpf.c +2 -2
@@ -18,8 +18,8 @@ s32 BPF_STRUCT_OPS(select_cpu_dispatch_dbl_dsp_select_cpu, struct task_struct *p s32 prev_cpu, u64 wake_flags) {/* Dispatching twice in a row is disallowed. */ - scx_bpf_dispatch(p, SCX_DSQ_GLOBAL, SCX_SLICE_DFL, 0); -scx_bpf_dispatch (p,SCX_DSQ_GLOBAL ,SCX_SLICE_DFL ,0 ); + scx_bpf_dsq_insert(p, SCX_DSQ_GLOBAL, SCX_SLICE_DFL, 0); +scx_bpf_dsq_insert (p,SCX_DSQ_GLOBAL ,SCX_SLICE_DFL ,0 );return prev_cpu; }
tools/testing/selftests/sched_ext/select_cpu_vtime.bpf.c +4 -4
@@ -2,8 +2,8 @@/* * A scheduler that validates that enqueue flags are properly stored and * applied at dispatch time when a task is directly dispatched from -* ops.select_cpu(). We validate this by using scx_bpf_dispatch_vtime(), and -* making the test a very basic vtime scheduler. +* ops.select_cpu(). We validate this by using scx_bpf_dsq_insert_vtime(), +* and making the test a very basic vtime scheduler. * * Copyright (c) 2024 Meta Platforms, Inc. and affiliates. * Copyright (c) 2024 David Vernet <[email protected]>
@@ -47,13 +47,13 @@ s32 BPF_STRUCT_OPS(select_cpu_vtime_select_cpu, struct task_struct *p, cpu = prev_cpu;scx_bpf_test_and_clear_cpu_idle (cpu); ddsp: -scx_bpf_dispatch_vtime (p,VTIME_DSQ ,SCX_SLICE_DFL ,task_vtime (p),0 ); +scx_bpf_dsq_insert_vtime (p,VTIME_DSQ ,SCX_SLICE_DFL ,task_vtime (p),0 );return cpu; }void BPF_STRUCT_OPS (select_cpu_vtime_dispatch ,s32 cpu,struct task_struct *p) { -if (scx_bpf_consume (VTIME_DSQ )) +if (scx_bpf_dsq_move_to_local (VTIME_DSQ )) consumed = true; }
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 2/8 scx: Fix maximal BPF selftest prog
From: David Vernet <[email protected]>
[ Upstream commit b8f614207b0d5e4abd6df8d5cb3cc11f009d1d93 ]
maximal.bpf.c is still dispatching to and consuming from SCX_DSQ_GLOBAL. Let's have it use its own DSQ to avoid any runtime errors.
--- tools/testing/selftests/sched_ext/maximal.bpf.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
tools/testing/selftests/sched_ext/maximal.bpf.c +5 -3
@@ -12,6 +12,8 @@ char _license[] SEC("license") = "GPL"; +#define DSQ_ID 0 +s32 BPF_STRUCT_OPS (maximal_select_cpu ,struct task_struct *p,s32 prev_cpu,u64 wake_flags) {
@@ -20,7 +22,7 @@ s32 BPF_STRUCT_OPS(maximal_select_cpu, struct task_struct *p, s32 prev_cpu,void BPF_STRUCT_OPS (maximal_enqueue ,struct task_struct *p,u64 enq_flags) { -scx_bpf_dsq_insert (p,SCX_DSQ_GLOBAL ,SCX_SLICE_DFL , enq_flags); +scx_bpf_dsq_insert (p,DSQ_ID ,SCX_SLICE_DFL , enq_flags); }void BPF_STRUCT_OPS (maximal_dequeue ,struct task_struct *p,u64 deq_flags)
@@ -28,7 +30,7 @@ void BPF_STRUCT_OPS(maximal_dequeue, struct task_struct *p, u64 deq_flags)void BPF_STRUCT_OPS (maximal_dispatch ,s32 cpu,struct task_struct *prev) { -scx_bpf_dsq_move_to_local (SCX_DSQ_GLOBAL ); +scx_bpf_dsq_move_to_local (DSQ_ID ); }void BPF_STRUCT_OPS (maximal_runnable ,struct task_struct *p,u64 enq_flags)
@@ -123,7 +125,7 @@ void BPF_STRUCT_OPS(maximal_cgroup_set_weight, struct cgroup *cgrp, u32 weight)s32 BPF_STRUCT_OPS_SLEEPABLE (maximal_init ) { -return 0 ; +return scx_bpf_create_dsq (DSQ_ID ,-1 ); }void BPF_STRUCT_OPS (maximal_exit ,struct scx_exit_info *info)
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 3/8 RDMA/bnxt_re: Fix to export port num to ib_query_qp
In reply to Sasha LevinFrom: Hongguang Gao <[email protected]>
[ Upstream commit 34db8ec931b84d1426423f263b1927539e73b397 ]
Current driver implementation doesn't populate the port_num field in query_qp. Adding the code to convert internal firmware port id to ibv defined port number and export it.
--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 1 + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 4 ++++ drivers/infiniband/hw/bnxt_re/qplib_fp.c | 1 + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 1 + 4 files changed, 7 insertions(+)
drivers/infiniband/hw/bnxt_re/ib_verbs.c +1 -0
@@ -2267,6 +2267,7 @@ int bnxt_re_query_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr, qp_attr->retry_cnt = qplib_qp->retry_cnt; qp_attr->rnr_retry = qplib_qp->rnr_retry; qp_attr->min_rnr_timer = qplib_qp->min_rnr_timer; + qp_attr->port_num =__to_ib_port_num (qplib_qp->port_id); qp_attr->rq_psn = qplib_qp->rq.psn; qp_attr->max_rd_atomic = qplib_qp->max_rd_atomic; qp_attr->sq_psn = qplib_qp->sq.psn;
drivers/infiniband/hw/bnxt_re/ib_verbs.h +4 -0
@@ -264,6 +264,10 @@ void bnxt_re_dealloc_ucontext(struct ib_ucontext *context);int bnxt_re_mmap (struct ib_ucontext *context,struct vm_area_struct *vma);void bnxt_re_mmap_free (struct rdma_user_mmap_entry *rdma_entry); +static inline u32 __to_ib_port_num (u16 port_id) +{ +return (u32 )port_id +1 ; +}unsigned long bnxt_re_lock_cqs (struct bnxt_re_qp *qp);void bnxt_re_unlock_cqs (struct bnxt_re_qp *qp,unsigned long flags);
drivers/infiniband/hw/bnxt_re/qplib_fp.c +1 -0
@@ -1470,6 +1470,7 @@ int bnxt_qplib_query_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp) qp->dest_qpn =le32_to_cpu (sb->dest_qp_id);memcpy (qp->smac, sb->src_mac,6 ); qp->vlan_id =le16_to_cpu (sb->vlan_pcp_vlan_dei_vlan_id); + qp->port_id =le16_to_cpu (sb->port_id); bail:dma_free_coherent (&rcfw->pdev->dev, sbuf.size, sbuf.sb, sbuf.dma_addr);
drivers/infiniband/hw/bnxt_re/qplib_fp.h +1 -0
@@ -299,6 +299,7 @@ struct bnxt_qplib_qp {u32 dest_qpn;u8 smac[6 ];u16 vlan_id; +u16 port_id;u8 nw_type;struct bnxt_qplib_ah ah;
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 4/8 sched_ext: Fix dsq_local_on selftest
In reply to Sasha LevinFrom: Tejun Heo <[email protected]>
[ Upstream commit ce2b93fc1dfa1c82f2576aa571731c4e5dcc8dd7 ]
The dsp_local_on selftest expects the scheduler to fail by trying to schedule an e.g. CPU-affine task to the wrong CPU. However, this isn't guaranteed to happen in the 1 second window that the test is running. Besides, it's odd to have this particular exception path tested when there are no other tests that verify that the interface is working at all - e.g. the test would pass if dsp_local_on interface is completely broken and fails on any attempt.
Flip the test so that it verifies that the feature works. While at it, fix a typo in the info message.
--- tools/testing/selftests/sched_ext/dsp_local_on.bpf.c | 5 ++++- tools/testing/selftests/sched_ext/dsp_local_on.c | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-)
tools/testing/selftests/sched_ext/dsp_local_on.bpf.c +4 -1
@@ -43,7 +43,10 @@ void BPF_STRUCT_OPS(dsp_local_on_dispatch, s32 cpu, struct task_struct *prev)if (!p)return ; - target =bpf_get_prandom_u32 () % nr_cpus; +if (p->nr_cpus_allowed == nr_cpus) + target =bpf_get_prandom_u32 () % nr_cpus; +else + target =scx_bpf_task_cpu (p);scx_bpf_dsq_insert (p,SCX_DSQ_LOCAL_ON | target,SCX_SLICE_DFL ,0 );bpf_task_release (p);
tools/testing/selftests/sched_ext/dsp_local_on.c +3 -2
@@ -34,9 +34,10 @@ static enum scx_test_status run(void *ctx)/* Just sleeping is fine, plenty of scheduling events happening */ sleep (1 ); -SCX_EQ (skel->data->uei.kind,EXIT_KIND (SCX_EXIT_ERROR ));bpf_link__destroy (link); +SCX_EQ (skel->data->uei.kind,EXIT_KIND (SCX_EXIT_UNREG )); +return SCX_TEST_PASS ; }
@@ -50,7 +51,7 @@ static void cleanup(void *ctx)struct scx_test dsp_local_on = { .name ="dsp_local_on" , .description ="Verify we can directly dispatch tasks to a local DSQs " -"from osp.dispatch()" , +"from ops.dispatch()" , .setup = setup, .run = run, .cleanup = cleanup,
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 5/8 nvmet: propagate npwg topology
In reply to Sasha LevinFrom: Luis Chamberlain <[email protected]>
[ Upstream commit b579d6fdc3a9149bb4d2b3133cc0767130ed13e6 ]
Ensure we propagate npwg to the target as well instead of assuming its the same logical blocks per physical block.
This ensures devices with large IUs information properly propagated on the target.
--- drivers/nvme/target/io-cmd-bdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/target/io-cmd-bdev.c +1 -1
@@ -36,7 +36,7 @@ void nvmet_bdev_set_limits(struct block_device *bdev, struct nvme_id_ns *id)*/ id->nsfeat |=1 <<4 ;/* NPWG = Namespace Preferred Write Granularity. 0's based */ - id->npwg = lpp0b; + id->npwg =to0based (bdev_io_min (bdev) /bdev_logical_block_size (bdev));/* NPWA = Namespace Preferred Write Alignment. 0's based */ id->npwa = id->npwg;/* NPDG = Namespace Preferred Deallocate Granularity. 0's based */
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 6/8 platform/x86: hp-wmi: mark 8A15 board for timed OMEN thermal profile
In reply to Sasha LevinFrom: Mingcong Bai <[email protected]>
[ Upstream commit 032fe9b0516702599c2dd990a4703f783d5716b8 ]
The HP OMEN 8 (2022), corresponding to a board ID of 8A15, supports OMEN thermal profile and requires the timed profile quirk.
Upon adding this ID to both the omen_thermal_profile_boards and omen_timed_thermal_profile_boards, significant bump in performance can be observed. For instance, SilverBench (https://silver.urih.com/) results improved from ~56,000 to ~69,000, as a result of higher power draws (and thus core frequencies) whilst under load:
Package Power:
- Before the patch: ~65W (dropping to about 55W under sustained load).
- After the patch: ~115W (dropping to about 105W under sustained load).
Core Power:
- Before: ~60W (ditto above).
- After: ~108W (ditto above).
Add 8A15 to omen_thermal_profile_boards and omen_timed_thermal_profile_boards to improve performance.
--- drivers/platform/x86/hp/hp-wmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/hp/hp-wmi.c +2 -2
@@ -64,7 +64,7 @@ static const char * const omen_thermal_profile_boards[] = {"874A" ,"8603" ,"8604" ,"8748" ,"886B" ,"886C" ,"878A" ,"878B" ,"878C" ,"88C8" ,"88CB" ,"8786" ,"8787" ,"8788" ,"88D1" ,"88D2" ,"88F4" ,"88FD" ,"88F5" ,"88F6" ,"88F7" ,"88FE" ,"88FF" ,"8900" ,"8901" ,"8902" ,"8912" , -"8917" ,"8918" ,"8949" ,"894A" ,"89EB" ,"8BAD" ,"8A42" +"8917" ,"8918" ,"8949" ,"894A" ,"89EB" ,"8BAD" ,"8A42" ,"8A15" };/* DMI Board names of Omen laptops that are specifically set to be thermal
@@ -80,7 +80,7 @@ static const char * const omen_thermal_profile_force_v0_boards[] = {* "balanced" when reaching zero. */ static const char *const omen_timed_thermal_profile_boards[] = { -"8BAD" ,"8A42" +"8BAD" ,"8A42" ,"8A15" };/* DMI Board names of Victus laptops */
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 7/8 platform/x86: thinkpad-acpi: Add support for hotkey 0x1401
In reply to Sasha LevinFrom: Vishnu Sankar <[email protected]>
[ Upstream commit 7e16ae558a87ac9099b6a93a43f19b42d809fd78 ]
F8 mode key on Lenovo 2025 platforms use a different key code. Adding support for the new keycode 0x1401.
Tested on X1 Carbon Gen 13 and X1 2-in-1 Gen 10.
--- Documentation/admin-guide/laptops/thinkpad-acpi.rst | 10 +++++++--- drivers/platform/x86/thinkpad_acpi.c | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-)
Documentation/admin-guide/laptops/thinkpad-acpi.rst +7 -3
@@ -445,8 +445,10 @@ event code Key Notes 0x1008 0x07 FN+F8 IBM: toggle screen expand Lenovo: configure UltraNav, or toggle screen expand. - On newer platforms (2024+) - replaced by 0x131f (see below) + On 2024 platforms replaced by + 0x131f (see below) and on newer + platforms (2025 +) keycode is + replaced by 0x1401 (see below). 0x1009 0x08 FN+F9 -
@@ -506,9 +508,11 @@ event code Key Notes 0x1019 0x18 unknown -0x131f ... FN+F8 Platform Mode change. +0x131f ... FN+F8 Platform Mode change (2024 systems). Implemented in driver. +0x1401 ... FN+F8 Platform Mode change (2025 + systems). + Implemented in driver. ... ... ... 0x1020 0x1F unknown
drivers/platform/x86/thinkpad_acpi.c +3 -1
@@ -184,7 +184,8 @@ enum tpacpi_hkey_event_t {*/ TP_HKEY_EV_AMT_TOGGLE =0x131a ,/* Toggle AMT on/off */ TP_HKEY_EV_DOUBLETAP_TOGGLE =0x131c ,/* Toggle trackpoint doubletap on/off */ -TP_HKEY_EV_PROFILE_TOGGLE =0x131f ,/* Toggle platform profile */ +TP_HKEY_EV_PROFILE_TOGGLE =0x131f ,/* Toggle platform profile in 2024 systems */ +TP_HKEY_EV_PROFILE_TOGGLE2 =0x1401 ,/* Toggle platform profile in 2025 + systems */ /* Reasons for waking up from S3/S4 */ TP_HKEY_EV_WKUP_S3_UNDOCK = 0x2304, /* undock requested, S3 */
@@ -11200,6 +11201,7 @@ static bool tpacpi_driver_event(const unsigned int hkey_event) tp_features.trackpoint_doubletap = !tp_features.trackpoint_doubletap;return true;case TP_HKEY_EV_PROFILE_TOGGLE : +case TP_HKEY_EV_PROFILE_TOGGLE2 :platform_profile_cycle ();return true; }
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 8/8 Revert "ALSA: ump: Don't enumeration invalid groups for legacy rawmidi"
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit abbff41b6932cde359589fd51f4024b7c85f366b ]
This reverts commit c2d188e137e77294323132a760a4608321a36a70.
Although it's fine to filter the invalid UMP groups at the first probe time, this will become a problem when UMP groups are updated and (re-)activated. Then there is no way to re-add the substreams properly for the legacy rawmidi, and the new active groups will be still invisible.
So let's revert the change. This will move back to showing the full 16 groups, but it's better than forever lost.
--- sound/core/ump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/core/ump.c +1 -1
@@ -1244,7 +1244,7 @@ static int fill_legacy_mapping(struct snd_ump_endpoint *ump) num =0 ;for (i =0 ; i <SNDRV_UMP_MAX_GROUPS ; i++) -if ((group_maps & (1U << i)) && ump->groups[i].valid) +if (group_maps & (1U << i)) ump->legacy_mapping[num++] = i;return num;
Signature · 1 line
2.39.5