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

Unverified Commit b2f8cfa7 authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

RISC-V: Rename riscv_of_processor_hart to riscv_of_processor_hartid 



It's a bit confusing exactly what this function does: it actually
returns the hartid of an OF processor node, failing with -1 on invalid
nodes.  I've changed the name to _hartid() in order to make that a bit
more clear, as well as adding a comment.

Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
[Atish: code comment formatting update]
Signed-off-by: default avatarAtish Patra <atish.patra@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent 9639a443

arch/riscv/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static inline void wait_for_interrupt(void) 
}



struct device_node;

extern int riscv_of_processor_hart(struct device_node *node);

int riscv_of_processor_hartid(struct device_node *node);



extern void riscv_fill_hwcap(void);

arch/riscv/kernel/cpu.c

+5 −2
Original line number Diff line number Diff line
@@ -15,8 +15,11 @@ 
#include <linux/seq_file.h>

#include <linux/of.h>



/* Return -1 if not a valid hart */

int riscv_of_processor_hart(struct device_node *node)

/*

 * Returns the hart ID of the given device tree node, or -1 if the device tree

 * node isn't a RISC-V hart.

 */

int riscv_of_processor_hartid(struct device_node *node)

{

	const char *isa, *status;

	u32 hart;

arch/riscv/kernel/smpboot.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ void __init setup_smp(void) 
	int hart, im_okay_therefore_i_am = 0;



	while ((dn = of_find_node_by_type(dn, "cpu"))) {

		hart = riscv_of_processor_hart(dn);

		hart = riscv_of_processor_hartid(dn);

		if (hart >= 0) {

			set_cpu_possible(hart, true);

			set_cpu_present(hart, true);

drivers/clocksource/riscv_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ void riscv_timer_interrupt(void) 


static int __init riscv_timer_init_dt(struct device_node *n)

{

	int cpu_id = riscv_of_processor_hart(n), error;

	int cpu_id = riscv_of_processor_hartid(n), error;

	struct clocksource *cs;



	if (cpu_id != smp_processor_id())

drivers/irqchip/irq-sifive-plic.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int plic_find_hart_id(struct device_node *node) 
{

	for (; node; node = node->parent) {

		if (of_device_is_compatible(node, "riscv"))

			return riscv_of_processor_hart(node);

			return riscv_of_processor_hartid(node);

	}



	return -1;