diff options
| author | Yun Wu <wuyun.wu@huawei.com> | 2015-03-06 16:37:47 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2015-03-08 05:34:12 +0000 |
| commit | 790b57aed156d22d6c7101a37adc78a621be1167 (patch) | |
| tree | aff7a38a50813e24433f7058c6f206891b3e8948 /drivers/irqchip/irq-gic-v3-its.c | |
| parent | 6c834125ba460eb1eea63bcc053b45564ca93407 (diff) | |
| download | op-kernel-dev-790b57aed156d22d6c7101a37adc78a621be1167.zip op-kernel-dev-790b57aed156d22d6c7101a37adc78a621be1167.tar.gz | |
irqchip: gicv3-its: Use 64KB page as default granule
The field of page size in register GITS_BASERn might be read-only
if an implementation only supports a single, fixed page size. But
currently the ITS driver will throw out an error when PAGE_SIZE
is less than the minimum size supported by an ITS. So addressing
this problem by using 64KB pages as default granule for all the
ITS base tables.
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
[maz: fixed bug breaking non Device Table allocations]
Signed-off-by: Yun Wu <wuyun.wu@huawei.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Link: https://lkml.kernel.org/r/1425659870-11832-9-git-send-email-marc.zyngier@arm.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'drivers/irqchip/irq-gic-v3-its.c')
| -rw-r--r-- | drivers/irqchip/irq-gic-v3-its.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 69eeea3..0fe25a9 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -800,14 +800,14 @@ static int its_alloc_tables(struct its_node *its) { int err; int i; - int psz = PAGE_SIZE; + int psz = SZ_64K; u64 shr = GITS_BASER_InnerShareable; for (i = 0; i < GITS_BASER_NR_REGS; i++) { u64 val = readq_relaxed(its->base + GITS_BASER + i * 8); u64 type = GITS_BASER_TYPE(val); u64 entry_size = GITS_BASER_ENTRY_SIZE(val); - int order = 0; + int order = get_order(psz); int alloc_size; u64 tmp; void *base; |
