Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp1417293pxb; Fri, 10 Sep 2021 05:36:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBzmkEgsRhcxjwslSMqe+tdJNzqY7desO4L8ZtTRPmmzy0RxQszjkQ78tH9AM2Qbwjrpbh X-Received: by 2002:a92:4a0b:: with SMTP id m11mr6313638ilf.118.1631277379669; Fri, 10 Sep 2021 05:36:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631277379; cv=none; d=google.com; s=arc-20160816; b=sa+SDi1hxbdG0LGRKxi4TYyFV++C09bI8BqyVOlU04pBC/cGGH5Fuyc3Q+TTs+7o1S MDz2L/oFoLV98XBTjoQ322ZsVjtR7AKURhdAgGeOB/yASJDGAY3YPnE36HC/kcJUQwsq Ohuqy4hcvG/FN3zMnK+wyU7X1kzu7DSaSuk4nqQjKXpc+sGPIioG69u6nf/6UcsIRJqe lfbnaoI9E19Ek59UnjBxgjOJBzFKl6fSANLl52kBv1ri7sx5zGubRweuwCakllu6MTQe UyDwZlbe3Z5wrMURaxh6ARxqFiLm4m7EmS+7w/ko0tMZ4dxZ2Zo1Z8avIYX5cSyRqn2s lrSQ== 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=0YYWpAoqZ7fhsoT5ITEjep7H5pDD639NCgRbH+knKrQ=; b=fSd61K1Nzc+2ZFVvXXYPGbAL3Dp0JBvSh9ku0yUBbgDczs024BATDeEwwXatgbguZX 2KIDQVevAQ678J+g2+o3EWmdczD00IdPFOg97kKPbNtSkBO7MGa9XEhrRUPVbs9SvLwG 1SR4zvTRdOCqhLkzMUtJgJ79kBJjatiY+gNbxHPlO4BlI+AMxuqekjmFlO6wgnEmDMGg 3PB92dVqiu6V47itq5e52KWSmLGJJeIQUIpI3u04jPNDdtAnfRsKlf0f5ky1N/EC73x5 Y1yzSjbdMpPzHNVUNclSbhSzs2XxVyqR2bDNT6i8l+KXLGrWPEQLn6kzlNwbHw7wquWM b3YQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="V1jo/iy8"; 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 y9si4555087ilc.12.2021.09.10.05.36.07; Fri, 10 Sep 2021 05:36:19 -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="V1jo/iy8"; 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 S234638AbhIJMgd (ORCPT + 99 others); Fri, 10 Sep 2021 08:36:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:51792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233869AbhIJMdv (ORCPT ); Fri, 10 Sep 2021 08:33:51 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F2A76611CE; Fri, 10 Sep 2021 12:32:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631277160; bh=V4C5UP6bMCDHaR6X1XMoUIhm2tNfMSTWbPtSbr2ccTM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V1jo/iy8gzwyRUSCSGqn++wS+gM3NLLLQe6D3AR8DwNFRqoQWnOVGJgPeUraEHFWi E6cylnjKrjUPqqI2+tJjm7uPKJeJzgd2fjrMzI8gGjNuMks9rsMqrM6jhBqfnoiy81 +dLcExSAoHmE4C+n0qGGOiLPHPC+1wwmikzu49xE= 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.13 04/22] Revert "r8169: avoid link-up interrupt issue on RTL8106e if user enables ASPM" Date: Fri, 10 Sep 2021 14:30:03 +0200 Message-Id: <20210910122916.078980972@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210910122915.942645251@linuxfoundation.org> References: <20210910122915.942645251@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 @@ -3510,6 +3510,7 @@ static void rtl_hw_start_8106(struct rtl rtl_eri_write(tp, 0x1b0, ERIAR_MASK_0011, 0x0000); rtl_pcie_state_l2l3_disable(tp); + rtl_hw_aspm_clkreq_enable(tp, true); } DECLARE_RTL_COND(rtl_mac_ocp_e00e_cond)