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=-6.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,URIBL_BLOCKED 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 99F5BC10DCE for ; Sun, 15 Mar 2020 10:47:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 66894206E9 for ; Sun, 15 Mar 2020 10:47:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584269256; bh=+KwrgMR0Pd0knpUrnzdKz7VrsgRaYIcdnOeh/toGV+8=; h=Subject:To:Cc:From:Date:List-ID:From; b=mx1dYAsangblz+te6QcBR5zs7IndjF81/PhPImJBty3I4qBxsXmVgvKtRg5CBIqO1 MOs/ttEd6yJ22QZFaRfhw+noJV+t8uM1kjnf3jy045jOcP74ghKS52/WD3J3/Vu2Hl Z7A40cOdQ30h4fonL6lnBD8b+9SCg1H9IY+9lhn4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728290AbgCOKrg (ORCPT ); Sun, 15 Mar 2020 06:47:36 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:57929 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728278AbgCOKrf (ORCPT ); Sun, 15 Mar 2020 06:47:35 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 40AD222063; Sun, 15 Mar 2020 06:47:35 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sun, 15 Mar 2020 06:47:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=FXIKXd 2id/Kdsa5WulyY8T3Ws5QPzH8zOhn2FP3TpuI=; b=xzLtF223L+RLxyA4KNBwFo EgyxGPU3pvnuZYYsGPnTB49OvMIz76JlaR22bLxo851ZixV02ru4W5EmdGnwpHSp J45O1iXIyg8ZIkFey6MfnSXrDxnE1p53gdJuhQivoBoeynT7fypvhq5PMSqu/ATK UlWoa9wGEre0YYK1wSHs3RLHeUE4xH+9fgXOJtUkdim9TvZwS7D6iueKD8WaQNTD 496S02U8+UA2BaYvowQ53O2UcuHVCtdIRO6C+07hNmkN7wpd3yOGzD1K9UjxzB/l nIOgVP/wq//X2AXIGCmin2rx3kW0pioILZupZ9Mei1ImwdoycaAYmAOnXh3OTxEA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrudeftddgudefkecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepuffvhfffkfggtgfgsehtkeertd dttdflnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdho rhhgqeenucfkphepkeefrdekiedrkeelrddutdejnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghhrdgtohhm X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 995483280066; Sun, 15 Mar 2020 06:47:33 -0400 (EDT) Subject: FAILED: patch "[PATCH] net: dsa: mv88e6xxx: fix lockup on warm boot" failed to apply to 4.19-stable tree To: rmk+kernel@armlinux.org.uk, andrew@lunn.ch, davem@davemloft.net Cc: From: Date: Sun, 15 Mar 2020 11:47:31 +0100 Message-ID: <15842692511666@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 0395823b8d9a4d87bd1bf74359123461c2ae801b Mon Sep 17 00:00:00 2001 From: Russell King Date: Fri, 28 Feb 2020 19:39:41 +0000 Subject: [PATCH] net: dsa: mv88e6xxx: fix lockup on warm boot If the switch is not hardware reset on a warm boot, interrupts can be left enabled, and possibly pending. This will cause us to enter an infinite loop trying to service an interrupt we are unable to handle, thereby preventing the kernel from booting. Ensure that the global 2 interrupt sources are disabled before we claim the parent interrupt. Observed on the ZII development revision B and C platforms with reworked serdes support, and using reboot -f to reboot the platform. Fixes: dc30c35be720 ("net: dsa: mv88e6xxx: Implement interrupt support.") Signed-off-by: Russell King Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller diff --git a/drivers/net/dsa/mv88e6xxx/global2.c b/drivers/net/dsa/mv88e6xxx/global2.c index 01503014b1ee..8fd483020c5b 100644 --- a/drivers/net/dsa/mv88e6xxx/global2.c +++ b/drivers/net/dsa/mv88e6xxx/global2.c @@ -1099,6 +1099,13 @@ int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip) { int err, irq, virq; + chip->g2_irq.masked = ~0; + mv88e6xxx_reg_lock(chip); + err = mv88e6xxx_g2_int_mask(chip, ~chip->g2_irq.masked); + mv88e6xxx_reg_unlock(chip); + if (err) + return err; + chip->g2_irq.domain = irq_domain_add_simple( chip->dev->of_node, 16, 0, &mv88e6xxx_g2_irq_domain_ops, chip); if (!chip->g2_irq.domain) @@ -1108,7 +1115,6 @@ int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip) irq_create_mapping(chip->g2_irq.domain, irq); chip->g2_irq.chip = mv88e6xxx_g2_irq_chip; - chip->g2_irq.masked = ~0; chip->device_irq = irq_find_mapping(chip->g1_irq.domain, MV88E6XXX_G1_STS_IRQ_DEVICE);