irqchip/gic-v3-its: Reference to its_invall_cmd descriptor when building INVALL

BugLink: https://bugs.launchpad.net/bugs/1867837
[ Upstream commit 107945227ac5d4c37911c7841b27c64b489ce9a9 ]

It looks like an obvious mistake to use its_mapc_cmd descriptor when
building the INVALL command block. It so far worked by luck because
both its_mapc_cmd.col and its_invall_cmd.col sit at the same offset of
the ITS command descriptor, but we should not rely on it.

Fixes: cc2d3216f53c ("irqchip: GICv3: ITS command queue")
Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20191202071021.1251-1-yuzenghui@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 5cc27ad2abd1970817f36263c3d1b2741f41479b..0714f4fe7111f3406cebd8850555d5110c4458df 100644 (file)
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -556,7 +556,7 @@ static struct its_collection *its_build_invall_cmd(struct its_node *its,
                                                   struct its_cmd_desc *desc)
 {
        its_encode_cmd(cmd, GITS_CMD_INVALL);
-       its_encode_collection(cmd, desc->its_mapc_cmd.col->col_id);
+       its_encode_collection(cmd, desc->its_invall_cmd.col->col_id);
 
        its_fixup_cmd(cmd);