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 6B60DC43381 for ; Sat, 30 Mar 2019 01:08:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3C7962184C for ; Sat, 30 Mar 2019 01:08:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553908138; bh=DuBdEdG4C10uQ/VybgsnniNYLisy4B48gkFMudNEeGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JEB5vCfN1Fx3ZMbeCcZFrh86dtwEgm6IEdT8t0xANW4ZV42kAQS+KaowGzmh+kM7B 5lQiJcWWGHlFKi94JOW+34jzpN+rm/H73sh4RVtA7xSgtYoqzaDfDB89Wqwnqrux0x 6UOdT0mDoMBT0wmBJAS8CHnCBTGUfyM0UFUHGdTo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731065AbfC3Awh (ORCPT ); Fri, 29 Mar 2019 20:52:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:59326 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731058AbfC3Awh (ORCPT ); Fri, 29 Mar 2019 20:52:37 -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 57EF5218D9; Sat, 30 Mar 2019 00:52:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907157; bh=DuBdEdG4C10uQ/VybgsnniNYLisy4B48gkFMudNEeGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IbZ+BIXuQju5wmxlskHKs3WcLbis8R2OvL8F5TTAj6EwyygOh8L5HWOzxnvuyGpKn u+EEqWQEeS69oXAaVVFtNo9Hcg4HKeO2mrQn7KrMnhZvdmhaQglNPDUsiW2jwZqOGF 9XDdT9ffAODnlO9qZ8ze27Z0mSBYz8hRi0uIk18Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jianguo Chen , Marc Zyngier , Sasha Levin Subject: [PATCH AUTOSEL 5.0 55/67] irqchip/mbigen: Don't clear eventid when freeing an MSI Date: Fri, 29 Mar 2019 20:50:35 -0400 Message-Id: <20190330005047.25998-55-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330005047.25998-1-sashal@kernel.org> References: <20190330005047.25998-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 567b29c47608..98b6e1d4b1a6 100644 --- a/drivers/irqchip/irq-mbigen.c +++ b/drivers/irqchip/irq-mbigen.c @@ -161,6 +161,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