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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 EA15DC43381 for ; Mon, 1 Apr 2019 17:50:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1E6E20830 for ; Mon, 1 Apr 2019 17:50:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554141009; bh=+/+CwaTeu9KN6uoZ+SWURV8bD7AvfREXYKzTxViderc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Y1HGkOG9UL/GEXYbxDQd2U3BiaeLcN2DlTXQZohRePLg1joD7LiK/JLb+/FhusDfX hunE6QhitUG+eV4hf2l+zGkThP6dCS2RYacX1BDzClsk4fQzVT2FbLPXus3S6x1uoK lu3KpcGbzvQhIagD4sNtZNMhwB1c1MzLxpg8bMc4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732895AbfDAR3G (ORCPT ); Mon, 1 Apr 2019 13:29:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:35270 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732367AbfDAR3C (ORCPT ); Mon, 1 Apr 2019 13:29:02 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CDCA421473; Mon, 1 Apr 2019 17:29:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554139741; bh=+/+CwaTeu9KN6uoZ+SWURV8bD7AvfREXYKzTxViderc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QrebeEgl3ekHPN0Z6vGA/Wxq9M/qS8kffM0dOmTdmYzUF9Xhml8Gsj7lTnJXhnwIz vssX9lpL4Z9qI0JFSMkqEd6UY2RZg7Q/QqGVFoLiSP1FQISHsk2sPa8Dmm6QWmw+W7 atWoZADhVCh+KqMygCRFXKUln88wRy4TsMXbELRc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Malcolm Priestley Subject: [PATCH 4.9 35/56] staging: vt6655: Fix interrupt race condition on device start up. Date: Mon, 1 Apr 2019 19:02:51 +0200 Message-Id: <20190401170105.863575103@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170103.398401360@linuxfoundation.org> References: <20190401170103.398401360@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Malcolm Priestley commit 3b9c2f2e0e99bb67c96abcb659b3465efe3bee1f upstream. 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+ Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/device_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -977,8 +977,6 @@ static void vnt_interrupt_process(struct return; } - MACvIntDisable(priv->PortOffset); - spin_lock_irqsave(&priv->lock, flags); /* Read low level stats */ @@ -1067,8 +1065,6 @@ static void vnt_interrupt_process(struct } spin_unlock_irqrestore(&priv->lock, flags); - - MACvIntEnable(priv->PortOffset, IMR_MASK_VALUE); } static void vnt_interrupt_work(struct work_struct *work) @@ -1078,6 +1074,8 @@ static void vnt_interrupt_work(struct wo if (priv->vif) vnt_interrupt_process(priv); + + MACvIntEnable(priv->PortOffset, IMR_MASK_VALUE); } static irqreturn_t vnt_interrupt(int irq, void *arg) @@ -1086,6 +1084,8 @@ static irqreturn_t vnt_interrupt(int irq schedule_work(&priv->interrupt_work); + MACvIntDisable(priv->PortOffset); + return IRQ_HANDLED; }