From patchwork Fri Nov 13 10:24:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Kaneko X-Patchwork-Id: 7610141 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 93CBC9F2F7 for ; Fri, 13 Nov 2015 10:29:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AE2B32075F for ; Fri, 13 Nov 2015 10:29:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3D7520747 for ; Fri, 13 Nov 2015 10:29:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933519AbbKMK3h (ORCPT ); Fri, 13 Nov 2015 05:29:37 -0500 Received: from mail-pa0-f43.google.com ([209.85.220.43]:33092 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933294AbbKMK3e (ORCPT ); Fri, 13 Nov 2015 05:29:34 -0500 Received: by pabfh17 with SMTP id fh17so96797874pab.0; Fri, 13 Nov 2015 02:29:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=SqCwGvne96KOIUERI4PqzOugtSpX4HNlQQGn0cZmAig=; b=WDI9NcBuy1/3s/MZpOoliXoGuFoLfZqsN06C+Kzn3bZylF4GbrEbDJZrOE80dOlnxc NgQofK6gcA4mdNwMPyZjJ/msAFwAumftG7nJqTBgiLwiggCSVAFjHMFj7eASWBgNa9Iq ++CYCOQCh1y/1ifoz74JqxErvhheOW0Kb/EuIMX+ebYUmPyubItuciFe98HJOA+KUOSv 3vn/COlQp0jOf2GSUVcgNZPsl/Djv1Eg3av8vUxX27CQLj1vwYnqk9CRO9dSUkO3P3pf mElE9jMSVhfsha66E+sv6bwLHRqyjnZui07KvMgOWkvDu2SRDOr7V3qciCrHPg7o+EhN QsvA== X-Received: by 10.68.197.67 with SMTP id is3mr30723597pbc.89.1447410574233; Fri, 13 Nov 2015 02:29:34 -0800 (PST) Received: from macc.flets-east.jp (p2139-ipngn2001marunouchi.tokyo.ocn.ne.jp. [114.178.169.139]) by smtp.gmail.com with ESMTPSA id ku1sm19622516pbc.47.2015.11.13.02.29.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Nov 2015 02:29:33 -0800 (PST) From: Yoshihiro Kaneko To: netdev@vger.kernel.org Cc: "David S. Miller" , Simon Horman , Magnus Damm , linux-sh@vger.kernel.org Subject: [PATCH net] ravb: Fix int mask value overwritten issue Date: Fri, 13 Nov 2015 19:24:49 +0900 Message-Id: <1447410289-3741-1-git-send-email-ykaneko0929@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Masaru Nagai When RX/TX interrupt for Network Control queue and Best Effort queue is issued at the same time, the interrupt mask of Network Control queue will be reset when the mask of Best Effort queue is set. This patch fixes this problem. Signed-off-by: Masaru Nagai Signed-off-by: Yoshihiro Kaneko Acked-by: Geert Uytterhoeven Acked-by: Simon Horman --- This patch is based on the master branch of David Miller's networking tree. drivers/net/ethernet/renesas/ravb_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index aa7b208..7180e26 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -733,8 +733,10 @@ static irqreturn_t ravb_interrupt(int irq, void *dev_id) ((tis & tic) & BIT(q))) { if (napi_schedule_prep(&priv->napi[q])) { /* Mask RX and TX interrupts */ - ravb_write(ndev, ric0 & ~BIT(q), RIC0); - ravb_write(ndev, tic & ~BIT(q), TIC); + ric0 &= ~BIT(q); + tic &= ~BIT(q); + ravb_write(ndev, ric0, RIC0); + ravb_write(ndev, tic, TIC); __napi_schedule(&priv->napi[q]); } else { netdev_warn(ndev,