From patchwork Tue Feb 21 02:38:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 59713 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1636474wrn; Mon, 20 Feb 2023 18:47:41 -0800 (PST) X-Google-Smtp-Source: AK7set/mR/tDiIT+n1t4RPEi65XJFLLSD9MYKHUEf+5y2LWu3+EXo23guduKsfj3bJdhk9X/m7fX X-Received: by 2002:a05:6a20:3948:b0:b8:90aa:1956 with SMTP id r8-20020a056a20394800b000b890aa1956mr13534512pzg.20.1676947660941; Mon, 20 Feb 2023 18:47:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676947660; cv=none; d=google.com; s=arc-20160816; b=PFJlNPKHnT88IbI0UQ6MGCI+wdHx5dS4z0rY1CEZfANPh3YMHAK7FNbq4iwhXKm+K8 VHntsM0gJ7qn5/H1k/d6V+nHMMa6cTMgV88phk8OIDSL76FLE3pRVR8oWU/hFQ5TN+NQ 7dV1m41t8vUw2/g9hy8OP0+HmXYBr9Lr8hGF3xcL6Um2uUr/WcACPfh8Qa3XwWzFfSj8 auVCLq3W/IrH7lxpYjFN2FqVGae7OqR0xuETyqJ8jUv0+mj2zOt/qmqtemiLt5+S/A/3 ZcM1p1Gv2GqNYrDH787FCBc/d+IQXosxMrKKuOc/B+/MVMlqb5aYsVD77JSHnsIosJQi sNyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Y882fDTAJIgU0c6v4mvBEAwTf+dckq3a6RQpDpIIC1Y=; b=Tu/Au0yKkR/cG9fBqpETwA0RkLVPN3jIK6F1ypZ7qW/2kfLzpKdaw4u6q3B/Fbv9ti ApOeGgCwkJ7WucLC7vwHMwDRohQ5oyvp6nDiDnt4eLMyOBBb50Mdh+1PmzUjOP6cfCsc 7VAqJInXn+dvkgclrgidb9KBFO3VCWJerAWOLoe3UwKNuL67iyPX4+dc88ftTNk8wEtu fVYNQ9qD1UWRaxyh9TOGWkGZ10o/Nd0Cn3lVcyjVH76V40ZGpqqnmsR++nq1g59Lt+F+ Fs40nUhW8iwS4uwqDnghCzL1e9VvMzVDnla1mdpY4nijyO9ab3Nn+sRKKTWF8dCQPzVC 6YTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=F7csYykf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l190-20020a6388c7000000b004fc238851cfsi15622507pgd.208.2023.02.20.18.47.28; Mon, 20 Feb 2023 18:47:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=F7csYykf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233096AbjBUCkz (ORCPT + 99 others); Mon, 20 Feb 2023 21:40:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233127AbjBUCkr (ORCPT ); Mon, 20 Feb 2023 21:40:47 -0500 Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCEAE23669; Mon, 20 Feb 2023 18:40:17 -0800 (PST) Received: from localhost.localdomain (unknown [10.101.196.174]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 3B5F2400DA; Tue, 21 Feb 2023 02:40:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1676947215; bh=Y882fDTAJIgU0c6v4mvBEAwTf+dckq3a6RQpDpIIC1Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=F7csYykfZy3BthhUwy2nS9QY4r8gF3p54jqSejU0psKN7oL0FF86NA4/9YDxPGnXm UzhznvkOoRHjx7zCuNGpzEh14Th+cKXvP0t7ZqsEwHDAvtjBdUtG4vZrLmbW6jwuSf 1UYQkGFLh2s/q3jnzztcGdYl8NHUTl57GjmRmoB9KHg7Q0ZlXRXjNnqxtV0ffJiTPQ i+4Yzw1Y3f4B0E5c0Yntk+80AAEngFYnW12VcGSgvn2ffnwqh/E7vMLp6RleXKUx4s g+EUQ8IkC6DUigxYMRH1ZdTRiX8SZTdg+zwxDObE32P1LTOz6GiRV66TbmzUjuc0fg WA6/e7c7zPGFA== From: Kai-Heng Feng To: hkallweit1@gmail.com, nic_swsd@realtek.com, bhelgaas@google.com Cc: koba.ko@canonical.com, acelan.kao@canonical.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, sathyanarayanan.kuppuswamy@linux.intel.com, vidyas@nvidia.com, rafael.j.wysocki@intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Kai-Heng Feng Subject: [PATCH v8 RESEND 6/6] r8169: Disable ASPM while doing NAPI poll Date: Tue, 21 Feb 2023 10:38:49 +0800 Message-Id: <20230221023849.1906728-7-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230221023849.1906728-1-kai.heng.feng@canonical.com> References: <20230221023849.1906728-1-kai.heng.feng@canonical.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758407070673760877?= X-GMAIL-MSGID: =?utf-8?q?1758407070673760877?= NAPI poll of Realtek NICs don't seem to perform well ASPM is enabled. The vendor driver uses a mechanism called "dynamic ASPM" to toggle ASPM based on the packet number in given time period. Instead of implementing "dynamic ASPM", use a more straightforward way by disabling ASPM during NAPI poll, as a similar approach was implemented to solve slow performance on Realtek wireless NIC, see commit 24f5e38a13b5 ("rtw88: Disable PCIe ASPM while doing NAPI poll on 8821CE"). Since NAPI poll should be handled as fast as possible, also remove the delay in rtl_hw_aspm_clkreq_enable() which was added by commit 94235460f9ea ("r8169: Align ASPM/CLKREQ setting function with vendor driver"). Signed-off-by: Kai-Heng Feng --- v8: - New patch. drivers/net/ethernet/realtek/r8169_main.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 897f90b48bba6..4d4a802346ae3 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2711,8 +2711,6 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable) RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~ClkReqEn); RTL_W8(tp, Config5, RTL_R8(tp, Config5) & ~ASPM_en); } - - udelay(10); } static void rtl_set_fifo_size(struct rtl8169_private *tp, u16 rx_stat, @@ -4577,6 +4575,12 @@ static int rtl8169_poll(struct napi_struct *napi, int budget) struct net_device *dev = tp->dev; int work_done; + if (tp->aspm_manageable) { + rtl_unlock_config_regs(tp); + rtl_hw_aspm_clkreq_enable(tp, false); + rtl_lock_config_regs(tp); + } + rtl_tx(dev, tp, budget); work_done = rtl_rx(dev, tp, budget); @@ -4584,6 +4588,12 @@ static int rtl8169_poll(struct napi_struct *napi, int budget) if (work_done < budget && napi_complete_done(napi, work_done)) rtl_irq_enable(tp); + if (tp->aspm_manageable) { + rtl_unlock_config_regs(tp); + rtl_hw_aspm_clkreq_enable(tp, true); + rtl_lock_config_regs(tp); + } + return work_done; }