Skip to contentSkip to conversation

net: mscc: ocelot: support PPS signal generation

PATCH In review Yangbo Lu 4 participants 11 messages Dec 26, 2019 – Dec 27, 2019

Subsystems (4)
lore
Share & tools
lore

Yangbo Lu

author
#0 lore raw

PATCH 1/1 net: mscc: ocelot: support PPS signal generation

This patch is to support PPS signal generation for Ocelot family switches, including VSC9959 switch.

---
 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(+)
drivers/net/dsa/ocelot/felix_vsc9959.c +2 -0
index b9758b0..ee0ce7c 100644
@@ -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),
drivers/net/ethernet/mscc/ocelot.c +25 -0
index 985b46d..c0f8a9e 100644
@@ -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;
drivers/net/ethernet/mscc/ocelot_ptp.h +2 -0
index 9ede14a..21bc744 100644
@@ -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)
drivers/net/ethernet/mscc/ocelot_regs.c +2 -0
index b88b589..ed4dd01 100644
@@ -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),
include/soc/mscc/ocelot.h +2 -0
index 64cbbbe..c2ab20d 100644
@@ -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,
Signature · 1 line
2.7.4
maintainer
#1 lore raw

Hi Yangbo,

Quoted 6 lines · Yangbo Lu

This patch is to support PPS signal generation for Ocelot family switches, including VSC9959 switch.

---

Shouldn't this be integrated with the .enable callback of the PTP core?

Quoted 26 lines
 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(+)
drivers/net/dsa/ocelot/felix_vsc9959.c +2 -0
index b9758b0..ee0ce7c 100644
@@ -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),
drivers/net/ethernet/mscc/ocelot.c +0 -0
index 985b46d..c0f8a9e 100644
@@ -2147,6 +2147,29 @@ static struct ptp_clock_info ocelot_ptp_clock_info = {
        .adjfine        = ocelot_ptp_adjfine,

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info ocelot_ptp_clock_info = { · line 2157

Quoted 10 lines
drivers/net/ethernet/mscc/ocelot.c +8 -0
 };
 
+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.

Also, I think what you have implemented here is periodic output (PTP_CLK_REQ_PEROUT) not PPS [input] (PTP_CLK_REQ_PPS). I have found the PTP documentation to be rather confusing on what PTP_CLK_REQ_PPS means, so I'm adding Richard in the hope that he may clarify (also what's different between PTP_CLK_REQ_PPS and PTP_CLK_REQ_PPS).

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info ocelot_ptp_clock_info = { · line 2169

Quoted 12 lines
drivers/net/ethernet/mscc/ocelot.c +12 -0
+        *
+        * 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));
+

I suppose the reason why you didn't use ocelot_rmw_rix here is that it doesn't fit in 80 characters?
Do you even need to read-modify-write? The only other field is the polarity bit which is by default 0 (active high) and non-configurable via the current API (struct ptp_pin_desc) as far as I can see.

Quoted 55 lines
drivers/net/ethernet/mscc/ocelot.c +5 -0
+       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;
drivers/net/ethernet/mscc/ocelot_ptp.h +2 -0
index 9ede14a..21bc744 100644
@@ -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)
drivers/net/ethernet/mscc/ocelot_regs.c +2 -0
index b88b589..ed4dd01 100644
@@ -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),
include/soc/mscc/ocelot.h +2 -1
index 64cbbbe..c2ab20d 100644
@@ -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,
--
Quoted 2 lines

2.7.4

Thanks,
-Vladimir

maintainer
#2 lore raw
Quoted 41 lines · Vladimir Oltean

Hi Yangbo,

Quoted 6 lines · Yangbo Lu

This patch is to support PPS signal generation for Ocelot family switches, including VSC9959 switch.

---

Shouldn't this be integrated with the .enable callback of the PTP core?

Quoted 28 lines
 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(+)
drivers/net/dsa/ocelot/felix_vsc9959.c +2 -0
index b9758b0..ee0ce7c 100644
@@ -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),
drivers/net/ethernet/mscc/ocelot.c +0 -0
index 985b46d..c0f8a9e 100644
@@ -2147,6 +2147,29 @@ static struct ptp_clock_info ocelot_ptp_clock_info = {
        .adjfine        = ocelot_ptp_adjfine,
 };
 
Quoted 14 lines

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info ocelot_ptp_clock_info = { · line 2157

Quoted 8 lines
drivers/net/ethernet/mscc/ocelot.c +8 -0
+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.

Also, I think what you have implemented here is periodic output (PTP_CLK_REQ_PEROUT) not PPS [input] (PTP_CLK_REQ_PPS). I have found the PTP documentation to be rather confusing on what PTP_CLK_REQ_PPS means, so I'm adding Richard in the hope that he may clarify (also what's different between PTP_CLK_REQ_PPS and PTP_CLK_REQ_PPS).

EXTTS, sorry, obviously nothing is different between X and itself.

Quoted 80 lines

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info ocelot_ptp_clock_info = { · line 2169

Quoted 13 lines
drivers/net/ethernet/mscc/ocelot.c +12 -0
+        *
+        * 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));
+

I suppose the reason why you didn't use ocelot_rmw_rix here is that it doesn't fit in 80 characters?
Do you even need to read-modify-write? The only other field is the polarity bit which is by default 0 (active high) and non-configurable via the current API (struct ptp_pin_desc) as far as I can see.

Quoted 55 lines
drivers/net/ethernet/mscc/ocelot.c +5 -0
+       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;
drivers/net/ethernet/mscc/ocelot_ptp.h +2 -0
index 9ede14a..21bc744 100644
@@ -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)
drivers/net/ethernet/mscc/ocelot_regs.c +2 -0
index b88b589..ed4dd01 100644
@@ -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),
include/soc/mscc/ocelot.h +2 -1
index 64cbbbe..c2ab20d 100644
@@ -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,
--
Quoted 2 lines

2.7.4

Thanks,
-Vladimir

author
#3 lore raw
Quoted 69 lines

-----Original Message-----
From: Vladimir Oltean <[email protected]>
Sent: Thursday, December 26, 2019 6:50 PM
To: Y.b. Lu <[email protected]>
Cc: netdev <[email protected]>; David S . Miller <[email protected]>; Claudiu Manoil <[email protected]>; Vladimir Oltean <[email protected]>; Alexandre Belloni <[email protected]>; Microchip Linux Driver Support <[email protected]>; Richard Cochran <[email protected]>
Subject: Re: [PATCH] net: mscc: ocelot: support PPS signal generation

Quoted 5 lines · Vladimir Oltean

Hi Yangbo,

Quoted 1 line · Yangbo Lu
Quoted 10 lines
Quoted 5 lines

This patch is to support PPS signal generation for Ocelot family switches, including VSC9959 switch.

---

Shouldn't this be integrated with the .enable callback of the PTP core?

Quoted 2 lines
 drivers/net/dsa/ocelot/felix_vsc9959.c  |  2 ++
 drivers/net/ethernet/mscc/ocelot.c      | 25

+++++++++++++++++++++++++

Quoted 6 lines

Review

Quoted 6 lines
 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(+)
(quoted diff) +0 -0

b/drivers/net/dsa/ocelot/felix_vsc9959.c

Quoted 5 lines
Quoted 5 lines

index b9758b0..ee0ce7c 100644

drivers/net/dsa/ocelot/felix_vsc9959.c +0 -0
@@ -287,6 +287,8 @@ static const u32 vsc9959_ptp_regmap[] = {
        REG(PTP_PIN_TOD_SEC_MSB,           0x000004),
Quoted 8 lines

Review

Quoted 8 lines
drivers/net/dsa/ocelot/felix_vsc9959.c +2 -0
        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),
(quoted diff) +0 -0

b/drivers/net/ethernet/mscc/ocelot.c

Quoted 4 lines

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info

Quoted 4 lines

index 985b46d..c0f8a9e 100644

drivers/net/ethernet/mscc/ocelot.c +0 -0
@@ -2147,6 +2147,29 @@ static struct ptp_clock_info

ocelot_ptp_clock_info = {

Quoted 8 lines

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info ocelot_ptp_clock_info = {

Quoted 8 lines
drivers/net/ethernet/mscc/ocelot.c +5 -0
        .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,

Quoted 1 line

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info · line 2155

Quoted 1 line
drivers/net/ethernet/mscc/ocelot.c +1 -0
+        * a single pulse will be generated after <WAFEFORM_LOW>

nanoseconds

Quoted 3 lines
Quoted 2 lines
drivers/net/ethernet/mscc/ocelot.c +2 -0
+        * after the time of day has increased the seconds. The pulse will
+        * get a width of <WAFEFORM_HIGH> nanoseconds.
Quoted 8 lines
Quoted 5 lines

Also, I think what you have implemented here is periodic output (PTP_CLK_REQ_PEROUT) not PPS [input] (PTP_CLK_REQ_PPS). I have found the PTP documentation to be rather confusing on what PTP_CLK_REQ_PPS means, so I'm adding Richard in the hope that he may clarify (also what's different between PTP_CLK_REQ_PPS and PTP_CLK_REQ_PPS).

EXTTS, sorry, obviously nothing is different between X and itself.

EXTTS is for capturing timestamps for external trigger pin which is input signal.

Quoted 87 lines
Quoted 7 lines

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info ocelot_ptp_clock_info = {

Quoted 7 lines
drivers/net/ethernet/mscc/ocelot.c +6 -0
+        *
+        * In default,
+        * WAFEFORM_LOW = 0
+        * WAFEFORM_HIGH = 1us
+        */
+       ocelot_write_rix(ocelot, 0, PTP_PIN_WF_LOW_PERIOD,

ALT_PPS_PIN);

Quoted 1 line

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info · line 2164

Quoted 1 line
drivers/net/ethernet/mscc/ocelot.c +1 -0
+       ocelot_write_rix(ocelot, 1000, PTP_PIN_WF_HIGH_PERIOD,

ALT_PPS_PIN);

Quoted 3 lines

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info ocelot_ptp_clock_info = {

Quoted 3 lines
drivers/net/ethernet/mscc/ocelot.c +3 -0
+
+       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);

Quoted 1 line

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info · line 2168

Quoted 1 line
drivers/net/ethernet/mscc/ocelot.c +1 -0
+       val |= (PTP_PIN_CFG_SYNC |

PTP_PIN_CFG_ACTION(PTP_PIN_ACTION_CLOCK));

Quoted 22 lines

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info · line 2169

Quoted 1 line
drivers/net/ethernet/mscc/ocelot.c +1 -0
+

I suppose the reason why you didn't use ocelot_rmw_rix here is that it doesn't fit in 80 characters?
Do you even need to read-modify-write? The only other field is the polarity bit which is by default 0 (active high) and non-configurable via the current API (struct ptp_pin_desc) as far as I can see.

Quoted 14 lines
drivers/net/ethernet/mscc/ocelot.c +5 -0
+       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);
        }
 
Quoted 2 lines

Review

Quoted 2 lines
drivers/net/ethernet/mscc/ocelot.c +0 -0
        return 0;
(quoted diff) +0 -0

b/drivers/net/ethernet/mscc/ocelot_ptp.h

Quoted 5 lines

drivers/net/ethernet/mscc/ocelot_ptp.h line 13

Quoted 5 lines

index 9ede14a..21bc744 100644

drivers/net/ethernet/mscc/ocelot_ptp.h +0 -0
@@ -13,6 +13,8 @@
 #define PTP_PIN_TOD_SEC_MSB_RSZ

PTP_PIN_CFG_RSZ

Quoted 8 lines

Review

Quoted 8 lines
drivers/net/ethernet/mscc/ocelot_ptp.h +2 -0
 #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)
(quoted diff) +0 -0

b/drivers/net/ethernet/mscc/ocelot_regs.c

Quoted 31 lines
Quoted 26 lines

index b88b589..ed4dd01 100644

drivers/net/ethernet/mscc/ocelot_regs.c +2 -0
@@ -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),
include/soc/mscc/ocelot.h +2 -1
index 64cbbbe..c2ab20d 100644
@@ -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,
--
Quoted 2 lines

2.7.4

Thanks,
-Vladimir

author
#4 lore raw
In reply to Vladimir Oltean
Quoted 16 lines

-----Original Message-----
From: Vladimir Oltean <[email protected]>
Sent: Thursday, December 26, 2019 6:49 PM
To: Y.b. Lu <[email protected]>
Cc: netdev <[email protected]>; David S . Miller <[email protected]>; Claudiu Manoil <[email protected]>; Vladimir Oltean <[email protected]>; Alexandre Belloni <[email protected]>; Microchip Linux Driver Support <[email protected]>; Richard Cochran <[email protected]>
Subject: Re: [PATCH] net: mscc: ocelot: support PPS signal generation

Hi Yangbo,

Quoted 1 line · Yangbo Lu
Quoted 7 lines
Quoted 5 lines

This patch is to support PPS signal generation for Ocelot family switches, including VSC9959 switch.

---

Shouldn't this be integrated with the .enable callback of the PTP core?

The .enable callback is to enable PPS interrupt and to handle the event. Current patch is just to initialize PPS signal, so that we can observe the signal on board.

Quoted 41 lines
Quoted 3 lines
 drivers/net/dsa/ocelot/felix_vsc9959.c  |  2 ++
 drivers/net/ethernet/mscc/ocelot.c      | 25

+++++++++++++++++++++++++

Review

Quoted 6 lines
 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(+)
(quoted diff) +0 -0

b/drivers/net/dsa/ocelot/felix_vsc9959.c

Review

Quoted 13 lines

index b9758b0..ee0ce7c 100644

drivers/net/dsa/ocelot/felix_vsc9959.c +2 -0
@@ -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),
(quoted diff) +0 -0

b/drivers/net/ethernet/mscc/ocelot.c

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info

Quoted 4 lines

index 985b46d..c0f8a9e 100644

drivers/net/ethernet/mscc/ocelot.c +0 -0
@@ -2147,6 +2147,29 @@ static struct ptp_clock_info

ocelot_ptp_clock_info = {

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info ocelot_ptp_clock_info = {

Quoted 8 lines
drivers/net/ethernet/mscc/ocelot.c +5 -0
        .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,

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info · line 2155

Quoted 1 line
drivers/net/ethernet/mscc/ocelot.c +1 -0
+        * a single pulse will be generated after <WAFEFORM_LOW>

nanoseconds

Quoted 8 lines

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info ocelot_ptp_clock_info = { · line 2157

Quoted 2 lines
drivers/net/ethernet/mscc/ocelot.c +2 -0
+        * after the time of day has increased the seconds. The pulse will
+        * get a width of <WAFEFORM_HIGH> nanoseconds.

Also, I think what you have implemented here is periodic output (PTP_CLK_REQ_PEROUT) not PPS [input] (PTP_CLK_REQ_PPS). I have found the PTP documentation to be rather confusing on what PTP_CLK_REQ_PPS means, so I'm adding Richard in the hope that he may clarify (also what's different between PTP_CLK_REQ_PPS and PTP_CLK_REQ_PPS).

My understand is PTP_CLK_REQ_PEROUT is for periodical output, and PTP_CLK_REQ_PPS is for PPS event handling. This patch is to initialize PPS signal. You may check reference manual for how to generate PPS.

"For the CLOCK action, the sync option makes the pin generate a single pulse, <WAFEFORM_LOW> nanoseconds after the time of day has increased the seconds. The pulse will get a width of <WAVEFORM_HIGH> nanoseconds. "

If the sync option is not used, it is for periodical clock generation that you mentioned.

Quoted 15 lines

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info ocelot_ptp_clock_info = {

Quoted 7 lines
drivers/net/ethernet/mscc/ocelot.c +6 -0
+        *
+        * In default,
+        * WAFEFORM_LOW = 0
+        * WAFEFORM_HIGH = 1us
+        */
+       ocelot_write_rix(ocelot, 0, PTP_PIN_WF_LOW_PERIOD,

ALT_PPS_PIN);

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info · line 2164

Quoted 1 line
drivers/net/ethernet/mscc/ocelot.c +1 -0
+       ocelot_write_rix(ocelot, 1000, PTP_PIN_WF_HIGH_PERIOD,

ALT_PPS_PIN);

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info ocelot_ptp_clock_info = {

Quoted 3 lines
drivers/net/ethernet/mscc/ocelot.c +3 -0
+
+       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);

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info · line 2168

Quoted 1 line
drivers/net/ethernet/mscc/ocelot.c +1 -0
+       val |= (PTP_PIN_CFG_SYNC |
Quoted 8 lines

PTP_PIN_CFG_ACTION(PTP_PIN_ACTION_CLOCK));

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info · line 2169

Quoted 1 line
drivers/net/ethernet/mscc/ocelot.c +1 -0
+

I suppose the reason why you didn't use ocelot_rmw_rix here is that it doesn't fit in 80 characters?
Do you even need to read-modify-write? The only other field is the polarity bit which is by default 0 (active high) and non-configurable via the current API (struct ptp_pin_desc) as far as I can see.

Some improvement is needed here. This is initialization. So I should only write an initial value into register, without reading. I will improve in new version patch.

Quoted 63 lines

Review

Quoted 17 lines
drivers/net/ethernet/mscc/ocelot.c +5 -0
+       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;
(quoted diff) +0 -0

b/drivers/net/ethernet/mscc/ocelot_ptp.h

Review

Quoted 13 lines

index 9ede14a..21bc744 100644

drivers/net/ethernet/mscc/ocelot_ptp.h +2 -0
@@ -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)
(quoted diff) +0 -0

b/drivers/net/ethernet/mscc/ocelot_regs.c

Quoted 26 lines

index b88b589..ed4dd01 100644

drivers/net/ethernet/mscc/ocelot_regs.c +2 -0
@@ -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),
include/soc/mscc/ocelot.h +2 -1
index 64cbbbe..c2ab20d 100644
@@ -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,
--
Quoted 2 lines

2.7.4

Thanks,
-Vladimir

maintainer
#5 lore raw
Quoted 6 lines · Y.b. Lu
Quoted 5 lines

Also, I think what you have implemented here is periodic output (PTP_CLK_REQ_PEROUT) not PPS [input] (PTP_CLK_REQ_PPS). I have found the PTP documentation to be rather confusing on what PTP_CLK_REQ_PPS means, so I'm adding Richard in the hope that he may clarify (also what's different between PTP_CLK_REQ_PPS and PTP_CLK_REQ_PPS).

Quoted 9 lines

My understand is PTP_CLK_REQ_PEROUT is for periodical output, and PTP_CLK_REQ_PPS is for PPS event handling. This patch is to initialize PPS signal. You may check reference manual for how to generate PPS.

"For the CLOCK action, the sync option makes the pin generate a single pulse, <WAFEFORM_LOW> nanoseconds after the time of day has increased the seconds. The pulse will get a width of <WAVEFORM_HIGH> nanoseconds. "

If the sync option is not used, it is for periodical clock generation that you mentioned.

So basically this hardware emits a periodic signal with the frequency f equal to:
- NSEC_PER_SEC / (WAFEFORM_LOW + WAFEFORM_HIGH) if PTP_PIN_SYNC is not set
- 1 Hz if PTP_PIN_SYNC is set

So the hardware hardcodes the frequency, basically, and makes WAFEFORM_LOW be the phase adjustment. So all in all, it's still PTP_CLK_REQ_PEROUT that needs to be treated for this. Maybe you have to special-case the value of rq->perout.period.sec and rq->perout.period.nsec.

What is the phase adjustment (pin start time) if the PTP_PIN_SYNC option is not set?

Anyway, it's good that you figured it out, but it's not really ok to hardcode it like this. On some boards there may be electrical issues if the PTP pins just emit pulses by default.

Quoted 1 line

EXTTS is for capturing timestamps for external trigger pin which is input signal.

And isn't PTP_CLK_REQ_PPS the same, just that the input signal is expected to have a particular waveform?
Some drivers, like ptp_qoriq, seem like they misinterpret the PPS request as meaning "generate PPS output". I find this strange because it's exactly Richard who added the code for it.

Thanks,
-Vladimir

#6 lore raw
In reply to Y.b. Lu
Quoted 7 lines · Y.b. Lu
Quoted 7 lines

-----Original Message-----
From: Vladimir Oltean <[email protected]>
Also, I think what you have implemented here is periodic output (PTP_CLK_REQ_PEROUT) not PPS [input] (PTP_CLK_REQ_PPS). I have found the PTP documentation to be rather confusing on what PTP_CLK_REQ_PPS means, so I'm adding Richard in the hope that he may clarify (also what's different between PTP_CLK_REQ_PPS and PTP_CLK_REQ_PPS).

The PTP_CLK_REQ_PPS is for generating events for the kernel's PPS subsystem. (See drivers/pps). This has nothing to do with actual PPS signals.

Quoted 1 line

My understand is PTP_CLK_REQ_PEROUT is for periodical output,

Yes.

Quoted 1 line

and PTP_CLK_REQ_PPS is for PPS event handling.

No.

Some cards generate an interrupt at the full second roll over. The interrupt service routine can feed a system time stamp into the kernel's pps subsystem for use by NTP.

If your device is generating an actual PPS output signal, then you should implement the PTP_CLK_REQ_PEROUT method.

Bonus points for making the signal fully programmable!

Thanks,
Richard

author
#7 lore raw
Quoted 30 lines

-----Original Message-----
From: Richard Cochran <[email protected]>
Sent: Friday, December 27, 2019 10:08 AM
To: Y.b. Lu <[email protected]>
Cc: Vladimir Oltean <[email protected]>; netdev <[email protected]>; David S . Miller <[email protected]>; Claudiu Manoil <[email protected]>; Vladimir Oltean <[email protected]>; Alexandre Belloni <[email protected]>; Microchip Linux Driver Support <[email protected]>
Subject: Re: [PATCH] net: mscc: ocelot: support PPS signal generation

Quoted 7 lines · Y.b. Lu
Quoted 7 lines

-----Original Message-----
From: Vladimir Oltean <[email protected]>
Also, I think what you have implemented here is periodic output (PTP_CLK_REQ_PEROUT) not PPS [input] (PTP_CLK_REQ_PPS). I have found the PTP documentation to be rather confusing on what PTP_CLK_REQ_PPS means, so I'm adding Richard in the hope that he may clarify (also what's different between PTP_CLK_REQ_PPS and PTP_CLK_REQ_PPS).

The PTP_CLK_REQ_PPS is for generating events for the kernel's PPS subsystem. (See drivers/pps). This has nothing to do with actual PPS signals.

Quoted 1 line

My understand is PTP_CLK_REQ_PEROUT is for periodical output,

Yes.

Quoted 1 line

and PTP_CLK_REQ_PPS is for PPS event handling.

Quoted 9 lines

No.

Some cards generate an interrupt at the full second roll over. The interrupt service routine can feed a system time stamp into the kernel's pps subsystem for use by NTP.

If your device is generating an actual PPS output signal, then you should implement the PTP_CLK_REQ_PEROUT method.

I'm a little confused.
It seems PTP_CLK_REQ_PEROUT method needs req.perout.start and req.perout.period to generate periodical *clock* signal, while PPS is *pulse* signal every second. For the two cases (1Hz clock signal and 1 pulse very second), how to configure with PTP_CLK_REQ_PEROUT method?

Quoted 1 line

Bonus points for making the signal fully programmable!

For some hardware, each pin has fixed function. And some hardware, each pin could be programable for function. The Ocelot PTP pin is programable, but initially the software author may plan to set fixed function for each pin. Do you suggest we make all pins function programable?

In include/soc/mscc/ocelot.h,
enum ocelot_clk_pins {
ALT_PPS_PIN = 1,
EXT_CLK_PIN,
ALT_LDST_PIN,
TOD_ACC_PIN
};

BTW, current ptp clock code is embedded in ocelot.c.
More and more functions will be added in the future, and the interrupt implementation in SoC is different between Ocelot and VSC9959. Do you think it's proper to separate common code as a single PTP driver?
Thanks.

Quoted 3 lines

Thanks,
Richard

#8 lore raw
Quoted 3 lines · Y.b. Lu

I'm a little confused.
It seems PTP_CLK_REQ_PEROUT method needs req.perout.start and req.perout.period to generate periodical *clock* signal, while PPS is *pulse* signal every second. For the two cases (1Hz clock signal and 1 pulse very second), how to configure with PTP_CLK_REQ_PEROUT method?

If your HW can generate other periods, then implement them!

If your HW can only do exactly one pps, then you can check that the nanoseconds fields are zero, returning -ERANGE when they are non-zero.

Quoted 3 lines

For some hardware, each pin has fixed function. And some hardware, each pin could be programable for function. The Ocelot PTP pin is programable, but initially the software author may plan to set fixed function for each pin. Do you suggest we make all pins function programable?

Yes. You should implement the ptp_clock_info.verify method:

 * @verify:   Confirm that a pin can perform a given function. The PTP
 *            Hardware Clock subsystem maintains the 'pin_config'
 *            array on behalf of the drivers, but the PHC subsystem
 *            assumes that every pin can perform every function. This
 *            hook gives drivers a way of telling the core about
 *            limitations on specific pins. This function must return
 *            zero if the function can be assigned to this pin, and
 *            nonzero otherwise.

If the pin cannot be changed on a particular SoC, then the .verify should simply make sure user space chose the correct setting.

Quoted 3 lines

BTW, current ptp clock code is embedded in ocelot.c.
More and more functions will be added in the future, and the interrupt implementation in SoC is different between Ocelot and VSC9959. Do you think it's proper to separate common code as a single PTP driver?

If you get a lot of code re-use, then sure.

Thanks,
Richard

maintainer
#9 lore raw
In reply to Yangbo Lu
Quoted 2 lines · Yangbo Lu

This patch is to support PPS signal generation for Ocelot family switches, including VSC9959 switch.

Hi Yangbo

Please always Cc: Richard Cochran <[email protected]> for ptp patches.

Andrew

Quoted 108 lines
---
 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(+)
drivers/net/dsa/ocelot/felix_vsc9959.c +2 -0
index b9758b0..ee0ce7c 100644
@@ -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),
drivers/net/ethernet/mscc/ocelot.c +25 -0
index 985b46d..c0f8a9e 100644
@@ -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;
drivers/net/ethernet/mscc/ocelot_ptp.h +2 -0
index 9ede14a..21bc744 100644
@@ -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)
drivers/net/ethernet/mscc/ocelot_regs.c +2 -0
index b88b589..ed4dd01 100644
@@ -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),
include/soc/mscc/ocelot.h +2 -0
index 64cbbbe..c2ab20d 100644
@@ -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,
Signature · 1 line
2.7.4
author
#10 lore raw
Quoted 12 lines

-----Original Message-----
From: Andrew Lunn <[email protected]>
Sent: Thursday, December 26, 2019 6:59 PM
To: Y.b. Lu <[email protected]>
Cc: [email protected]; David S . Miller <[email protected]>; Claudiu Manoil <[email protected]>; Vladimir Oltean <[email protected]>; Alexandre Belloni <[email protected]>; Microchip Linux Driver Support <[email protected]>; Richard Cochran <[email protected]>
Subject: Re: [PATCH] net: mscc: ocelot: support PPS signal generation

Quoted 9 lines
Quoted 2 lines · Yangbo Lu

This patch is to support PPS signal generation for Ocelot family switches, including VSC9959 switch.

Hi Yangbo

Please always Cc: Richard Cochran <[email protected]> for ptp patches.

Sorry for missing...

Quoted 120 lines

Andrew

Quoted 5 lines
---
 drivers/net/dsa/ocelot/felix_vsc9959.c  |  2 ++
 drivers/net/ethernet/mscc/ocelot.c      | 25

+++++++++++++++++++++++++

Review

Quoted 6 lines
 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(+)
(quoted diff) +0 -0

b/drivers/net/dsa/ocelot/felix_vsc9959.c

Review

Quoted 13 lines

index b9758b0..ee0ce7c 100644

drivers/net/dsa/ocelot/felix_vsc9959.c +2 -0
@@ -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),
(quoted diff) +0 -0

b/drivers/net/ethernet/mscc/ocelot.c

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info

Quoted 4 lines

index 985b46d..c0f8a9e 100644

drivers/net/ethernet/mscc/ocelot.c +0 -0
@@ -2147,6 +2147,29 @@ static struct ptp_clock_info

ocelot_ptp_clock_info = {

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info ocelot_ptp_clock_info = {

Quoted 9 lines
drivers/net/ethernet/mscc/ocelot.c +6 -0
 	.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

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info ocelot_ptp_clock_info = {

Quoted 9 lines
drivers/net/ethernet/mscc/ocelot.c +9 -0
+	 * 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);

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info ocelot_ptp_clock_info = {

Quoted 3 lines
drivers/net/ethernet/mscc/ocelot.c +3 -0
+
+	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);

drivers/net/ethernet/mscc/ocelot.c static struct ptp_clock_info · line 2168

Quoted 1 line
drivers/net/ethernet/mscc/ocelot.c +1 -0
+	val |= (PTP_PIN_CFG_SYNC |

PTP_PIN_CFG_ACTION(PTP_PIN_ACTION_CLOCK));

Review

Quoted 17 lines
drivers/net/ethernet/mscc/ocelot.c +6 -0
+
+	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;
(quoted diff) +0 -0

b/drivers/net/ethernet/mscc/ocelot_ptp.h

Review

Quoted 13 lines

index 9ede14a..21bc744 100644

drivers/net/ethernet/mscc/ocelot_ptp.h +2 -0
@@ -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)
(quoted diff) +0 -0

b/drivers/net/ethernet/mscc/ocelot_regs.c

Quoted 28 lines

index b88b589..ed4dd01 100644

drivers/net/ethernet/mscc/ocelot_regs.c +2 -0
@@ -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),
include/soc/mscc/ocelot.h +2 -1
index 64cbbbe..c2ab20d 100644
@@ -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