From nobody Fri Oct 3 16:44:12 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 007072D6E7C; Thu, 28 Aug 2025 07:39:51 +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=1756366793; cv=none; b=ImM4Iy6VQEsu0xNJpepIxY72UNYeWmeqK14RVWzGOInHcTULlEi0jcYJNvZAgA7OYqVFSo/CSYjz4DqwMSuOKA+tAmcu/MYI+bderEc9q2uQcpKOgy6wFJmQ9sGLnidi2rfx7mxxp9DXkmgLusrmhqkbqAJCTYa2AZ07nYkuP3Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756366793; c=relaxed/simple; bh=EqgH5I3zjwnAJWWJN8/p/ltYY9bIFWSlIx4TncVSGu8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=S/zkQEsnLHZC52EHRfA2V1AOWkKnnLXGejztKbz+iJA9Vf9/JRB1S+Hk1xckMdJaX0p9sLbiFcJqez64cGP2+Z7/RD22yjERYl0dPTmeXruESR+JEALr+m1vcVPuUPrGwRYhGGM2GRePnu0oKj2uAya2SQxe5QONrZ/tdMtpUTI= 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=sHfmXWIU; 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="sHfmXWIU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1756366792; x=1787902792; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EqgH5I3zjwnAJWWJN8/p/ltYY9bIFWSlIx4TncVSGu8=; b=sHfmXWIUgT2QA7VeSfbbY0LoabPM4E1U70SSMoEcXnQ+FAgSr/UHhUC7 3zkAlsvhz7FIA8fJ75CnDXJLcsjIDhmEcB2AG9G8QUd5YEzXrIqR4Loc0 NOLYejVPdl9YM2UEEshccbCUnbM8yOyaxlNMg4hHHIHEVs8xGiI1sXvNO WNMZsOwssaIV8ryT3UK5++XbEr/FHQSVlxLN21M93d8sXzAYnBfxfgPdp 6Wdt4DlfNHNo07XezYB7/20j4qqa9ULvO+EC9Sq/gI4VJoM3WrYmNzZJV vos4kW8p+IRQSLQs+mdNyMaEL61QTo3VDVz5G7ynWSg/EMHWOMNST8fhp Q==; X-CSE-ConnectionGUID: WAPdFMS8QiWIKMV0w6QKBA== X-CSE-MsgGUID: pFSARGrmSNiQ7IGIoLlM9A== X-IronPort-AV: E=Sophos;i="6.18,217,1751266800"; d="scan'208";a="45199985" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 28 Aug 2025 00:39:50 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.87.72) by chn-vm-ex02.mchp-main.com (10.10.87.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Thu, 28 Aug 2025 00:38:59 -0700 Received: from DEN-DL-M31836.microchip.com (10.10.85.11) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Thu, 28 Aug 2025 00:38:56 -0700 From: Horatiu Vultur To: , , , , , , , , CC: , , Horatiu Vultur Subject: [PATCH net-next v4 1/2] net: phy: micrel: Introduce function __lan8814_ptp_probe_once Date: Thu, 28 Aug 2025 09:34:24 +0200 Message-ID: <20250828073425.3999528-2-horatiu.vultur@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250828073425.3999528-1-horatiu.vultur@microchip.com> References: <20250828073425.3999528-1-horatiu.vultur@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" Introduce the function __lan8814_ptp_probe_once as this function will be used also by lan8842 driver. This change doesn't have any functional changes. Signed-off-by: Horatiu Vultur --- drivers/net/phy/micrel.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 04bd744920b0d..9a90818481320 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -4242,7 +4242,8 @@ static void lan8814_ptp_init(struct phy_device *phyde= v) phydev->default_timestamp =3D true; } =20 -static int lan8814_ptp_probe_once(struct phy_device *phydev) +static int __lan8814_ptp_probe_once(struct phy_device *phydev, char *pin_n= ame, + int gpios) { struct lan8814_shared_priv *shared =3D phy_package_get_priv(phydev); =20 @@ -4250,18 +4251,18 @@ static int lan8814_ptp_probe_once(struct phy_device= *phydev) mutex_init(&shared->shared_lock); =20 shared->pin_config =3D devm_kmalloc_array(&phydev->mdio.dev, - LAN8814_PTP_GPIO_NUM, + gpios, sizeof(*shared->pin_config), GFP_KERNEL); if (!shared->pin_config) return -ENOMEM; =20 - for (int i =3D 0; i < LAN8814_PTP_GPIO_NUM; i++) { + for (int i =3D 0; i < gpios; i++) { struct ptp_pin_desc *ptp_pin =3D &shared->pin_config[i]; =20 memset(ptp_pin, 0, sizeof(*ptp_pin)); snprintf(ptp_pin->name, - sizeof(ptp_pin->name), "lan8814_ptp_pin_%02d", i); + sizeof(ptp_pin->name), "%s_%02d", pin_name, i); ptp_pin->index =3D i; ptp_pin->func =3D PTP_PF_NONE; } @@ -4271,7 +4272,7 @@ static int lan8814_ptp_probe_once(struct phy_device *= phydev) shared->ptp_clock_info.max_adj =3D 31249999; shared->ptp_clock_info.n_alarm =3D 0; shared->ptp_clock_info.n_ext_ts =3D LAN8814_PTP_EXTTS_NUM; - shared->ptp_clock_info.n_pins =3D LAN8814_PTP_GPIO_NUM; + shared->ptp_clock_info.n_pins =3D gpios; shared->ptp_clock_info.pps =3D 0; shared->ptp_clock_info.supported_extts_flags =3D PTP_RISING_EDGE | PTP_FALLING_EDGE | @@ -4318,6 +4319,12 @@ static int lan8814_ptp_probe_once(struct phy_device = *phydev) return 0; } =20 +static int lan8814_ptp_probe_once(struct phy_device *phydev) +{ + return __lan8814_ptp_probe_once(phydev, "lan8814_ptp_pin", + LAN8814_PTP_GPIO_NUM); +} + static void lan8814_setup_led(struct phy_device *phydev, int val) { int temp; --=20 2.34.1 From nobody Fri Oct 3 16:44:12 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 F02442E62DA; Thu, 28 Aug 2025 07:39:42 +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=1756366784; cv=none; b=n9FFIUVcINUqLFDZ+b1gtj1uvKhBskRu0VVYqJ0B+/b4ybek3gDhVwA/pSFYOel4cLA7WeBFgKbc1+mT/nwKfE42q8u8DMHry4Q7yXxuce9+0ezBPauhAYDC52+CmQeySJLKmFBRoDZQ//dlBzzU/7snse5zQ9t/0FfhoqxmNwc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756366784; c=relaxed/simple; bh=n9TZULwgxYPQd7I3SRycARL3DwMkupaaF1dU4hxh/hw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eKi4W4fKhwf31DXpnUXB0v9acVk9pOXaRAGktEpTFOBUp8mXwzdMWP/E+KizQuOm8UGeEgEtNh/M9JLwRsK6BYfdwHDERQuH+XQaNHwRSacP3mlEegcD1WYX06H2o62ui4RV/HUagcnvLhX+k8crNbssOpNFAauuD3zN48CJwRA= 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=1uGFeWcG; 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="1uGFeWcG" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1756366783; x=1787902783; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=n9TZULwgxYPQd7I3SRycARL3DwMkupaaF1dU4hxh/hw=; b=1uGFeWcGjVg1NQaf4hEpmokqeGylRLp+P5GE9mMJIWxFW1AHGFypVaAp tYS1JyJPIuubZV8C8M5PfgnXitoCvBrrcicZaEGhGxhKVVaX+SDVezfOw 1a1cuMeyoEfZzEOgc7nJXnxLmzdCU50BCHUXRzlpGgdFKhy73vFjKGkmt /ta5b3N8b6t0rjRU3JqnffR0SSM0ILUXBu9ltW59zqFbBqGKTmaSEejrN pNwnfNU4NdLbDyZn9tKf3xA5yhmFP5lE07OaY6+6Pn+P/NqqEFwWjCJcZ 0wrsjEAtwXkHKkdoZyF8tNT7mCaKEHXb/ScbuWubS5treoU96WmtBh6ZK w==; X-CSE-ConnectionGUID: vZ6Q4hMfQseYYiGgngORMg== X-CSE-MsgGUID: iVodR+4mSF+Bam2/rJY58A== X-IronPort-AV: E=Sophos;i="6.18,217,1751266800"; d="scan'208";a="277141623" 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; 28 Aug 2025 00:39:42 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) 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.44; Thu, 28 Aug 2025 00:39:01 -0700 Received: from DEN-DL-M31836.microchip.com (10.10.85.11) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Thu, 28 Aug 2025 00:38:59 -0700 From: Horatiu Vultur To: , , , , , , , , CC: , , Horatiu Vultur Subject: [PATCH net-next v4 2/2] net: phy: micrel: Add PTP support for lan8842 Date: Thu, 28 Aug 2025 09:34:25 +0200 Message-ID: <20250828073425.3999528-3-horatiu.vultur@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250828073425.3999528-1-horatiu.vultur@microchip.com> References: <20250828073425.3999528-1-horatiu.vultur@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" It has the same PTP IP block as lan8814, only the number of GPIOs is different, all the other functionality is the same. So reuse the same functions as lan8814 for lan8842. There is a revision of lan8842 called lan8832 which doesn't have the PTP IP block. So make sure in that case the PTP is not initialized. Signed-off-by: Horatiu Vultur --- drivers/net/phy/micrel.c | 97 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 9a90818481320..95ba1a2859a9a 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -457,6 +457,9 @@ struct lan8842_phy_stats { =20 struct lan8842_priv { struct lan8842_phy_stats phy_stats; + int rev; + struct phy_device *phydev; + struct kszphy_ptp_priv ptp_priv; }; =20 static const struct kszphy_type lan8814_type =3D { @@ -5786,6 +5789,17 @@ static int ksz9131_resume(struct phy_device *phydev) return kszphy_resume(phydev); } =20 +#define LAN8842_PTP_GPIO_NUM 16 + +static int lan8842_ptp_probe_once(struct phy_device *phydev) +{ + return __lan8814_ptp_probe_once(phydev, "lan8842_ptp_pin", + LAN8842_PTP_GPIO_NUM); +} + +#define LAN8842_STRAP_REG 0 /* 0x0 */ +#define LAN8842_STRAP_REG_PHYADDR_MASK GENMASK(4, 0) +#define LAN8842_SKU_REG 11 /* 0x0b */ #define LAN8842_SELF_TEST 14 /* 0x0e */ #define LAN8842_SELF_TEST_RX_CNT_ENA BIT(8) #define LAN8842_SELF_TEST_TX_CNT_ENA BIT(4) @@ -5793,6 +5807,7 @@ static int ksz9131_resume(struct phy_device *phydev) static int lan8842_probe(struct phy_device *phydev) { struct lan8842_priv *priv; + int addr; int ret; =20 priv =3D devm_kzalloc(&phydev->mdio.dev, sizeof(*priv), GFP_KERNEL); @@ -5800,6 +5815,7 @@ static int lan8842_probe(struct phy_device *phydev) return -ENOMEM; =20 phydev->priv =3D priv; + priv->phydev =3D phydev; =20 /* Similar to lan8814 this PHY has a pin which needs to be pulled down * to enable to pass any traffic through it. Therefore use the same @@ -5817,6 +5833,41 @@ static int lan8842_probe(struct phy_device *phydev) if (ret < 0) return ret; =20 + /* Revision lan8832 doesn't have support for PTP, therefore don't add + * any PTP clocks + */ + priv->rev =3D lanphy_read_page_reg(phydev, LAN8814_PAGE_COMMON_REGS, + LAN8842_SKU_REG); + if (priv->rev < 0) + return priv->rev; + if (priv->rev =3D=3D 0x8832) + return 0; + + /* As the lan8814 and lan8842 has the same IP for the PTP block, the + * only difference is the number of the GPIOs, then make sure that the + * lan8842 initialized also the shared data pointer as this is used in + * all the PTP functions for lan8814. The lan8842 doesn't have multiple + * PHYs in the same package. + */ + addr =3D lanphy_read_page_reg(phydev, LAN8814_PAGE_COMMON_REGS, + LAN8842_STRAP_REG); + if (addr < 0) + return addr; + addr &=3D LAN8842_STRAP_REG_PHYADDR_MASK; + + ret =3D devm_phy_package_join(&phydev->mdio.dev, phydev, addr, + sizeof(struct lan8814_shared_priv)); + if (ret) + return ret; + + if (phy_package_init_once(phydev)) { + ret =3D lan8842_ptp_probe_once(phydev); + if (ret) + return ret; + } + + lan8814_ptp_init(phydev); + return 0; } =20 @@ -5896,8 +5947,34 @@ static int lan8842_config_inband(struct phy_device *= phydev, unsigned int modes) enable ? LAN8814_QSGMII_PCS1G_ANEG_CONFIG_ANEG_ENA : 0); } =20 +static void lan8842_handle_ptp_interrupt(struct phy_device *phydev, u16 st= atus) +{ + struct kszphy_ptp_priv *ptp_priv; + struct lan8842_priv *priv; + + priv =3D phydev->priv; + ptp_priv =3D &priv->ptp_priv; + + if (status & PTP_TSU_INT_STS_PTP_TX_TS_EN_) + lan8814_get_tx_ts(ptp_priv); + + if (status & PTP_TSU_INT_STS_PTP_RX_TS_EN_) + lan8814_get_rx_ts(ptp_priv); + + if (status & PTP_TSU_INT_STS_PTP_TX_TS_OVRFL_INT_) { + lan8814_flush_fifo(phydev, true); + skb_queue_purge(&ptp_priv->tx_queue); + } + + if (status & PTP_TSU_INT_STS_PTP_RX_TS_OVRFL_INT_) { + lan8814_flush_fifo(phydev, false); + skb_queue_purge(&ptp_priv->rx_queue); + } +} + static irqreturn_t lan8842_handle_interrupt(struct phy_device *phydev) { + struct lan8842_priv *priv =3D phydev->priv; int ret =3D IRQ_NONE; int irq_status; =20 @@ -5912,6 +5989,26 @@ static irqreturn_t lan8842_handle_interrupt(struct p= hy_device *phydev) ret =3D IRQ_HANDLED; } =20 + /* Phy revision lan8832 doesn't have support for PTP threrefore there is + * not need to check the PTP and GPIO interrupts + */ + if (priv->rev =3D=3D 0x8832) + goto out; + + while (true) { + irq_status =3D lanphy_read_page_reg(phydev, LAN8814_PAGE_PORT_REGS, + PTP_TSU_INT_STS); + if (!irq_status) + break; + + lan8842_handle_ptp_interrupt(phydev, irq_status); + ret =3D IRQ_HANDLED; + } + + if (!lan8814_handle_gpio_interrupt(phydev, irq_status)) + ret =3D IRQ_HANDLED; + +out: return ret; } =20 --=20 2.34.1