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,USER_AGENT_GIT autolearn=unavailable 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 55A3BC43381 for ; Mon, 1 Apr 2019 18:01:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1CDE420880 for ; Mon, 1 Apr 2019 18:01:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554141665; bh=i0MOLalflgdPeaFn95YXeEKANDXfCrcf9PL9UEevIgw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MJd7KQa2frEoaG3C0KKXobPDzaxHGWnJj3xgXUTE+fkcjF7eCWz4sp0TS7CglFAtd GILNrMkb9DyefHwlOeC7vfkuxjPG1z8Xs6fmcooZ512j2sa/g2pMy9Y6LoQtqplikX gMcAXGV309oUndR3pYLVV7+nKm8Bil8AzA7++IW4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729991AbfDARQo (ORCPT ); Mon, 1 Apr 2019 13:16:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:42146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730650AbfDARQm (ORCPT ); Mon, 1 Apr 2019 13:16:42 -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 7AC2420856; Mon, 1 Apr 2019 17:16:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554139001; bh=i0MOLalflgdPeaFn95YXeEKANDXfCrcf9PL9UEevIgw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xDBfPBWqNve9wnc/ztpKIP1wWTaeoQY99iFZtEUzyK3GUazpy/zC7Jmn5lbfgP2zG +/q/yncpvwMqVMW/psEkJMG1sMdlK2N4juBGrmx99cCD9P30vJICK/aG1cVoCSVEeA iXbVoxosbpthWe2OQK4vHc0bEN6rTZs2i7ccKpEU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Malcolm Priestley Subject: [PATCH 4.19 084/134] staging: vt6655: Fix interrupt race condition on device start up. Date: Mon, 1 Apr 2019 19:02:00 +0200 Message-Id: <20190401170052.160457934@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170044.243719205@linuxfoundation.org> References: <20190401170044.243719205@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.19-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 @@ -1040,8 +1040,6 @@ static void vnt_interrupt_process(struct return; } - MACvIntDisable(priv->PortOffset); - spin_lock_irqsave(&priv->lock, flags); /* Read low level stats */ @@ -1129,8 +1127,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) @@ -1140,6 +1136,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) @@ -1148,6 +1146,8 @@ static irqreturn_t vnt_interrupt(int irq schedule_work(&priv->interrupt_work); + MACvIntDisable(priv->PortOffset); + return IRQ_HANDLED; }