From patchwork Mon Sep 11 09:07:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1832211 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=EibcvnP3; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rkgpj1w48z1yhZ for ; Mon, 11 Sep 2023 19:07:41 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qfctF-0003KN-Vt; Mon, 11 Sep 2023 09:07:30 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qfctB-0003JX-Ss for kernel-team@lists.ubuntu.com; Mon, 11 Sep 2023 09:07:26 +0000 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (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-internal-0.canonical.com (Postfix) with ESMTPS id AEBD53F182 for ; Mon, 11 Sep 2023 09:07:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1694423245; bh=m5gYyHE2rG//2SJB0U8cA85JxBerZAjhETPlsiPjPqA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EibcvnP3pClOHoD/yxnR70z29LvlFhpDW4Acgnx/WtLtyDJCFE9DMAHEU5JzbtlAZ cIJZN7sDe05yJeluQB3wrZJEubgVnS7nOE9HE57ZrEcojZfzLbtp59lE83QFIuZm7y X6dc8zLxDIJn5yFac0z/7opQgQXaNWU7mAOobOu0BDuVcwwA1LtnpOvf7Ss/09pc5b gicFD6b/0MQHgH1H3eUH29xchae3t5L6jf49mH9M/VEGNNl6pzkRbd1g4o+tbqZ2Dx d23Nin0wLCEHop565tv7S2NL+TjvXVhXZnte/yihJhcUZclXjXP3BPjCLGZ1SXX3Ns 7fxQ0tVuPEgmA== Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-3fef3606d8cso33700155e9.1 for ; Mon, 11 Sep 2023 02:07:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694423245; x=1695028045; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m5gYyHE2rG//2SJB0U8cA85JxBerZAjhETPlsiPjPqA=; b=BHl2u3NHaZvzXbKHbYnWhbucy8WZBA+KC2WLEe62snbmMCCVhS9lFhE+N/ZIr4y1/w HR3KhxcNSJgeAMMnLnYmj2wHxcvD2j5Z2fSwKc5X/zkiVZ2Ps+Ikpr9HbbrVNU5RwosH Dkck+rs7Zsxv1ucfKOxMzg9MZQ7NlQ7dyg3bDtDPjfg0vdeOZCmk/FF8URU7lOq1E5KX wd3PsWWiOPx9txMroDX1fGPYQHeTMAzchMc5ue5bKrVsGNNtgIK62ybHGl9Sf71/qVJX 1tUw2WIJgF3OBMSRLGAH1CrR5FXeGq90XU84DNFX4NQ0f655MDGLTSCpBfrc2HCkduvd 7fLQ== X-Gm-Message-State: AOJu0YyBxxTa+MnxV+ProKXQsQYrB1vGCR9NNA7tmAFFSKYeZ6BZQ0dW LmL4LI478BvHOGcDK2PfOMbWTUZId3b8vDvKQpK+7kZ/sKePEcOUIBTQ4b/mZqtRhsdg8bT89EF FGPMLNcgtznASz0eFhuDXT4Tt9SVrh2xK3I5yRlsNCARoq2Y1vg== X-Received: by 2002:a7b:ce85:0:b0:401:bf62:9456 with SMTP id q5-20020a7bce85000000b00401bf629456mr7379092wmj.8.1694423245443; Mon, 11 Sep 2023 02:07:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEnAhckjMTztqh61qKmyGvhXBUTCjA9U9+Xc907144RwKpJwDdQtvZQhg5OlPyNxhA2YbfiaA== X-Received: by 2002:a7b:ce85:0:b0:401:bf62:9456 with SMTP id q5-20020a7bce85000000b00401bf629456mr7379079wmj.8.1694423245005; Mon, 11 Sep 2023 02:07:25 -0700 (PDT) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id y9-20020a7bcd89000000b003fed630f560sm9405148wmj.36.2023.09.11.02.07.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 02:07:24 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][L][PATCH 4/4] r8169: fix ASPM-related issues on a number of systems with NIC version from RTL8168h Date: Mon, 11 Sep 2023 11:07:01 +0200 Message-Id: <20230911090701.41518-5-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230911090701.41518-1-juerg.haefliger@canonical.com> References: <20230911090701.41518-1-juerg.haefliger@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Heiner Kallweit This effectively reverts 4b5f82f6aaef. On a number of systems ASPM L1 causes tx timeouts with RTL8168h, see referenced bug report. Fixes: 4b5f82f6aaef ("r8169: enable ASPM L1/L1.1 from RTL8168h") Cc: stable@vger.kernel.org Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217814 Signed-off-by: Heiner Kallweit Signed-off-by: David S. Miller BugLink: https://bugs.launchpad.net/bugs/2031537 (cherry picked from commit 90ca51e8c654699b672ba61aeaa418dfb3252e5e) Signed-off-by: Juerg Haefliger --- drivers/net/ethernet/realtek/r8169_main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index caeb01d07b36..bb7c5386906f 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -5281,13 +5281,9 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) /* Disable ASPM L1 as that cause random device stop working * problems as well as full system hangs for some PCIe devices users. - * Chips from RTL8168h partially have issues with L1.2, but seem - * to work fine with L1 and L1.1. */ if (rtl_aspm_is_safe(tp)) rc = 0; - else if (tp->mac_version >= RTL_GIGA_MAC_VER_46) - rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1_2); else rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1); tp->aspm_manageable = !rc;