From patchwork Tue Dec 17 20:16:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 181909 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp6251270ile; Tue, 17 Dec 2019 12:17:24 -0800 (PST) X-Google-Smtp-Source: APXvYqxGZiQrFwiDSVJ8MZPndkyeK9f4MMPmF39bJLNMU+Y5Y8o+TwttapEVmRr7vnJehW+6QblX X-Received: by 2002:a05:6830:1d91:: with SMTP id y17mr37777718oti.276.1576613844457; Tue, 17 Dec 2019 12:17:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576613844; cv=none; d=google.com; s=arc-20160816; b=FOma7rVrOQAi9RdJFeLNOZKBkKWTQg27WmKvVxpYt0gkmV977nWtX5v4PKk2y7zgn3 YKYtyRDctET716EXyPvjRwOynBnA28xvGF7bVKG60kfIPHyVI4kbw/hGdL0qoL9LbmN/ kOiKW6ZHsFgcI9RTAoW8uZH6L96Ejik6r1/TeMhLHvnld7APSIkVmjXPapxCRfJDdWKc m8CnzkUyxAmfvYZ9Axm44K3km8+ae2rNbBXKsDKXOy6LmVRkybQzmclnjo0RY+iq7Z/1 5XPZMaxy0P8IyHLO7HXs0Uvn3vIjW1sfUF6gR3SI3IJBTBkjjJDvLlMJtuEylLFJk+Nx Hctw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=5s54kr2RHb4AUeyPTvVonW6t9p4/VWUBIkZn09W17A4=; b=j0I+apbtmtVZIsTGgKDKqBbF3PCe0EEux4T7dPN6q969OCheayu6OqvuTwHGiWsSdC JU26qjx78WHVkWEUzMndwlmyRyQxw42bnx8rUvONCO/SUIgUq8RFUGtaTPVuRDkfr2Bc VzeEBF+dC9N/wud2jcviZSZfvqKXxvwd8MZ2w7KPHnqqOVEfxfmwzmlatzlvYPrt2s4m nlJItJiAACoz6BugjfUexvTpkNcZuTDHkoJ/vTA6t8IApVDPYeds/vwELWEeZGJYOp7F OWBCacsBM8zeDxIqJjqqatG5Aa1dVBgFwTopBFD2srOGa50GFgsFtDhIqtpa6lhAfQU1 kLLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zjkhR5Vx; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 s11si11118955otd.123.2019.12.17.12.17.24; Tue, 17 Dec 2019 12:17:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zjkhR5Vx; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728834AbfLQURX (ORCPT + 14 others); Tue, 17 Dec 2019 15:17:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:41904 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728823AbfLQURW (ORCPT ); Tue, 17 Dec 2019 15:17:22 -0500 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 0E6AE21775; Tue, 17 Dec 2019 20:17:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576613842; bh=7I/A2Gv6FuvwnPeTtQRWUP+nBGtZ1qPYwGx36MZx0LI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zjkhR5VxbS/9tPGHU4tnAlFJSZY858/v94zzTz/Tem5bpmXHVKwuxxjrhnQ5Sw+Ot 8wldtg+fhPYixZkI2Qk/TbE31rylxtxEbhlQTfyKv/mI+XR3ykTzA+WWKkBImB1WPz +IVRQw7XIXE++/23gtMLxHy+QAZlQHh+SrUUXnL0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Grygorii Strashko , "David S. Miller" Subject: [PATCH 5.3 05/25] net: ethernet: ti: cpsw: fix extra rx interrupt Date: Tue, 17 Dec 2019 21:16:04 +0100 Message-Id: <20191217200905.642350955@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191217200903.179327435@linuxfoundation.org> References: <20191217200903.179327435@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Grygorii Strashko [ Upstream commit 51302f77bedab8768b761ed1899c08f89af9e4e2 ] Now RX interrupt is triggered twice every time, because in cpsw_rx_interrupt() it is asked first and then disabled. So there will be pending interrupt always, when RX interrupt is enabled again in NAPI handler. Fix it by first disabling IRQ and then do ask. Fixes: 870915feabdc ("drivers: net: cpsw: remove disable_irq/enable_irq as irq can be masked from cpsw itself") Signed-off-by: Grygorii Strashko Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/ti/cpsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -890,8 +890,8 @@ static irqreturn_t cpsw_rx_interrupt(int { struct cpsw_common *cpsw = dev_id; - cpdma_ctlr_eoi(cpsw->dma, CPDMA_EOI_RX); writel(0, &cpsw->wr_regs->rx_en); + cpdma_ctlr_eoi(cpsw->dma, CPDMA_EOI_RX); if (cpsw->quirk_irq) { disable_irq_nosync(cpsw->irqs_table[0]);