All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Lunn <andrew@lunn.ch>
To: Yangbo Lu <yangbo.lu@nxp.com>
Cc: netdev@vger.kernel.org, "David S . Miller" <davem@davemloft.net>,
	Claudiu Manoil <claudiu.manoil@nxp.com>,
	Vladimir Oltean <vladimir.oltean@nxp.com>,
	Alexandre Belloni <alexandre.belloni@bootlin.com>,
	Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>,
	Richard Cochran <richardcochran@gmail.com>
Subject: Re: [PATCH] net: mscc: ocelot: support PPS signal generation
Date: Thu, 26 Dec 2019 11:58:38 +0100	[thread overview]
Message-ID: <20191226105838.GD1480@lunn.ch> (raw)
In-Reply-To: <20191226095851.24325-1-yangbo.lu@nxp.com>

On Thu, Dec 26, 2019 at 05:58:51PM +0800, Yangbo Lu wrote:
> This patch is to support PPS signal generation for Ocelot family
> switches, including VSC9959 switch.

Hi Yangbo

Please always Cc: Richard Cochran <richardcochran@gmail.com> for ptp
patches.

	Andrew

> 
> Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
> ---
>  drivers/net/dsa/ocelot/felix_vsc9959.c  |  2 ++
>  drivers/net/ethernet/mscc/ocelot.c      | 25 +++++++++++++++++++++++++
>  drivers/net/ethernet/mscc/ocelot_ptp.h  |  2 ++
>  drivers/net/ethernet/mscc/ocelot_regs.c |  2 ++
>  include/soc/mscc/ocelot.h               |  2 ++
>  5 files changed, 33 insertions(+)
> 
> diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
> index b9758b0..ee0ce7c 100644
> --- a/drivers/net/dsa/ocelot/felix_vsc9959.c
> +++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
> @@ -287,6 +287,8 @@ static const u32 vsc9959_ptp_regmap[] = {
>  	REG(PTP_PIN_TOD_SEC_MSB,           0x000004),
>  	REG(PTP_PIN_TOD_SEC_LSB,           0x000008),
>  	REG(PTP_PIN_TOD_NSEC,              0x00000c),
> +	REG(PTP_PIN_WF_HIGH_PERIOD,        0x000014),
> +	REG(PTP_PIN_WF_LOW_PERIOD,         0x000018),
>  	REG(PTP_CFG_MISC,                  0x0000a0),
>  	REG(PTP_CLK_CFG_ADJ_CFG,           0x0000a4),
>  	REG(PTP_CLK_CFG_ADJ_FREQ,          0x0000a8),
> diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
> index 985b46d..c0f8a9e 100644
> --- a/drivers/net/ethernet/mscc/ocelot.c
> +++ b/drivers/net/ethernet/mscc/ocelot.c
> @@ -2147,6 +2147,29 @@ static struct ptp_clock_info ocelot_ptp_clock_info = {
>  	.adjfine	= ocelot_ptp_adjfine,
>  };
>  
> +static void ocelot_ptp_init_pps(struct ocelot *ocelot)
> +{
> +	u32 val;
> +
> +	/* PPS signal generation uses CLOCK action. Together with SYNC option,
> +	 * a single pulse will be generated after <WAFEFORM_LOW> nanoseconds
> +	 * after the time of day has increased the seconds. The pulse will
> +	 * get a width of <WAFEFORM_HIGH> nanoseconds.
> +	 *
> +	 * In default,
> +	 * WAFEFORM_LOW = 0
> +	 * WAFEFORM_HIGH = 1us
> +	 */
> +	ocelot_write_rix(ocelot, 0, PTP_PIN_WF_LOW_PERIOD, ALT_PPS_PIN);
> +	ocelot_write_rix(ocelot, 1000, PTP_PIN_WF_HIGH_PERIOD, ALT_PPS_PIN);
> +
> +	val = ocelot_read_rix(ocelot, PTP_PIN_CFG, ALT_PPS_PIN);
> +	val &= ~(PTP_PIN_CFG_SYNC | PTP_PIN_CFG_ACTION_MASK | PTP_PIN_CFG_DOM);
> +	val |= (PTP_PIN_CFG_SYNC | PTP_PIN_CFG_ACTION(PTP_PIN_ACTION_CLOCK));
> +
> +	ocelot_write_rix(ocelot, val, PTP_PIN_CFG, ALT_PPS_PIN);
> +}
> +
>  static int ocelot_init_timestamp(struct ocelot *ocelot)
>  {
>  	struct ptp_clock *ptp_clock;
> @@ -2478,6 +2501,8 @@ int ocelot_init(struct ocelot *ocelot)
>  				"Timestamp initialization failed\n");
>  			return ret;
>  		}
> +
> +		ocelot_ptp_init_pps(ocelot);
>  	}
>  
>  	return 0;
> diff --git a/drivers/net/ethernet/mscc/ocelot_ptp.h b/drivers/net/ethernet/mscc/ocelot_ptp.h
> index 9ede14a..21bc744 100644
> --- a/drivers/net/ethernet/mscc/ocelot_ptp.h
> +++ b/drivers/net/ethernet/mscc/ocelot_ptp.h
> @@ -13,6 +13,8 @@
>  #define PTP_PIN_TOD_SEC_MSB_RSZ		PTP_PIN_CFG_RSZ
>  #define PTP_PIN_TOD_SEC_LSB_RSZ		PTP_PIN_CFG_RSZ
>  #define PTP_PIN_TOD_NSEC_RSZ		PTP_PIN_CFG_RSZ
> +#define PTP_PIN_WF_HIGH_PERIOD_RSZ	PTP_PIN_CFG_RSZ
> +#define PTP_PIN_WF_LOW_PERIOD_RSZ	PTP_PIN_CFG_RSZ
>  
>  #define PTP_PIN_CFG_DOM			BIT(0)
>  #define PTP_PIN_CFG_SYNC		BIT(2)
> diff --git a/drivers/net/ethernet/mscc/ocelot_regs.c b/drivers/net/ethernet/mscc/ocelot_regs.c
> index b88b589..ed4dd01 100644
> --- a/drivers/net/ethernet/mscc/ocelot_regs.c
> +++ b/drivers/net/ethernet/mscc/ocelot_regs.c
> @@ -239,6 +239,8 @@ static const u32 ocelot_ptp_regmap[] = {
>  	REG(PTP_PIN_TOD_SEC_MSB,           0x000004),
>  	REG(PTP_PIN_TOD_SEC_LSB,           0x000008),
>  	REG(PTP_PIN_TOD_NSEC,              0x00000c),
> +	REG(PTP_PIN_WF_HIGH_PERIOD,        0x000014),
> +	REG(PTP_PIN_WF_LOW_PERIOD,         0x000018),
>  	REG(PTP_CFG_MISC,                  0x0000a0),
>  	REG(PTP_CLK_CFG_ADJ_CFG,           0x0000a4),
>  	REG(PTP_CLK_CFG_ADJ_FREQ,          0x0000a8),
> diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
> index 64cbbbe..c2ab20d 100644
> --- a/include/soc/mscc/ocelot.h
> +++ b/include/soc/mscc/ocelot.h
> @@ -325,6 +325,8 @@ enum ocelot_reg {
>  	PTP_PIN_TOD_SEC_MSB,
>  	PTP_PIN_TOD_SEC_LSB,
>  	PTP_PIN_TOD_NSEC,
> +	PTP_PIN_WF_HIGH_PERIOD,
> +	PTP_PIN_WF_LOW_PERIOD,
>  	PTP_CFG_MISC,
>  	PTP_CLK_CFG_ADJ_CFG,
>  	PTP_CLK_CFG_ADJ_FREQ,
> -- 
> 2.7.4
> 

  parent reply	other threads:[~2019-12-26 10:58 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-26  9:58 [PATCH] net: mscc: ocelot: support PPS signal generation Yangbo Lu
2019-12-26 10:49 ` Vladimir Oltean
2019-12-26 10:50   ` Vladimir Oltean
2019-12-26 11:21     ` Y.b. Lu
2019-12-26 11:17   ` Y.b. Lu
2019-12-26 11:44     ` Vladimir Oltean
2019-12-27  2:08     ` Richard Cochran
2019-12-27  3:51       ` Y.b. Lu
2019-12-27 15:12         ` Richard Cochran
2019-12-26 10:58 ` Andrew Lunn [this message]
2019-12-26 11:22   ` Y.b. Lu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191226105838.GD1480@lunn.ch \
    --to=andrew@lunn.ch \
    --cc=UNGLinuxDriver@microchip.com \
    --cc=alexandre.belloni@bootlin.com \
    --cc=claudiu.manoil@nxp.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=richardcochran@gmail.com \
    --cc=vladimir.oltean@nxp.com \
    --cc=yangbo.lu@nxp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.