Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A1D54C8C for ; Fri, 14 Jul 2023 05:39:44 +0000 (UTC) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-3fb4146e8ceso13844215e9.0 for ; Thu, 13 Jul 2023 22:39:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689313183; x=1691905183; h=content-transfer-encoding:subject:from:cc:to:content-language :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=PghXL2nj0bR1AkbvTWEvPVUujehAvZqC6bXTuYKarO4=; b=sRtAqt/uPpzCDQx7F84Puxwm7bEoL4jC60zuSC4QHJkoM5Tm/htAgFpM+YZ4utVKl8 dC+DgmPWfmGZBug6sPsgqRV1RCX3j9zbVnTZTJtnCD8vTKeZhJ7A2uaEC1VLvRF2ZuOh EYIIFx/V4rCvGrDaPt1V09DInCondQU96gutLUmE8akVyJRHefhqsPqVuohBoM32AyWo AjSvOsXDEKoB30J2+thaUvMlSCt38AEV8CCneVGcuSskS4noFIS4xrhO0qkzofQef8xi COVX5lm6rMelLzB+fXGWVHtOWkF+SIKJ4AA3+UqPgoDKiXR9wr/5AYVvFIBufJcKCODb Rj6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689313183; x=1691905183; h=content-transfer-encoding:subject:from:cc:to:content-language :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=PghXL2nj0bR1AkbvTWEvPVUujehAvZqC6bXTuYKarO4=; b=LWGS9sHKj8Ua0ageLGKXNrugyR4EVIn4dbhtESsIIfWOVIKhzT8pf0rHwWzxGkATkP ZA7yMEqtYAT2ci4rzTXa8z0Z6LSWd0wCaGsSybI51ZshABQ9ZFAq4UBkBk2Az4ep85iV b8yDE1owPPThAuFyO4TmaKiT9GLx32pvZ3ilDNQCjKNwxGvgsy7QJJQ/3bW1gfoXM2lG Y0gBISA1u/GnyQIJzFB9juXohWgdjtncnsf2PURRKyrAzmP3+QnqZshA4XxJp6NveYwO zgCR5Qd8yWrmZkPjwuBd0KwQxEhPiNdrOgJnqfoTZm0bl875IDwowH12gtYE1E1U9W3Q JbBw== X-Gm-Message-State: ABy/qLbMPbuc22KAA6AvttdqheXvmXzIEORgbfNtd5fSD5BQJ9UfbVZN J1ID/WDPuPjiGOTGcFCEehQ= X-Google-Smtp-Source: APBJJlH42Qc3jaAjtoQ2irlB5opLg8u1XsnD9QuF1c/D3fNThKvjdg7+k2oJUCEMitJob2vpU1Z4qQ== X-Received: by 2002:a7b:c5c5:0:b0:3fa:7478:64be with SMTP id n5-20020a7bc5c5000000b003fa747864bemr2900437wmk.1.1689313182676; Thu, 13 Jul 2023 22:39:42 -0700 (PDT) Received: from ?IPV6:2a01:c22:72e8:a200:99ec:cf51:6f55:b3af? (dynamic-2a01-0c22-72e8-a200-99ec-cf51-6f55-b3af.c22.pool.telefonica.de. [2a01:c22:72e8:a200:99ec:cf51:6f55:b3af]) by smtp.googlemail.com with ESMTPSA id f14-20020a5d58ee000000b003143c532431sm9836618wrd.27.2023.07.13.22.39.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Jul 2023 22:39:42 -0700 (PDT) Message-ID: Date: Fri, 14 Jul 2023 07:39:36 +0200 Precedence: bulk X-Mailing-List: regressions@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Content-Language: en-US To: Jakub Kicinski , David Miller , Realtek linux nic maintainers , Eric Dumazet , Paolo Abeni Cc: "netdev@vger.kernel.org" , Linux regressions mailing list , joey.joey586@gmail.com From: Heiner Kallweit Subject: [PATCH net v2] r8169: fix ASPM-related problem for chip version 42 and 43 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Referenced commit missed that for chip versions 42 and 43 ASPM remained disabled in the respective rtl_hw_start_...() routines. This resulted in problems as described in the referenced bug ticket. Therefore re-instantiate the previous logic. Fixes: 5fc3f6c90cca ("r8169: consolidate disabling ASPM before EPHY access") Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217635 Signed-off-by: Heiner Kallweit --- v2: - add Closes tag --- drivers/net/ethernet/realtek/r8169_main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 9445f04f8..2b3aa6b45 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2747,6 +2747,13 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable) return; if (enable) { + /* On these chip versions ASPM can even harm + * bus communication of other PCI devices. + */ + if (tp->mac_version == RTL_GIGA_MAC_VER_42 || + tp->mac_version == RTL_GIGA_MAC_VER_43) + return; + rtl_mod_config5(tp, 0, ASPM_en); rtl_mod_config2(tp, 0, ClkReqEn); -- 2.41.0