| From d8326c831693bc08eafff6d0ed72317944caa9db Mon Sep 17 00:00:00 2001 |
| From: Zenghui Yu <yuzenghui@huawei.com> |
| Date: Thu, 31 Jan 2019 11:19:43 +0000 |
| Subject: irqchip/gic-v3-its: Fix ITT_entry_size accessor |
| |
| [ Upstream commit 56841070ccc87b463ac037d2d1f2beb8e5e35f0c ] |
| |
| According to ARM IHI 0069C (ID070116), we should use GITS_TYPER's |
| bits [7:4] as ITT_entry_size instead of [8:4]. Although this is |
| pretty annoying, it only results in a potential over-allocation |
| of memory, and nothing bad happens. |
| |
| Fixes: 3dfa576bfb45 ("irqchip/gic-v3-its: Add probing for VLPI properties") |
| Signed-off-by: Zenghui Yu <yuzenghui@huawei.com> |
| [maz: massaged subject and commit message] |
| Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| include/linux/irqchip/arm-gic-v3.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h |
| index 8bdbb5f29494..3188c0bef3e7 100644 |
| --- a/include/linux/irqchip/arm-gic-v3.h |
| +++ b/include/linux/irqchip/arm-gic-v3.h |
| @@ -319,7 +319,7 @@ |
| #define GITS_TYPER_PLPIS (1UL << 0) |
| #define GITS_TYPER_VLPIS (1UL << 1) |
| #define GITS_TYPER_ITT_ENTRY_SIZE_SHIFT 4 |
| -#define GITS_TYPER_ITT_ENTRY_SIZE(r) ((((r) >> GITS_TYPER_ITT_ENTRY_SIZE_SHIFT) & 0x1f) + 1) |
| +#define GITS_TYPER_ITT_ENTRY_SIZE(r) ((((r) >> GITS_TYPER_ITT_ENTRY_SIZE_SHIFT) & 0xf) + 1) |
| #define GITS_TYPER_IDBITS_SHIFT 8 |
| #define GITS_TYPER_DEVBITS_SHIFT 13 |
| #define GITS_TYPER_DEVBITS(r) ((((r) >> GITS_TYPER_DEVBITS_SHIFT) & 0x1f) + 1) |
| -- |
| 2.19.1 |
| |
