summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZenghui Yu <yuzenghui@huawei.com>2020-02-06 15:57:06 +0800
committerMarc Zyngier <maz@kernel.org>2020-02-08 10:01:33 +0000
commite88bd316e5971fe78884ad1f466b9fc576575e5f (patch)
tree35c43373fcc365e4045914cd88f9bcfa45a1ae01
parent107945227ac5d4c37911c7841b27c64b489ce9a9 (diff)
downloadlinux-stable-e88bd316e5971fe78884ad1f466b9fc576575e5f.tar.gz
linux-stable-e88bd316e5971fe78884ad1f466b9fc576575e5f.tar.bz2
linux-stable-e88bd316e5971fe78884ad1f466b9fc576575e5f.zip
irqchip/gic-v4.1: Fix programming of GICR_VPROPBASER_4_1_SIZE
The Size field of GICv4.1 VPROPBASER register indicates number of pages minus one and together Page_Size and Size control the vPEID width. Let's respect this requirement of the architecture. Signed-off-by: Zenghui Yu <yuzenghui@huawei.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20200206075711.1275-2-yuzenghui@huawei.com
-rw-r--r--drivers/irqchip/irq-gic-v3-its.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index e5a25d97f8db..992bc72cab6f 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -2531,7 +2531,7 @@ static int allocate_vpe_l1_table(void)
npg = 1;
}
- val |= FIELD_PREP(GICR_VPROPBASER_4_1_SIZE, npg);
+ val |= FIELD_PREP(GICR_VPROPBASER_4_1_SIZE, npg - 1);
/* Right, that's the number of CPU pages we need for L1 */
np = DIV_ROUND_UP(npg * psz, PAGE_SIZE);