Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 4b26d22f authored by Anup Patel's avatar Anup Patel Committed by Palmer Dabbelt
Browse files

RISC-V: Show CPU ID and Hart ID separately in /proc/cpuinfo 



Currently, /proc/cpuinfo show logical CPU ID as Hart ID which
is in-correct. This patch shows CPU ID and Hart ID separately
in /proc/cpuinfo using cpuid_to_hardid_map().

With this patch, contents of /proc/cpuinfo looks as follows:
processor	: 0
hart		: 1
isa		: rv64imafdc
mmu		: sv48

processor	: 1
hart		: 0
isa		: rv64imafdc
mmu		: sv48

processor	: 2
hart		: 2
isa		: rv64imafdc
mmu		: sv48

processor	: 3
hart		: 3
isa		: rv64imafdc
mmu		: sv48

Signed-off-by: default avatarAnup Patel <anup@brainfault.org>
Signed-off-by: default avatarAtish Patra <atish.patra@wdc.com>
Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent f99fb607

arch/riscv/kernel/cpu.c

+6 −4
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void print_isa(struct seq_file *f, const char *orig_isa) 
#endif



	/* Print the base ISA, as we already know it's legal. */

	seq_puts(f, "isa\t: ");

	seq_puts(f, "isa\t\t: ");

	seq_write(f, isa, 5);

	isa += 5;
@@ -96,6 +96,7 @@ static void print_isa(struct seq_file *f, const char *orig_isa) 
			isa++;

		}

	}

	seq_puts(f, "\n");



	/*

	 * If we were given an unsupported ISA in the device tree then print
@@ -116,7 +117,7 @@ static void print_mmu(struct seq_file *f, const char *mmu_type) 
		return;

#endif



	seq_printf(f, "mmu\t: %s\n", mmu_type+6);

	seq_printf(f, "mmu\t\t: %s\n", mmu_type+6);

}



static void *c_start(struct seq_file *m, loff_t *pos)
@@ -144,14 +145,15 @@ static int c_show(struct seq_file *m, void *v) 
						   NULL);

	const char *compat, *isa, *mmu;



	seq_printf(m, "hart\t: %lu\n", cpu_id);

	seq_printf(m, "processor\t: %lu\n", cpu_id);

	seq_printf(m, "hart\t\t: %lu\n", cpuid_to_hartid_map(cpu_id));

	if (!of_property_read_string(node, "riscv,isa", &isa))

		print_isa(m, isa);

	if (!of_property_read_string(node, "mmu-type", &mmu))

		print_mmu(m, mmu);

	if (!of_property_read_string(node, "compatible", &compat)

	    && strcmp(compat, "riscv"))

		seq_printf(m, "uarch\t: %s\n", compat);

		seq_printf(m, "uarch\t\t: %s\n", compat);

	seq_puts(m, "\n");



	return 0;