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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS 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 1E0F6C43381 for ; Sun, 24 Mar 2019 18:53:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7EC62147C for ; Sun, 24 Mar 2019 18:53:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DW+taflV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727192AbfCXSxy (ORCPT ); Sun, 24 Mar 2019 14:53:54 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:37324 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726347AbfCXSxy (ORCPT ); Sun, 24 Mar 2019 14:53:54 -0400 Received: by mail-wr1-f66.google.com with SMTP id w10so7663091wrm.4 for ; Sun, 24 Mar 2019 11:53:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=AOiafznSVa9qEa9mffCRSZHVdNjQ1j7ZtzygloJd2KA=; b=DW+taflVTZFUuaHDiZSDx7nhaeVPWPw0PfGnIYUmZBa0NgGbMxs3nOlCllK3VgYGwv 9JTycqYo6t98RZLFyu6OwDkbiyg/OtkdES5sYleVj1tXpQwmxbWVaKtwszxdD5OTt3jO BzvDh+XHWm77ujOF7aQFJmCfd6gTpmnZULS3VlpXEigpKkXGmd1dvJ9vx9HOtkQl1R8T E18noVd8A8mZHyPCpJlAraEIX8GjYJHZwM2wGduAfaKGSTVlMVJI4lSNJeXVVbQRFz1t 9ngFATKvs2UefMS4IOo7/y0a/cDaMnEWAMX3Z5F9UMm76lS6qKBK0rOwwas4UbhxEbJO +PGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=AOiafznSVa9qEa9mffCRSZHVdNjQ1j7ZtzygloJd2KA=; b=poNq1JCa8G0OMtnLaRi901Il6BtLGMyn9Q9SwxvEHERpPsm8po9cVntstvkqnH76kA JdNY0WRAy4KffdDo7+jZ37V2sUOkxj2vA8qI9nPSk82+x1ReRF7fiu3hHFY9bu/cmgur GK8rUPyjZLuMMT5gtfHUJU1tjbC1mjWcfcSYPLJIq+Q7RXv6d1AV4fu9ZDf3PiphgqF0 N3U61lj7AzV/iiB0ry+lWKQppMtCRoQm2+u9XelSZg5iFIf/dEo2AEl8VdFzlFTI95yG n1J430Koz2EJ8vFKCq2y3QiO4Z/1sr+5UFLDSdMM56yfKci5vP2mFnCp5e0dr0l1MtVR 6wYQ== X-Gm-Message-State: APjAAAXh58dQH8TKFswF3sQXH9N1CyJLZAfixtXw6FEZHxcFhRL622aH NHolNnHVU1g9l8Oef7hlksZFu4i3 X-Google-Smtp-Source: APXvYqy0hXrCjMNgpIXnXYjRFM8FhLdFuYEJwdfVtBd0fcu1nWtLDQ0OdJGQGmjZsHJbK94rQHz4jg== X-Received: by 2002:a5d:4a4d:: with SMTP id v13mr12664901wrs.169.1553453631967; Sun, 24 Mar 2019 11:53:51 -0700 (PDT) Received: from [192.168.43.227] (94.197.120.177.threembb.co.uk. [94.197.120.177]) by smtp.gmail.com with ESMTPSA id o10sm8758761wru.54.2019.03.24.11.53.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Mar 2019 11:53:51 -0700 (PDT) To: Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org, stable@vger.kernel.org From: Malcolm Priestley Subject: [PATCH] staging: vt6655: Fix interrupt race condition on device start up. Message-ID: Date: Sun, 24 Mar 2019 18:53:49 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org It appears on some slower systems that the driver can find its way out of the workqueue while the interrupt is disabled by continuous polling by it. Move MACvIntEnable to vnt_interrupt_work so that it is always enabled on all routes out of vnt_interrupt_process. Move MACvIntDisable so that the device doesn't keep polling the system while the workqueue is being processed. Signed-off-by: Malcolm Priestley CC: stable@vger.kernel.org # v4.2+ --- drivers/staging/vt6655/device_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index b370985b58a1..83f1a1cf9182 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1033,8 +1033,6 @@ static void vnt_interrupt_process(struct vnt_private *priv) return; } - MACvIntDisable(priv->PortOffset); - spin_lock_irqsave(&priv->lock, flags); /* Read low level stats */ @@ -1122,8 +1120,6 @@ static void vnt_interrupt_process(struct vnt_private *priv) } spin_unlock_irqrestore(&priv->lock, flags); - - MACvIntEnable(priv->PortOffset, IMR_MASK_VALUE); } static void vnt_interrupt_work(struct work_struct *work) @@ -1133,6 +1129,8 @@ static void vnt_interrupt_work(struct work_struct *work) if (priv->vif) vnt_interrupt_process(priv); + + MACvIntEnable(priv->PortOffset, IMR_MASK_VALUE); } static irqreturn_t vnt_interrupt(int irq, void *arg) @@ -1142,6 +1140,8 @@ static irqreturn_t vnt_interrupt(int irq, void *arg) if (priv->vif) schedule_work(&priv->interrupt_work); + MACvIntDisable(priv->PortOffset); + return IRQ_HANDLED; } -- 2.20.1