hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

irqchip/gic: Make quirks matching conditional on init return value 

As it turns out, the IIDR is not sufficient to distinguish between GICv3
implementations when it comes to enabling quirks. So update the prototype
of the init() hook to return a bool, and interpret a 'false' return value
as no match, in which case the 'enabling workaround' log message should
not be printed.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
Ard Biesheuvel 2017-10-17 17:55:55 +01:00 committed by Marc Zyngier
parent fa15001919
commit 9d111d4910
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/irqchip/irq-gic-common.c
View File

@ -40,8 +40,9 @@ void gic_enable_quirks(u32 iidr, const struct gic_quirk *quirks,
for (; quirks->desc; quirks++) { for (; quirks->desc; quirks++) {
if (quirks->iidr != (quirks->mask & iidr)) if (quirks->iidr != (quirks->mask & iidr))
continue; continue;
quirks->init(data); if (quirks->init(data))
pr_info("GIC: enabling workaround for %s\n", quirks->desc); pr_info("GIC: enabling workaround for %s\n",
quirks->desc);
} }
} }

2
drivers/irqchip/irq-gic-common.h
View File

@ -23,7 +23,7 @@
struct gic_quirk { struct gic_quirk {
const char *desc; const char *desc;
void (*init)(void *data); bool (*init)(void *data);
u32 iidr; u32 iidr;
u32 mask; u32 mask;
}; };

12
drivers/irqchip/irq-gic-v3-its.c
View File

@ -2730,28 +2730,34 @@ static int its_force_quiescent(void __iomem *base)
} }
} }
static void __maybe_unused its_enable_quirk_cavium_22375(void *data) static bool __maybe_unused its_enable_quirk_cavium_22375(void *data)
{ {
struct its_node *its = data; struct its_node *its = data;
/* erratum 22375: only alloc 8MB table size */ /* erratum 22375: only alloc 8MB table size */
its->device_ids = 0x14; /* 20 bits, 8MB */ its->device_ids = 0x14; /* 20 bits, 8MB */
its->flags |= ITS_FLAGS_WORKAROUND_CAVIUM_22375; its->flags |= ITS_FLAGS_WORKAROUND_CAVIUM_22375;
return true;
} }
static void __maybe_unused its_enable_quirk_cavium_23144(void *data) static bool __maybe_unused its_enable_quirk_cavium_23144(void *data)
{ {
struct its_node *its = data; struct its_node *its = data;
its->flags |= ITS_FLAGS_WORKAROUND_CAVIUM_23144; its->flags |= ITS_FLAGS_WORKAROUND_CAVIUM_23144;
return true;
} }
static void __maybe_unused its_enable_quirk_qdf2400_e0065(void *data) static bool __maybe_unused its_enable_quirk_qdf2400_e0065(void *data)
{ {
struct its_node *its = data; struct its_node *its = data;
/* On QDF2400, the size of the ITE is 16Bytes */ /* On QDF2400, the size of the ITE is 16Bytes */
its->ite_size = 16; its->ite_size = 16;
return true;
} }
static const struct gic_quirk its_quirks[] = { static const struct gic_quirk its_quirks[] = {