Received: by 2002:ab2:3350:0:b0:1f4:6588:b3a7 with SMTP id o16csp1835484lqe; Tue, 9 Apr 2024 01:31:29 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWuSVoWTtoVGM+2bufGaYWyq30988UbNwidZ8BitBx5jiNxqaVw7A6r8LjorE0QEjpHy2Lra0Om/nGfFHnNsVqyY2gZOEQunUSatpCD+w== X-Google-Smtp-Source: AGHT+IEUMcVEA7A/cuvZjVJlpHb11q1ZZ8ey58mDkA+ONWBWW7l0F1JLAe5caRfOkr+859ME4XzF X-Received: by 2002:a05:6a21:8cc9:b0:1a7:61f0:9d81 with SMTP id ta9-20020a056a218cc900b001a761f09d81mr7113883pzb.45.1712651489233; Tue, 09 Apr 2024 01:31:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712651489; cv=pass; d=google.com; s=arc-20160816; b=cs28h981HXS7xgradgTBySXp4nMmxm7s7/lbl9mNP6prxC1UlYY4C/uZbdEYg0uL8X J/1TeLyXwYtp/fQg202ea82mqUvkyR7ED0va0EwdoVesUYN17bwwmZry5eVbXqW0+6Ko b4rUbIVSDdvEjccIycxPkttw207xuZU5DTknYikBlF7u32547bhompUVcgUd2yDLw1X7 EwJP5UOGVkJpyZjb98MSbbuoPo1FNr+QFU6vo5vAgnOIbg2e1XVvjOqU8OLWUa5qShc+ PRzb6szFxOGBEKHVj6H0VXOxbeG4I7mGAwJaKjvysxF7htp2v8sPHmMwSnOfziYrauP0 EV+w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=i54fp5QfOZNl70WagwsL45FIExmmuC3Icj77UdRlzDo=; fh=vtlcgQ30nO0QjQR7y1Wfn7g9c11A+T6SWcSZ6WixcJI=; b=B0Ohl9QxrmgbWVddec2D/XOiqUCAsdn16HwciBwrhFrluMTFw+PsNnJ44sE0dZIYSQ d9DeFF+nh+iHDbeuxTG19VyoK2LmqpUiaVUkOLokA0VakaS/IkZKXrnyeqtg5gy8W5Ib PAfLTyQHdhEMpQglF7OatdXNr+e/CtpfAp8r/t3Z6GYeQ+XJfyQaALZFHASIpa0oIdNO 8B1w1haRH682zmmwicPgkn4JKrZzPV49IDX3JoMNMccyF7WwwWrFb3CGuvMI/j1rXkIO t197uH8duQldZrRGsYZEjNtutssZIhXpA4oZgS4abjBNqaw57u7/iQ1ZxRbN+1Jsd5ih tCew==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b="RV/w+py9"; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-136466-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-136466-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id e4-20020a17090a6f8400b002a1fe44cd6bsi10127985pjk.155.2024.04.09.01.31.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Apr 2024 01:31:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-136466-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b="RV/w+py9"; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-136466-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-136466-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id E12822817A4 for ; Tue, 9 Apr 2024 08:31:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DAC9B80622; Tue, 9 Apr 2024 08:27:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="RV/w+py9" Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) (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 C43F884D0B; Tue, 9 Apr 2024 08:27:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712651238; cv=none; b=BpRP4TDeZ/tIi1jUOl3k+9YHqoACRsEoCOoHFtt1hZ2YlzbBtFp4ShhLCt/bzPi3W1+bXd9UST7wpK8VeksONouT+ViB9XfJpniH51nnkW1W/xRFxj3cg8WlQXQinqilyhsyy05uorOPd2x/7fS3Rw5Vq6M0XFD3HfBti9XWxag= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712651238; c=relaxed/simple; bh=jGCcCTFBzxiwRm9MDmD0/esgmzj9/IbN3/Z8qCu/f/I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Bh+SLmon7RFcLzjvXwg01TarN+D9aieiQjBKyLPxVT+KN5aCu/2ILKCLbJvESmgq+64BVaXoxg9/kZ3giBQmY93TR9m+8x/pnvMU9eteDOMtGggVm4AEfhYWOR5gtwRlAZ9kid+nwMh+5XAyfNsv5ShFZ0hZ5LGJwUnPnpMnaos= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=RV/w+py9; arc=none smtp.client-ip=217.70.183.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id 30EA4FF80E; Tue, 9 Apr 2024 08:27:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1712651234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i54fp5QfOZNl70WagwsL45FIExmmuC3Icj77UdRlzDo=; b=RV/w+py9pUk92zvPf+T9J/u1UCTZ82EnSikYdVpNeJYXGVShIAEDar8cyScP3CHMVrlwfB /7PaieNwxkxngUVefjY7mohskTPntcMR7WZhm3teSikX2r3OFhIAsCA7dREciJ4LGyIqq0 8rfmR28grW0ekCiEIiNGzu3Ag/HR5IHxKK9vb5trpqUjf0EH06O7d3vEVXOtAmEIBYzNtk W3fdb54oPdZm1b2ErTnk5qWRS2mN1EVlo2nnPOsYnJ9rPMZdQAsuMrcv8HWbTwv4YUey6i 47SeoffTtnWzVbkE3JKUZH1rhp4dMP0Vu82BJqeTPPczg9e9Hbe0E/2/O9tiqA== From: Kory Maincent Date: Tue, 09 Apr 2024 10:26:30 +0200 Subject: [PATCH net-next v10 08/13] ptp: Add phc source and helpers to register specific PTP clock or get information Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240409-feature_ptp_netnext-v10-8-0fa2ea5c89a9@bootlin.com> References: <20240409-feature_ptp_netnext-v10-0-0fa2ea5c89a9@bootlin.com> In-Reply-To: <20240409-feature_ptp_netnext-v10-0-0fa2ea5c89a9@bootlin.com> To: Florian Fainelli , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Radu Pirea , Jay Vosburgh , Andy Gospodarek , Nicolas Ferre , Claudiu Beznea , Willem de Bruijn , Jonathan Corbet , Horatiu Vultur , UNGLinuxDriver@microchip.com, Simon Horman , Vladimir Oltean Cc: Thomas Petazzoni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Maxime Chevallier , Rahul Rameshbabu , Kory Maincent X-Mailer: b4 0.13.0 X-GND-Sasl: kory.maincent@bootlin.com Prepare for future hardware timestamp selection by adding source and corresponding pointers to ptp_clock structure. Additionally, introduce helpers for registering specific phydev or netdev PTP clocks, retrieving PTP clock information such as hwtstamp source or phydev/netdev pointers, and obtaining the ptp_clock structure from the phc index. Signed-off-by: Kory Maincent --- Change in v8: - New patch. Change in v10: - Add get and put function to avoid unregistering a ptp clock object used. - Fix kdoc issues. --- drivers/ptp/ptp_clock.c | 114 +++++++++++++++++++++++++++++++++++++++ drivers/ptp/ptp_private.h | 5 ++ include/linux/ptp_clock_kernel.h | 104 +++++++++++++++++++++++++++++++++++ 3 files changed, 223 insertions(+) diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c index c56cd0f63909..f962f460ec9d 100644 --- a/drivers/ptp/ptp_clock.c +++ b/drivers/ptp/ptp_clock.c @@ -512,6 +512,120 @@ void ptp_cancel_worker_sync(struct ptp_clock *ptp) } EXPORT_SYMBOL(ptp_cancel_worker_sync); +struct ptp_clock *netdev_ptp_clock_register(struct ptp_clock_info *info, + struct net_device *dev) +{ + struct ptp_clock *ptp; + + ptp = ptp_clock_register(info, &dev->dev); + if (IS_ERR(ptp)) + return ptp; + + ptp->phc_source = HWTSTAMP_SOURCE_NETDEV; + ptp->netdev = dev; + + return ptp; +} +EXPORT_SYMBOL(netdev_ptp_clock_register); + +struct ptp_clock *phydev_ptp_clock_register(struct ptp_clock_info *info, + struct phy_device *phydev) +{ + struct ptp_clock *ptp; + + ptp = ptp_clock_register(info, &phydev->mdio.dev); + if (IS_ERR(ptp)) + return ptp; + + ptp->phc_source = HWTSTAMP_SOURCE_PHYLIB; + ptp->phydev = phydev; + + return ptp; +} +EXPORT_SYMBOL(phydev_ptp_clock_register); + +bool ptp_clock_from_phylib(struct ptp_clock *ptp) +{ + return ptp->phc_source == HWTSTAMP_SOURCE_PHYLIB; +} +EXPORT_SYMBOL(ptp_clock_from_phylib); + +bool ptp_clock_from_netdev(struct ptp_clock *ptp) +{ + return ptp->phc_source == HWTSTAMP_SOURCE_NETDEV; +} +EXPORT_SYMBOL(ptp_clock_from_netdev); + +struct net_device *ptp_clock_netdev(struct ptp_clock *ptp) +{ + if (ptp->phc_source != HWTSTAMP_SOURCE_NETDEV) + return NULL; + + return ptp->netdev; +} +EXPORT_SYMBOL(ptp_clock_netdev); + +struct phy_device *ptp_clock_phydev(struct ptp_clock *ptp) +{ + if (ptp->phc_source != HWTSTAMP_SOURCE_PHYLIB) + return NULL; + + return ptp->phydev; +} +EXPORT_SYMBOL(ptp_clock_phydev); + +int ptp_clock_get(struct device *dev, struct ptp_clock *ptp) +{ + struct device_link *link; + + if (!ptp) + return 0; + + if (!try_module_get(ptp->info->owner)) + return -EPROBE_DEFER; + + get_device(&ptp->dev); + + link = device_link_add(dev, &ptp->dev, DL_FLAG_STATELESS); + if (!link) + dev_warn(dev, "failed to create device link to %s\n", + dev_name(&ptp->dev)); + + return 0; +} +EXPORT_SYMBOL(ptp_clock_get); + +struct ptp_clock *ptp_clock_get_by_index(struct device *dev, int index) +{ + struct ptp_clock *ptp; + int ret; + + if (index < 0) + return NULL; + + ptp = xa_load(&ptp_clocks_map, (unsigned long)index); + if (IS_ERR_OR_NULL(ptp)) + return ptp; + + ret = ptp_clock_get(dev, ptp); + if (ret) + return ERR_PTR(ret); + + return ptp; +} +EXPORT_SYMBOL(ptp_clock_get_by_index); + +void ptp_clock_put(struct device *dev, struct ptp_clock *ptp) +{ + if (!ptp) + return; + + device_link_remove(dev, &ptp->dev); + put_device(&ptp->dev); + module_put(ptp->info->owner); +} +EXPORT_SYMBOL(ptp_clock_put); + /* module operations */ static void __exit ptp_exit(void) diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h index 18934e28469e..64d4bfafabfc 100644 --- a/drivers/ptp/ptp_private.h +++ b/drivers/ptp/ptp_private.h @@ -41,6 +41,11 @@ struct ptp_clock { struct ptp_clock_info *info; dev_t devid; int index; /* index into clocks.map */ + enum hwtstamp_source phc_source; + union { /* Pointer of the phc_source device */ + struct net_device *netdev; + struct phy_device *phydev; + }; struct pps_device *pps_source; long dialed_frequency; /* remembers the frequency adjustment */ struct list_head tsevqs; /* timestamp fifo list */ diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h index 6e4b8206c7d0..367453dd3ada 100644 --- a/include/linux/ptp_clock_kernel.h +++ b/include/linux/ptp_clock_kernel.h @@ -9,7 +9,9 @@ #define _PTP_CLOCK_KERNEL_H_ #include +#include #include +#include #include #include #include @@ -340,6 +342,90 @@ extern void ptp_clock_event(struct ptp_clock *ptp, extern int ptp_clock_index(struct ptp_clock *ptp); +/** + * netdev_ptp_clock_register() - register a PTP hardware clock driver for + * a net device + * + * @info: Structure describing the new clock. + * @dev: Pointer of the net device + */ + +extern struct ptp_clock * +netdev_ptp_clock_register(struct ptp_clock_info *info, + struct net_device *dev); + +/** + * phydev_ptp_clock_register() - register a PTP hardware clock driver for + * a phy device + * + * @info: Structure describing the new clock. + * @phydev: Pointer of the phy device + */ + +extern struct ptp_clock * +phydev_ptp_clock_register(struct ptp_clock_info *info, + struct phy_device *phydev); + +/** + * ptp_clock_from_phylib() - return true if the PTP clock comes from phylib + * + * @ptp: The clock obtained from net/phy_ptp_clock_register(). + */ + +bool ptp_clock_from_phylib(struct ptp_clock *ptp); + +/** + * ptp_clock_from_netdev() - return true if the PTP clock comes from netdev + * + * @ptp: The clock obtained from net/phy_ptp_clock_register(). + */ + +bool ptp_clock_from_netdev(struct ptp_clock *ptp); + +/** + * ptp_clock_netdev() - obtain the net_device of PTP clock + * + * @ptp: The clock obtained from netdev_ptp_clock_register(). + */ + +struct net_device *ptp_clock_netdev(struct ptp_clock *ptp); + +/** + * ptp_clock_phydev() - obtain the phy_device of a PTP clock + * + * @ptp: The clock obtained from phydev_ptp_clock_register(). + */ + +struct phy_device *ptp_clock_phydev(struct ptp_clock *ptp); + +/** + * ptp_clock_get() - increment refcount of the PTP clock + * + * @dev: The device which get the PTP clock. + * @ptp: Pointer of a PTP clock. + */ + +int ptp_clock_get(struct device *dev, struct ptp_clock *ptp); + +/** + * ptp_clock_get_by_index() - obtain the PTP clock reference from a given + * PHC index + * + * @dev: The device which get the PTP clock. + * @index: The device index of a PTP clock. + */ + +struct ptp_clock *ptp_clock_get_by_index(struct device *dev, int index); + +/** + * ptp_clock_put() - decrement refcount of the PTP clock + * + * @dev: The device which get the PTP clock. + * @ptp: Pointer of a PTP clock. + */ + +void ptp_clock_put(struct device *dev, struct ptp_clock *ptp); + /** * ptp_find_pin() - obtain the pin index of a given auxiliary function * @@ -405,6 +491,24 @@ static inline void ptp_clock_event(struct ptp_clock *ptp, { } static inline int ptp_clock_index(struct ptp_clock *ptp) { return -1; } +static inline struct ptp_clock * +netdev_ptp_clock_register(struct ptp_clock_info *info, + struct net_device *dev) +{ return NULL; } +static inline struct ptp_clock * +phydev_ptp_clock_register(struct ptp_clock_info *info, + struct phy_device *phydev) +{ return NULL; } +static inline bool ptp_clock_from_phylib(struct ptp_clock *ptp) +{ return false; } +static inline bool ptp_clock_from_netdev(struct ptp_clock *ptp) +{ return false; } +static inline struct net_device *ptp_clock_netdev(struct ptp_clock *ptp) +{ return NULL; } +static inline struct phy_device *ptp_clock_phydev(struct ptp_clock *ptp); +{ return NULL; } +static inline struct ptp_clock *ptp_clock_get_by_index(int index); +{ return NULL; } static inline int ptp_find_pin(struct ptp_clock *ptp, enum ptp_pin_function func, unsigned int chan) { return -1; } -- 2.34.1