From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372482-1517180644-2-540827096852415491 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517180644; b=Uyy0yKUD8YtcNppMItqzq/4SQctivXCFA3g/pi435Ym9Eme TtHCoAPiQcnXAL2arClubdbvvU10YCyXAQlDyibRF05mGrABzfgR2acLMjyM+lwf p3ejDrtnL5CaySzn8yIQ5CcYSfRcYE7vsWcyMdG3sHM8LzOnnmYftMsEsf8YuMwv 07M3F6I5JuXWvzaMv8R8tyX5z+ctVwVI0uJWrqfUowI6IdPtqdnQ6Yo1uNBxVD+b jm+Y7FoLq8aiaWYWmBzmfzuYIKzJVrq/pguuQuPY9MEcVaYBUrWPxAqfQjzAE8zD 8/nHUGB8Z2Cl9KCANmOuKmpPaWNpjt3rOFz+YxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517180644; bh=XUx/qG UDazTCzt+cjNbNqee/eSuAXUsA9gy6yuj1XSI=; b=chMdiptMXTyHyv23os0od2 BRZNt4DuI2gMW5MX8DHoOb4q4tzU7yLoxihXUW6RuwQs7aBog3TeTwJJ6pA5QcNq qNBX1xtlvxtxTtEA1ccM2ttqqF87GmiSCC87xnqYOhdsY+UqLXA5a1GExnAni9bg im6Ia74MFrCsZhBudZ4spP6hmqBd/ZAWtQ+grfeK/Zz0q53gqUfCq31G7OnPjMiK 7MxCIxxe53ZmqUNstP7HomslNWG6I2M8j/rg6v6bPRikyqJEQfhOl0sVFPFMPoQq LtnPxo/dkE0n5/i4X1cK6gv+3EyAlIHa/NX37KJPmByTUu6DM7u18UkqVSLnCUtw == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=NvIBY+2D x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=NvIBY+2D x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753588AbeA1XDo (ORCPT ); Sun, 28 Jan 2018 18:03:44 -0500 Received: from mail-by2nam03on0134.outbound.protection.outlook.com ([104.47.42.134]:46538 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753467AbeA1W1j (ORCPT ); Sun, 28 Jan 2018 17:27:39 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Andrew Lunn , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 068/100] net: dsa: mv88e6xxx: Fix interrupt masking on removal Thread-Topic: [PATCH AUTOSEL for 4.14 068/100] net: dsa: mv88e6xxx: Fix interrupt masking on removal Thread-Index: AQHTmIcT+OQ3am2WMEm9lZ7DKnkQ4A== Date: Sun, 28 Jan 2018 22:26:43 +0000 Message-ID: <20180128222547.7398-68-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1034;6:7AOsds9Zd1LKRKWMcL9iDfA7dBK4hQUNukH9EHFn7Mr2k97Ow4AUXtdn7jjkpUU04R8YVI9t6NNnXcGsODHh4KCnR/ZEm1FU5JjqvVZtY8ryJe/jzdVrs1mK5mzeAjMtpLruwLAtcWXro3iC/KSKcLD/8XqjoHBg0oAu7zq7uHlNw432AghmzCet6RsE6qw7qEtokQ0mmHtODF249t6EEHu0bR5CMk9C66MpA5xR9P/K3g866sbMPsZq9yUal9Ln1pCXMV2Tcsi3loYkcfrF9HOEXKRyOQzjeR3O2sIxK+8TMptffrAt7cgpF6ZqYwDuJI99lk5ezvsga7Tk3x7sM0Qs5ScryWmMXWHLE7nG/y318/FtokpS5bDdQMk2GD7E;5:0UMm3dBBtNVm3LLd2tSdQ1j7KhOAil0t05Ilxop00ZQFosQxbf468KSvzm5+U6hR1iIFjJkzRrGVcsPnP8pr51S0r4jsjUVhfor8JUZBhJEkXLkVqxbDYVlxXPlrWEzYH7yYYFDfi0neIBAeTBPbpC9nWjZHUr34qjAZhMGZl84=;24:ltO2BQbYnIWjA3clAAxdIVPtLaAWdkyxotWAjTyR7wBK5aemAE7WAw9sNvOyxDHaFmIie2UMUK0B66JzIepID6pWb3DauRVK/ePaGgh++hA=;7:zR9oIWRcC4LmXbBhkqm+TkiEzcSt7AcA4vW8+q6AvW9co3Iuwh3SpGSwR56iKdURafojqpMFA+ZQXXQkNBNbGexCWnrdg1YNuug4CPXyqKahV5rrRrsyEw4FmOVY7MoEzb5ob9ji/qUoiK7Bl9PELmnWZRCfZ0YYBJOu0XJnhGWN21uDCp2z3ftD5Hs1vZugEueB0sn3rAYgC4Nysvw/jsOTtMoxRKkbOpjFWm2Tr63KQ6GqSffuiit08BPdkr1X x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 2d692d65-40d3-4bcc-e6d5-08d5669e551f x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1034; x-ms-traffictypediagnostic: MW2PR2101MB1034: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1034;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1034; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(346002)(376002)(396003)(366004)(39380400002)(199004)(189003)(2906002)(2950100002)(26005)(1076002)(66066001)(6116002)(5660300001)(3846002)(186003)(316002)(22452003)(54906003)(110136005)(6666003)(86612001)(36756003)(6486002)(86362001)(53936002)(6436002)(6512007)(106356001)(8676002)(105586002)(305945005)(7736002)(68736007)(478600001)(81166006)(102836004)(76176011)(6506007)(72206003)(10290500003)(14454004)(2900100001)(3660700001)(99286004)(97736004)(81156014)(25786009)(8936002)(4326008)(5250100002)(3280700002)(2501003)(10090500001)(107886003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1034;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: FJ2z9CWz9fDaFYQTIuf8Oz+SBMqdue/WWjWjcL+IzLNaE4k3leO4SJGYHSDmkLXlA+ZY5nu9k60L6zquMLhQAw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d692d65-40d3-4bcc-e6d5-08d5669e551f X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:43.3626 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1034 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 inte= rrupt") Signed-off-by: Andrew Lunn Reviewed-by: Vivien Didelot Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/mv88e6xxx/chip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/c= hip.c index d74c7335c512..07704b372861 100644 --- 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 mv88e6xxx_chip= *chip) u16 mask; =20 mv88e6xxx_g1_read(chip, MV88E6XXX_G1_CTL1, &mask); - mask |=3D GENMASK(chip->g1_irq.nirqs, 0); + mask &=3D ~GENMASK(chip->g1_irq.nirqs, 0); mv88e6xxx_g1_write(chip, MV88E6XXX_G1_CTL1, mask); =20 free_irq(chip->irq, chip); @@ -395,7 +395,7 @@ static int mv88e6xxx_g1_irq_setup(struct mv88e6xxx_chip= *chip) return 0; =20 out_disable: - mask |=3D GENMASK(chip->g1_irq.nirqs, 0); + mask &=3D ~GENMASK(chip->g1_irq.nirqs, 0); mv88e6xxx_g1_write(chip, MV88E6XXX_G1_CTL1, mask); =20 out_mapping: --=20 2.11.0