sifive/sifive_l2_cache: Add disabling IRQ option (workaround)

This commit is contained in:
Tom 2021-02-13 22:25:17 +08:00 committed by Emil Renner Berthing
parent 53a0235d5b
commit 578236e1ab
3 changed files with 53 additions and 0 deletions

View file

@ -271,6 +271,44 @@ static int plic_starting_cpu(unsigned int cpu)
return 0;
}
#if IS_ENABLED(CONFIG_SIFIVE_L2_IRQ_DISABLE)
#ifdef CONFIG_SOC_STARFIVE_VIC7100
#define SIFIVE_L2_MAX_ECCINTR 4
#else
#define SIFIVE_L2_MAX_ECCINTR 3
#endif
static const struct of_device_id sifive_l2_ids[] = {
{ .compatible = "sifive,fu540-c000-ccache" },
{ .compatible = "starfive,ccache0" },
{ /* end of table */ },
};
static void sifive_l2_irq_disable(struct plic_handler *handler)
{
int i, irq;
struct of_phandle_args oirq;
struct device_node *np = of_find_matching_node(NULL, sifive_l2_ids);
if (!np) {
pr_err("Can't get L2 cache device node.\n");
return;
}
for (i = 0; i < SIFIVE_L2_MAX_ECCINTR; i++) {
if (!of_irq_parse_one(np, i, &oirq)) {
irq = *oirq.args;
if (irq) {
pr_info("disable L2 cache irq %d in plic\n", irq);
plic_toggle(handler, irq, 0);
continue;
}
}
pr_err("Can't get L2 cache irq(#%d).\n", i);
}
}
#endif
static int __init plic_init(struct device_node *node,
struct device_node *parent)
{
@ -364,6 +402,9 @@ static int __init plic_init(struct device_node *node,
done:
for (hwirq = 1; hwirq <= nr_irqs; hwirq++)
plic_toggle(handler, hwirq, 0);
#if IS_ENABLED(CONFIG_SIFIVE_L2_IRQ_DISABLE)
sifive_l2_irq_disable(handler);
#endif
nr_handlers++;
}

View file

@ -22,4 +22,8 @@ config SIFIVE_L2_FLUSH_SIZE
endif # SIFIVE_L2_FLUSH
config SIFIVE_L2_IRQ_DISABLE
bool "Disable Level 2 Cache Controller interrupts"
default y if SOC_STARFIVE_VIC7100
endif

View file

@ -40,7 +40,9 @@
#define SIFIVE_L2_FLUSH64_LINE_LEN 64
static void __iomem *l2_base = NULL;
#if !IS_ENABLED(CONFIG_SIFIVE_L2_IRQ_DISABLE)
static int g_irq[SIFIVE_L2_MAX_ECCINTR];
#endif
static struct riscv_cacheinfo_ops l2_cache_ops;
enum {
@ -188,6 +190,7 @@ static const struct attribute_group *l2_get_priv_group(struct cacheinfo *this_le
return NULL;
}
#if !IS_ENABLED(CONFIG_SIFIVE_L2_IRQ_DISABLE)
static irqreturn_t l2_int_handler(int irq, void *device)
{
unsigned int add_h, add_l;
@ -231,12 +234,15 @@ static irqreturn_t l2_int_handler(int irq, void *device)
return IRQ_HANDLED;
}
#endif
static int __init sifive_l2_init(void)
{
struct device_node *np;
struct resource res;
#if !IS_ENABLED(CONFIG_SIFIVE_L2_IRQ_DISABLE)
int i, rc, intr_num;
#endif
np = of_find_matching_node(NULL, sifive_l2_ids);
if (!np)
@ -249,6 +255,7 @@ static int __init sifive_l2_init(void)
if (!l2_base)
return -ENOMEM;
#if !IS_ENABLED(CONFIG_SIFIVE_L2_IRQ_DISABLE)
intr_num = of_property_count_u32_elems(np, "interrupts");
if (!intr_num) {
pr_err("L2CACHE: no interrupts property\n");
@ -263,6 +270,7 @@ static int __init sifive_l2_init(void)
return rc;
}
}
#endif
l2_config_read();