diff options
| author | Leon Romanovsky <leon@kernel.org> | 2025-06-25 03:57:23 -0400 |
|---|---|---|
| committer | Leon Romanovsky <leon@kernel.org> | 2025-06-25 03:57:23 -0400 |
| commit | 4aa765af7983d51eafa13d76398045a5e687b73d (patch) | |
| tree | a3da8fece8eb8caf6143bb160f2ec3ce8019f219 /arch/x86/power/hibernate.c | |
| parent | b5eeb8365d196c95dbb0fd0a5b5a69a44832f16f (diff) | |
| parent | 52931f55159ea5c27ad4fe66fc0cb8ad75ab795b (diff) | |
Add multiple priorities support to mlx5 RDMA TRANSPORT tables
From Patrisious:
This short series from Patrisious extends mlx5 flow steering logic to
allow creation rule creation with priorities in RDMA TRANSPORT tables.
Thanks
Link: https://lore.kernel.org/all/cover.1750148083.git.leon@kernel.org
Signed-off-by: Leon Romanovsky <leon@kernel.org>
* mlx5-next: (200 commits)
net/mlx5: fs, add multiple prios to RDMA TRANSPORT steering domain
Linux 6.16-rc2
...
Diffstat (limited to 'arch/x86/power/hibernate.c')
| -rw-r--r-- | arch/x86/power/hibernate.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/arch/x86/power/hibernate.c b/arch/x86/power/hibernate.c index a7c23f2a58c9..a2294c1649f6 100644 --- a/arch/x86/power/hibernate.c +++ b/arch/x86/power/hibernate.c @@ -192,7 +192,8 @@ out: int arch_resume_nosmt(void) { - int ret = 0; + int ret; + /* * We reached this while coming out of hibernation. This means * that SMT siblings are sleeping in hlt, as mwait is not safe @@ -206,18 +207,10 @@ int arch_resume_nosmt(void) * Called with hotplug disabled. */ cpu_hotplug_enable(); - if (cpu_smt_control == CPU_SMT_DISABLED || - cpu_smt_control == CPU_SMT_FORCE_DISABLED) { - enum cpuhp_smt_control old = cpu_smt_control; - - ret = cpuhp_smt_enable(); - if (ret) - goto out; - ret = cpuhp_smt_disable(old); - if (ret) - goto out; - } -out: + + ret = arch_cpu_rescan_dead_smt_siblings(); + cpu_hotplug_disable(); + return ret; } |