From patchwork Fri Feb 21 07:41:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 230980 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB4E9C35645 for ; Fri, 21 Feb 2020 07:59:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 808AA20801 for ; Fri, 21 Feb 2020 07:59:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582271997; bh=b7WeVWMU18+0j8Oy/dzmg82C976aMJG0iJwWBry31w0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0seZ9nZBE61slGXqn/srwMMEx7GP1MjUEJ24k7hGsA19lRZ+EIQ2QSHhQYWdh2o8M zVq5xPM1gPfNTglj0m9TgqcaWWU6RCAe9rb7lTx8wpD9LlI7HbmxJk1DF5f8SBD6pb MhNTP/VyYJfn57H6TfA/WSGldxeIdXmxRx0be0YM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730976AbgBUH74 (ORCPT ); Fri, 21 Feb 2020 02:59:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:60094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730966AbgBUH7z (ORCPT ); Fri, 21 Feb 2020 02:59:55 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4008F222C4; Fri, 21 Feb 2020 07:59:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582271994; bh=b7WeVWMU18+0j8Oy/dzmg82C976aMJG0iJwWBry31w0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pfu0JQ+2Hzicy75BxlEPZT+Gr5resjWfTNKV3NHqMx6na5yfxtClH/Tnc/bZl55qw E7qXHai8ZAhK3aGzvFHjqtuoq4YmoRgGeqFgW+5GVle9mbTEL4OdX2Ruo/CnzR1Lx3 8gZ9k+94tf9F+mO2hEM33F5+CXptS3xTVD5nkUSM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zenghui Yu , Marc Zyngier , Sasha Levin Subject: [PATCH 5.5 376/399] irqchip/gic-v3-its: Reference to its_invall_cmd descriptor when building INVALL Date: Fri, 21 Feb 2020 08:41:41 +0100 Message-Id: <20200221072436.881050013@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072402.315346745@linuxfoundation.org> References: <20200221072402.315346745@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zenghui Yu [ 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 Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20191202071021.1251-1-yuzenghui@huawei.com Signed-off-by: Sasha Levin --- drivers/irqchip/irq-gic-v3-its.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index b704214390c0f..50f89056c16bb 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -598,7 +598,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);