From patchwork Thu Dec 19 18:34:19 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: 182173 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp864110iln; Thu, 19 Dec 2019 10:48:52 -0800 (PST) X-Google-Smtp-Source: APXvYqy9+toIvk+7EEWJxUROj+qANl5bNfUryMKn+XuciwSxq6V4Hfru7WWLEBlpYiguwL7ftRI5 X-Received: by 2002:a9d:6251:: with SMTP id i17mr10471760otk.14.1576781332869; Thu, 19 Dec 2019 10:48:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576781332; cv=none; d=google.com; s=arc-20160816; b=oo4njhtYyXflKovriWVWEzhGECZOpABJtSR5iOn8cBS96OjW2UnMRGTRehRGsqi2s7 Vt9bssSxu0LcXL/nHKyUx+hM8IWTQzKj0RhRVI1QoXFZ7i+m0fSbfqkG/GQobC+dBVvh QR+8c4jJu4QS03YZC0Bm/TA+ssc/prAfQnxHR5MZZL3Nz1pFUG1I+nnHYOAMsmLNcsZR x7taveskPbRfyxMLpQc6Cv6cE+xlcQy2ukQQOUwyaobheitI51G4r2qWBUyeOcWJ+ACd ibfFs7s+LcIOSf3QnxFX1lQ29c4tmiOdi+Yuj9Mc0nxzZwWVmDfjGmyxi5+PqacSgIm/ JNcg== 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=haE+a58DvEzuRQCf76cx8qHjn5lRIXDhHJzmyGJUf/Q=; b=EUby0iYXepz9ktp5vjCfw1LB6vo4+pSi9TS5wer4NWH3qap9Sx4T1XcN8vuqCFmFQk /72fRLdZl2/xxY38zWDyQiU/yyDKjVbgtmAlwA9Do/Bsp0YK03kAe8TwPR6a2Y0oRM9g NFR0pfFNnhujftCERycU40JLGGHL6lHQOzmLPEb9FRtDLlYTHc2uQYFoQtjS+K4KejwW idob/yELPwM5evnjM1qTlAtitO/vbwcQh2GhKuhCoAaGFqJqA6lxdmfNyHOT7pRRfIrH iSZYLKRgzYPO43bdyu1wEvb44FOp+bK8njVXT78OwfrZVLGFnAYVkDVJmsTVqsZJAvqf kUbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Q+CPpPa+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 r1si3692938otq.298.2019.12.19.10.48.52; Thu, 19 Dec 2019 10:48:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=Q+CPpPa+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729690AbfLSSsv (ORCPT + 27 others); Thu, 19 Dec 2019 13:48:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:42030 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729677AbfLSSss (ORCPT ); Thu, 19 Dec 2019 13:48:48 -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 4D0FC24683; Thu, 19 Dec 2019 18:48:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781327; bh=Ph09qFfmaBHHIt4pNk55ghnUGqDVXfldIT3+1xaUYjQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q+CPpPa+dI0UrwLuQKDsyPpUlSsdYuCvsUtQ+BmJf0owYMTzPKBteEyxqZ+tXDUZT 2iLG/vrgIw2ZixfM353p4cgDBgJiAkKvgrlCk6pMDSemLcl68AWRX+c+uPwZuy8oPo FxAmUyhwd2IzweT6SfdO0IN9Yqqo831R25z7s41Y= 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 4.9 177/199] net: ethernet: ti: cpsw: fix extra rx interrupt Date: Thu, 19 Dec 2019 19:34:19 +0100 Message-Id: <20191219183225.379351583@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183214.629503389@linuxfoundation.org> References: <20191219183214.629503389@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -773,8 +773,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]);