From nobody Thu Dec 18 11:27:51 2025 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 96A3719DF6B; Fri, 14 Jun 2024 17:15:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=68.232.153.233 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718385330; cv=none; b=aPyfNGDveSlPlona6beey1agYv2jxpPIywmwb9C3xDNIe6lORTwlcTkjyyE0VEpwGYmKH4D+uGvY1l9zZyyk0ghKh8oWLIhOiGoXpgQBfjCs2zYdfmyWjBV3zieEMMJAflwO+BbW5yyBJLVE3Lvha6+ye0qGo2eKeEGdkOZO490= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718385330; c=relaxed/simple; bh=8sSXErA72XHH0FmZV55gKMk3lGpLdJz0hZpC1Oyy1x0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JRG0T2yUC4m6mN6lQs63oJrAyDb02Ns0bDSKLGbDRatGtz/Szik9Y2919qCfHO5BOSiTx4aFRq792o27x8yQ0gKNybQxEAoeeasb3b91Wr/GHLP9ZiE7Nxa2tETvkVO+hyqsGe4L413q4RVQBCK5LMAci/YEBkdDYTdxLW182pM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com; spf=pass smtp.mailfrom=microchip.com; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b=M3nQu8C8; arc=none smtp.client-ip=68.232.153.233 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=microchip.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="M3nQu8C8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1718385329; x=1749921329; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8sSXErA72XHH0FmZV55gKMk3lGpLdJz0hZpC1Oyy1x0=; b=M3nQu8C8X0FYt1MibaYPojAu3c8JNOi+H2NFT9xuzCDRZt2OC0psd7EE nzAEVybVjV6dfiiIXdRP/nyD9k9I1nwzR9DUqUkihD7HKrba/WTbjLEC0 Q9OarFsyjAml4obaP6UEYrIUBblgiIp4KKZFR0AMWry638cXmvKrzn+fF IaPkTYavEQ/QRHO+M8YlIpq2VjT2Fvt20fboQfFVubKD48MFl7s0UbGXu qJf6tGWoN88veorcoaIWQb9eRFxQq/mRqL1Jnsc7LhrPrtxsTkDny4U6t gqL2WqyYH7x9lNiT2yIl8dl8ETj8H/PJ4ESV1YKKtO+veV97kFV73GVow A==; X-CSE-ConnectionGUID: ARXfGER+SECGbybsuTH9RQ== X-CSE-MsgGUID: KjEbXRY2Qy2YV4n6Us94FQ== X-IronPort-AV: E=Sophos;i="6.08,238,1712646000"; d="scan'208";a="258450493" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa5.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 14 Jun 2024 10:15:26 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Fri, 14 Jun 2024 10:15:03 -0700 Received: from HYD-DK-UNGSW21.microchip.com (10.10.85.11) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Fri, 14 Jun 2024 10:14:58 -0700 From: Raju Lakkaraju To: CC: , , , , , , , , , , , , , Subject: [PATCH net V5 1/3] net: lan743x: disable WOL upon resume to restore full data path operation Date: Fri, 14 Jun 2024 22:41:55 +0530 Message-ID: <20240614171157.190871-2-Raju.Lakkaraju@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240614171157.190871-1-Raju.Lakkaraju@microchip.com> References: <20240614171157.190871-1-Raju.Lakkaraju@microchip.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When Wake-on-LAN (WoL) is active and the system is in suspend mode, trigger= ing a system event can wake the system from sleep, which may block the data pat= h. To restore normal data path functionality after waking, disable all wake-up events. Furthermore, clear all Write 1 to Clear (W1C) status bits by writing 1's to them. Fixes: 4d94282afd95 ("lan743x: Add power management support") Reviewed-by: Wojciech Drewek Signed-off-by: Raju Lakkaraju --- Change List: ------------ V4 -> V5: - Change Wakeup source message from info to debug V3 -> V4: - No change V2 -> V3: - No change V1 -> V2: - Repost - No change V0 -> V1: - Variable "data" change from "int" to "unsigned int" drivers/net/ethernet/microchip/lan743x_main.c | 30 ++++++++++++++++--- drivers/net/ethernet/microchip/lan743x_main.h | 24 +++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/et= hernet/microchip/lan743x_main.c index 6be8a43c908a..48835bdc2e63 100644 --- a/drivers/net/ethernet/microchip/lan743x_main.c +++ b/drivers/net/ethernet/microchip/lan743x_main.c @@ -3575,7 +3575,7 @@ static void lan743x_pm_set_wol(struct lan743x_adapter= *adapter) =20 /* clear wake settings */ pmtctl =3D lan743x_csr_read(adapter, PMT_CTL); - pmtctl |=3D PMT_CTL_WUPS_MASK_; + pmtctl |=3D PMT_CTL_WUPS_MASK_ | PMT_CTL_RES_CLR_WKP_MASK_; pmtctl &=3D ~(PMT_CTL_GPIO_WAKEUP_EN_ | PMT_CTL_EEE_WAKEUP_EN_ | PMT_CTL_WOL_EN_ | PMT_CTL_MAC_D3_RX_CLK_OVR_ | PMT_CTL_RX_FCT_RFE_D3_CLK_OVR_ | PMT_CTL_ETH_PHY_WAKE_EN_); @@ -3710,6 +3710,7 @@ static int lan743x_pm_resume(struct device *dev) struct pci_dev *pdev =3D to_pci_dev(dev); struct net_device *netdev =3D pci_get_drvdata(pdev); struct lan743x_adapter *adapter =3D netdev_priv(netdev); + u32 data; int ret; =20 pci_set_power_state(pdev, PCI_D0); @@ -3728,6 +3729,30 @@ static int lan743x_pm_resume(struct device *dev) return ret; } =20 + ret =3D lan743x_csr_read(adapter, MAC_WK_SRC); + netif_dbg(adapter, drv, adapter->netdev, + "Wakeup source : 0x%08X\n", ret); + + /* Clear the wol configuration and status bits. Note that + * the status bits are "Write One to Clear (W1C)" + */ + data =3D MAC_WUCSR_EEE_TX_WAKE_ | MAC_WUCSR_EEE_RX_WAKE_ | + MAC_WUCSR_RFE_WAKE_FR_ | MAC_WUCSR_PFDA_FR_ | MAC_WUCSR_WUFR_ | + MAC_WUCSR_MPR_ | MAC_WUCSR_BCAST_FR_; + lan743x_csr_write(adapter, MAC_WUCSR, data); + + data =3D MAC_WUCSR2_NS_RCD_ | MAC_WUCSR2_ARP_RCD_ | + MAC_WUCSR2_IPV6_TCPSYN_RCD_ | MAC_WUCSR2_IPV4_TCPSYN_RCD_; + lan743x_csr_write(adapter, MAC_WUCSR2, data); + + data =3D MAC_WK_SRC_ETH_PHY_WK_ | MAC_WK_SRC_IPV6_TCPSYN_RCD_WK_ | + MAC_WK_SRC_IPV4_TCPSYN_RCD_WK_ | MAC_WK_SRC_EEE_TX_WK_ | + MAC_WK_SRC_EEE_RX_WK_ | MAC_WK_SRC_RFE_FR_WK_ | + MAC_WK_SRC_PFDA_FR_WK_ | MAC_WK_SRC_MP_FR_WK_ | + MAC_WK_SRC_BCAST_FR_WK_ | MAC_WK_SRC_WU_FR_WK_ | + MAC_WK_SRC_WK_FR_SAVED_; + lan743x_csr_write(adapter, MAC_WK_SRC, data); + /* open netdev when netdev is at running state while resume. * For instance, it is true when system wakesup after pm-suspend * However, it is false when system wakes up after suspend GUI menu @@ -3736,9 +3761,6 @@ static int lan743x_pm_resume(struct device *dev) lan743x_netdev_open(netdev); =20 netif_device_attach(netdev); - ret =3D lan743x_csr_read(adapter, MAC_WK_SRC); - netif_info(adapter, drv, adapter->netdev, - "Wakeup source : 0x%08X\n", ret); =20 return 0; } diff --git a/drivers/net/ethernet/microchip/lan743x_main.h b/drivers/net/et= hernet/microchip/lan743x_main.h index 645bc048e52e..fac0f33d10b2 100644 --- a/drivers/net/ethernet/microchip/lan743x_main.h +++ b/drivers/net/ethernet/microchip/lan743x_main.h @@ -61,6 +61,7 @@ #define PMT_CTL_RX_FCT_RFE_D3_CLK_OVR_ BIT(18) #define PMT_CTL_GPIO_WAKEUP_EN_ BIT(15) #define PMT_CTL_EEE_WAKEUP_EN_ BIT(13) +#define PMT_CTL_RES_CLR_WKP_MASK_ GENMASK(9, 8) #define PMT_CTL_READY_ BIT(7) #define PMT_CTL_ETH_PHY_RST_ BIT(4) #define PMT_CTL_WOL_EN_ BIT(3) @@ -227,12 +228,31 @@ #define MAC_WUCSR (0x140) #define MAC_MP_SO_EN_ BIT(21) #define MAC_WUCSR_RFE_WAKE_EN_ BIT(14) +#define MAC_WUCSR_EEE_TX_WAKE_ BIT(13) +#define MAC_WUCSR_EEE_RX_WAKE_ BIT(11) +#define MAC_WUCSR_RFE_WAKE_FR_ BIT(9) +#define MAC_WUCSR_PFDA_FR_ BIT(7) +#define MAC_WUCSR_WUFR_ BIT(6) +#define MAC_WUCSR_MPR_ BIT(5) +#define MAC_WUCSR_BCAST_FR_ BIT(4) #define MAC_WUCSR_PFDA_EN_ BIT(3) #define MAC_WUCSR_WAKE_EN_ BIT(2) #define MAC_WUCSR_MPEN_ BIT(1) #define MAC_WUCSR_BCST_EN_ BIT(0) =20 #define MAC_WK_SRC (0x144) +#define MAC_WK_SRC_ETH_PHY_WK_ BIT(17) +#define MAC_WK_SRC_IPV6_TCPSYN_RCD_WK_ BIT(16) +#define MAC_WK_SRC_IPV4_TCPSYN_RCD_WK_ BIT(15) +#define MAC_WK_SRC_EEE_TX_WK_ BIT(14) +#define MAC_WK_SRC_EEE_RX_WK_ BIT(13) +#define MAC_WK_SRC_RFE_FR_WK_ BIT(12) +#define MAC_WK_SRC_PFDA_FR_WK_ BIT(11) +#define MAC_WK_SRC_MP_FR_WK_ BIT(10) +#define MAC_WK_SRC_BCAST_FR_WK_ BIT(9) +#define MAC_WK_SRC_WU_FR_WK_ BIT(8) +#define MAC_WK_SRC_WK_FR_SAVED_ BIT(7) + #define MAC_MP_SO_HI (0x148) #define MAC_MP_SO_LO (0x14C) =20 @@ -295,6 +315,10 @@ #define RFE_INDX(index) (0x580 + (index << 2)) =20 #define MAC_WUCSR2 (0x600) +#define MAC_WUCSR2_NS_RCD_ BIT(7) +#define MAC_WUCSR2_ARP_RCD_ BIT(6) +#define MAC_WUCSR2_IPV6_TCPSYN_RCD_ BIT(5) +#define MAC_WUCSR2_IPV4_TCPSYN_RCD_ BIT(4) =20 #define SGMII_ACC (0x720) #define SGMII_ACC_SGMII_BZY_ BIT(31) --=20 2.34.1 From nobody Thu Dec 18 11:27:51 2025 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 061431974EA; Fri, 14 Jun 2024 17:15:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=68.232.154.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718385331; cv=none; b=NU0wliP0NzGEnnnCoxkdpBIpRUoG4WzcVRAtwaxEINzd3LhGwyDFD2nSl30fTnQ40xHk6MV/MeRLeQz9zkJePDcWn7hfhf5d/nXSa7UqiAEE38hzYvepoS56bNHdViK15xPTpsE2Y1ybONvwD3IQko/QKn02xox7BoBSg34SCIs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718385331; c=relaxed/simple; bh=ERY31lbQ9ymOsxtCzVpP4HOibxzB6fNrq3B3Ti28nEo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VcQOlqhpAyHgk2iGKQWMVkheCY66A9g82CLBQf831T4LmJqmmlfJPO4RplhxP3sMqcAXpZV/sCY099Tx7JZd1LM0Qcm2Q5XLCBWmGxZr6a7Iv2mRwKCVTuU4iRfh2Yf1J3JYqvG/dZTBcN2SdXQ9fQ0vmNL0TCcdlvNjpy4s4hY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com; spf=pass smtp.mailfrom=microchip.com; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b=r3Vlb3Zl; arc=none smtp.client-ip=68.232.154.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=microchip.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="r3Vlb3Zl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1718385329; x=1749921329; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ERY31lbQ9ymOsxtCzVpP4HOibxzB6fNrq3B3Ti28nEo=; b=r3Vlb3Zl/+xRksXeVGp8QnPC62zFOgLkO2Ggt3oyEKQ38hckLpZu8Woj PMpPB5nU/zOpiW5GkkeTYhyCI+ZGkeFoEGpg9GRqG3kQaVPsfBpMcSOZd cjLb+U/mRyTDyfNwxF90u0MqAF2Wa53+NGlihLFwJM241iJOwA1vYFQ3N JoflGqbWM4VSuWzJyr6fY0dReTuyTB325qGvHjF+jP5f9Iuc22QJJbJfG E+MRxmpbiee21cxW0DKoIVnqbMKqjJJE4WLv93Uirh7SGS2BisTeIQNb5 XRyccf6dKhdugGmNQSfsPnDmgk4xnHL2MKh6iJxibkXZGsA1/Iceb7/7Z Q==; X-CSE-ConnectionGUID: FkzynaL6Qw6YgMHq0F4nsw== X-CSE-MsgGUID: QxxoVixiRUePyTcyhQN//g== X-IronPort-AV: E=Sophos;i="6.08,238,1712646000"; d="scan'208";a="194985066" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa6.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 14 Jun 2024 10:15:29 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Fri, 14 Jun 2024 10:15:08 -0700 Received: from HYD-DK-UNGSW21.microchip.com (10.10.85.11) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Fri, 14 Jun 2024 10:15:03 -0700 From: Raju Lakkaraju To: CC: , , , , , , , , , , , , , Subject: [PATCH net V5 2/3] net: lan743x: Support WOL at both the PHY and MAC appropriately Date: Fri, 14 Jun 2024 22:41:56 +0530 Message-ID: <20240614171157.190871-3-Raju.Lakkaraju@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240614171157.190871-1-Raju.Lakkaraju@microchip.com> References: <20240614171157.190871-1-Raju.Lakkaraju@microchip.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Prevent options not supported by the PHY from being requested to it by the = MAC Whenever a WOL option is supported by both, the PHY is given priority since that usually leads to better power savings. Fixes: e9e13b6adc33 ("lan743x: fix for potential NULL pointer dereference w= ith bare card") Reviewed-by: Wojciech Drewek Signed-off-by: Raju Lakkaraju --- Change List: ------------ V4 -> V5: - Change Fixes's SHA from 13 chars to 12 chars - Remove the "Reported-by" and "Closes" tags V3 -> V4: - Fix the support for "CONFIG_PM=3DN"=20 V2 -> V3: - Remove the "phy does not support WOL" debug message which is not requir= ed - Remove WAKE_PHY support option from Ethernet MAC (LAN743x/PCI11x1x) dri= ver - Add "phy_wol_supported" and "phy_wolopts" variables to hold PHY's WOL c= onfig V1 -> V2: - Repost - No change V0 -> V1: - Change the "phy does not support WOL" print from netif_info() to netif_dbg() .../net/ethernet/microchip/lan743x_ethtool.c | 44 +++++++++++++++++-- drivers/net/ethernet/microchip/lan743x_main.c | 18 ++++++-- drivers/net/ethernet/microchip/lan743x_main.h | 4 ++ 3 files changed, 58 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/microchip/lan743x_ethtool.c b/drivers/net= /ethernet/microchip/lan743x_ethtool.c index d0f4ff4ee075..0d1740d64676 100644 --- a/drivers/net/ethernet/microchip/lan743x_ethtool.c +++ b/drivers/net/ethernet/microchip/lan743x_ethtool.c @@ -1127,8 +1127,12 @@ static void lan743x_ethtool_get_wol(struct net_devic= e *netdev, if (netdev->phydev) phy_ethtool_get_wol(netdev->phydev, wol); =20 - wol->supported |=3D WAKE_BCAST | WAKE_UCAST | WAKE_MCAST | - WAKE_MAGIC | WAKE_PHY | WAKE_ARP; + if (wol->supported !=3D adapter->phy_wol_supported) + netif_warn(adapter, drv, adapter->netdev, + "PHY changed its supported WOL! old=3D%x, new=3D%x\n", + adapter->phy_wol_supported, wol->supported); + + wol->supported |=3D MAC_SUPPORTED_WAKES; =20 if (adapter->is_pci11x1x) wol->supported |=3D WAKE_MAGICSECURE; @@ -1143,7 +1147,39 @@ static int lan743x_ethtool_set_wol(struct net_device= *netdev, { struct lan743x_adapter *adapter =3D netdev_priv(netdev); =20 + /* WAKE_MAGICSEGURE is a modifier of and only valid together with + * WAKE_MAGIC + */ + if ((wol->wolopts & WAKE_MAGICSECURE) && !(wol->wolopts & WAKE_MAGIC)) + return -EINVAL; + + if (netdev->phydev) { + struct ethtool_wolinfo phy_wol; + int ret; + + phy_wol.wolopts =3D wol->wolopts & adapter->phy_wol_supported; + + /* If WAKE_MAGICSECURE was requested, filter out WAKE_MAGIC + * for PHYs that do not support WAKE_MAGICSECURE + */ + if (wol->wolopts & WAKE_MAGICSECURE && + !(adapter->phy_wol_supported & WAKE_MAGICSECURE)) + phy_wol.wolopts &=3D ~WAKE_MAGIC; + + ret =3D phy_ethtool_set_wol(netdev->phydev, &phy_wol); + if (ret && (ret !=3D -EOPNOTSUPP)) + return ret; + + if (ret =3D=3D -EOPNOTSUPP) + adapter->phy_wolopts =3D 0; + else + adapter->phy_wolopts =3D phy_wol.wolopts; + } else { + adapter->phy_wolopts =3D 0; + } + adapter->wolopts =3D 0; + wol->wolopts &=3D ~adapter->phy_wolopts; if (wol->wolopts & WAKE_UCAST) adapter->wolopts |=3D WAKE_UCAST; if (wol->wolopts & WAKE_MCAST) @@ -1164,10 +1200,10 @@ static int lan743x_ethtool_set_wol(struct net_devic= e *netdev, memset(adapter->sopass, 0, sizeof(u8) * SOPASS_MAX); } =20 + wol->wolopts =3D adapter->wolopts | adapter->phy_wolopts; device_set_wakeup_enable(&adapter->pdev->dev, (bool)wol->wolopts); =20 - return netdev->phydev ? phy_ethtool_set_wol(netdev->phydev, wol) - : -ENETDOWN; + return 0; } #endif /* CONFIG_PM */ =20 diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/et= hernet/microchip/lan743x_main.c index 48835bdc2e63..e418539565b1 100644 --- a/drivers/net/ethernet/microchip/lan743x_main.c +++ b/drivers/net/ethernet/microchip/lan743x_main.c @@ -3118,6 +3118,17 @@ static int lan743x_netdev_open(struct net_device *ne= tdev) if (ret) goto close_tx; } + +#ifdef CONFIG_PM + if (adapter->netdev->phydev) { + struct ethtool_wolinfo wol =3D { .cmd =3D ETHTOOL_GWOL }; + + phy_ethtool_get_wol(netdev->phydev, &wol); + adapter->phy_wol_supported =3D wol.supported; + adapter->phy_wolopts =3D wol.wolopts; + } +#endif + return 0; =20 close_tx: @@ -3587,10 +3598,9 @@ static void lan743x_pm_set_wol(struct lan743x_adapte= r *adapter) =20 pmtctl |=3D PMT_CTL_ETH_PHY_D3_COLD_OVR_ | PMT_CTL_ETH_PHY_D3_OVR_; =20 - if (adapter->wolopts & WAKE_PHY) { - pmtctl |=3D PMT_CTL_ETH_PHY_EDPD_PLL_CTL_; + if (adapter->phy_wolopts) pmtctl |=3D PMT_CTL_ETH_PHY_WAKE_EN_; - } + if (adapter->wolopts & WAKE_MAGIC) { wucsr |=3D MAC_WUCSR_MPEN_; macrx |=3D MAC_RX_RXEN_; @@ -3686,7 +3696,7 @@ static int lan743x_pm_suspend(struct device *dev) lan743x_csr_write(adapter, MAC_WUCSR2, 0); lan743x_csr_write(adapter, MAC_WK_SRC, 0xFFFFFFFF); =20 - if (adapter->wolopts) + if (adapter->wolopts || adapter->phy_wolopts) lan743x_pm_set_wol(adapter); =20 if (adapter->is_pci11x1x) { diff --git a/drivers/net/ethernet/microchip/lan743x_main.h b/drivers/net/et= hernet/microchip/lan743x_main.h index fac0f33d10b2..3b2585a384e2 100644 --- a/drivers/net/ethernet/microchip/lan743x_main.h +++ b/drivers/net/ethernet/microchip/lan743x_main.h @@ -1042,6 +1042,8 @@ enum lan743x_sgmii_lsd { LINK_2500_SLAVE }; =20 +#define MAC_SUPPORTED_WAKES (WAKE_BCAST | WAKE_UCAST | WAKE_MCAST | \ + WAKE_MAGIC | WAKE_ARP) struct lan743x_adapter { struct net_device *netdev; struct mii_bus *mdiobus; @@ -1049,6 +1051,8 @@ struct lan743x_adapter { #ifdef CONFIG_PM u32 wolopts; u8 sopass[SOPASS_MAX]; + u32 phy_wolopts; + u32 phy_wol_supported; #endif struct pci_dev *pdev; struct lan743x_csr csr; --=20 2.34.1 From nobody Thu Dec 18 11:27:51 2025 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E55816D339; Fri, 14 Jun 2024 17:15:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=68.232.154.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718385322; cv=none; b=oHdjbPilSw8XQSHpBQp8vJfJ8m1GYgxEMlc/8VuwEQ09eX2q7pLz23ORHFzNbmcC4W7K8bP6yy98KDoAV/4do8NEKMngoS+figRxfWEDK4BfbUlNNFceM9zokyPrEZyeASfQb8UtRu95tdcSfF7zFCs1H8N5uUq1Fpd6/aC5FqA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718385322; c=relaxed/simple; bh=E4kWCwpi97nUrP5r8szVoHd7Nv9FJpe1nSWH5e9Auuc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UskkSSa0OfFfq3RYqXmnK6md6kzMA3STfS4umDktI26rMitfehmeVgjcFfmj+MmD/HU+uTVlS24iEPOlhbKdK18eSLSYozP0LkqgTSd4dWfUXuriZg1pFPyWUE+Kl/4vJT9XWEnUlst5CFbF3re3ezrZgoAPJSsPegGXWUw1uA4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com; spf=pass smtp.mailfrom=microchip.com; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b=ggnqrTeb; arc=none smtp.client-ip=68.232.154.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=microchip.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="ggnqrTeb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1718385320; x=1749921320; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=E4kWCwpi97nUrP5r8szVoHd7Nv9FJpe1nSWH5e9Auuc=; b=ggnqrTebbmgtWhRumWFEhYvndMlH/jskhGlwdJoFOJ98lSg3RZUV9MIu DNXmXBQr0BQFJK5wrcItRS24TwBSvjc1FculfIl90EbYaRLuGUSot/0l1 yDuXrvXQ+zxu1H0D1GGTsCp1taEZ/Zir3MIHRn2rELhzOkTnJ/4NvQfAB RTIN4TTjffZHT0irg/JKBLurnB4FpE7CcEE2Hycv7KGHonIk4xGdYbAmv xENcYSIvuBDpLUs/80gRMSQhXiYfX5+eVNmOP3OcwQgHntb47Ewd5ZPvT 3t+7c5HDOK573GpyCmKhUKrhllV1H2X8fzwTmf1VoJqIk2qe9sruVSyrl A==; X-CSE-ConnectionGUID: oTu+8oZpRNSsGgyH6m3d9w== X-CSE-MsgGUID: zpD7oSHaQluYeCHGlndR3g== X-IronPort-AV: E=Sophos;i="6.08,238,1712646000"; d="scan'208";a="28220421" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa2.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 14 Jun 2024 10:15:19 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Fri, 14 Jun 2024 10:15:14 -0700 Received: from HYD-DK-UNGSW21.microchip.com (10.10.85.11) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Fri, 14 Jun 2024 10:15:09 -0700 From: Raju Lakkaraju To: CC: , , , , , , , , , , , , , Subject: [PATCH net V5 3/3] net: phy: mxl-gpy: Remove interrupt mask clearing from config_init Date: Fri, 14 Jun 2024 22:41:57 +0530 Message-ID: <20240614171157.190871-4-Raju.Lakkaraju@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240614171157.190871-1-Raju.Lakkaraju@microchip.com> References: <20240614171157.190871-1-Raju.Lakkaraju@microchip.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When the system resumes from sleep, the phy_init_hw() function invokes config_init(), which clears all interrupt masks and causes wake events to be lost in subsequent wake sequences. Remove interrupt mask clearing from config_init() and preserve relevant masks in config_intr(). Fixes: 7d901a1e878a ("net: phy: add Maxlinear GPY115/21x/24x driver") Reviewed-by: Wojciech Drewek Signed-off-by: Raju Lakkaraju --- Change List: ------------ V4 -> V5: - No change V3 -> V4: - No change V0 -> V3: - Address the https://lore.kernel.org/lkml/4a565d54-f468-4e32-8a2c-102c12= 03f72c@lunn.ch/T/ review comments drivers/net/phy/mxl-gpy.c | 58 +++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/drivers/net/phy/mxl-gpy.c b/drivers/net/phy/mxl-gpy.c index b2d36a3a96f1..e5f8ac4b4604 100644 --- a/drivers/net/phy/mxl-gpy.c +++ b/drivers/net/phy/mxl-gpy.c @@ -107,6 +107,7 @@ struct gpy_priv { =20 u8 fw_major; u8 fw_minor; + u32 wolopts; =20 /* It takes 3 seconds to fully switch out of loopback mode before * it can safely re-enter loopback mode. Record the time when @@ -221,6 +222,15 @@ static int gpy_hwmon_register(struct phy_device *phyde= v) } #endif =20 +static int gpy_ack_interrupt(struct phy_device *phydev) +{ + int ret; + + /* Clear all pending interrupts */ + ret =3D phy_read(phydev, PHY_ISTAT); + return ret < 0 ? ret : 0; +} + static int gpy_mbox_read(struct phy_device *phydev, u32 addr) { struct gpy_priv *priv =3D phydev->priv; @@ -262,16 +272,8 @@ static int gpy_mbox_read(struct phy_device *phydev, u3= 2 addr) =20 static int gpy_config_init(struct phy_device *phydev) { - int ret; - - /* Mask all interrupts */ - ret =3D phy_write(phydev, PHY_IMASK, 0); - if (ret) - return ret; - - /* Clear all pending interrupts */ - ret =3D phy_read(phydev, PHY_ISTAT); - return ret < 0 ? ret : 0; + /* Nothing to configure. Configuration Requirement Placeholder */ + return 0; } =20 static int gpy21x_config_init(struct phy_device *phydev) @@ -627,11 +629,23 @@ static int gpy_read_status(struct phy_device *phydev) =20 static int gpy_config_intr(struct phy_device *phydev) { + struct gpy_priv *priv =3D phydev->priv; u16 mask =3D 0; + int ret; + + ret =3D gpy_ack_interrupt(phydev); + if (ret) + return ret; =20 if (phydev->interrupts =3D=3D PHY_INTERRUPT_ENABLED) mask =3D PHY_IMASK_MASK; =20 + if (priv->wolopts & WAKE_MAGIC) + mask |=3D PHY_IMASK_WOL; + + if (priv->wolopts & WAKE_PHY) + mask |=3D PHY_IMASK_LSTC; + return phy_write(phydev, PHY_IMASK, mask); } =20 @@ -678,6 +692,7 @@ static int gpy_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol) { struct net_device *attach_dev =3D phydev->attached_dev; + struct gpy_priv *priv =3D phydev->priv; int ret; =20 if (wol->wolopts & WAKE_MAGIC) { @@ -725,6 +740,8 @@ static int gpy_set_wol(struct phy_device *phydev, ret =3D phy_read(phydev, PHY_ISTAT); if (ret < 0) return ret; + + priv->wolopts |=3D WAKE_MAGIC; } else { /* Disable magic packet matching */ ret =3D phy_clear_bits_mmd(phydev, MDIO_MMD_VEND2, @@ -732,6 +749,13 @@ static int gpy_set_wol(struct phy_device *phydev, WOL_EN); if (ret < 0) return ret; + + /* Disable the WOL interrupt */ + ret =3D phy_clear_bits(phydev, PHY_IMASK, PHY_IMASK_WOL); + if (ret < 0) + return ret; + + priv->wolopts &=3D ~WAKE_MAGIC; } =20 if (wol->wolopts & WAKE_PHY) { @@ -748,9 +772,11 @@ static int gpy_set_wol(struct phy_device *phydev, if (ret & (PHY_IMASK_MASK & ~PHY_IMASK_LSTC)) phy_trigger_machine(phydev); =20 + priv->wolopts |=3D WAKE_PHY; return 0; } =20 + priv->wolopts &=3D ~WAKE_PHY; /* Disable the link state change interrupt */ return phy_clear_bits(phydev, PHY_IMASK, PHY_IMASK_LSTC); } @@ -758,18 +784,10 @@ static int gpy_set_wol(struct phy_device *phydev, static void gpy_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol) { - int ret; + struct gpy_priv *priv =3D phydev->priv; =20 wol->supported =3D WAKE_MAGIC | WAKE_PHY; - wol->wolopts =3D 0; - - ret =3D phy_read_mmd(phydev, MDIO_MMD_VEND2, VPSPEC2_WOL_CTL); - if (ret & WOL_EN) - wol->wolopts |=3D WAKE_MAGIC; - - ret =3D phy_read(phydev, PHY_IMASK); - if (ret & PHY_IMASK_LSTC) - wol->wolopts |=3D WAKE_PHY; + wol->wolopts =3D priv->wolopts; } =20 static int gpy_loopback(struct phy_device *phydev, bool enable) --=20 2.34.1