Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp243282pxf; Wed, 10 Mar 2021 05:30:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJxdxbUrJlmb/rfUXiYaBqSB5Jy/VbfVYq+nCY2HII9XrkDEtB/UKIRJ93HpHX3ssHCO3qGn X-Received: by 2002:aa7:d5c9:: with SMTP id d9mr3391836eds.102.1615383045434; Wed, 10 Mar 2021 05:30:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615383045; cv=none; d=google.com; s=arc-20160816; b=wFKQJ74uUhjTQ6ACHXhKBIIN53KW54wisT8PPGMMipjOme1hoOvh2slssArTdLZGK/ 474zMlGDfwtDL4Ai/trY20YORUBagv++ih/wyGiZBxPl1p73EUODYYs5WxIPAimgq7s6 uW0SInNL93F79cqgaCRiMP2+U1odj9q+2yspdr3X5GQb9k4YUe+cN5XL/NcJogvZa30k XNZUQTu+sXG5u3XsgCtQaLOiwUXSlhphIQ+laaWwaSQVFRAdaojdomDY1hnPpz9Wed+3 4jDLjhY3eWpF1DhZsrTY5Zu2yvRmPur4BgByZVBYF6KR9PtRtKL4ChDeIDlVDgkbgf1v UYzg== 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=mTJEtX48MjE8gYCxUAjWSBdLKeuW0SgMEBViybVkPFw=; b=RZA2FQdY/ccTgpEQBu2CnCslRkGdKQSP8DBKBqeW73kDUkhyfTQOpsaPMb02REhkLg 0RTQXT3YIJ2gDzqaU/6H2D0HC22Sy4f5IHMCgJtaOpd3RQ70ccklQCXhshVWQsI0XZC/ LeEtzkrPboOg89qiSRfqi5NISvF0je2y6E2ONtBKbEhjy3ewaDQd42gML5Zyz5/Fwzhi etykItneQ7nas8hupBP5ntnwDMQS75QHtoKv39vCixFk3XwcHDySIGP+dkAP4iTdzPVn 3K8gw5ninKoRL/9/YazO8qPlt5GsWim9ZKWbHk8m6ieGWa8gu8+JeqlkjA2nRDEtfYzR 9WCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ASmu0TCW; 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 i25si11615937ejv.640.2021.03.10.05.30.21; Wed, 10 Mar 2021 05:30:45 -0800 (PST) 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=ASmu0TCW; 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 S233666AbhCJN3X (ORCPT + 99 others); Wed, 10 Mar 2021 08:29:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:47960 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232832AbhCJNZc (ORCPT ); Wed, 10 Mar 2021 08:25:32 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7E4336509D; Wed, 10 Mar 2021 13:25:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615382727; bh=/njeAngNDUY7boyAqABp6iWVkUY+jhqRBquVjom9DS8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ASmu0TCWfrELG0KQx9G8mYF9wh9aiRQT99MyvW6/ORA8Cse7NAkp+HGF8zyuenR6N kFP3xZITU3Ko4sdrJSfHpxioo31YghltDxrdiPG8nsqG6e5R85+GTuMeDZ0PXxLuQM moLzKRRJ4V7KAfhdmq/EL902VKknkefL1eECsvbY= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Armin Wolf , Heiner Kallweit , "David S. Miller" Subject: [PATCH 4.19 20/39] r8169: fix resuming from suspend on RTL8105e if machine runs on battery Date: Wed, 10 Mar 2021 14:24:28 +0100 Message-Id: <20210310132320.357631522@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210310132319.708237392@linuxfoundation.org> References: <20210310132319.708237392@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: Greg Kroah-Hartman From: Heiner Kallweit commit d2a04370817fc7b0172dad2ef2decf907e1a304e upstream. Armin reported that after referenced commit his RTL8105e is dead when resuming from suspend and machine runs on battery. This patch has been confirmed to fix the issue. Fixes: e80bd76fbf56 ("r8169: work around power-saving bug on some chip versions") Reported-by: Armin Wolf Tested-by: Armin Wolf Signed-off-by: Heiner Kallweit Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/realtek/r8169.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -4238,6 +4238,7 @@ static void r8168_pll_power_down(struct switch (tp->mac_version) { case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_26: + case RTL_GIGA_MAC_VER_29 ... RTL_GIGA_MAC_VER_30: case RTL_GIGA_MAC_VER_32 ... RTL_GIGA_MAC_VER_33: case RTL_GIGA_MAC_VER_37: case RTL_GIGA_MAC_VER_39: @@ -4265,6 +4266,7 @@ static void r8168_pll_power_up(struct rt { switch (tp->mac_version) { case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_26: + case RTL_GIGA_MAC_VER_29 ... RTL_GIGA_MAC_VER_30: case RTL_GIGA_MAC_VER_32 ... RTL_GIGA_MAC_VER_33: case RTL_GIGA_MAC_VER_37: case RTL_GIGA_MAC_VER_39: