Commit 48c205c6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'r8169-fix-dash-devices-network-lost-issue' 

ChunHao Lin says:

====================
r8169: fix DASH devices network lost issue

This series are used to fix network lost issue on systems that support
DASH. It has been tested on rtl8168ep and rtl8168fp.
====================

Link: https://lore.kernel.org/r/20231109173400.4573-1-hau@realtek.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 334e90b8 868c3b95

drivers/net/ethernet/realtek/r8169_main.c

+31 −11
Original line number Diff line number Diff line
@@ -624,6 +624,7 @@ struct rtl8169_private { 


	unsigned supports_gmii:1;

	unsigned aspm_manageable:1;

	unsigned dash_enabled:1;

	dma_addr_t counters_phys_addr;

	struct rtl8169_counters *counters;

	struct rtl8169_tc_offsets tc_offset;
@@ -1253,14 +1254,26 @@ static bool r8168ep_check_dash(struct rtl8169_private *tp) 
	return r8168ep_ocp_read(tp, 0x128) & BIT(0);

}



static enum rtl_dash_type rtl_check_dash(struct rtl8169_private *tp)

static bool rtl_dash_is_enabled(struct rtl8169_private *tp)

{

	switch (tp->dash_type) {

	case RTL_DASH_DP:

		return r8168dp_check_dash(tp);

	case RTL_DASH_EP:

		return r8168ep_check_dash(tp);

	default:

		return false;

	}

}



static enum rtl_dash_type rtl_get_dash_type(struct rtl8169_private *tp)

{

	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_28:

	case RTL_GIGA_MAC_VER_31:

		return r8168dp_check_dash(tp) ? RTL_DASH_DP : RTL_DASH_NONE;

		return RTL_DASH_DP;

	case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_53:

		return r8168ep_check_dash(tp) ? RTL_DASH_EP : RTL_DASH_NONE;

		return RTL_DASH_EP;

	default:

		return RTL_DASH_NONE;

	}
@@ -1453,7 +1466,7 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts) 


	device_set_wakeup_enable(tp_to_dev(tp), wolopts);



	if (tp->dash_type == RTL_DASH_NONE) {

	if (!tp->dash_enabled) {

		rtl_set_d3_pll_down(tp, !wolopts);

		tp->dev->wol_enabled = wolopts ? 1 : 0;

	}
@@ -2512,7 +2525,7 @@ static void rtl_wol_enable_rx(struct rtl8169_private *tp) 


static void rtl_prepare_power_down(struct rtl8169_private *tp)

{

	if (tp->dash_type != RTL_DASH_NONE)

	if (tp->dash_enabled)

		return;



	if (tp->mac_version == RTL_GIGA_MAC_VER_32 ||
@@ -4648,10 +4661,16 @@ static void rtl8169_down(struct rtl8169_private *tp) 
	rtl8169_cleanup(tp);

	rtl_disable_exit_l1(tp);

	rtl_prepare_power_down(tp);



	if (tp->dash_type != RTL_DASH_NONE)

		rtl8168_driver_stop(tp);

}



static void rtl8169_up(struct rtl8169_private *tp)

{

	if (tp->dash_type != RTL_DASH_NONE)

		rtl8168_driver_start(tp);



	pci_set_master(tp->pci_dev);

	phy_init_hw(tp->phydev);

	phy_resume(tp->phydev);
@@ -4869,7 +4888,7 @@ static int rtl8169_runtime_idle(struct device *device) 
{

	struct rtl8169_private *tp = dev_get_drvdata(device);



	if (tp->dash_type != RTL_DASH_NONE)

	if (tp->dash_enabled)

		return -EBUSY;



	if (!netif_running(tp->dev) || !netif_carrier_ok(tp->dev))
@@ -4895,8 +4914,7 @@ static void rtl_shutdown(struct pci_dev *pdev) 
	/* Restore original MAC address */

	rtl_rar_set(tp, tp->dev->perm_addr);



	if (system_state == SYSTEM_POWER_OFF &&

	    tp->dash_type == RTL_DASH_NONE) {

	if (system_state == SYSTEM_POWER_OFF && !tp->dash_enabled) {

		pci_wake_from_d3(pdev, tp->saved_wolopts);

		pci_set_power_state(pdev, PCI_D3hot);

	}
@@ -5254,7 +5272,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1);

	tp->aspm_manageable = !rc;



	tp->dash_type = rtl_check_dash(tp);

	tp->dash_type = rtl_get_dash_type(tp);

	tp->dash_enabled = rtl_dash_is_enabled(tp);



	tp->cp_cmd = RTL_R16(tp, CPlusCmd) & CPCMD_MASK;
@@ -5325,7 +5344,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* configure chip for default features */

	rtl8169_set_features(dev, dev->features);



	if (tp->dash_type == RTL_DASH_NONE) {

	if (!tp->dash_enabled) {

		rtl_set_d3_pll_down(tp, true);

	} else {

		rtl_set_d3_pll_down(tp, false);
@@ -5365,7 +5384,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
			    "ok" : "ko");



	if (tp->dash_type != RTL_DASH_NONE) {

		netdev_info(dev, "DASH enabled\n");

		netdev_info(dev, "DASH %s\n",

			    tp->dash_enabled ? "enabled" : "disabled");

		rtl8168_driver_start(tp);

	}