Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp1419765pxb; Fri, 10 Sep 2021 05:40:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzLV094R7ZTY2tG8jB9ZIa8+P9G/KHX243B4h1mqy+xMyBuB6qfy7lkjqsg4bOOkAVUaMv7 X-Received: by 2002:a05:6638:14cf:: with SMTP id l15mr4293817jak.8.1631277600298; Fri, 10 Sep 2021 05:40:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631277600; cv=none; d=google.com; s=arc-20160816; b=DlJ0XjBhmUIBdotrrlMJeNu/qR0SPcJxZy5vsOmvj9MeIE9PuUs2NaZJT1IjFzGK9y ySsfe5PXE0JsqIABsJ9BwuO4ANTuk+e4IOMlhsuFmhyb1ELTEh06g0zq527uTQOYI/qb pdvMNA1WcyBX9rU5Evjm5xZuZebsBZ6HZ9vNm51ovUOpPxWxjGUV/9bmlCaWXisTxyje 8MqD5cYQWpqpweL0J8qP6yZNjLhLR4K0PujJBKdpBL3zkxSddV/i+XfAOFUTP5iPQmPy 6TP1mOBTZGcUQZ54UUVwYad2JoZnSrPMIjebxkl94uJCur+brwl0IlUyD3IPQKHh+wHa DbYg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hkfzJ3IMj8cLV4JBo9m3Ph44sCnjL8fSDc+Gpw0KRGc=; b=AOu1zm7D1cfG8R0I3NVKbyTsEkDVrF4Y5J6u/rmfPNdaxSgpUYnxcz1EWUqGdIxTWq iMZ4SJONIWjSuQOui3fwx48wOw7XNisp5cKb5DMGIDkaAE/r1zFpR9XNAYhHeprGfVDd vrxIKUAMcv6uzcZBBhGZSBzeJmDZI7H/cPs1r6QmU8uu/xT9FgxFiIUIVJWR9psKlkuK votcyZlz8pI2hZdo/zdFJCt4bVWKmVn2HWY8WCVS0qVVQ9I0FWrLoxzQORZ4mPPycO+W h/nlVejoDLNthnE1dQW0fCuPBzWzPYRN5M33wEJ92lX0M81Mki1HaGvyg0vIpIPlf2GV tsmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=07U5XhhC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h9si4877964jar.120.2021.09.10.05.39.49; Fri, 10 Sep 2021 05:40:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=07U5XhhC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233914AbhIJMi4 (ORCPT + 99 others); Fri, 10 Sep 2021 08:38:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:52702 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234816AbhIJMhI (ORCPT ); Fri, 10 Sep 2021 08:37:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CF3FD6120C; Fri, 10 Sep 2021 12:35:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631277346; bh=F8QdmjtKL6/Wu8pkJufAIMMyWMxfPCEJTjYlh+/hMGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=07U5XhhCCHVoXSzh9155DYuciT2cS5pWSeI2xsMH7MKREFthOEv+hFs1qL2pot3Qk pxaoOpMSvGgz7D1QMMYI4nopHjb1VEMQg+9T4RT2JKBfPliAHNmsnWaIifqFVP7ZTC wppmh1tIRk1il1IvuVE6U3olw6D+m+qV8szj3BgI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hayes Wang , "David S. Miller" Subject: [PATCH 5.4 28/37] Revert "r8169: avoid link-up interrupt issue on RTL8106e if user enables ASPM" Date: Fri, 10 Sep 2021 14:30:31 +0200 Message-Id: <20210910122918.093706379@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210910122917.149278545@linuxfoundation.org> References: <20210910122917.149278545@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hayes Wang commit 2115d3d482656ea702f7cf308c0ded3500282903 upstream. This reverts commit 1ee8856de82faec9bc8bd0f2308a7f27e30ba207. This is used to re-enable ASPM on RTL8106e, if it is possible. Signed-off-by: Hayes Wang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/realtek/r8169_main.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4713,6 +4713,7 @@ static void rtl_hw_start_8168g(struct rt rtl_eri_clear_bits(tp, 0x1b0, ERIAR_MASK_0011, BIT(12)); rtl_pcie_state_l2l3_disable(tp); + rtl_hw_aspm_clkreq_enable(tp, true); } static void rtl_hw_start_8168g_1(struct rtl8169_private *tp)