mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 07:04:24 +00:00
Code Issues Releases Wiki Activity

RISC-V: Rename riscv_of_processor_hart to riscv_of_processor_hartid

Browse source 
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: Palmer Dabbelt <palmer@sifive.com>
[Atish: code comment formatting update]
Signed-off-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
This commit is contained in:
Palmer Dabbelt 2018-10-02 12:15:00 -07:00
parent 9639a44394
commit b2f8cfa7ac
No known key found for this signature in database
GPG key ID: EF4CA1502CCBAB41
5 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/riscv/include/asm/processor.h
View file

@ -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);

7
arch/riscv/kernel/cpu.c
View file

@ -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;

2
arch/riscv/kernel/smpboot.c
View file

@ -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);

2
drivers/clocksource/riscv_timer.c
View file

@ -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())

2
drivers/irqchip/irq-sifive-plic.c
View file

@ -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;