All of lore.kernel.org
 help / color / mirror / Atom feed
From: Heiner Kallweit <hkallweit1@gmail.com>
To: Paolo Abeni <pabeni@redhat.com>, Jakub Kicinski <kuba@kernel.org>,
	David Miller <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Realtek linux nic maintainers <nic_swsd@realtek.com>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
	"Simon Horman" <simon.horman@corigine.com>,
	"Kai-Heng Feng" <kai.heng.feng@canonical.com>,
	"Holger Hoffstätte" <holger@applied-asynchrony.com>
Subject: [PATCH net-next 4/6] r8169: prepare rtl_hw_aspm_clkreq_enable for usage in atomic context
Date: Mon, 6 Mar 2023 22:25:49 +0100	[thread overview]
Message-ID: <acf3615b-e9c5-ccb6-65b2-885e86d74b7e@gmail.com> (raw)
In-Reply-To: <b434a0ce-9a76-e227-3267-ee26497ec446@gmail.com>

Bail out if the function is used with chip versions that don't support
ASPM configuration. In addition remove the delay, it tuned out that
it's not needed, also vendor driver r8125 doesn't have it.

Suggested-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Tested-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Tested-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/net/ethernet/realtek/r8169_main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 61cbf498f..96af31aea 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -2741,6 +2741,9 @@ static void rtl_disable_exit_l1(struct rtl8169_private *tp)
 
 static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)
 {
+	if (tp->mac_version < RTL_GIGA_MAC_VER_32)
+		return;
+
 	/* Don't enable ASPM in the chip if OS can't control ASPM */
 	if (enable && tp->aspm_manageable) {
 		rtl_mod_config5(tp, 0, ASPM_en);
@@ -2770,8 +2773,6 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)
 		rtl_mod_config2(tp, ClkReqEn, 0);
 		rtl_mod_config5(tp, ASPM_en, 0);
 	}
-
-	udelay(10);
 }
 
 static void rtl_set_fifo_size(struct rtl8169_private *tp, u16 rx_stat,
-- 
2.39.2




  parent reply	other threads:[~2023-03-06 21:28 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-06 21:17 [PATCH net-next 0/6] r8169: disable ASPM during NAPI poll Heiner Kallweit
2023-03-06 21:23 ` [PATCH net-next 1/6] r8169: use spinlock to protect mac ocp register access Heiner Kallweit
2023-03-06 21:24 ` [PATCH net-next 2/6] r8169: use spinlock to protect access to registers Config2 and Config5 Heiner Kallweit
2023-03-06 21:24 ` [PATCH net-next 3/6] r8169: enable cfg9346 config register access in atomic context Heiner Kallweit
2023-03-06 21:25 ` Heiner Kallweit [this message]
2023-03-06 21:26 ` [PATCH net-next 5/6] r8169: disable ASPM during NAPI poll Heiner Kallweit
2023-03-06 21:28 ` [PATCH net-next 6/6] r8169: remove ASPM restrictions now that ASPM is disabled " Heiner Kallweit
2023-03-08 10:00 ` [PATCH net-next 0/6] r8169: disable ASPM " patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=acf3615b-e9c5-ccb6-65b2-885e86d74b7e@gmail.com \
    --to=hkallweit1@gmail.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=holger@applied-asynchrony.com \
    --cc=kai.heng.feng@canonical.com \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=nic_swsd@realtek.com \
    --cc=pabeni@redhat.com \
    --cc=simon.horman@corigine.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.