From patchwork Tue Feb 6 09:19:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Barker X-Patchwork-Id: 197282 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1417888dyb; Tue, 6 Feb 2024 01:21:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IEDY/3IpnRF1aWKcojVVIiIIJG/EEwXJUfSGCfx9BnC3b1FWZsGXewjS2LGlvGskgFidCH6 X-Received: by 2002:a05:6a20:9591:b0:19e:487e:39e7 with SMTP id iu17-20020a056a20959100b0019e487e39e7mr1951003pzb.16.1707211319371; Tue, 06 Feb 2024 01:21:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707211319; cv=pass; d=google.com; s=arc-20160816; b=eHZT/x71A2z7xS+NL67Zy/aInop//06K/nfQV+V4U2xb09orwhvr5IItUF16tpt5cN vllyGML+AyTsr70Yq2w7WWzjghyU+u53LjVP8G/Su4IA1B2s7Y6sesPTd72uTaDydUbo FVCh/VmuwC78rOvGO4TROWmESIgP+u3sAuJz6ULyd6/Cu7fY3/XqeDV2UQJ3E1rc7XsW gMSCpsEvdQDIAJ+P0qLGkQw9B82/EZNT6nRQjqnEHTmMcVSw/cx+7+GdEisONNguLDFf vkjwq8n4DzNCXUkSgvD9oS7h7sWiEGXc5mxUmxsyA49xBUbLlNipaUBV7GOTgFbC2NNc 3ubg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=xyiOUdHK0bMQCWOdpMuWoJ1WCVfzek/iF/jrS9uOLrg=; fh=GHMPSKXn93pIHPfsxLw3pzxAavCO2ykuHdi2bsqSRUs=; b=so80apQUKMnkycijmpoDf6ljgqBOVyZtjv0nXKStNU2VSBuoLwTsUE4C+GUUJIW8Lu BL6QXOzPIzWuxqDAgPvuhvzKnlxUBkSp/diQRl6M+/uyh+ExSjZWzLjngdMtNttvrMlI BgzOTr2a3wu3j24Qz1TKx5YG8IfmkBG2OaLPgh9KCQ9KDBq4AA7a99fNR60tUl2pnZTx uTUqRMZEdNvPNdIiGi4kK2Q2/625XCofMqW+TBRfN/qdINOJv0ysFBYd8qz3hBuKA7k9 W4SEZ9rSSeQx3SAuZQxL9Ama2FTzNmDgPOqjKrK1NMJhItECE6SmPLl67Mj1yYEVtpLk aNNA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=bp.renesas.com dmarc=pass fromdomain=bp.renesas.com); spf=pass (google.com: domain of linux-kernel+bounces-54574-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54574-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com X-Forwarded-Encrypted: i=1; AJvYcCUaZUPjDpDQ5TK1VCi+9QyYyeYM1Uc5Md6P7wyJx1rqxMiYhg+DhUhOLyVz+5pyGlr5HfQFO66EfUVVEJxg3Ynve3e7Mw== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id b17-20020aa78711000000b006e044ae6f2esi1266145pfo.313.2024.02.06.01.21.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 01:21:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-54574-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=bp.renesas.com dmarc=pass fromdomain=bp.renesas.com); spf=pass (google.com: domain of linux-kernel+bounces-54574-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54574-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id A1DF4B223B7 for ; Tue, 6 Feb 2024 09:21:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8258112EBF2; Tue, 6 Feb 2024 09:19:43 +0000 (UTC) Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3230512EBDD; Tue, 6 Feb 2024 09:19:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707211182; cv=none; b=SvfVQc/resLy15z19jnw4nu9eULsiFC630c1vHwdUSGjUcUjOnmmC5Ha+XJ+P+nasgoJrC4zHICHQ2oSVJdRM/Wdz4hGYHHRNhMkvkvaCCh/TTBc8vH5J52pn6de1k4/lNHZjSAA/YwMDF77WOlHHbrG0mob4CfxfJz12ZqysKI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707211182; c=relaxed/simple; bh=87blQj+GxmDYGplMV4xdgn6LYv3+QSfpU7NtXCzDNME=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UqL+34O8ClfAV16DhDFAt+Y31bNLdPIrX8Nz56QXvkTruZn1LX95lVTjW/JB/Q3yX3gnwcKg+YgvcLY0YR9ovWg+t8Deb/vTo2N0KUO7JSTGaxqtBlSToXUsMDuPSSK8Rg6LSKoWk0mEQBLCpX/NlyOOcazhYUWD9q4IZPF5Ax4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-IronPort-AV: E=Sophos;i="6.05,246,1701097200"; d="scan'208";a="196934650" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 06 Feb 2024 18:19:39 +0900 Received: from GBR-5CG2373LKG.adwin.renesas.com (unknown [10.226.93.63]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 834D941B86C7; Tue, 6 Feb 2024 18:19:35 +0900 (JST) From: Paul Barker To: Sergey Shtylyov , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Paul Barker , Yoshihiro Shimoda , Wolfram Sang , netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH net-next v2 5/7] net: ravb: Align poll function with NAPI docs Date: Tue, 6 Feb 2024 09:19:07 +0000 Message-Id: <20240206091909.3191-6-paul.barker.ct@bp.renesas.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240206091909.3191-1-paul.barker.ct@bp.renesas.com> References: <20240206091909.3191-1-paul.barker.ct@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790140816445229789 X-GMAIL-MSGID: 1790140816445229789 Call napi_complete_done() in accordance with the documentation in `Documentation/networking/napi.rst`. Signed-off-by: Paul Barker Reviewed-by: Sergey Shtylyov --- drivers/net/ethernet/renesas/ravb_main.c | 26 ++++++++++-------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 2136600d60dd..661fd86899ac 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -1367,23 +1367,19 @@ static int ravb_poll(struct napi_struct *napi, int budget) if (priv->rx_fifo_errors != ndev->stats.rx_fifo_errors) ndev->stats.rx_fifo_errors = priv->rx_fifo_errors; - if (work_done == budget) - goto out; - - napi_complete(napi); - - /* Re-enable RX/TX interrupts */ - spin_lock_irqsave(&priv->lock, flags); - if (!info->irq_en_dis) { - ravb_modify(ndev, RIC0, mask, mask); - ravb_modify(ndev, TIC, mask, mask); - } else { - ravb_write(ndev, mask, RIE0); - ravb_write(ndev, mask, TIE); + if (work_done < budget && napi_complete_done(napi, work_done)) { + /* Re-enable RX/TX interrupts */ + spin_lock_irqsave(&priv->lock, flags); + if (!info->irq_en_dis) { + ravb_modify(ndev, RIC0, mask, mask); + ravb_modify(ndev, TIC, mask, mask); + } else { + ravb_write(ndev, mask, RIE0); + ravb_write(ndev, mask, TIE); + } + spin_unlock_irqrestore(&priv->lock, flags); } - spin_unlock_irqrestore(&priv->lock, flags); -out: return work_done; }