From mboxrd@z Thu Jan 1 00:00:00 1970 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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 293EBC43381 for ; Sat, 30 Mar 2019 01:00:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF449217F5 for ; Sat, 30 Mar 2019 01:00:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907654; bh=ASNU+Yz/vl0E2nHeQn1tXoI+LUjlijN15G31D/+RcQI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wdI17sfUhvlDte8QZ06XIit/JJ/nHSIP7A1fy6pOjv2T/XejTyOseI9K5NQe1M1DF tmKwRmgAOoP+qSUIaF+rKu978zTbh2kN+JDPvofQbBMw4gn8x0O8QZjtIwEB7YEbG7 mhI/ck/QVBvcpw30Ad0DOP78R4hWcXrqf9j7+bj4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731725AbfC3BAr (ORCPT ); Fri, 29 Mar 2019 21:00:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:36360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731530AbfC3A4j (ORCPT ); Fri, 29 Mar 2019 20:56:39 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 12C9121905; Sat, 30 Mar 2019 00:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907398; bh=ASNU+Yz/vl0E2nHeQn1tXoI+LUjlijN15G31D/+RcQI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DT5QGQ9XPhNNe9jIIc39R7kJ2eFANMwtKD7FUeD7tMnrZkAlEji1S/IHE4KQPDvHM c+ewtOL5jIbVbhfeiv9QmJ5clX8B+fZZDDpeLbxlasT88l66iqDPCIeKk1tz/VLGvJ C5TqtkBKsHI+xKMTHEagt/nNomF8Sq+6hUF8N1Jw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jianguo Chen , Marc Zyngier , Sasha Levin Subject: [PATCH AUTOSEL 4.9 21/27] irqchip/mbigen: Don't clear eventid when freeing an MSI Date: Fri, 29 Mar 2019 20:55:47 -0400 Message-Id: <20190330005555.28087-21-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330005555.28087-1-sashal@kernel.org> References: <20190330005555.28087-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jianguo Chen [ Upstream commit fca269f201a8d9985c0a31fb60b15d4eb57cef80 ] mbigen_write_msg clears eventid bits of a mbigen register when free a interrupt, because msi_domain_deactivate memset struct msg to zero. Then multiple mbigen pins with zero eventid will report the same interrupt number. The eventid clear call trace: free_irq __free_irq irq_shutdown irq_domain_deactivate_irq __irq_domain_deactivate_irq __irq_domain_deactivate_irq msi_domain_deactivate platform_msi_write_msg mbigen_write_msg Signed-off-by: Jianguo Chen [maz: massaged subject] Signed-off-by: Marc Zyngier Signed-off-by: Sasha Levin --- drivers/irqchip/irq-mbigen.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c index 05d87f60d929..406bfe618448 100644 --- a/drivers/irqchip/irq-mbigen.c +++ b/drivers/irqchip/irq-mbigen.c @@ -160,6 +160,9 @@ static void mbigen_write_msg(struct msi_desc *desc, struct msi_msg *msg) void __iomem *base = d->chip_data; u32 val; + if (!msg->address_lo && !msg->address_hi) + return; + base += get_mbigen_vec_reg(d->hwirq); val = readl_relaxed(base); -- 2.19.1