releases/5.1.7/r8169-fix-mac-address-being-lost-in-pci-d3.patch

   1 From foo@baz Fri 31 May 2019 03:16:39 PM PDT
   2 From: Heiner Kallweit <hkallweit1@gmail.com>
   3 Date: Wed, 29 May 2019 07:44:01 +0200
   4 Subject: r8169: fix MAC address being lost in PCI D3
   5
   6 From: Heiner Kallweit <hkallweit1@gmail.com>
   7
   8 [ Upstream commit 59715171fbd0172a579576f46821031800a63bc5 ]
   9
  10 (At least) RTL8168e forgets its MAC address in PCI D3. To fix this set
  11 the MAC address when resuming. For resuming from runtime-suspend we
  12 had this in place already, for resuming from S3/S5 it was missing.
  13
  14 The commit referenced as being fixed isn't wrong, it's just the first
  15 one where the patch applies cleanly.
  16
  17 Fixes: 0f07bd850d36 ("r8169: use dev_get_drvdata where possible")
  18 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
  19 Reported-by: Albert Astals Cid <aacid@kde.org>
  20 Tested-by: Albert Astals Cid <aacid@kde.org>
  21 Signed-off-by: David S. Miller <davem@davemloft.net>
  22 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  23 ---
  24  drivers/net/ethernet/realtek/r8169.c |    3 +++
  25  1 file changed, 3 insertions(+)
  26
  27 --- a/drivers/net/ethernet/realtek/r8169.c
  28 +++ b/drivers/net/ethernet/realtek/r8169.c
  29 @@ -6914,6 +6914,8 @@ static int rtl8169_resume(struct device
  30         struct net_device *dev = dev_get_drvdata(device);
  31         struct rtl8169_private *tp = netdev_priv(dev);
  32
  33 +       rtl_rar_set(tp, dev->dev_addr);
  34 +
  35         clk_prepare_enable(tp->clk);
  36
  37         if (netif_running(dev))
  38 @@ -6947,6 +6949,7 @@ static int rtl8169_runtime_resume(struct
  39  {
  40         struct net_device *dev = dev_get_drvdata(device);
  41         struct rtl8169_private *tp = netdev_priv(dev);
  42 +
  43         rtl_rar_set(tp, dev->dev_addr);
  44
  45         if (!tp->TxDescArray)