leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

riscv: andes_plic: init plic by scanning each cpu node

Browse Source 
Initialize plic driver by ofnode_for_each_subnode() instead
of cpu_get_count().

This way can support to skip some harts which maybe marked as
unavailable, but the cpu node exists indeed.

Signed-off-by: Rick Chen <rick@andestech.com>
Cc: KC Lin <kclin@andestech.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Rick Chen 2019-08-21 11:26:50 +08:00 committed by Andes
parent f6cb427fdc
commit d58b0a6ee1
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/riscv/lib/andes_plic.c
View File

@ -44,15 +44,12 @@ static int init_plic(void);
} \ } \
} while (0) } while (0)
static int enable_ipi(int harts) static int enable_ipi(int hart)
{ {
int i; int en;
int en = ENABLE_HART_IPI;
for (i = 0; i < harts; i++) { en = ENABLE_HART_IPI >> hart;
en = en >> i; writel(en, (void __iomem *)ENABLE_REG(gd->arch.plic, hart));
writel(en, (void __iomem *)ENABLE_REG(gd->arch.plic, i));
}
return 0; return 0;
} }
@ -60,18 +57,35 @@ static int enable_ipi(int harts)
static int init_plic(void) static int init_plic(void)
{ {
struct udevice *dev; struct udevice *dev;
ofnode node;
int ret; int ret;
u32 reg;
ret = uclass_find_first_device(UCLASS_CPU, &dev); ret = uclass_find_first_device(UCLASS_CPU, &dev);
if (ret) if (ret)
return ret; return ret;
if (ret == 0 && dev) { if (ret == 0 && dev) {
ret = cpu_get_count(dev); ofnode_for_each_subnode(node, dev_ofnode(dev->parent)) {
if (ret < 0) const char *device_type;
return ret;
device_type = ofnode_read_string(node, "device_type");
if (!device_type)
continue;
if (strcmp(device_type, "cpu"))
continue;
/* skip if hart is marked as not available */
if (!ofnode_is_available(node))
continue;
/* read hart ID of CPU */
ret = ofnode_read_u32(node, "reg", &reg);
if (ret == 0)
enable_ipi(reg);
}
enable_ipi(ret);
return 0; return 0;
} }