Skip to content

[Deepin-Kernel-SIG] [Backport] [linux 6.6-y] Backport some commits by Uniontech in v6.14-rc3 #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Avenger-285714 merged 2 commits into from
Feb 17, 2025
Merged

[Deepin-Kernel-SIG] [Backport] [linux 6.6-y] Backport some commits by Uniontech in v6.14-rc3 #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd5a7c5
LoongArch: Use str_yes_no() helper function for /proc/cpuinfo
Feb 13, 2025
cd8b1ef
LoongArch: Remove the deprecated notifier hook mechanism
Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions arch/loongarch/include/asm/cpu-info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,27 +75,6 @@ extern const char *__cpu_full_name[];
#define cpu_family_string() __cpu_family[raw_smp_processor_id()]
#define cpu_full_name_string() __cpu_full_name[raw_smp_processor_id()]

struct seq_file;
struct notifier_block;

extern int register_proc_cpuinfo_notifier(struct notifier_block *nb);
extern int proc_cpuinfo_notifier_call_chain(unsigned long val, void *v);

#define proc_cpuinfo_notifier(fn, pri) \
({ \
static struct notifier_block fn##_nb = { \
.notifier_call = fn, \
.priority = pri \
}; \
\
register_proc_cpuinfo_notifier(&fn##_nb); \
})

struct proc_cpuinfo_notifier_args {
struct seq_file *m;
unsigned long n;
};

static inline bool cpus_are_siblings(int cpua, int cpub)
{
struct cpuinfo_loongarch *infoa = &cpu_data[cpua];
Expand Down
2 changes: 2 additions & 0 deletions arch/loongarch/include/asm/smp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ extern int __cpu_logical_map[NR_CPUS];
#define SMP_RESCHEDULE BIT(ACTION_RESCHEDULE)
#define SMP_CALL_FUNCTION BIT(ACTION_CALL_FUNCTION)

struct seq_file;

struct secondary_data {
unsigned long stack;
unsigned long thread_info;
Expand Down
29 changes: 3 additions & 26 deletions arch/loongarch/kernel/proc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,11 @@
#include <asm/processor.h>
#include <asm/time.h>

/*
* No lock; only written during early bootup by CPU 0.
*/
static RAW_NOTIFIER_HEAD(proc_cpuinfo_chain);

int __ref register_proc_cpuinfo_notifier(struct notifier_block *nb)
{
return raw_notifier_chain_register(&proc_cpuinfo_chain, nb);
}

int proc_cpuinfo_notifier_call_chain(unsigned long val, void *v)
{
return raw_notifier_call_chain(&proc_cpuinfo_chain, val, v);
}

static int show_cpuinfo(struct seq_file *m, void *v)
{
unsigned long n = (unsigned long) v - 1;
unsigned int version = cpu_data[n].processor_id & 0xff;
unsigned int fp_version = cpu_data[n].fpu_vers;
struct proc_cpuinfo_notifier_args proc_cpuinfo_notifier_args;

#ifdef CONFIG_SMP
if (!cpu_online(n))
Expand Down Expand Up @@ -87,20 +71,13 @@ static int show_cpuinfo(struct seq_file *m, void *v)
if (cpu_has_lbt_mips) seq_printf(m, " lbt_mips");
seq_printf(m, "\n");

seq_printf(m, "Hardware Watchpoint\t: %s",
cpu_has_watch ? "yes, " : "no\n");
seq_printf(m, "Hardware Watchpoint\t: %s", str_yes_no(cpu_has_watch));
if (cpu_has_watch) {
seq_printf(m, "iwatch count: %d, dwatch count: %d\n",
seq_printf(m, ", iwatch count: %d, dwatch count: %d",
cpu_data[n].watch_ireg_count, cpu_data[n].watch_dreg_count);
}

proc_cpuinfo_notifier_args.m = m;
proc_cpuinfo_notifier_args.n = n;

raw_notifier_call_chain(&proc_cpuinfo_chain, 0,
&proc_cpuinfo_notifier_args);

seq_printf(m, "\n");
seq_printf(m, "\n\n");

return 0;
}
Expand Down
Loading