net: ethernet: ti: k3: introduce common platform time sync driver - cpts
cover net: ethernet: ti: k3: introduce common platform time sync driver - cpts
Hi
This series introduced support for significantly upgraded TI A65x/J721E Common platform time sync (CPTS) modules which are part of AM65xx Time Synchronization Architecture [1].
The TI A65x/J721E now contain more than one CPTS instance:
- MCU CPSW CPTS (IEEE 1588 compliant)
- Main NAVSS CPTS (central)
- PCIe CPTS(s) (PTM compliant)
- J721E: Main CPSW9g CPTS (IEEE 1588 compliant)
which can work as separately as interact to each other through Time Sync Router (TSR) and Compare Event Router (CER). In addition there are also ICSS-G IEP blocks which can perform similar timsync functions, but require FW support. More info also available in TRM [2][3]. Not all above modules are available to the Linux by as of now as some of them are reserved for RTOS/FW purposes.
The scope of this submission is TI A65x/J721E CPSW CPTS and Main NAVSS CPTS, and TSR was used for testing purposes.
+---------------------------+
| MCU CPSW |
+-------------------+ +------------------------+ | TS |
| Main Navss CPTS | | Time Sync Router (TSR) | | +-------------+ |
| | | | | | | |
| HW1_TS +<----------+ | | +--------v-----+ +--+--+
| | | | | | CPTS | |Port |
| ... | | | X+-->HW1_TS | | |
| HW8_TS <------------<---------+ | X|-->HW2_TS | +--^--+
| | | | +--------------->HW3_TS | | |
| | | | +--------------->HW4_TS | | |
| | | | | | | | | |
| | | | | | | | | |
| Genf0 +-----------> (A)---------+ +<--------------+Genf0 | | |
| | | | | | | | | |
| ... | | +-----------> <---------------+Genf1 ESTf+-------+ |
| | | | | | | |
| | | | | +--------------+ |
| Genf8 +---------->+ | | |
| | | SYNC0 ... SYNC3 | | |
+-------------------+ +------+------------+----+ +---------------------------+
+ +
X X(A) shows possible routing path for MCU CPSW CPTS Genf0 signal as an example.
Main features of the new TI A65x/J721E CPTS modules are:
- 64-bit timestamp/counter mode support in ns by using add_val
- implemented in HW PPM and nudge adjustment.
- control of time sync events via interrupt or polling
- selection of multiple external reference clock sources
- hardware timestamp of ext. inputs events (HWx_TS_PUSH)
- periodic generator function outputs (TS_GENFx)
- (CPSW only) Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn), which drives TSN schedule
- timestamping of all RX packets bypassing CPTS FIFO
Patch 1 - DT bindings
Patch 2 - the AM65x/J721E driver
Patch 3 - enables packet timestamping support in TI AM65x/J721E MCU CPSW driver. Patches 4-7 - DT updates.
=== PTP Testing:
phc2sys -s CLOCK_REALTIME -c eth0 -m -O 0 -u30
phc2sys[627.331]: eth0 rms 409912446712787392 max 1587584079521858304 freq -6665 +/- 35040 delay 832 +/- 27
phc2sys[657.335]: eth0 rms 33 max 66 freq -0 +/- 28 delay 820 +/- 30 phc2sys[687.339]: eth0 rms 37 max 70 freq -1 +/- 32 delay 830 +/- 29 phc2sys[717.343]: eth0 rms 33 max 71 freq -0 +/- 29 delay 828 +/- 23 phc2sys[747.346]: eth0 rms 35 max 75 freq -0 +/- 31 delay 829 +/- 26 phc2sys[777.350]: eth0 rms 37 max 68 freq -1 +/- 32 delay 825 +/- 25 phc2sys[807.354]: eth0 rms 28 max 57 freq -1 +/- 25 delay 824 +/- 21 phc2sys[837.358]: eth0 rms 43 max 81 freq -1 +/- 37 delay 836 +/- 23 phc2sys[867.361]: eth0 rms 33 max 74 freq +0 +/- 29 delay 828 +/- 24 phc2sys[897.365]: eth0 rms 35 max 77 freq -2 +/- 30 delay 824 +/- 25 phc2sys[927.369]: eth0 rms 28 max 50 freq +0 +/- 25 delay 825 +/- 25
ptp4l -P -2 -H -i eth0 -l 6 -m -q -p /dev/ptp1 -f ptp.cfg -s ptp4l[22095.754]: port 1: MASTER to UNCALIBRATED on RS_SLAVE ptp4l[22097.754]: port 1: UNCALIBRATED to SLAVE on MASTER_CLOCK_SELECTED
ptp4l[22159.757]: rms 317 max 1418 freq +79 +/- 186 delay 410 +/- 1 ptp4l[22223.760]: rms 9 max 24 freq +42 +/- 12 delay 409 +/- 1 ptp4l[22287.763]: rms 10 max 28 freq +41 +/- 11 delay 410 +/- 1 ptp4l[22351.767]: rms 10 max 26 freq +34 +/- 12 delay 410 +/- 1 ptp4l[22415.770]: rms 10 max 26 freq +49 +/- 14 delay 410 +/- 1
=== Ext. HW_TS and Genf testing:
For testing purposes Time Sync Router (TSR) can be modeled in DT as pin controller
+ timesync_router: timesync_router@A40000 {
+ compatible = "pinctrl-single"; + reg = <0x0 0xA40000 0x0 0x800>; + #address-cells = <1>; + #size-cells = <0>; + #pinctrl-cells = <1>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0x800007ff>;
+ };
then signals routing can be done in board file, for example:
+#define TS_OFFSET(pa, val) (0x4+(pa)*4) (0x80000000 | val)
+
+×ync_router {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcu_cpts>;
+
+ /* Example of the timesync routing */
+ mcu_cpts: mcu_cpts {
+ pinctrl-single,pins = <
+ /* [cpts genf1] in13 -> out25 [cpts hw4_push] */ + TS_OFFSET(25, 13) + /* [cpts genf1] in13 -> out0 [main cpts hw1_push] */ + TS_OFFSET(0, 13) + /* [main cpts genf0] in4 -> out1 [main cpts hw2_push] */ + TS_OFFSET(1, 4) + /* [main cpts genf0] in4 -> out24 [cpts hw3_push] */ + TS_OFFSET(24, 4)
+ >;
+ };
+};
will create link:
cpsw cpts Genf1 -> main cpts hw1_push
-> cpsw cpts hw4_push
main cpts Genf0 -> main cpts hw2_push
-> cpsw cpts hw3_push#enable Main CPTS Genf0, period 1sec
testptp -d /dev/ptp0 -i 0 -p 1000000000
periodic output request okay
#enable Main CPTS HW2_TS and read
testptp -d /dev/ptp0 -i 1 -e 5
external time stamp request okay
event index 1 at 22583.000000025
event index 1 at 22584.000000025
event index 1 at 22585.000000025
event index 1 at 22586.000000025
event index 1 at 22587.000000025
#enable MCU CPSW CPTS HW3_TS and read
testptp -d /dev/ptp1 -i 2 -e 5
external time stamp request okay
event index 2 at 1587606764.249304554
event index 2 at 1587606765.249304467
event index 2 at 1587606766.249304380
event index 2 at 1587606767.249304293
event index 2 at 1587606768.249304206
[1] https://www.ti.com/lit/pdf/spracp7
[2] https://www.ti.com/lit/pdf/sprz452
[3] https://www.ti.com/lit/pdf/spruil1
Grygorii Strashko (7):
dt-binding: ti: am65x: document common platform time sync cpts module
net: ethernet: ti: introduce am654 common platform time sync driver
net: ethernet: ti: am65-cpsw-nuss: enable packet timestamping support
arm64: dts: ti: k3-am65-mcu: add cpsw cpts node
arm64: dts: ti: k3-am65-main: add main navss cpts node
arm64: dts: ti: k3-j721e-mcu: add mcu cpsw cpts node
arm64: dts: ti: j721e-main: add main navss cpts node
.../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 7 + .../bindings/net/ti,k3-am654-cpts.yaml | 152 +++ arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 22 + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 19 + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 12 + .../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 9 + drivers/net/ethernet/ti/Kconfig | 15 + drivers/net/ethernet/ti/Makefile | 1 + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 24 +- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 172 +++ drivers/net/ethernet/ti/am65-cpsw-nuss.h | 6 +- drivers/net/ethernet/ti/am65-cpts.c | 1041 +++++++++++++++++ drivers/net/ethernet/ti/am65-cpts.h | 50 + 13 files changed, 1528 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml create mode 100644 drivers/net/ethernet/ti/am65-cpts.c create mode 100644 drivers/net/ethernet/ti/am65-cpts.h
Signature · 1 line
2.17.1
PATCH 1/7 dt-binding: ti: am65x: document common platform time sync cpts module
Document device tree bindings for TI AM654/J721E SoC The Common Platform Time Sync (CPTS) module. The CPTS module is used to facilitate host control of time sync operations. Main features of CPTS module are:
- selection of multiple external clock sources
- 64-bit timestamp mode in ns with ppm and nudge adjustment.
- control of time sync events via interrupt or polling
- hardware timestamp of ext. events (HWx_TS_PUSH)
- periodic generator function outputs (TS_GENFx)
- PPS in combination with timesync router
- Depending on integration it enables compliance with the IEEE 1588-2008
standard for a precision clock synchronization protocol, Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn) and PCIe Subsystem Precision Time Measurement (PTM).
--- .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 7 + .../bindings/net/ti,k3-am654-cpts.yaml | 152 ++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +7 -0
@@ -144,6 +144,13 @@ patternProperties: description: CPSW MDIO bus. + "^cpts$": + type: object + allOf: + - $ref: "ti,am654-cpts.yaml#" + description: + CPSW Common Platform Time Sync (CPTS) module. + required: - compatible - reg
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +152 -0
152 lines not on this page · raw message
Signature · 1 line
2.17.1
Rob Herring
maintainerRe: [PATCH net-next 1/7] dt-binding: ti: am65x: document common platform time sync cpts module
Quoted 26 lines · Grygorii Strashko
Document device tree bindings for TI AM654/J721E SoC The Common Platform Time Sync (CPTS) module. The CPTS module is used to facilitate host control of time sync operations. Main features of CPTS module are:
- selection of multiple external clock sources
- 64-bit timestamp mode in ns with ppm and nudge adjustment.
- control of time sync events via interrupt or polling
- hardware timestamp of ext. events (HWx_TS_PUSH)
- periodic generator function outputs (TS_GENFx)
- PPS in combination with timesync router
- Depending on integration it enables compliance with the IEEE 1588-2008
standard for a precision clock synchronization protocol, Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn) and PCIe Subsystem Precision Time Measurement (PTM).Signed-off-by Grygorii Strashko <[email protected]>--- .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 7 + .../bindings/net/ti,k3-am654-cpts.yaml | 152 ++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yamlDocumentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +0
-0
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml patternProperties: · line 147
Quoted 4 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +1
-0@@ -144,6 +144,13 @@ patternProperties: description: CPSW MDIO bus. + "^cpts$":
Fixed strings go under 'properties'.
Quoted 46 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +6
-0+ type: object + allOf: + - $ref: "ti,am654-cpts.yaml#" + description: + CPSW Common Platform Time Sync (CPTS) module. + required: - compatible - regDocumentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +31
-0@@ -0,0 +1,152 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/ti,am654-cpts.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: The TI AM654x/J721E Common Platform Time Sync (CPTS) module Device Tree Bindings + +maintainers: + - Grygorii Strashko <[email protected]> + - Sekhar Nori <[email protected]> + +description: |+ + The TI AM654x/J721E CPTS module is used to facilitate host control of time + sync operations. + Main features of CPTS module are + - selection of multiple external clock sources + - Software control of time sync events via interrupt or polling + - 64-bit timestamp mode in ns with PPM and nudge adjustment. + - hardware timestamp push inputs (HWx_TS_PUSH) + - timestamp counter compare output (TS_COMP) + - timestamp counter bit output (TS_SYNC) + - periodic Generator function outputs (TS_GENFx) + - Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn) (TSN) + - external hardware timestamp push inputs (HWx_TS_PUSH) timestamping + + Depending on integration it enables compliance with the IEEE 1588-2008 + standard for a precision clock synchronization protocol, Ethernet Enhanced + Scheduled Traffic Operations (CPTS_ESTFn) and PCIe Subsystem Precision Time + Measurement (PTM). +
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml line 41
Quoted 10 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +10
-0+ TI AM654x/J721E SoCs has several similar CPTS modules integrated into the + different parts of the system which could be synchronized with each other + - Main CPTS + - MCU CPSW CPTS with IEEE 1588-2008 support + - PCIe subsystem CPTS for PTM support + + Depending on CPTS module integration and when CPTS is integral part of + another module (MCU CPSW for example) "compatible" and "reg" can + be omitted - parent module is fully responsible for CPTS enabling and + configuration.
That's fine, but you should still have compatible and reg.
Quoted 4 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +4
-0+ +properties: + $nodename: + pattern: "^cpts(@.*|-[0-9a-f])*$"
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml line 55
Quoted 10 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +10
-0+ + compatible: + oneOf: + - const: ti,am65-cpts + - const: ti,j721e-cpts + + reg: + maxItems: 1 + description: + The physical base address and size of CPTS IO range
Wrong indentation.
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml line 59
Quoted 4 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +4
-0+ + reg-names: + items: + - const: cpts
Don't really need *-names when there's only one and you haven't picked very meaningful names.
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml line 68
Quoted 9 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +9
-0+ + clocks: + description: CPTS reference clock + + clock-names: + items: + - const: cpts + + interrupts-extended:
Use 'interrupts' here, the tooling will fixup things to allow both.
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml line 74
Quoted 6 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +6
-0+ items: + - description: CPTS events interrupt + + interrupt-names: + items: + - const: "cpts"
Don't need quotes.
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml line 81
Quoted 7 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +7
-0+ + ti,cpts-ext-ts-inputs: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + maximum: 8 + description: + Number of hardware timestamp push inputs (HWx_TS_PUSH)
Wrong indentation.
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml line 88
Quoted 7 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +7
-0+ + ti,cpts-periodic-outputs: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + maximum: 8 + description: + Number of timestamp Generator function outputs (TS_GENFx)
Wrong indentation.
Quoted 53 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +53
-0+ + refclk-mux: + type: object + description: CPTS reference clock multiplexer clock + properties: + '#clock-cells': + const: 0 + + clocks: + maxItems: 8 + + assigned-clocks: + maxItems: 1 + + assigned-clocks-parents: + maxItems: 1 + + required: + - clocks + +required: + - clocks + - clock-names + - interrupts-extended + - interrupt-names + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + + cpts@310d0000 { + compatible = "ti,am65-cpts"; + reg = <0x0 0x310d0000 0x0 0x400>; + reg-names = "cpts"; + clocks = <&main_cpts_mux>; + clock-names = "cpts"; + interrupts-extended = <&k3_irq 163 0 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "cpts"; + ti,cpts-periodic-outputs = <6>; + ti,cpts-ext-ts-inputs = <8>; + + main_cpts_mux: refclk-mux { + #clock-cells = <0>; + clocks = <&k3_clks 118 5>, <&k3_clks 118 11>, + <&k3_clks 157 91>, <&k3_clks 157 77>, + <&k3_clks 157 102>, <&k3_clks 157 80>, + <&k3_clks 120 3>, <&k3_clks 121 3>; + assigned-clocks = <&main_cpts_mux>; + assigned-clock-parents = <&k3_clks 118 11>; + };
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml line 151
Quoted 10 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +10
-0+ }; + - | + + cpts { + clocks = <&k3_clks 18 2>; + clock-names = "cpts"; + interrupts-extended = <&gic500 GIC_SPI 858 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "cpts"; + ti,cpts-ext-ts-inputs = <4>; + ti,cpts-periodic-outputs = <2>;
How is this example accessed?
Quoted 4 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +1
-0+ };Signature · 1 line
2.17.1
Re: [PATCH net-next 1/7] dt-binding: ti: am65x: document common platform time sync cpts module
Quoted 30 lines · Rob Herring
Quoted 29 lines · Grygorii Strashko
Document device tree bindings for TI AM654/J721E SoC The Common Platform Time Sync (CPTS) module. The CPTS module is used to facilitate host control of time sync operations. Main features of CPTS module are:
- selection of multiple external clock sources
- 64-bit timestamp mode in ns with ppm and nudge adjustment.
- control of time sync events via interrupt or polling
- hardware timestamp of ext. events (HWx_TS_PUSH)
- periodic generator function outputs (TS_GENFx)
- PPS in combination with timesync router
- Depending on integration it enables compliance with the IEEE 1588-2008
standard for a precision clock synchronization protocol, Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn) and PCIe Subsystem Precision Time Measurement (PTM).Signed-off-by Grygorii Strashko <[email protected]>--- .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 7 + .../bindings/net/ti,k3-am654-cpts.yaml | 152 ++++++++++++++++++ 2 files changed, 159 insertions(+)create mode 100644
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yamlDocumentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +0
-0@@ -144,6 +144,13 @@ patternProperties: description: CPSW MDIO bus.
Quoted 1 line
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml patternProperties: · line 147
Quoted 1 line
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +1
-0+ "^cpts$":
ok
Quoted 53 lines
Fixed strings go under 'properties'.
Quoted 50 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +6
-0+ type: object + allOf: + - $ref: "ti,am654-cpts.yaml#" + description: + CPSW Common Platform Time Sync (CPTS) module. + required: - compatible - regDocumentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +35
-0@@ -0,0 +1,152 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/ti,am654-cpts.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: The TI AM654x/J721E Common Platform Time Sync (CPTS) module Device Tree Bindings + +maintainers: + - Grygorii Strashko <[email protected]> + - Sekhar Nori <[email protected]> + +description: |+ + The TI AM654x/J721E CPTS module is used to facilitate host control of time + sync operations. + Main features of CPTS module are + - selection of multiple external clock sources + - Software control of time sync events via interrupt or polling + - 64-bit timestamp mode in ns with PPM and nudge adjustment. + - hardware timestamp push inputs (HWx_TS_PUSH) + - timestamp counter compare output (TS_COMP) + - timestamp counter bit output (TS_SYNC) + - periodic Generator function outputs (TS_GENFx) + - Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn) (TSN) + - external hardware timestamp push inputs (HWx_TS_PUSH) timestamping + + Depending on integration it enables compliance with the IEEE 1588-2008 + standard for a precision clock synchronization protocol, Ethernet Enhanced + Scheduled Traffic Operations (CPTS_ESTFn) and PCIe Subsystem Precision Time + Measurement (PTM). + + TI AM654x/J721E SoCs has several similar CPTS modules integrated into the + different parts of the system which could be synchronized with each other + - Main CPTS + - MCU CPSW CPTS with IEEE 1588-2008 support
Quoted 8 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml line 41
Quoted 6 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +6
-0+ - PCIe subsystem CPTS for PTM support + + Depending on CPTS module integration and when CPTS is integral part of + another module (MCU CPSW for example) "compatible" and "reg" can + be omitted - parent module is fully responsible for CPTS enabling and + configuration.That's fine, but you should still have compatible and reg.
I'll add reg as below. But compatible is an issue, because k3-am654-cpsw-nuss call of_platform_populate() to create mdio device. But for CPTS I do not want to create device as k3-am654-cpsw-nuss uses direct function calls to CPTS.
Will it be correct to switch to of_platform_device_create() instead of of_platform_populate()?
Quoted 18 lines
Quoted 5 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +4
-0+ +properties: + $nodename: + pattern: "^cpts(@.*|-[0-9a-f])*$"Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml line 55
Quoted 10 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +10
-0+ + compatible: + oneOf: + - const: ti,am65-cpts + - const: ti,j721e-cpts + + reg: + maxItems: 1 + description: + The physical base address and size of CPTS IO rangeWrong indentation.
Quoted 7 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml line 59
Quoted 4 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +4
-0+ + reg-names: + items: + - const: cptsDon't really need *-names when there's only one and you haven't picked very meaningful names.
Could I keep it if you don't mind?
Quoted 13 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml line 68
Quoted 10 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +9
-0+ + clocks: + description: CPTS reference clock + + clock-names: + items: + - const: cpts + + interrupts-extended:Use 'interrupts' here, the tooling will fixup things to allow both.
[...]
Quoted 30 lines
Quoted 30 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +30
-0+ +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + + cpts@310d0000 { + compatible = "ti,am65-cpts"; + reg = <0x0 0x310d0000 0x0 0x400>; + reg-names = "cpts"; + clocks = <&main_cpts_mux>; + clock-names = "cpts"; + interrupts-extended = <&k3_irq 163 0 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "cpts"; + ti,cpts-periodic-outputs = <6>; + ti,cpts-ext-ts-inputs = <8>; + + main_cpts_mux: refclk-mux { + #clock-cells = <0>; + clocks = <&k3_clks 118 5>, <&k3_clks 118 11>, + <&k3_clks 157 91>, <&k3_clks 157 77>, + <&k3_clks 157 102>, <&k3_clks 157 80>, + <&k3_clks 120 3>, <&k3_clks 121 3>; + assigned-clocks = <&main_cpts_mux>; + assigned-clock-parents = <&k3_clks 118 11>; + }; + }; + - | + + cpts {
Quoted 8 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml
Quoted 6 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +6
-0+ clocks = <&k3_clks 18 2>; + clock-names = "cpts"; + interrupts-extended = <&gic500 GIC_SPI 858 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "cpts"; + ti,cpts-ext-ts-inputs = <4>; + ti,cpts-periodic-outputs = <2>;How is this example accessed?
I'll move it in .../bindings/net/ti,k3-am654-cpsw-nuss.yaml as below
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +13 -1
@@ -143,7 +143,7 @@ patternProperties: description: CPSW MDIO bus. - "^cpts$": + "^cpts(@.*|-[0-9a-f])*$": type: object allOf: - $ref: "ti,am654-cpts.yaml#"
@@ -170,6 +170,8 @@ examples: #include <dt-bindings/pinctrl/k3.h> #include <dt-bindings/soc/ti,sci_pm_domain.h> #include <dt-bindings/net/ti-dp83867.h> + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> mcu_cpsw: ethernet@46000000 { compatible = "ti,am654-cpsw-nuss";
@@ -228,4 +230,14 @@ examples: ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>; }; }; + + cpts@3d000 { + reg = <0x0 0x3d000 0x0 0x400>; + clocks = <&k3_clks 18 2>; + clock-names = "cpts"; + interrupts-extended = <&gic500 GIC_SPI 858 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "cpts"; + ti,cpts-ext-ts-inputs = <4>; + ti,cpts-periodic-outputs = <2>; + }; };
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml +0 -10
@@ -140,13 +140,3 @@ examples: assigned-clock-parents = <&k3_clks 118 11>; }; }; - - | - - cpts { - clocks = <&k3_clks 18 2>; - clock-names = "cpts"; - interrupts-extended = <&gic500 GIC_SPI 858 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "cpts"; - ti,cpts-ext-ts-inputs = <4>; - ti,cpts-periodic-outputs = <2>; - };
Signature · 2 lines
Best regards, grygorii
Rob Herring
maintainerRe: [PATCH net-next 1/7] dt-binding: ti: am65x: document common platform time sync cpts module
Quoted 100 lines · Grygorii Strashko
Quoted 30 lines · Rob Herring
Quoted 29 lines · Grygorii Strashko
Document device tree bindings for TI AM654/J721E SoC The Common Platform Time Sync (CPTS) module. The CPTS module is used to facilitate host control of time sync operations. Main features of CPTS module are:
- selection of multiple external clock sources
- 64-bit timestamp mode in ns with ppm and nudge adjustment.
- control of time sync events via interrupt or polling
- hardware timestamp of ext. events (HWx_TS_PUSH)
- periodic generator function outputs (TS_GENFx)
- PPS in combination with timesync router
- Depending on integration it enables compliance with the IEEE 1588-2008
standard for a precision clock synchronization protocol, Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn) and PCIe Subsystem Precision Time Measurement (PTM).Signed-off-by Grygorii Strashko <[email protected]>--- .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 7 + .../bindings/net/ti,k3-am654-cpts.yaml | 152 ++++++++++++++++++ 2 files changed, 159 insertions(+)create mode 100644
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yamlDocumentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +0
-0@@ -144,6 +144,13 @@ patternProperties: description: CPSW MDIO bus.Quoted 1 line
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml patternProperties: · line 147
Quoted 1 line
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +1
-0+ "^cpts$":ok
Quoted 53 lines
Fixed strings go under 'properties'.
Quoted 50 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +6
-0+ type: object + allOf: + - $ref: "ti,am654-cpts.yaml#" + description: + CPSW Common Platform Time Sync (CPTS) module. + required: - compatible - regDocumentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +35
-0@@ -0,0 +1,152 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/ti,am654-cpts.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: The TI AM654x/J721E Common Platform Time Sync (CPTS) module Device Tree Bindings + +maintainers: + - Grygorii Strashko <[email protected]> + - Sekhar Nori <[email protected]> + +description: |+ + The TI AM654x/J721E CPTS module is used to facilitate host control of time + sync operations. + Main features of CPTS module are + - selection of multiple external clock sources + - Software control of time sync events via interrupt or polling + - 64-bit timestamp mode in ns with PPM and nudge adjustment. + - hardware timestamp push inputs (HWx_TS_PUSH) + - timestamp counter compare output (TS_COMP) + - timestamp counter bit output (TS_SYNC) + - periodic Generator function outputs (TS_GENFx) + - Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn) (TSN) + - external hardware timestamp push inputs (HWx_TS_PUSH) timestamping + + Depending on integration it enables compliance with the IEEE 1588-2008 + standard for a precision clock synchronization protocol, Ethernet Enhanced + Scheduled Traffic Operations (CPTS_ESTFn) and PCIe Subsystem Precision Time + Measurement (PTM). + + TI AM654x/J721E SoCs has several similar CPTS modules integrated into the + different parts of the system which could be synchronized with each other + - Main CPTS + - MCU CPSW CPTS with IEEE 1588-2008 supportQuoted 8 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml line 41
Quoted 6 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +6
-0+ - PCIe subsystem CPTS for PTM support + + Depending on CPTS module integration and when CPTS is integral part of + another module (MCU CPSW for example) "compatible" and "reg" can + be omitted - parent module is fully responsible for CPTS enabling and + configuration.That's fine, but you should still have compatible and reg.
Quoted 7 lines
I'll add reg as below. But compatible is an issue, because k3-am654-cpsw-nuss call
of_platform_populate()to create mdio device. But for CPTS I do not want to create device as k3-am654-cpsw-nuss uses direct function calls to CPTS.Will it be correct to switch to
of_platform_device_create()instead ofof_platform_populate()?
That should be fine I think.
Rob
Re: [PATCH net-next 1/7] dt-binding: ti: am65x: document common platform time sync cpts module
Quoted 107 lines · Rob Herring
Quoted 105 lines · Grygorii Strashko
Quoted 30 lines · Rob Herring
Quoted 29 lines · Grygorii Strashko
Document device tree bindings for TI AM654/J721E SoC The Common Platform Time Sync (CPTS) module. The CPTS module is used to facilitate host control of time sync operations. Main features of CPTS module are:
- selection of multiple external clock sources
- 64-bit timestamp mode in ns with ppm and nudge adjustment.
- control of time sync events via interrupt or polling
- hardware timestamp of ext. events (HWx_TS_PUSH)
- periodic generator function outputs (TS_GENFx)
- PPS in combination with timesync router
- Depending on integration it enables compliance with the IEEE 1588-2008
standard for a precision clock synchronization protocol, Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn) and PCIe Subsystem Precision Time Measurement (PTM).Signed-off-by Grygorii Strashko <[email protected]>--- .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 7 + .../bindings/net/ti,k3-am654-cpts.yaml | 152 ++++++++++++++++++ 2 files changed, 159 insertions(+)create mode 100644
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yamlDocumentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +0
-0@@ -144,6 +144,13 @@ patternProperties: description: CPSW MDIO bus.Quoted 1 line
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml patternProperties: · line 147
Quoted 1 line
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +1
-0+ "^cpts$":ok
Quoted 53 lines
Fixed strings go under 'properties'.
Quoted 50 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +6
-0+ type: object + allOf: + - $ref: "ti,am654-cpts.yaml#" + description: + CPSW Common Platform Time Sync (CPTS) module. + required: - compatible - regDocumentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +35
-0@@ -0,0 +1,152 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/ti,am654-cpts.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: The TI AM654x/J721E Common Platform Time Sync (CPTS) module Device Tree Bindings + +maintainers: + - Grygorii Strashko <[email protected]> + - Sekhar Nori <[email protected]> + +description: |+ + The TI AM654x/J721E CPTS module is used to facilitate host control of time + sync operations. + Main features of CPTS module are + - selection of multiple external clock sources + - Software control of time sync events via interrupt or polling + - 64-bit timestamp mode in ns with PPM and nudge adjustment. + - hardware timestamp push inputs (HWx_TS_PUSH) + - timestamp counter compare output (TS_COMP) + - timestamp counter bit output (TS_SYNC) + - periodic Generator function outputs (TS_GENFx) + - Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn) (TSN) + - external hardware timestamp push inputs (HWx_TS_PUSH) timestamping + + Depending on integration it enables compliance with the IEEE 1588-2008 + standard for a precision clock synchronization protocol, Ethernet Enhanced + Scheduled Traffic Operations (CPTS_ESTFn) and PCIe Subsystem Precision Time + Measurement (PTM). + + TI AM654x/J721E SoCs has several similar CPTS modules integrated into the + different parts of the system which could be synchronized with each other + - Main CPTS + - MCU CPSW CPTS with IEEE 1588-2008 supportQuoted 8 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml line 41
Quoted 6 lines
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml new file +6
-0+ - PCIe subsystem CPTS for PTM support + + Depending on CPTS module integration and when CPTS is integral part of + another module (MCU CPSW for example) "compatible" and "reg" can + be omitted - parent module is fully responsible for CPTS enabling and + configuration.That's fine, but you should still have compatible and reg.
I'll add reg as below. But compatible is an issue, because k3-am654-cpsw-nuss call
of_platform_populate()to create mdio device. But for CPTS I do not want to create device as k3-am654-cpsw-nuss uses direct function calls to CPTS.
Quoted 4 lines
Quoted 2 lines
Will it be correct to switch to
of_platform_device_create()instead ofof_platform_populate()?That should be fine I think.
Thanks. I've sent follow up patches.
Signature · 2 lines
Best regards, grygorii
Rob Herring
maintainerRe: [PATCH net-next 1/7] dt-binding: ti: am65x: document common platform time sync cpts module
In reply to Grygorii StrashkoQuoted 14 lines · Grygorii Strashko
Document device tree bindings for TI AM654/J721E SoC The Common Platform Time Sync (CPTS) module. The CPTS module is used to facilitate host control of time sync operations. Main features of CPTS module are:
- selection of multiple external clock sources
- 64-bit timestamp mode in ns with ppm and nudge adjustment.
- control of time sync events via interrupt or polling
- hardware timestamp of ext. events (HWx_TS_PUSH)
- periodic generator function outputs (TS_GENFx)
- PPS in combination with timesync router
- Depending on integration it enables compliance with the IEEE 1588-2008
standard for a precision clock synchronization protocol, Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn) and PCIe Subsystem Precision Time Measurement (PTM).
Quoted 7 lines
Signed-off-by Grygorii Strashko <[email protected]>--- .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 7 + .../bindings/net/ti,k3-am654-cpts.yaml | 152 ++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml
My bot found errors running 'make dt_binding_check' on your patch:
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml: $id: relative path/filename doesn't match actual path or filename
expected: http://devicetree.org/schemas/net/ti,k3-am654-cpts.yaml#
Unknown file referenced: [Errno 2] No such file or directory: '/usr/local/lib/python3.6/dist-packages/dtschema/schemas/net/ti,am654-cpts.yaml' Documentation/devicetree/bindings/Makefile:12: recipe for target 'Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.example.dts' failed make[1]: *** [Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.example.dts] Error 255
make[1]: *** Waiting for unfinished jobs....
Makefile:1300: recipe for target 'dt_binding_check' failed
make: *** [dt_binding_check] Error 2
See https://patchwork.ozlabs.org/patch/1281460
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure dt-schema is up to date:
pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade
Please check and re-submit.
Re: [PATCH net-next 1/7] dt-binding: ti: am65x: document common platform time sync cpts module
Quoted 34 lines · Rob Herring
Quoted 14 lines · Grygorii Strashko
Document device tree bindings for TI AM654/J721E SoC The Common Platform Time Sync (CPTS) module. The CPTS module is used to facilitate host control of time sync operations. Main features of CPTS module are:
- selection of multiple external clock sources
- 64-bit timestamp mode in ns with ppm and nudge adjustment.
- control of time sync events via interrupt or polling
- hardware timestamp of ext. events (HWx_TS_PUSH)
- periodic generator function outputs (TS_GENFx)
- PPS in combination with timesync router
- Depending on integration it enables compliance with the IEEE 1588-2008
standard for a precision clock synchronization protocol, Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn) and PCIe Subsystem Precision Time Measurement (PTM).Quoted 7 lines
Signed-off-by Grygorii Strashko <[email protected]>--- .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 7 + .../bindings/net/ti,k3-am654-cpts.yaml | 152 ++++++++++++++++++ 2 files changed, 159 insertions(+)create mode 100644
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yamlMy bot found errors running 'make
dt_binding_check' on your patch:
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml: $id: relative path/filename doesn't match actual path or filenameexpected: http://devicetree.org/schemas/net/ti,k3-am654-cpts.yaml#Unknown file referenced: [Errno 2] No such file or directory: '
/usr/local/lib/python3.6/dist-packages/dtschema/schemas/net/ti,am654-cpts.yaml'Documentation/devicetree/bindings/Makefile:12: recipe for target 'Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.example.dts' failed make[1]: *** [Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.example.dts] Error 255
make[1]: *** Waiting for unfinished jobs....
Makefile:1300: recipe for target 'dt_binding_check' failed
make: *** [dt_binding_check] Error 2
Quoted 9 lines
See https://patchwork.ozlabs.org/patch/1281460
If you already ran 'make
dt_binding_check' and didn't see the above error(s), then make sure dt-schema is up to date:pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade
Please check and re-submit.
I've sent fix for this.
Signature · 2 lines
Best regards, grygorii
PATCH 2/7 net: ethernet: ti: introduce am654 common platform time sync driver
In reply to Grygorii StrashkoThe CPTS module is used to facilitate host control of time sync operations. Main features of CPTS module are:
- selection of multiple external clock sources
- control of time sync events via interrupt or polling
- 64-bit timestamp mode in ns with HW PPM and nudge adjustment.
- hardware timestamp ext. inputs (HWx_TS_PUSH)
- timestamp Generator function outputs (TS_GENFx)
Depending on integration it enables compliance with the IEEE 1588-2008 standard for a precision clock synchronization protocol, Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn) and PCIe Subsystem Precision Time Measurement (PTM).
Introduced driver provides Linux PTP hardware clock for each CPTS device and network packets timestamping where applicable. CPTS PTP hardware clock supports following operations:
- Set time
- Get time
- Shift the clock by a given offset atomically
- Adjust clock frequency
- Time stamp external events
- Periodic output signals
--- drivers/net/ethernet/ti/Kconfig | 14 + drivers/net/ethernet/ti/Makefile | 1 + drivers/net/ethernet/ti/am65-cpts.c | 1041 +++++++++++++++++++++++++++ drivers/net/ethernet/ti/am65-cpts.h | 50 ++ 4 files changed, 1106 insertions(+) create mode 100644 drivers/net/ethernet/ti/am65-cpts.c create mode 100644 drivers/net/ethernet/ti/am65-cpts.h
drivers/net/ethernet/ti/Kconfig +14 -0
@@ -110,6 +110,20 @@ config TI_K3_AM65_CPSW_NUSS To compile this driver as a module, choose M here: the module will be called ti-am65-cpsw-nuss. +config TI_K3_AM65_CPTS + tristate "TI K3 AM65x CPTS" + depends on ARCH_K3 && OF && PTP_1588_CLOCK + depends on PTP_1588_CLOCK + select NET_PTP_CLASSIFY + help + Say y here to support the TI K3 AM65x CPTS with 1588 features such as + PTP hardware clock for each CPTS device and network packets + timestamping where applicable. + Depending on integration CPTS blocks enable compliance with + the IEEE 1588-2008 standard for a precision clock synchronization + protocol, Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn) + and PCIe Subsystem Precision Time Measurement (PTM). + config TI_KEYSTONE_NETCP tristate "TI Keystone NETCP Core Support" select TI_DAVINCI_MDIO
drivers/net/ethernet/ti/Makefile +1 -0
@@ -26,3 +26,4 @@ keystone_netcp_ethss-y := netcp_ethss.o netcp_sgmii.o netcp_xgbepcsr.o cpsw_ale. obj-$(CONFIG_TI_K3_AM65_CPSW_NUSS) += ti-am65-cpsw-nuss.o ti-am65-cpsw-nuss-y := am65-cpsw-nuss.o cpsw_sl.o am65-cpsw-ethtool.o cpsw_ale.o k3-cppi-desc-pool.o +obj-$(CONFIG_TI_K3_AM65_CPTS) += am65-cpts.o
drivers/net/ethernet/ti/am65-cpts.c new file +1041 -0
1,041 lines not on this page · raw message
drivers/net/ethernet/ti/am65-cpts.h new file +50 -0
50 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 3/7 net: ethernet: ti: am65-cpsw-nuss: enable packet timestamping support
In reply to Grygorii StrashkoThe MCU CPSW Common Platform Time Sync (CPTS) provides possibility to timestamp TX PTP packets and all RX packets.
This enables corresponding support in TI AM65x/J721E MCU CPSW driver.
--- drivers/net/ethernet/ti/Kconfig | 1 + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 24 ++- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 172 ++++++++++++++++++++ drivers/net/ethernet/ti/am65-cpsw-nuss.h | 6 +- 4 files changed, 201 insertions(+), 2 deletions(-)
drivers/net/ethernet/ti/Kconfig +1 -0
@@ -100,6 +100,7 @@ config TI_K3_AM65_CPSW_NUSS depends on ARCH_K3 && OF && TI_K3_UDMA_GLUE_LAYER select TI_DAVINCI_MDIO imply PHY_TI_GMII_SEL + imply TI_AM65_CPTS help This driver supports TI K3 AM654/J721E CPSW2G Ethernet SubSystem. The two-port Gigabit Ethernet MAC (MCU_CPSW0) subsystem provides
drivers/net/ethernet/ti/am65-cpsw-ethtool.c +23 -1
@@ -12,6 +12,7 @@#include "am65-cpsw-nuss.h" #include "cpsw_ale.h" +#include "am65-cpts.h" #define AM65_CPSW_REGDUMP_VER 0x1
@@ -694,6 +695,27 @@ static void am65_cpsw_get_ethtool_stats(struct net_device *ndev, hw_stats[i].offset); } +static int am65_cpsw_get_ethtool_ts_info (struct net_device *ndev, +struct ethtool_ts_info *info) +{ +struct am65_cpsw_common *common =am65_ndev_to_common (ndev); + +if (!IS_ENABLED (CONFIG_TI_K3_AM65_CPTS )) +return ethtool_op_get_ts_info (ndev, info); + + info->so_timestamping = +SOF_TIMESTAMPING_TX_HARDWARE | +SOF_TIMESTAMPING_TX_SOFTWARE | +SOF_TIMESTAMPING_RX_HARDWARE | +SOF_TIMESTAMPING_RX_SOFTWARE | +SOF_TIMESTAMPING_SOFTWARE | +SOF_TIMESTAMPING_RAW_HARDWARE ; + info->phc_index =am65_cpts_phc_index (common->cpts); + info->tx_types =BIT (HWTSTAMP_TX_OFF ) |BIT (HWTSTAMP_TX_ON ); + info->rx_filters =BIT (HWTSTAMP_FILTER_NONE ) |BIT (HWTSTAMP_FILTER_ALL ); +return 0 ; +} +static u32 am65_cpsw_get_ethtool_priv_flags (struct net_device *ndev) {struct am65_cpsw_common *common =am65_ndev_to_common (ndev);
@@ -730,7 +752,7 @@ const struct ethtool_ops am65_cpsw_ethtool_ops_slave = { .get_sset_count = am65_cpsw_get_sset_count, .get_strings = am65_cpsw_get_strings, .get_ethtool_stats = am65_cpsw_get_ethtool_stats, - .get_ts_info = ethtool_op_get_ts_info, + .get_ts_info = am65_cpsw_get_ethtool_ts_info, .get_priv_flags = am65_cpsw_get_ethtool_priv_flags, .set_priv_flags = am65_cpsw_set_ethtool_priv_flags,
drivers/net/ethernet/ti/am65-cpsw-nuss.c +172 -0
226 lines not on this page · raw message
drivers/net/ethernet/ti/am65-cpsw-nuss.h +5 -1
@@ -10,6 +10,8 @@#include <linux/module.h> #include <linux/netdevice.h> +struct am65_cpts ; +#define HOST_PORT_NUM 0#define AM65_CPSW_MAX_TX_QUEUES 8
@@ -37,6 +39,8 @@ struct am65_cpsw_port {void __iomem *stat_base;bool disabled;struct am65_cpsw_slave_data slave; +bool tx_ts_enabled; +bool rx_ts_enabled; };struct am65_cpsw_host {
@@ -96,8 +100,8 @@ struct am65_cpsw_common {u32 nuss_ver;u32 cpsw_ver; -bool pf_p0_rx_ptype_rrobin; +struct am65_cpts *cpts; };struct am65_cpsw_ndev_stats {
Signature · 1 line
2.17.1
Re: [PATCH net-next 3/7] net: ethernet: ti: am65-cpsw-nuss: enable packet timestamping support
Quoted 19 lines · Grygorii Strashko
The MCU CPSW Common Platform Time Sync (CPTS) provides possibility to timestamp TX PTP packets and all RX packets.
This enables corresponding support in TI AM65x/J721E MCU CPSW driver.
Signed-off-by Grygorii Strashko <[email protected]>--- drivers/net/ethernet/ti/Kconfig | 1 + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 24 ++- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 172 ++++++++++++++++++++ drivers/net/ethernet/ti/am65-cpsw-nuss.h | 6 +- 4 files changed, 201 insertions(+), 2 deletions(-)drivers/net/ethernet/ti/Kconfig +0
-0
drivers/net/ethernet/ti/Kconfig config TI_K3_AM65_CPSW_NUSS · line 103
Quoted 4 lines
drivers/net/ethernet/ti/Kconfig +1
-0@@ -100,6 +100,7 @@ config TI_K3_AM65_CPSW_NUSS depends on ARCH_K3 && OF && TI_K3_UDMA_GLUE_LAYER select TI_DAVINCI_MDIO imply PHY_TI_GMII_SEL + imply TI_AM65_CPTS
Should this be TI_K3_AM65_CPTS ?
I did an arm64 allmodconfig build on todays next tag: next-20200505 and got this undefined symbol:
aarch64-linux-gnu-ld: drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_init_cpts':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1685:
undefined reference to `am65_cpts_create'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1685:(.text+0x2e20):
relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol
`am65_cpts_create'
aarch64-linux-gnu-ld: drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_nuss_tx_compl_packets':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:923:
undefined reference to `am65_cpts_tx_timestamp'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:923:(.text+0x4cf0):
relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `am65_cpts_tx_timestamp'
aarch64-linux-gnu-ld: drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_nuss_ndo_slave_xmit':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1018:
undefined reference to `am65_cpts_prep_tx_timestamp'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1018:(.text+0x58fc):
relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `am65_cpts_prep_tx_timestamp'
aarch64-linux-gnu-ld: drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_nuss_hwtstamp_set':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1265:
undefined reference to `am65_cpts_rx_enable'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1265:(.text+0x7564):
relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol
`am65_cpts_rx_enable'
aarch64-linux-gnu-ld: drivers/net/ethernet/ti/am65-cpsw-ethtool.o: in
function `am65_cpsw_get_ethtool_ts_info':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-ethtool.c:713:
undefined reference to `am65_cpts_phc_index'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-ethtool.c:713:(.text+0xbe8):
relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol
`am65_cpts_phc_index'
make[1]: *** [/srv/src/kernel/next/Makefile:1114: vmlinux] Error 1
make[1]: Target 'Image' not remade because of errors.
make: *** [Makefile:180: sub-make] Error 2
make: Target 'Image' not remade because of errors.
Cheers,
Anders
Quoted 326 lines
drivers/net/ethernet/ti/Kconfig +0
-0help This driver supports TI K3 AM654/J721E CPSW2G Ethernet SubSystem. The two-port Gigabit Ethernet MAC (MCU_CPSW0) subsystem providesdrivers/net/ethernet/ti/am65-cpsw-ethtool.c +23
-1@@ -12,6 +12,7 @@#include "am65-cpsw-nuss.h" #include "cpsw_ale.h" +#include "am65-cpts.h" #define AM65_CPSW_REGDUMP_VER 0x1@@ -694,6 +695,27 @@ static void am65_cpsw_get_ethtool_stats(struct net_device *ndev, hw_stats[i].offset); } +static int am65_cpsw_get_ethtool_ts_info (struct net_device *ndev, +struct ethtool_ts_info *info) +{ +struct am65_cpsw_common *common =am65_ndev_to_common (ndev); + +if (!IS_ENABLED (CONFIG_TI_K3_AM65_CPTS )) +return ethtool_op_get_ts_info (ndev, info); + + info->so_timestamping = +SOF_TIMESTAMPING_TX_HARDWARE | +SOF_TIMESTAMPING_TX_SOFTWARE | +SOF_TIMESTAMPING_RX_HARDWARE | +SOF_TIMESTAMPING_RX_SOFTWARE | +SOF_TIMESTAMPING_SOFTWARE | +SOF_TIMESTAMPING_RAW_HARDWARE ; + info->phc_index =am65_cpts_phc_index (common->cpts); + info->tx_types =BIT (HWTSTAMP_TX_OFF ) |BIT (HWTSTAMP_TX_ON ); + info->rx_filters =BIT (HWTSTAMP_FILTER_NONE ) |BIT (HWTSTAMP_FILTER_ALL ); +return 0 ; +} +static u32 am65_cpsw_get_ethtool_priv_flags (struct net_device *ndev) {struct am65_cpsw_common *common =am65_ndev_to_common (ndev);@@ -730,7 +752,7 @@ const struct ethtool_ops am65_cpsw_ethtool_ops_slave = { .get_sset_count = am65_cpsw_get_sset_count, .get_strings = am65_cpsw_get_strings, .get_ethtool_stats = am65_cpsw_get_ethtool_stats, - .get_ts_info = ethtool_op_get_ts_info, + .get_ts_info = am65_cpsw_get_ethtool_ts_info, .get_priv_flags = am65_cpsw_get_ethtool_priv_flags, .set_priv_flags = am65_cpsw_set_ethtool_priv_flags,drivers/net/ethernet/ti/am65-cpsw-nuss.c +172
-0@@ -30,6 +30,7 @@#include "cpsw_sl.h" #include "am65-cpsw-nuss.h" #include "k3-cppi-desc-pool.h" +#include "am65-cpts.h" #define AM65_CPSW_SS_BASE 0x0#define AM65_CPSW_SGMII_BASE 0x100@@ -668,6 +669,18 @@ static void am65_cpsw_nuss_rx_cleanup(void *data, dma_addr_t desc_dma)dev_kfree_skb_any (skb); } +static void am65_cpsw_nuss_rx_ts (struct sk_buff *skb,u32 *psdata) +{ +struct skb_shared_hwtstamps *ssh; +u64 ns; + + ns = ((u64 )psdata[1 ] <<32 ) | psdata[0 ]; + + ssh =skb_hwtstamps (skb); +memset (ssh,0 ,sizeof (*ssh)); + ssh->hwtstamp =ns_to_ktime (ns); +} +/* RX psdata[2] word format - checksum information */ #define AM65_CPSW_RX_PSD_CSUM_ADD GENMASK(15, 0)#define AM65_CPSW_RX_PSD_CSUM_ERR BIT(16)@@ -745,6 +758,9 @@ static int am65_cpsw_nuss_rx_packets(struct am65_cpsw_common *common, skb->dev = ndev; psdata =cppi5_hdesc_get_psdata (desc_rx); +/* add RX timestamp */ +if (port->rx_ts_enabled) +am65_cpsw_nuss_rx_ts (skb, psdata); csum_info = psdata[2 ];dev_dbg (dev,"%s rx csum_info:%#x\n" , __func__, csum_info);@@ -904,6 +920,8 @@ static int am65_cpsw_nuss_tx_compl_packets(struct am65_cpsw_common *common, ndev = skb->dev; +am65_cpts_tx_timestamp (common->cpts, skb); + ndev_priv =netdev_priv (ndev); stats =this_cpu_ptr (ndev_priv->stats);u64_stats_update_begin (&stats->syncp);@@ -995,6 +1013,10 @@ static netdev_tx_t am65_cpsw_nuss_ndo_slave_xmit(struct sk_buff *skb,/* padding enabled in hw */ pkt_len =skb_headlen (skb); +/* SKB TX timestamp */ +if (port->tx_ts_enabled) +am65_cpts_prep_tx_timestamp (common->cpts, skb); + q_idx =skb_get_queue_mapping (skb);dev_dbg (dev,"%s skb_queue:%d\n" , __func__, q_idx);@@ -1158,6 +1180,111 @@ static int am65_cpsw_nuss_ndo_slave_set_mac_address(struct net_device *ndev,return 0 ; } +static int am65_cpsw_nuss_hwtstamp_set (struct net_device *ndev, +struct ifreq *ifr) +{ +struct am65_cpsw_common *common =am65_ndev_to_common (ndev); +struct am65_cpsw_port *port =am65_ndev_to_port (ndev); +u32 ts_ctrl, seq_id, ts_ctrl_ltype2, ts_vlan_ltype; +struct hwtstamp_config cfg; + +if (!IS_ENABLED (CONFIG_TI_K3_AM65_CPTS )) +return -EOPNOTSUPP ; + +if (copy_from_user (&cfg, ifr->ifr_data,sizeof (cfg))) +return -EFAULT ; + +/* TX HW timestamp */ +switch (cfg.tx_type) { +case HWTSTAMP_TX_OFF : +case HWTSTAMP_TX_ON : +break ; +default : +return -ERANGE ; + } + +switch (cfg.rx_filter) { +case HWTSTAMP_FILTER_NONE : + port->rx_ts_enabled = false; +break ; +case HWTSTAMP_FILTER_ALL : +case HWTSTAMP_FILTER_SOME : +case HWTSTAMP_FILTER_PTP_V1_L4_EVENT : +case HWTSTAMP_FILTER_PTP_V1_L4_SYNC : +case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ : +case HWTSTAMP_FILTER_PTP_V2_L4_EVENT : +case HWTSTAMP_FILTER_PTP_V2_L4_SYNC : +case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ : +case HWTSTAMP_FILTER_PTP_V2_L2_EVENT : +case HWTSTAMP_FILTER_PTP_V2_L2_SYNC : +case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ : +case HWTSTAMP_FILTER_PTP_V2_EVENT : +case HWTSTAMP_FILTER_PTP_V2_SYNC : +case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ : +case HWTSTAMP_FILTER_NTP_ALL : + port->rx_ts_enabled = true; + cfg.rx_filter =HWTSTAMP_FILTER_ALL ; +break ; +default : +return -ERANGE ; + } + + port->tx_ts_enabled = (cfg.tx_type ==HWTSTAMP_TX_ON ); + +/* cfg TX timestamp */ + seq_id = (AM65_CPSW_TS_SEQ_ID_OFFSET << +AM65_CPSW_PN_TS_SEQ_ID_OFFSET_SHIFT ) |ETH_P_1588 ; + + ts_vlan_ltype =ETH_P_8021Q ; + + ts_ctrl_ltype2 =ETH_P_1588 | +AM65_CPSW_PN_TS_CTL_LTYPE2_TS_107 | +AM65_CPSW_PN_TS_CTL_LTYPE2_TS_129 | +AM65_CPSW_PN_TS_CTL_LTYPE2_TS_130 | +AM65_CPSW_PN_TS_CTL_LTYPE2_TS_131 | +AM65_CPSW_PN_TS_CTL_LTYPE2_TS_132 | +AM65_CPSW_PN_TS_CTL_LTYPE2_TS_319 | +AM65_CPSW_PN_TS_CTL_LTYPE2_TS_320 | +AM65_CPSW_PN_TS_CTL_LTYPE2_TS_TTL_NONZERO ; + + ts_ctrl =AM65_CPSW_TS_EVENT_MSG_TYPE_BITS << +AM65_CPSW_PN_TS_CTL_MSG_TYPE_EN_SHIFT ; + +if (port->tx_ts_enabled) + ts_ctrl |=AM65_CPSW_TS_TX_ANX_ALL_EN | +AM65_CPSW_PN_TS_CTL_TX_VLAN_LT1_EN ; + +writel (seq_id, port->port_base +AM65_CPSW_PORTN_REG_TS_SEQ_LTYPE_REG ); +writel (ts_vlan_ltype, port->port_base + +AM65_CPSW_PORTN_REG_TS_VLAN_LTYPE_REG ); +writel (ts_ctrl_ltype2, port->port_base + +AM65_CPSW_PORTN_REG_TS_CTL_LTYPE2 ); +writel (ts_ctrl, port->port_base +AM65_CPSW_PORTN_REG_TS_CTL ); + +/* en/dis RX timestamp */ +am65_cpts_rx_enable (common->cpts, port->rx_ts_enabled); + +return copy_to_user (ifr->ifr_data, &cfg,sizeof (cfg)) ? -EFAULT :0 ; +} + +static int am65_cpsw_nuss_hwtstamp_get (struct net_device *ndev, +struct ifreq *ifr) +{ +struct am65_cpsw_port *port =am65_ndev_to_port (ndev); +struct hwtstamp_config cfg; + +if (!IS_ENABLED (CONFIG_TI_K3_AM65_CPTS )) +return -EOPNOTSUPP ; + + cfg.flags =0 ; + cfg.tx_type = port->tx_ts_enabled ? +HWTSTAMP_TX_ON :HWTSTAMP_TX_OFF ; + cfg.rx_filter = port->rx_ts_enabled ? +HWTSTAMP_FILTER_ALL :HWTSTAMP_FILTER_NONE ; + +return copy_to_user (ifr->ifr_data, &cfg,sizeof (cfg)) ? -EFAULT :0 ; +} +static int am65_cpsw_nuss_ndo_slave_ioctl (struct net_device *ndev,struct ifreq *req,int cmd) {@@ -1166,6 +1293,13 @@ static int am65_cpsw_nuss_ndo_slave_ioctl(struct net_device *ndev,if (!netif_running (ndev))return -EINVAL ; +switch (cmd) { +case SIOCSHWTSTAMP : +return am65_cpsw_nuss_hwtstamp_set (ndev, req); +case SIOCGHWTSTAMP : +return am65_cpsw_nuss_hwtstamp_get (ndev, req); + } +if (!port->slave.phy)return -EOPNOTSUPP ;@@ -1531,6 +1665,40 @@ static int am65_cpsw_am654_get_efuse_macid(struct device_node *of_node,return 0 ; } +static int am65_cpsw_init_cpts (struct am65_cpsw_common *common) +{ +struct device *dev = common->dev; +struct device_node *node; +struct am65_cpts *cpts; +void __iomem *reg_base; + +if (!IS_ENABLED (CONFIG_TI_K3_AM65_CPTS )) +return 0 ; + + node =of_get_child_by_name (dev->of_node,"cpts" ); +if (!node) { +dev_err (dev,"%s cpts not found\n" , __func__); +return -ENOENT ; + } + + reg_base = common->cpsw_base +AM65_CPSW_NU_CPTS_BASE ; + cpts =am65_cpts_create (dev, reg_base, node); +if (IS_ERR (cpts)) { +int ret =PTR_ERR (cpts); + +if (ret == -EOPNOTSUPP ) { +dev_info (dev,"cpts disabled\n" ); +return 0 ; + } + +dev_err (dev,"cpts create err %d\n" , ret); +return ret; + } + common->cpts = cpts; + +return 0 ; +} +static int am65_cpsw_nuss_init_slave_ports (struct am65_cpsw_common *common) {struct device_node *node, *port_np;@@ -1899,6 +2067,10 @@ static int am65_cpsw_nuss_probe(struct platform_device *pdev) goto err_of_clear; } + ret =am65_cpsw_init_cpts (common); +if (ret) + goto err_of_clear; +/* init ports */ for (i =0 ; i < common->port_num; i++)am65_cpsw_nuss_slave_disable_unused (&common->ports[i]);drivers/net/ethernet/ti/am65-cpsw-nuss.h +5
-2@@ -10,6 +10,8 @@#include <linux/module.h> #include <linux/netdevice.h> +struct am65_cpts ; +#define HOST_PORT_NUM 0#define AM65_CPSW_MAX_TX_QUEUES 8@@ -37,6 +39,8 @@ struct am65_cpsw_port {void __iomem *stat_base;bool disabled;struct am65_cpsw_slave_data slave; +bool tx_ts_enabled; +bool rx_ts_enabled; };struct am65_cpsw_host {@@ -96,8 +100,8 @@ struct am65_cpsw_common {u32 nuss_ver;u32 cpsw_ver; -bool pf_p0_rx_ptype_rrobin; +struct am65_cpts *cpts; };struct am65_cpsw_ndev_stats { --2.17.1
Re: [PATCH net-next 3/7] net: ethernet: ti: am65-cpsw-nuss: enable packet timestamping support
hi Anders,
Quoted 66 lines · Anders Roxell
Quoted 19 lines · Grygorii Strashko
The MCU CPSW Common Platform Time Sync (CPTS) provides possibility to timestamp TX PTP packets and all RX packets.
This enables corresponding support in TI AM65x/J721E MCU CPSW driver.
Signed-off-by Grygorii Strashko <[email protected]>--- drivers/net/ethernet/ti/Kconfig | 1 + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 24 ++- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 172 ++++++++++++++++++++ drivers/net/ethernet/ti/am65-cpsw-nuss.h | 6 +- 4 files changed, 201 insertions(+), 2 deletions(-)drivers/net/ethernet/ti/Kconfig +0
-0drivers/net/ethernet/ti/Kconfig config TI_K3_AM65_CPSW_NUSS · line 103
Quoted 4 lines
drivers/net/ethernet/ti/Kconfig +1
-0@@ -100,6 +100,7 @@ config TI_K3_AM65_CPSW_NUSS depends on ARCH_K3 && OF && TI_K3_UDMA_GLUE_LAYER select TI_DAVINCI_MDIO imply PHY_TI_GMII_SEL + imply TI_AM65_CPTSShould this be
TI_K3_AM65_CPTS?I did an arm64 allmodconfig build on todays next tag: next-20200505 and got this undefined symbol:
aarch64-linux-gnu-ld:
drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_init_cpts':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1685:
undefined reference to `am65_cpts_create'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1685:(.text+0x2e20):
relocation truncated to fit:R_AARCH64_CALL26against undefined symbol
`am65_cpts_create'
aarch64-linux-gnu-ld:drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_nuss_tx_compl_packets':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:923:
undefined reference to `am65_cpts_tx_timestamp'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:923:(.text+0x4cf0):
relocation truncated to fit:R_AARCH64_CALL26against undefined symbol `am65_cpts_tx_timestamp'
aarch64-linux-gnu-ld:drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_nuss_ndo_slave_xmit':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1018:
undefined reference to `am65_cpts_prep_tx_timestamp'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1018:(.text+0x58fc):
relocation truncated to fit:R_AARCH64_CALL26against undefined symbol `am65_cpts_prep_tx_timestamp'
aarch64-linux-gnu-ld:drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_nuss_hwtstamp_set':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1265:
undefined reference to `am65_cpts_rx_enable'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1265:(.text+0x7564):
relocation truncated to fit:R_AARCH64_CALL26against undefined symbol `am65_cpts_rx_enable'
aarch64-linux-gnu-ld:drivers/net/ethernet/ti/am65-cpsw-ethtool.o: in
function `am65_cpsw_get_ethtool_ts_info':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-ethtool.c:713:
undefined reference to `am65_cpts_phc_index'
Quoted 8 lines
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-ethtool.c:713:(.text+0xbe8):
relocation truncated to fit:R_AARCH64_CALL26against undefined symbol
`am65_cpts_phc_index'
make[1]: *** [/srv/src/kernel/next/Makefile:1114: vmlinux] Error 1
make[1]: Target 'Image' not remade because of errors.
make: *** [Makefile:180: sub-make] Error 2
make: Target 'Image' not remade because of errors.
Sry, I can't reproduce it net-next. trying next... What's your config?
Signature · 2 lines
Best regards, grygorii
Re: [PATCH net-next 3/7] net: ethernet: ti: am65-cpsw-nuss: enable packet timestamping support
Quoted 2 lines · Grygorii Strashko
hi Anders,
Hi Grygorii,
Quoted 77 lines · Anders Roxell
Quoted 66 lines · Grygorii Strashko
Quoted 19 lines
The MCU CPSW Common Platform Time Sync (CPTS) provides possibility to timestamp TX PTP packets and all RX packets.
This enables corresponding support in TI AM65x/J721E MCU CPSW driver.
Signed-off-by Grygorii Strashko <[email protected]>--- drivers/net/ethernet/ti/Kconfig | 1 + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 24 ++- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 172 ++++++++++++++++++++ drivers/net/ethernet/ti/am65-cpsw-nuss.h | 6 +- 4 files changed, 201 insertions(+), 2 deletions(-)drivers/net/ethernet/ti/Kconfig +0
-0drivers/net/ethernet/ti/Kconfig config TI_K3_AM65_CPSW_NUSS · line 103
Quoted 4 lines
drivers/net/ethernet/ti/Kconfig +1
-0@@ -100,6 +100,7 @@ config TI_K3_AM65_CPSW_NUSS depends on ARCH_K3 && OF && TI_K3_UDMA_GLUE_LAYER select TI_DAVINCI_MDIO imply PHY_TI_GMII_SEL + imply TI_AM65_CPTSShould this be
TI_K3_AM65_CPTS?I did an arm64 allmodconfig build on todays next tag: next-20200505 and got this undefined symbol:
aarch64-linux-gnu-ld:
drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_init_cpts':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1685:
undefined reference to `am65_cpts_create'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1685:(.text+0x2e20):
relocation truncated to fit:R_AARCH64_CALL26against undefined symbol
`am65_cpts_create'
aarch64-linux-gnu-ld:drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_nuss_tx_compl_packets':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:923:
undefined reference to `am65_cpts_tx_timestamp'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:923:(.text+0x4cf0):
relocation truncated to fit:R_AARCH64_CALL26against undefined symbol `am65_cpts_tx_timestamp'
aarch64-linux-gnu-ld:drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_nuss_ndo_slave_xmit':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1018:
undefined reference to `am65_cpts_prep_tx_timestamp'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1018:(.text+0x58fc):
relocation truncated to fit:R_AARCH64_CALL26against undefined symbol `am65_cpts_prep_tx_timestamp'
aarch64-linux-gnu-ld:drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_nuss_hwtstamp_set':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1265:
undefined reference to `am65_cpts_rx_enable'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1265:(.text+0x7564):
relocation truncated to fit:R_AARCH64_CALL26against undefined symbol `am65_cpts_rx_enable'
aarch64-linux-gnu-ld:drivers/net/ethernet/ti/am65-cpsw-ethtool.o: in
function `am65_cpsw_get_ethtool_ts_info':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-ethtool.c:713:
undefined reference to `am65_cpts_phc_index'Quoted 8 lines
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-ethtool.c:713:(.text+0xbe8):
relocation truncated to fit:R_AARCH64_CALL26against undefined symbol
`am65_cpts_phc_index'
make[1]: *** [/srv/src/kernel/next/Makefile:1114: vmlinux] Error 1
make[1]: Target 'Image' not remade because of errors.
make: *** [Makefile:180: sub-make] Error 2
make: Target 'Image' not remade because of errors.
Quoted 1 line
Sry, I can't reproduce it net-next.
Oh I forgot to try net-next, sorry.
Quoted 1 line
trying next...
Thank you.
Quoted 1 line
What's your config?
This is the config [1] I used.
Cheers,
Anders
[1] https://people.linaro.org/~anders.roxell/kernel-next-20200505.config
Quoted 4 lines
--
Best regards,
grygorii
Re: [PATCH net-next 3/7] net: ethernet: ti: am65-cpsw-nuss: enable packet timestamping support
Quoted 6 lines · Anders Roxell
Quoted 2 lines · Grygorii Strashko
hi Anders,
Hi Grygorii,
Hi again,
Quoted 18 lines
Quoted 18 lines · Anders Roxell
Quoted 15 lines · Grygorii Strashko
Quoted 14 lines
The MCU CPSW Common Platform Time Sync (CPTS) provides possibility to timestamp TX PTP packets and all RX packets.
This enables corresponding support in TI AM65x/J721E MCU CPSW driver.
Signed-off-by Grygorii Strashko <[email protected]>--- drivers/net/ethernet/ti/Kconfig | 1 + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 24 ++- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 172 ++++++++++++++++++++ drivers/net/ethernet/ti/am65-cpsw-nuss.h | 6 +- 4 files changed, 201 insertions(+), 2 deletions(-)
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/net/ethernet/ti/Kconfig config TI_K3_AM65_CPSW_NUSS · line 103
Quoted 9 lines
drivers/net/ethernet/ti/Kconfig +1
-0@@ -100,6 +100,7 @@ config TI_K3_AM65_CPSW_NUSS depends on ARCH_K3 && OF && TI_K3_UDMA_GLUE_LAYER select TI_DAVINCI_MDIO imply PHY_TI_GMII_SEL + imply TI_AM65_CPTSShould this be
TI_K3_AM65_CPTS?
instead of 'imply TI_K3_AM65_CPTS' don't you want to do this:
'depends on TI_K3_AM65_CPTS || !TI_K3_AM65_CPTS'
Cheers,
Anders
Quoted 69 lines
Quoted 49 lines
Quoted 40 lines
I did an arm64 allmodconfig build on todays next tag: next-20200505 and got this undefined symbol:
aarch64-linux-gnu-ld:
drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_init_cpts':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1685:
undefined reference to `am65_cpts_create'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1685:(.text+0x2e20):
relocation truncated to fit:R_AARCH64_CALL26against undefined symbol
`am65_cpts_create'
aarch64-linux-gnu-ld:drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_nuss_tx_compl_packets':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:923:
undefined reference to `am65_cpts_tx_timestamp'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:923:(.text+0x4cf0):
relocation truncated to fit:R_AARCH64_CALL26against undefined symbol `am65_cpts_tx_timestamp'
aarch64-linux-gnu-ld:drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_nuss_ndo_slave_xmit':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1018:
undefined reference to `am65_cpts_prep_tx_timestamp'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1018:(.text+0x58fc):
relocation truncated to fit:R_AARCH64_CALL26against undefined symbol `am65_cpts_prep_tx_timestamp'
aarch64-linux-gnu-ld:drivers/net/ethernet/ti/am65-cpsw-nuss.o: in
function `am65_cpsw_nuss_hwtstamp_set':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1265:
undefined reference to `am65_cpts_rx_enable'
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-nuss.c:1265:(.text+0x7564):
relocation truncated to fit:R_AARCH64_CALL26against undefined symbol `am65_cpts_rx_enable'
aarch64-linux-gnu-ld:drivers/net/ethernet/ti/am65-cpsw-ethtool.o: in
function `am65_cpsw_get_ethtool_ts_info':/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-ethtool.c:713:
undefined reference to `am65_cpts_phc_index'Quoted 8 lines
aarch64-linux-gnu-ld:
/srv/src/kernel/next/obj-arm64-next-20200505/../drivers/net/ethernet/ti/am65-cpsw-ethtool.c:713:(.text+0xbe8):
relocation truncated to fit:R_AARCH64_CALL26against undefined symbol
`am65_cpts_phc_index'
make[1]: *** [/srv/src/kernel/next/Makefile:1114: vmlinux] Error 1
make[1]: Target 'Image' not remade because of errors.
make: *** [Makefile:180: sub-make] Error 2
make: Target 'Image' not remade because of errors.Quoted 1 line
Sry, I can't reproduce it net-next.
Oh I forgot to try net-next, sorry.
Quoted 1 line
trying next...
Thank you.
Quoted 1 line
What's your config?
This is the config [1] I used.
Cheers,
Anders
[1] https://people.linaro.org/~anders.roxell/kernel-next-20200505.configQuoted 4 lines
--
Best regards,
grygorii
Re: [PATCH net-next 3/7] net: ethernet: ti: am65-cpsw-nuss: enable packet timestamping support
Hi Anders,
Quoted 30 lines · Anders Roxell
Quoted 17 lines · Anders Roxell
Quoted 16 lines · Grygorii Strashko
Quoted 15 lines · Anders Roxell
Quoted 14 lines · Grygorii Strashko
The MCU CPSW Common Platform Time Sync (CPTS) provides possibility to timestamp TX PTP packets and all RX packets.
This enables corresponding support in TI AM65x/J721E MCU CPSW driver.
Signed-off-by Grygorii Strashko <[email protected]>--- drivers/net/ethernet/ti/Kconfig | 1 + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 24 ++- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 172 ++++++++++++++++++++ drivers/net/ethernet/ti/am65-cpsw-nuss.h | 6 +- 4 files changed, 201 insertions(+), 2 deletions(-)Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/net/ethernet/ti/Kconfig config TI_K3_AM65_CPSW_NUSS · line 103
Quoted 9 lines
drivers/net/ethernet/ti/Kconfig +1
-0@@ -100,6 +100,7 @@ config TI_K3_AM65_CPSW_NUSS depends on ARCH_K3 && OF && TI_K3_UDMA_GLUE_LAYER select TI_DAVINCI_MDIO imply PHY_TI_GMII_SEL + imply TI_AM65_CPTSShould this be
TI_K3_AM65_CPTS?
Quoted 4 lines
instead of 'imply
TI_K3_AM65_CPTS' don't you want to do this:
'depends onTI_K3_AM65_CPTS|| !TI_K3_AM65_CPTS'
Right, I'll try. It seems your defconfig is produced by randconfig as I can't get broken cfg TI_AM65_CPTS=m and TI_K3_AM65_CPSW_NUSS=y with neither one below:
make ARCH=arm64 O=k3-arm64 defconfig
make ARCH=arm64 O=k3-arm64 allnoconfig
make ARCH=arm64 O=k3-arm64 allyesconfig
make ARCH=arm64 O=k3-arm64 allmodconfig
make ARCH=arm64 O=k3-arm64 alldefconfig
make ARCH=arm64 O=k3-arm64 yes2modconfig
make ARCH=arm64 O=k3-arm64 mod2yesconfig
Related legacy TI CPTS threads:
https://lkml.org/lkml/2020/5/2/344
https://lkml.org/lkml/2020/5/1/1348
I'd try summarize goal
TI_K3_AM65_CPSW_NUSS TI_AM65_CPTS
Y Y/N
M Y/M/N
N Y/M/N
Signature · 2 lines
Best regards, grygorii
Re: [PATCH net-next 3/7] net: ethernet: ti: am65-cpsw-nuss: enable packet timestamping support
Quoted 2 lines · Grygorii Strashko
Hi Anders,
Hi Grygorii,
Quoted 41 lines · Anders Roxell
Quoted 30 lines · Anders Roxell
Quoted 17 lines · Grygorii Strashko
Quoted 16 lines · Anders Roxell
Quoted 15 lines · Grygorii Strashko
Quoted 14 lines
The MCU CPSW Common Platform Time Sync (CPTS) provides possibility to timestamp TX PTP packets and all RX packets.
This enables corresponding support in TI AM65x/J721E MCU CPSW driver.
Signed-off-by Grygorii Strashko <[email protected]>--- drivers/net/ethernet/ti/Kconfig | 1 + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 24 ++- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 172 ++++++++++++++++++++ drivers/net/ethernet/ti/am65-cpsw-nuss.h | 6 +- 4 files changed, 201 insertions(+), 2 deletions(-)Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/net/ethernet/ti/Kconfig config TI_K3_AM65_CPSW_NUSS · line 103
Quoted 9 lines
drivers/net/ethernet/ti/Kconfig +1
-0@@ -100,6 +100,7 @@ config TI_K3_AM65_CPSW_NUSS depends on ARCH_K3 && OF && TI_K3_UDMA_GLUE_LAYER select TI_DAVINCI_MDIO imply PHY_TI_GMII_SEL + imply TI_AM65_CPTSShould this be
TI_K3_AM65_CPTS?Quoted 4 lines
instead of 'imply
TI_K3_AM65_CPTS' don't you want to do this:
'depends onTI_K3_AM65_CPTS|| !TI_K3_AM65_CPTS'Right, I'll try. It seems your defconfig is produced by randconfig as I can't get broken cfg TI_AM65_CPTS=m and TI_K3_AM65_CPSW_NUSS=y with neither one below:
Quoted 7 lines
make ARCH=arm64 O=k3-arm64 defconfig
make ARCH=arm64 O=k3-arm64 allnoconfig
make ARCH=arm64 O=k3-arm64 allyesconfig
make ARCH=arm64 O=k3-arm64 allmodconfig
make ARCH=arm64 O=k3-arm64 alldefconfig
make ARCH=arm64 O=k3-arm64 yes2modconfig
make ARCH=arm64 O=k3-arm64 mod2yesconfig
I'm so sorry, I forgot to tell you that I do my allmodconfig like this:
make ARCH=arm64 KCONFIG_ALLCONFIG=arch/arm64/configs/defconfig O=k3-arm64 allmodconfig
Then I'm sure I should get a bootable kernel since that uses the defconfig as a base...
Cheers,
Anders
Quoted 15 lines
Related legacy TI CPTS threads:
https://lkml.org/lkml/2020/5/2/344
https://lkml.org/lkml/2020/5/1/1348I'd try summarize goal
TI_K3_AM65_CPSW_NUSS TI_AM65_CPTS Y Y/N M Y/M/N N Y/M/N--
Best regards,
grygorii
Re: [PATCH net-next 3/7] net: ethernet: ti: am65-cpsw-nuss: enable packet timestamping support
In reply to Anders RoxellQuoted 40 lines · Anders Roxell
Quoted 6 lines · Anders Roxell
Quoted 2 lines · Grygorii Strashko
hi Anders,
Hi Grygorii,
Hi again,
Quoted 18 lines
Quoted 18 lines · Anders Roxell
Quoted 15 lines · Grygorii Strashko
Quoted 14 lines
The MCU CPSW Common Platform Time Sync (CPTS) provides possibility to timestamp TX PTP packets and all RX packets.
This enables corresponding support in TI AM65x/J721E MCU CPSW driver.
Signed-off-by Grygorii Strashko <[email protected]>--- drivers/net/ethernet/ti/Kconfig | 1 + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 24 ++- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 172 ++++++++++++++++++++ drivers/net/ethernet/ti/am65-cpsw-nuss.h | 6 +- 4 files changed, 201 insertions(+), 2 deletions(-)Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/net/ethernet/ti/Kconfig config TI_K3_AM65_CPSW_NUSS · line 103
Quoted 9 lines
drivers/net/ethernet/ti/Kconfig +1
-0@@ -100,6 +100,7 @@ config TI_K3_AM65_CPSW_NUSS depends on ARCH_K3 && OF && TI_K3_UDMA_GLUE_LAYER select TI_DAVINCI_MDIO imply PHY_TI_GMII_SEL + imply TI_AM65_CPTSShould this be
TI_K3_AM65_CPTS?
Quoted 4 lines
instead of 'imply
TI_K3_AM65_CPTS' don't you want to do this:
'depends onTI_K3_AM65_CPTS|| !TI_K3_AM65_CPTS'
this seems will do the trick.
Dependencies:PTP_1588_CLOCK -> TI_K3_AM65_CPTS -> TI_K3_AM65_CPSW_NUSS
I'll send patch.
Signature · 2 lines
Best regards, grygorii
PATCH 4/7 arm64: dts: ti: k3-am65-mcu: add cpsw cpts node
In reply to Grygorii StrashkoAdd DT node for the TI AM65x SoC Common Platform Time Sync (CPTS).
--- arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi +19 -0
@@ -247,5 +247,24 @@ clock-names = "fck"; bus_freq = <1000000>; }; + + cpts { + clocks = <&mcu_cpsw_cpts_mux>; + clock-names = "cpts"; + interrupts-extended = <&gic500 GIC_SPI 570 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "cpts"; + ti,cpts-ext-ts-inputs = <4>; + ti,cpts-periodic-outputs = <2>; + + mcu_cpsw_cpts_mux: refclk-mux { + #clock-cells = <0>; + clocks = <&k3_clks 118 5>, <&k3_clks 118 11>, + <&k3_clks 118 6>, <&k3_clks 118 3>, + <&k3_clks 118 8>, <&k3_clks 118 14>, + <&k3_clks 120 3>, <&k3_clks 121 3>; + assigned-clocks = <&mcu_cpsw_cpts_mux>; + assigned-clock-parents = <&k3_clks 118 5>; + }; + }; }; };
Signature · 1 line
2.17.1
PATCH 5/7 arm64: dts: ti: k3-am65-main: add main navss cpts node
In reply to Grygorii StrashkoAdd DT node for Main NAVSS CPTS module.
--- arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/arm64/boot/dts/ti/k3-am65-main.dtsi +22 -0
@@ -583,6 +583,28 @@ <0x5>; /* RX_CHAN */ ti,sci-rm-range-rflow = <0x6>; /* GP RFLOW */ }; + + cpts@310d0000 { + compatible = "ti,am65-cpts"; + reg = <0x0 0x310d0000 0x0 0x400>; + reg-names = "cpts"; + clocks = <&main_cpts_mux>; + clock-names = "cpts"; + interrupts-extended = <&intr_main_navss 163 0>; + interrupt-names = "cpts"; + ti,cpts-periodic-outputs = <6>; + ti,cpts-ext-ts-inputs = <8>; + + main_cpts_mux: refclk-mux { + #clock-cells = <0>; + clocks = <&k3_clks 118 5>, <&k3_clks 118 11>, + <&k3_clks 118 6>, <&k3_clks 118 3>, + <&k3_clks 118 8>, <&k3_clks 118 14>, + <&k3_clks 120 3>, <&k3_clks 121 3>; + assigned-clocks = <&main_cpts_mux>; + assigned-clock-parents = <&k3_clks 118 5>; + }; + }; }; main_gpio0: main_gpio0@600000 {
Signature · 1 line
2.17.1
PATCH 6/7 arm64: dts: ti: k3-j721e-mcu: add mcu cpsw cpts node
In reply to Grygorii StrashkoAdd DT node for The TI J721E MCU CPSW CPTS which is part of MCU CPSW NUSS.
--- arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi +9 -0
@@ -338,5 +338,14 @@ clock-names = "fck"; bus_freq = <1000000>; }; + + cpts { + clocks = <&k3_clks 18 2>; + clock-names = "cpts"; + interrupts-extended = <&gic500 GIC_SPI 858 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "cpts"; + ti,cpts-ext-ts-inputs = <4>; + ti,cpts-periodic-outputs = <2>; + }; }; };
Signature · 1 line
2.17.1
PATCH 7/7 arm64: dts: ti: j721e-main: add main navss cpts node
In reply to Grygorii StrashkoAdd DT node for Main NAVSS CPTS module.
--- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +12 -0
@@ -254,6 +254,18 @@ <0x0c>; /* RX_UHCHAN */ ti,sci-rm-range-rflow = <0x00>; /* GP RFLOW */ }; + + cpts@310d0000 { + compatible = "ti,j721e-cpts"; + reg = <0x0 0x310d0000 0x0 0x400>; + reg-names = "cpts"; + clocks = <&k3_clks 201 1>; + clock-names = "cpts"; + interrupts-extended = <&main_navss_intr 201 0>; + interrupt-names = "cpts"; + ti,cpts-periodic-outputs = <6>; + ti,cpts-ext-ts-inputs = <8>; + }; }; main_pmx0: pinmux@11c000 {
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Grygorii Strashko <[email protected]>
Date: Fri, 1 May 2020 23:50:04 +0300
Quoted 3 lines
This series introduced support for significantly upgraded TI A65x/J721E Common platform time sync (CPTS) modules which are part of AM65xx Time Synchronization Architecture [1].
...
Series applied, thank you.