Received: by 10.223.185.116 with SMTP id b49csp1067910wrg; Fri, 23 Feb 2018 11:19:38 -0800 (PST) X-Google-Smtp-Source: AH8x224ybeSEgPeDzStQwTITnkv2ipFMNbD9b1xxvWbRsx9nvD4W698Jw6LyHKw5Hv/u8MLevp0W X-Received: by 10.99.154.73 with SMTP id e9mr2175833pgo.26.1519413578194; Fri, 23 Feb 2018 11:19:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519413578; cv=none; d=google.com; s=arc-20160816; b=DifQ1bxWcdSoiWvjXo6+/RwAP+EBlrCthbOUGFP7YxEnFmOI0SOcQPOR00bvckiTFs BkrkBDUl1HXr7VvN3YIXw+rTMZK8NIST5hX8VintdFKL364Naps9NQI7Rm+IBwDSLAXB 8jVLdMgWqRiyDy/D3mN6a9PLaZn4rJAVAqeTvNPns9J5vR8CnZz6ebByJKfZyWNgoKGU t0L04K6nXPNqM5gO1au6qj5+/VLjUslagjyBavBebgdH2IMKRL6rTy0ezC4aoTaW0Xam JDQuDFIxhpZnCnOgSEwFMn/f3k2T0hN9FnoAIpf+y/ZlcVqblHajJZNdkbJWWIm6WUUw VYVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=bHR0qXj9IF4DaMJMzIZ0EGgwTZZIyXytfCefvqvT5ok=; b=qg7iFZTVxFCjuVhlQ4g3s3Od8sJj1+91qZYpCdA8kOG5hMu3ieRhu91bV+365QOBat NgeVsKKIsQxLv0sKRixskChC7+/B+DS1IAYD4w8lNwHFFgnaq0djFqSQHq77+yH8LiqS MGAA+HH7aC3AmU2YZFlCatLZCr8UKVs1WipiNEcbtHLBY2M5z/jr+oR5KWBsI9ZSkSsX gwu7JzJd4npCQ6MTN4DN6Whq2rpNE7DN07Uq/x0pfaOKaiSidfH2ZDcQJNjjjSIyYo6B nydSafHqK9noGpaO7TtD79CeIvfg4c8zWWfHz0tJSWsqWuflxwBHRCyMYO4gYxXIwTnt rmkA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b2-v6si149180plz.81.2018.02.23.11.19.23; Fri, 23 Feb 2018 11:19:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754123AbeBWTRh (ORCPT + 99 others); Fri, 23 Feb 2018 14:17:37 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:47968 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965030AbeBWSyy (ORCPT ); Fri, 23 Feb 2018 13:54:54 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id A587A1215; Fri, 23 Feb 2018 18:54:53 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrew Lunn , Vivien Didelot , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 124/159] net: dsa: mv88e6xxx: Fix interrupt masking on removal Date: Fri, 23 Feb 2018 19:27:12 +0100 Message-Id: <20180223170758.219733834@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andrew Lunn [ Upstream commit 3d5fdba1842bdd2eef29364c660558cb4cbb3fe0 ] When removing the interrupt handling code, we should mask the generation of interrupts. The code however unmasked all interrupts. This can then cause a new interrupt. We then get into a deadlock where the interrupt thread is waiting to run, and the code continues, trying to remove the interrupt handler, which means waiting for the thread to complete. On a UP machine this deadlocks. Fix so we really mask interrupts in the hardware. The same error is made in the error path when install the interrupt handling code. Fixes: 3460a5770ce9 ("net: dsa: mv88e6xxx: Mask g1 interrupts and free interrupt") Signed-off-by: Andrew Lunn Reviewed-by: Vivien Didelot Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/dsa/mv88e6xxx/chip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -339,7 +339,7 @@ static void mv88e6xxx_g1_irq_free(struct u16 mask; mv88e6xxx_g1_read(chip, MV88E6XXX_G1_CTL1, &mask); - mask |= GENMASK(chip->g1_irq.nirqs, 0); + mask &= ~GENMASK(chip->g1_irq.nirqs, 0); mv88e6xxx_g1_write(chip, MV88E6XXX_G1_CTL1, mask); free_irq(chip->irq, chip); @@ -395,7 +395,7 @@ static int mv88e6xxx_g1_irq_setup(struct return 0; out_disable: - mask |= GENMASK(chip->g1_irq.nirqs, 0); + mask &= ~GENMASK(chip->g1_irq.nirqs, 0); mv88e6xxx_g1_write(chip, MV88E6XXX_G1_CTL1, mask); out_mapping: