raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

Revert "fixup! arch/arm64: Add Revision, Serial, Model to cpuinfo"

Browse Source 
This reverts commit 0b54967ac8.
This commit is contained in:
Dom Cobley
2025-11-12 12:17:59 +00:00
parent 0b54967ac8
commit 69f60687b7
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
arch/arm64/kernel/cpuinfo.c
View File

@@ -219,6 +219,10 @@ static int c_show(struct seq_file *m, void *v)
bool compat = personality(current->personality) == PER_LINUX32; bool compat = personality(current->personality) == PER_LINUX32;
struct cpuinfo_arm64 *cpuinfo = v; struct cpuinfo_arm64 *cpuinfo = v;
u32 midr = cpuinfo->reg_midr; u32 midr = cpuinfo->reg_midr;
struct device_node *np;
const char *model;
const char *serial;
u32 revision;
/* /*
* glibc reads /proc/cpuinfo to determine the number of * glibc reads /proc/cpuinfo to determine the number of
@@ -274,28 +278,6 @@ static int c_show(struct seq_file *m, void *v)
seq_printf(m, "CPU part\t: 0x%03x\n", MIDR_PARTNUM(midr)); seq_printf(m, "CPU part\t: 0x%03x\n", MIDR_PARTNUM(midr));
seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr)); seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
return 0;
}
static void *c_start(struct seq_file *m, loff_t *pos)
{
*pos = cpumask_next(*pos - 1, cpu_online_mask);
return *pos < nr_cpu_ids ? &per_cpu(cpu_data, *pos) : NULL;
}
static void *c_next(struct seq_file *m, void *v, loff_t *pos)
{
++*pos;
return c_start(m, pos);
}
static void c_stop(struct seq_file *m, void *v)
{
struct device_node *np;
const char *model;
const char *serial;
u32 revision;
np = of_find_node_by_path("/system"); np = of_find_node_by_path("/system");
if (np) { if (np) {
if (!of_property_read_u32(np, "linux,revision", &revision)) if (!of_property_read_u32(np, "linux,revision", &revision))
@@ -313,6 +295,24 @@ static void c_stop(struct seq_file *m, void *v)
seq_printf(m, "Model\t\t: %s\n", model); seq_printf(m, "Model\t\t: %s\n", model);
of_node_put(np); of_node_put(np);
} }
return 0;
}
static void *c_start(struct seq_file *m, loff_t *pos)
{
*pos = cpumask_next(*pos - 1, cpu_online_mask);
return *pos < nr_cpu_ids ? &per_cpu(cpu_data, *pos) : NULL;
}
static void *c_next(struct seq_file *m, void *v, loff_t *pos)
{
++*pos;
return c_start(m, pos);
}
static void c_stop(struct seq_file *m, void *v)
{
} }
const struct seq_operations cpuinfo_op = { const struct seq_operations cpuinfo_op = {