Coresight uses DT graph bindings to describe the connections of the
components. However we have some undocumented usage of the bindings
to describe some of the properties of the connections.
The coresight driver needs to know the hardware ports invovled
in the connection and the direction of data flow to effectively
manage the trace sessions. So far we have relied on the "port"
address (as described by the generic graph bindings) to represent
the hardware port of the component for a connection.
The hardware uses separate numbering scheme for input and output
ports, which implies, we could have two different (input and output)
ports with the same port number. This could create problems in the
graph bindings where the label of the port wouldn't match the address.
e.g, with the existing bindings we get :
port@0{ // Output port 0
reg = <0>;
...
};
port@1{
reg = <0>; // Input port 0
endpoint {
slave-mode;
...
};
};
With the new enforcement in the DT rules, mismatches in label and address
are not allowed (as see in the case for port@1). So, we need a new mechanism
to describe the hardware port number reliably.
Also, we relied on an undocumented "slave-mode" property (see the above
example) to indicate if the port is an input port. Let us formalise and
switch to a new property to describe the direction of data flow.
There were three options considered for the hardware port number scheme:
1) Use natural ordering in the DT to infer the hardware port number.
i.e, Mandate that the all ports are listed in the DT and in the ascending
order for each class (input and output respectively).
Pros :
- We don't need new properties and if the existing DTS list them in
order (which most of them do), they work out of the box.
Cons :
- We must list all the ports even if the system cannot/shouldn't use
it.
- It is prone to human errors (if the order is not kept).
2) Use an explicit property to list both the direction and the hw port
number and direction. Define "coresight,hwid" as 2 member array of u32,
where the members are port number and the direction respectively.
e.g
port@0{
reg = <0>;
endpoint {
coresight,hwid = <0 1>; // Port # 0, Output
}
};
port@1{
reg = <1>;
endpoint {
coresight,hwid = <0 0>; // Port # 0, Input
};
};
Pros:
- The bindings are formal but not so reader friendly and could potentially
lead to human errors.
Cons:
- Backward compatiblity is lost.
3) Use explicit properties (implemented in the series) for the hardware
port id and direction. We define a new property "coresight,hwid" for
each endpoint in coresight devices to specify the hardware port number
explicitly. Also use a separate property "direction" to specify the
direction of the data flow.
e.g,
port@0{
reg = <0>;
endpoint {
direction = <1>; // Output
coresight,hwid = <0>; // Port # 0
}
};
port@1{
reg = <1>;
endpoint {
direction = <0>; // Input
coresight,hwid = <0>; // Port # 0
};
};
Pros:
- The bindings are formal and reader friendly, and less prone to errors.
Cons:
- Backward compatibility is lost.
This series implements Option (3) listed above and falls back to the old
bindings if the new bindings are not available. This allows the systems
with old bindings work with the new driver. The driver now issues a warning
(once) when it encounters the old bindings.
It also cleans up the platform parsing code to reduce the memory usage by
reusing the platform description.
I am not sure what is the best route to push these DTS changes. Thoughts ?
Changes since RFC [0] :
- Fixed style issues
- Fix an existing memory leak coresight_register (Found in code update)
- Fix missing of_node_put() in the existing driver (Reported-by Mathieu)
- Update the existing dts in kernel tree.
- Rename new helper functions for consistency
Suzuki K Poulose (20):
coresight: Fix memory leak in coresight_register
coresight: of: Fix refcounting for graph nodes
coresight: Fix remote endpoint parsing
coresight: Cleanup platform description data
coresight: platform: Cleanup coresight connection handling
coresight: Handle errors in finding input/output ports
coresight: dts: Document usage of graph bindings
coresight: dts: Cleanup device tree graph bindings
coresight: dts: Define new bindings for direction of data flow
dts: juno: Update coresight bindings for hw port
dts: hisilicon: Update coresight bindings for hw ports
dts: spreadtrum: Update coresight bindings for hw ports
dts: qcom: Update coresight bindings for hw ports
dts: arm: hisilicon: Update coresight bindings for hardware port
dts: arm: imx7{d,s}: Update coresight binding for hardware ports
dts: arm: omap: Update coresight bindings for hardware ports
dts: arm: qcom: Update coresight bindings for hardware ports
dts: sama5d2: Update coresight bindings for hardware ports
dts: ste-dbx5x0: Update coresight bindings for hardware port
dts: tc2: Update coresight bindings for hardware ports
.../devicetree/bindings/arm/coresight.txt | 76 +++++--
arch/arm/boot/dts/hip04.dtsi | 195 +++++++++++++-----
arch/arm/boot/dts/imx7d.dtsi | 5 +-
arch/arm/boot/dts/imx7s.dtsi | 41 ++--
arch/arm/boot/dts/omap3-beagle-xm.dts | 5 +-
arch/arm/boot/dts/omap3-beagle.dts | 5 +-
arch/arm/boot/dts/qcom-apq8064.dtsi | 37 +++-
arch/arm/boot/dts/qcom-msm8974.dtsi | 60 ++++--
arch/arm/boot/dts/sama5d2.dtsi | 5 +-
arch/arm/boot/dts/ste-dbx5x0.dtsi | 31 ++-
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 48 +++--
arch/arm64/boot/dts/arm/juno-base.dtsi | 82 +++++---
arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 26 ++-
arch/arm64/boot/dts/arm/juno.dts | 5 +-
.../arm64/boot/dts/hisilicon/hi6220-coresight.dtsi | 89 ++++++---
arch/arm64/boot/dts/qcom/msm8916.dtsi | 55 ++++--
arch/arm64/boot/dts/sprd/sc9836.dtsi | 40 ++--
arch/arm64/boot/dts/sprd/sc9860.dtsi | 101 +++++++---
drivers/hwtracing/coresight/coresight.c | 30 +--
drivers/hwtracing/coresight/of_coresight.c | 219 +++++++++++++--------
include/linux/coresight.h | 11 +-
21 files changed, 818 insertions(+), 348 deletions(-)
--
2.7.4
Nobody uses the "clk" field in struct coresight_platform_data.
Remove it.
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
include/linux/coresight.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index e5421b8..69a5c9f 100644
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -87,7 +87,6 @@ struct coresight_dev_subtype {
* @child_ports:child component port number the current component is
connected to.
* @nr_outport: number of output ports for this component.
- * @clk: The clock this component is associated to.
*/
struct coresight_platform_data {
int cpu;
@@ -97,7 +96,6 @@ struct coresight_platform_data {
const char **child_names;
int *child_ports;
int nr_outport;
- struct clk *clk;
};
/**
--
2.7.4
Switch to the new the hardware port bindings.
Cc: Wei Xu <[email protected]>
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
arch/arm/boot/dts/hip04.dtsi | 195 +++++++++++++++++++++++++++++++------------
1 file changed, 141 insertions(+), 54 deletions(-)
diff --git a/arch/arm/boot/dts/hip04.dtsi b/arch/arm/boot/dts/hip04.dtsi
index 44044f2..dfd82be 100644
--- a/arch/arm/boot/dts/hip04.dtsi
+++ b/arch/arm/boot/dts/hip04.dtsi
@@ -279,8 +279,9 @@
clock-names = "apb_pclk";
port {
etb0_in_port: endpoint@0 {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator0_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -293,8 +294,9 @@
clock-names = "apb_pclk";
port {
etb1_in_port: endpoint@0 {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator1_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -307,8 +309,9 @@
clock-names = "apb_pclk";
port {
etb2_in_port: endpoint@0 {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator2_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -321,8 +324,9 @@
clock-names = "apb_pclk";
port {
etb3_in_port: endpoint@0 {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator3_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -335,8 +339,9 @@
clock-names = "apb_pclk";
port {
tpiu_in_port: endpoint@0 {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&funnel4_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -356,6 +361,8 @@
reg = <0>;
replicator0_out_port0: endpoint {
remote-endpoint = <&etb0_in_port>;
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
@@ -363,15 +370,18 @@
reg = <1>;
replicator0_out_port1: endpoint {
remote-endpoint = <&funnel4_in_port0>;
+ coresight,hwid = <1>;
+ direction = <1>;
};
};
/* replicator input port */
port@2 {
- reg = <0>;
+ reg = <2>;
replicator0_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&funnel0_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -392,6 +402,8 @@
reg = <0>;
replicator1_out_port0: endpoint {
remote-endpoint = <&etb1_in_port>;
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
@@ -399,15 +411,18 @@
reg = <1>;
replicator1_out_port1: endpoint {
remote-endpoint = <&funnel4_in_port1>;
+ coresight,hwid = <1>;
+ direction = <1>;
};
};
/* replicator input port */
port@2 {
- reg = <0>;
+ reg = <2>;
replicator1_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&funnel1_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -428,22 +443,27 @@
reg = <0>;
replicator2_out_port0: endpoint {
remote-endpoint = <&etb2_in_port>;
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
port@1 {
reg = <1>;
- replicator2_out_port1: endpoint {
+ replicator2_out_port1: endpoint {
remote-endpoint = <&funnel4_in_port2>;
+ coresight,hwid = <1>;
+ direction = <1>;
};
};
/* replicator input port */
port@2 {
- reg = <0>;
+ reg = <2>;
replicator2_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&funnel2_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -464,6 +484,8 @@
reg = <0>;
replicator3_out_port0: endpoint {
remote-endpoint = <&etb3_in_port>;
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
@@ -471,15 +493,18 @@
reg = <1>;
replicator3_out_port1: endpoint {
remote-endpoint = <&funnel4_in_port3>;
+ coresight,hwid = <1>;
+ direction = <1>;
};
};
/* replicator input port */
port@2 {
- reg = <0>;
+ reg = <2>;
replicator3_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&funnel3_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -501,39 +526,45 @@
funnel0_out_port0: endpoint {
remote-endpoint =
<&replicator0_in_port0>;
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
/* funnel input ports */
port@1 {
- reg = <0>;
+ reg = <1>;
funnel0_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm0_out_port>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
funnel0_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm1_out_port>;
+ coresight,hwid = <1>;
};
};
port@3 {
- reg = <2>;
+ reg = <3>;
funnel0_in_port2: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm2_out_port>;
+ coresight,hwid = <2>;
};
};
port@4 {
- reg = <3>;
+ reg = <4>;
funnel0_in_port3: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm3_out_port>;
+ coresight,hwid = <3>;
};
};
};
@@ -553,41 +584,47 @@
port@0 {
reg = <0>;
funnel1_out_port0: endpoint {
+ direction = <1>;
remote-endpoint =
<&replicator1_in_port0>;
+ coresight,hwid = <0>;
};
};
/* funnel input ports */
port@1 {
- reg = <0>;
+ reg = <1>;
funnel1_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm4_out_port>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
funnel1_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm5_out_port>;
+ coresight,hwid = <1>;
};
};
port@3 {
- reg = <2>;
+ reg = <3>;
funnel1_in_port2: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm6_out_port>;
+ coresight,hwid = <2>;
};
};
port@4 {
- reg = <3>;
+ reg = <4>;
funnel1_in_port3: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm7_out_port>;
+ coresight,hwid = <3>;
};
};
};
@@ -607,41 +644,47 @@
port@0 {
reg = <0>;
funnel2_out_port0: endpoint {
+ direction = <1>;
remote-endpoint =
<&replicator2_in_port0>;
+ coresight,hwid = <0>;
};
};
/* funnel input ports */
port@1 {
- reg = <0>;
+ reg = <1>;
funnel2_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm8_out_port>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
funnel2_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm9_out_port>;
+ coresight,hwid = <1>;
};
};
port@3 {
- reg = <2>;
+ reg = <3>;
funnel2_in_port2: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm10_out_port>;
+ coresight,hwid = <2>;
};
};
port@4 {
- reg = <3>;
+ reg = <4>;
funnel2_in_port3: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm11_out_port>;
+ coresight,hwid = <3>;
};
};
};
@@ -661,41 +704,47 @@
port@0 {
reg = <0>;
funnel3_out_port0: endpoint {
+ direction = <1>;
remote-endpoint =
<&replicator3_in_port0>;
+ coresight,hwid = <0>;
};
};
/* funnel input ports */
port@1 {
- reg = <0>;
+ reg = <1>;
funnel3_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm12_out_port>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
funnel3_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm13_out_port>;
+ coresight,hwid = <1>;
};
};
port@3 {
- reg = <2>;
+ reg = <3>;
funnel3_in_port2: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm14_out_port>;
+ coresight,hwid = <2>;
};
};
port@4 {
- reg = <3>;
+ reg = <4>;
funnel3_in_port3: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm15_out_port>;
+ coresight,hwid = <3>;
};
};
};
@@ -715,44 +764,50 @@
port@0 {
reg = <0>;
funnel4_out_port0: endpoint {
+ direction = <1>;
remote-endpoint = <&tpiu_in_port>;
+ coresight,hwid = <0>;
};
};
/* funnel input ports */
port@1 {
- reg = <0>;
+ reg = <1>;
funnel4_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&replicator0_out_port1>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
funnel4_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&replicator1_out_port1>;
+ coresight,hwid = <1>;
};
};
port@3 {
- reg = <2>;
+ reg = <3>;
funnel4_in_port2: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&replicator2_out_port1>;
+ coresight,hwid = <2>;
};
};
port@4 {
- reg = <3>;
+ reg = <4>;
funnel4_in_port3: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&replicator3_out_port1>;
+ coresight,hwid = <3>;
};
};
};
@@ -767,7 +822,9 @@
cpu = <&CPU0>;
port {
ptm0_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel0_in_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -781,7 +838,9 @@
cpu = <&CPU1>;
port {
ptm1_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel0_in_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -795,7 +854,9 @@
cpu = <&CPU2>;
port {
ptm2_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel0_in_port2>;
+ coresight,hwid = <0>;
};
};
};
@@ -809,7 +870,9 @@
cpu = <&CPU3>;
port {
ptm3_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel0_in_port3>;
+ coresight,hwid = <0>;
};
};
};
@@ -823,7 +886,9 @@
cpu = <&CPU4>;
port {
ptm4_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel1_in_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -837,7 +902,9 @@
cpu = <&CPU5>;
port {
ptm5_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel1_in_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -851,7 +918,9 @@
cpu = <&CPU6>;
port {
ptm6_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel1_in_port2>;
+ coresight,hwid = <0>;
};
};
};
@@ -865,7 +934,9 @@
cpu = <&CPU7>;
port {
ptm7_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel1_in_port3>;
+ coresight,hwid = <0>;
};
};
};
@@ -879,7 +950,9 @@
cpu = <&CPU8>;
port {
ptm8_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel2_in_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -892,7 +965,9 @@
cpu = <&CPU9>;
port {
ptm9_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel2_in_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -906,7 +981,9 @@
cpu = <&CPU10>;
port {
ptm10_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel2_in_port2>;
+ coresight,hwid = <0>;
};
};
};
@@ -920,7 +997,9 @@
cpu = <&CPU11>;
port {
ptm11_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel2_in_port3>;
+ coresight,hwid = <0>;
};
};
};
@@ -934,7 +1013,9 @@
cpu = <&CPU12>;
port {
ptm12_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel3_in_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -948,7 +1029,9 @@
cpu = <&CPU13>;
port {
ptm13_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel3_in_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -962,7 +1045,9 @@
cpu = <&CPU14>;
port {
ptm14_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel3_in_port2>;
+ coresight,hwid = <0>;
};
};
};
@@ -976,7 +1061,9 @@
cpu = <&CPU15>;
port {
ptm15_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel3_in_port3>;
+ coresight,hwid = <0>;
};
};
};
--
2.7.4
The coresight drivers relied on default bindings for graph
in DT, while reusing the "reg" field of the "ports" to indicate
the actual hardware port number for the connections. However,
with the rules getting stricter w.r.t to the address mismatch
with the label, it is no longer possible to use the port address
field for the hardware port number. Hence, we add an explicit
property to denote the hardware port number, "coresight,hwid"
which must be specified for each "endpoint".
Cc: Mathieu Poirier <[email protected]>
Cc: Sudeep Holla <[email protected]>
Cc: Rob Herring <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
.../devicetree/bindings/arm/coresight.txt | 29 ++++++++++---
drivers/hwtracing/coresight/of_coresight.c | 49 +++++++++++++++++-----
2 files changed, 62 insertions(+), 16 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt
index ed6b555..bf75ab3 100644
--- a/Documentation/devicetree/bindings/arm/coresight.txt
+++ b/Documentation/devicetree/bindings/arm/coresight.txt
@@ -108,8 +108,13 @@ following properties to uniquely identify the connection details.
"slave-mode"
* Hardware Port number at the component:
- - The hardware port number is assumed to be the address of the "port"
- component.
+ - Each "endpoint" must define the hardware port of the local end of the
+ connection using the following property :
+
+ "coresight,hwid" - 32bit integer, local hardware port.
+
+ - [ ** Obsolete ** ] The hardware port number is assumed to be the address
+ of the "port" component.
@@ -126,6 +131,7 @@ Example:
etb_in_port: endpoint@0 {
slave-mode;
remote-endpoint = <&replicator_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -140,6 +146,7 @@ Example:
tpiu_in_port: endpoint@0 {
slave-mode;
remote-endpoint = <&replicator_out_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -160,6 +167,7 @@ Example:
reg = <0>;
replicator_out_port0: endpoint {
remote-endpoint = <&etb_in_port>;
+ coresight,hwid = <0>;
};
};
@@ -167,15 +175,17 @@ Example:
reg = <1>;
replicator_out_port1: endpoint {
remote-endpoint = <&tpiu_in_port>;
+ coresight,hwid = <1>;
};
};
/* replicator input port */
port@2 {
- reg = <0>;
+ reg = <1>;
replicator_in_port0: endpoint {
slave-mode;
remote-endpoint = <&funnel_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -197,31 +207,35 @@ Example:
funnel_out_port0: endpoint {
remote-endpoint =
<&replicator_in_port0>;
+ coresight,hwid = <0>;
};
};
/* funnel input ports */
port@1 {
- reg = <0>;
+ reg = <1>;
funnel_in_port0: endpoint {
slave-mode;
remote-endpoint = <&ptm0_out_port>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
funnel_in_port1: endpoint {
slave-mode;
remote-endpoint = <&ptm1_out_port>;
+ coresight,hwid = <1>;
};
};
port@3 {
- reg = <2>;
+ reg = <3>;
funnel_in_port2: endpoint {
slave-mode;
remote-endpoint = <&etm0_out_port>;
+ coresight,hwid = <2>;
};
};
@@ -239,6 +253,7 @@ Example:
port {
ptm0_out_port: endpoint {
remote-endpoint = <&funnel_in_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -253,6 +268,7 @@ Example:
port {
ptm1_out_port: endpoint {
remote-endpoint = <&funnel_in_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -269,6 +285,7 @@ Example:
port {
stm_out_port: endpoint {
remote-endpoint = <&main_funnel_in_port2>;
+ coresight,hwid = <0>;
};
};
};
diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
index d01a9ce..d23d7dd 100644
--- a/drivers/hwtracing/coresight/of_coresight.c
+++ b/drivers/hwtracing/coresight/of_coresight.c
@@ -99,6 +99,31 @@ int of_coresight_get_cpu(const struct device_node *node)
EXPORT_SYMBOL_GPL(of_coresight_get_cpu);
/*
+ * of_coresight_endpoint_get_port_id : Get the hardware port number for the
+ * given endpoint device node. Prefer the explicit "coresight,hwid" property
+ * over the endpoint register id (obsolete bindings).
+ */
+static int of_coresight_endpoint_get_port_id(struct device *dev,
+ struct device_node *ep_node)
+{
+ struct of_endpoint ep;
+ int rc, port_id;
+
+
+ if (!of_property_read_u32(ep_node, "coresight,hwid", &port_id))
+ return port_id;
+
+ rc = of_graph_parse_endpoint(ep_node, &ep);
+ if (rc)
+ return rc;
+ dev_warn_once(dev,
+ "ep%d: Mandatory \"coresight,hwid\" property missing.\n",
+ ep.port);
+ dev_warn_once(dev, "DT uses obsolete coresight bindings\n");
+ return ep.port;
+}
+
+/*
* of_coresight_parse_endpoint : Parse the given output endpoint @ep
* and fill the connection information in *@pconn.
*
@@ -109,11 +134,11 @@ EXPORT_SYMBOL_GPL(of_coresight_get_cpu);
* 0 - If the parsing completed without any fatal errors.
* -Errno - Fatal error, abort the scanning.
*/
-static int of_coresight_parse_endpoint(struct device_node *ep,
+static int of_coresight_parse_endpoint(struct device *dev,
+ struct device_node *ep,
struct coresight_connection **pconn)
{
- int ret = 0;
- struct of_endpoint endpoint, rendpoint;
+ int ret = 0, local_port, child_port;
struct device_node *rparent = NULL;
struct device_node *rep = NULL;
struct device *rdev = NULL;
@@ -128,7 +153,8 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
break;
/* Parse the local port details */
- if (of_graph_parse_endpoint(ep, &endpoint))
+ local_port = of_coresight_endpoint_get_port_id(dev, ep);
+ if (local_port < 0)
break;
/*
* Get a handle on the remote endpoint and the device it is
@@ -140,9 +166,6 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
rparent = of_graph_get_port_parent(rep);
if (!rparent)
break;
- if (of_graph_parse_endpoint(rep, &rendpoint))
- break;
-
/* If the remote device is not available, defer probing */
rdev = of_coresight_get_endpoint_device(rparent);
if (!rdev) {
@@ -150,9 +173,15 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
break;
}
- conn->outport = endpoint.port;
+ child_port = of_coresight_endpoint_get_port_id(rdev, rep);
+ if (child_port < 0) {
+ ret = 0;
+ break;
+ }
+
+ conn->outport = local_port;
conn->child_name = dev_name(rdev);
- conn->child_port = rendpoint.port;
+ conn->child_port = child_port;
/* Move the connection record */
(*pconn)++;
} while (0);
@@ -200,7 +229,7 @@ of_get_coresight_platform_data(struct device *dev,
ep = of_graph_get_next_endpoint(node, ep);
if (!ep)
break;
- ret = of_coresight_parse_endpoint(ep, &conn);
+ ret = of_coresight_parse_endpoint(dev, ep, &conn);
if (ret)
return ERR_PTR(ret);
} while (ep);
--
2.7.4
When parsing the remote endpoint of an output port, we do :
rport = of_graph_get_remote_port(ep);
rparent = of_graph_get_remote_port_parent(ep);
and then parse the "remote_port" as if it was the remote endpoint,
which is wrong. The code worked fine because we used endpoint number
as the port number. Let us fix it and optimise a bit as:
remote_ep = of_graph_get_remote_endpoint(ep);
if (remote_ep)
remote_parent = of_graph_get_port_parent(remote_ep);
and then, parse the remote_ep for the port/endpoint details.
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
drivers/hwtracing/coresight/of_coresight.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
index 8a23c63..ada4f07 100644
--- a/drivers/hwtracing/coresight/of_coresight.c
+++ b/drivers/hwtracing/coresight/of_coresight.c
@@ -129,7 +129,7 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
int ret = 0;
struct of_endpoint endpoint, rendpoint;
struct device_node *rparent = NULL;
- struct device_node *rport = NULL;
+ struct device_node *rep = NULL;
struct device *rdev = NULL;
do {
@@ -144,16 +144,16 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
if (of_graph_parse_endpoint(ep, &endpoint))
break;
/*
- * Get a handle on the remote port and parent
- * attached to it.
+ * Get a handle on the remote endpoint and the device it is
+ * attached to.
*/
- rparent = of_graph_get_remote_port_parent(ep);
+ rep = of_graph_get_remote_endpoint(ep);
+ if (!rep)
+ break;
+ rparent = of_graph_get_port_parent(rep);
if (!rparent)
break;
- rport = of_graph_get_remote_port(ep);
- if (!rport)
- break;
- if (of_graph_parse_endpoint(rport, &rendpoint))
+ if (of_graph_parse_endpoint(rep, &rendpoint))
break;
/* If the remote device is not available, defer probing */
@@ -165,15 +165,15 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
pdata->outports[*i] = endpoint.port;
pdata->child_names[*i] = dev_name(rdev);
- pdata->child_ports[*i] = rendpoint.id;
+ pdata->child_ports[*i] = rendpoint.port;
/* Move the index */
(*i)++;
} while (0);
if (rparent)
of_node_put(rparent);
- if (rport)
- of_node_put(rport);
+ if (rep)
+ of_node_put(rep);
return ret;
}
--
2.7.4
Switch to the new coresight bindings
Cc: Linus Walleij <[email protected]>
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
arch/arm/boot/dts/ste-dbx5x0.dtsi | 31 +++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi
index 2310a4e..a02312a 100644
--- a/arch/arm/boot/dts/ste-dbx5x0.dtsi
+++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi
@@ -69,7 +69,9 @@
cpu = <&CPU0>;
port {
ptm0_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -83,7 +85,9 @@
cpu = <&CPU1>;
port {
ptm1_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -102,25 +106,29 @@
port@0 {
reg = <0>;
funnel_out_port: endpoint {
+ direction = <1>;
remote-endpoint =
<&replicator_in_port0>;
+ coresight,hwid = <0>;
};
};
/* funnel input ports */
port@1 {
- reg = <0>;
+ reg = <1>;
funnel_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm0_out_port>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
funnel_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm1_out_port>;
+ coresight,hwid = <1>;
};
};
};
@@ -139,22 +147,27 @@
port@0 {
reg = <0>;
replicator_out_port0: endpoint {
+ direction = <1>;
remote-endpoint = <&tpiu_in_port>;
+ coresight,hwid = <0>;
};
};
port@1 {
reg = <1>;
replicator_out_port1: endpoint {
+ direction = <1>;
remote-endpoint = <&etb_in_port>;
+ coresight,hwid = <1>;
};
};
/* replicator input port */
port@2 {
- reg = <0>;
+ reg = <2>;
replicator_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&funnel_out_port>;
+ coresight,hwid = <0>;
};
};
};
@@ -168,8 +181,9 @@
clock-names = "apb_pclk", "atclk";
port {
tpiu_in_port: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -182,8 +196,9 @@
clock-names = "apb_pclk", "atclk";
port {
etb_in_port: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out_port1>;
+ coresight,hwid = <0>;
};
};
};
--
2.7.4
Switch to the new coresight bindings for hardware ports
Cc: [email protected]
Cc: "Benoît Cousson" <[email protected]>
Cc: Tony Lindgren <[email protected]>
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
arch/arm/boot/dts/omap3-beagle-xm.dts | 5 ++++-
arch/arm/boot/dts/omap3-beagle.dts | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 0349fcc..b5f40069 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -155,8 +155,9 @@
clock-names = "apb_pclk";
port {
etb_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm_out>;
+ coresight,hwid = <0>;
};
};
};
@@ -169,7 +170,9 @@
clock-names = "apb_pclk";
port {
etm_out: endpoint {
+ direction = <1>;
remote-endpoint = <&etb_in>;
+ coresight,hwid = <0>;
};
};
};
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index 3ca8991..b32e35b 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -149,8 +149,9 @@
clock-names = "apb_pclk";
port {
etb_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm_out>;
+ coresight,hwid = <0>;
};
};
};
@@ -163,7 +164,9 @@
clock-names = "apb_pclk";
port {
etm_out: endpoint {
+ direction = <1>;
remote-endpoint = <&etb_in>;
+ coresight,hwid = <0>;
};
};
};
--
2.7.4
Switch to the new coresight bindings
Cc: Liviu Dudau <[email protected]>
Cc: Sudeep Holla <[email protected]>
Cc: Lorenzo Pieralisi <[email protected]>
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 48 ++++++++++++++++++++++--------
1 file changed, 36 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
index a4c7713..407693e 100644
--- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
@@ -394,8 +394,9 @@
clock-names = "apb_pclk";
port {
etb_in_port: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -408,8 +409,9 @@
clock-names = "apb_pclk";
port {
tpiu_in_port: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -428,23 +430,28 @@
port@0 {
reg = <0>;
replicator_out_port0: endpoint {
+ direction = <1>;
remote-endpoint = <&etb_in_port>;
+ coresight,hwid = <0>;
};
};
port@1 {
reg = <1>;
replicator_out_port1: endpoint {
+ direction = <1>;
remote-endpoint = <&tpiu_in_port>;
+ coresight,hwid = <1>;
};
};
/* replicator input port */
port@2 {
- reg = <0>;
+ reg = <2>;
replicator_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&funnel_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -464,33 +471,38 @@
port@0 {
reg = <0>;
funnel_out_port0: endpoint {
+ direction = <1>;
remote-endpoint =
<&replicator_in_port0>;
+ coresight,hwid = <0>;
};
};
/* funnel input ports */
port@1 {
- reg = <0>;
+ reg = <1>;
funnel_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm0_out_port>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
funnel_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm1_out_port>;
+ coresight,hwid = <1>;
};
};
port@3 {
- reg = <2>;
+ reg = <3>;
funnel_in_port2: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm0_out_port>;
+ coresight,hwid = <2>;
};
};
@@ -499,16 +511,18 @@
port@4 {
reg = <4>;
funnel_in_port4: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm1_out_port>;
+ coresight,hwid = <4>;
};
};
port@5 {
reg = <5>;
funnel_in_port5: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm2_out_port>;
+ coresight,hwid = <5>;
};
};
};
@@ -523,7 +537,9 @@
clock-names = "apb_pclk";
port {
ptm0_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -537,7 +553,9 @@
clock-names = "apb_pclk";
port {
ptm1_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -551,7 +569,9 @@
clock-names = "apb_pclk";
port {
etm0_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in_port2>;
+ coresight,hwid = <0>;
};
};
};
@@ -565,7 +585,9 @@
clock-names = "apb_pclk";
port {
etm1_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in_port4>;
+ coresight,hwid = <0>;
};
};
};
@@ -579,7 +601,9 @@
clock-names = "apb_pclk";
port {
etm2_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in_port5>;
+ coresight,hwid = <0>;
};
};
};
--
2.7.4
Switch to the new hardware port bindings for coresight
Cc: Andy Gross <[email protected]>
Cc: David Brown <[email protected]>
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
arch/arm/boot/dts/qcom-apq8064.dtsi | 37 +++++++++++++++++------
arch/arm/boot/dts/qcom-msm8974.dtsi | 60 +++++++++++++++++++++++++++----------
2 files changed, 73 insertions(+), 24 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 5341a39..d854220 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -1609,8 +1609,9 @@
port {
etb_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out0>;
+ coresight,hwid = <0>;
};
};
};
@@ -1624,8 +1625,9 @@
port {
tpiu_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out1>;
+ coresight,hwid = <0>;
};
};
};
@@ -1644,19 +1646,22 @@
reg = <0>;
replicator_out0: endpoint {
remote-endpoint = <&etb_in>;
+ coresight,hwid = <0>;
};
};
port@1 {
reg = <1>;
replicator_out1: endpoint {
remote-endpoint = <&tpiu_in>;
+ coresight,hwid = <1>;
};
};
port@2 {
- reg = <0>;
+ reg = <2>;
replicator_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&funnel_out>;
+ coresight,hwid = <0>;
};
};
};
@@ -1683,35 +1688,41 @@
port@0 {
reg = <0>;
funnel_in0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm0_out>;
+ coresight,hwid = <0>;
};
};
port@1 {
reg = <1>;
funnel_in1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm1_out>;
+ coresight,hwid = <1>;
};
};
port@4 {
reg = <4>;
funnel_in4: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm2_out>;
+ coresight,hwid = <4>;
};
};
port@5 {
reg = <5>;
funnel_in5: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm3_out>;
+ coresight,hwid = <5>;
};
};
port@8 {
- reg = <0>;
+ reg = <8>;
funnel_out: endpoint {
+ direction = <1>;
remote-endpoint = <&replicator_in>;
+ coresight,hwid = <0>;
};
};
};
@@ -1728,7 +1739,9 @@
port {
etm0_out: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in0>;
+ coresight,hwid = <0>;
};
};
};
@@ -1744,7 +1757,9 @@
port {
etm1_out: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in1>;
+ coresight,hwid = <0>;
};
};
};
@@ -1760,7 +1775,9 @@
port {
etm2_out: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in4>;
+ coresight,hwid = <0>;
};
};
};
@@ -1776,7 +1793,9 @@
port {
etm3_out: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in5>;
+ coresight,hwid = <0>;
};
};
};
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index d9019a4..89c7eb3 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -772,8 +772,9 @@
port {
etr_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out0>;
+ coresight,hwid = <0>;
};
};
};
@@ -787,8 +788,9 @@
port {
tpiu_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out1>;
+ coresight,hwid = <0>;
};
};
};
@@ -807,20 +809,25 @@
port@0 {
reg = <0>;
replicator_out0: endpoint {
+ direction = <1>;
remote-endpoint = <&etr_in>;
+ coresight,hwid = <0>;
};
};
port@1 {
reg = <1>;
replicator_out1: endpoint {
+ direction = <1>;
remote-endpoint = <&tpiu_in>;
+ coresight,hwid = <1>;
};
};
port@2 {
- reg = <0>;
+ reg = <2>;
replicator_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etf_out>;
+ coresight,hwid = <0>;
};
};
};
@@ -840,14 +847,17 @@
port@0 {
reg = <0>;
etf_out: endpoint {
+ direction = <1>;
remote-endpoint = <&replicator_in>;
+ coresight,hwid = <0>;
};
};
port@1 {
- reg = <0>;
+ reg = <1>;
etf_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&merger_out>;
+ coresight,hwid = <0>;
};
};
};
@@ -873,14 +883,17 @@
port@1 {
reg = <1>;
merger_in1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&funnel1_out>;
+ coresight,hwid = <1>;
};
};
port@8 {
- reg = <0>;
+ reg = <8>;
merger_out: endpoint {
+ direction = <1>;
remote-endpoint = <&etf_in>;
+ coresight,hwid = <0>;
};
};
};
@@ -910,14 +923,17 @@
port@5 {
reg = <5>;
funnel1_in5: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&kpss_out>;
+ coresight,hwid = <5>;
};
};
port@8 {
- reg = <0>;
+ reg = <8>;
funnel1_out: endpoint {
+ direction = <1>;
remote-endpoint = <&merger_in1>;
+ coresight,hwid = <0>;
};
};
};
@@ -937,35 +953,41 @@
port@0 {
reg = <0>;
kpss_in0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm0_out>;
+ coresight,hwid = <0>;
};
};
port@1 {
reg = <1>;
kpss_in1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm1_out>;
+ coresight,hwid = <1>;
};
};
port@2 {
reg = <2>;
kpss_in2: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm2_out>;
+ coresight,hwid = <2>;
};
};
port@3 {
reg = <3>;
kpss_in3: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm3_out>;
+ coresight,hwid = <3>;
};
};
port@8 {
- reg = <0>;
+ reg = <8>;
kpss_out: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel1_in5>;
+ coresight,hwid = <0>;
};
};
};
@@ -982,7 +1004,9 @@
port {
etm0_out: endpoint {
+ direction = <1>;
remote-endpoint = <&kpss_in0>;
+ coresight,hwid = <0>;
};
};
};
@@ -998,7 +1022,9 @@
port {
etm1_out: endpoint {
+ direction = <1>;
remote-endpoint = <&kpss_in1>;
+ coresight,hwid = <0>;
};
};
};
@@ -1014,7 +1040,9 @@
port {
etm2_out: endpoint {
+ direction = <1>;
remote-endpoint = <&kpss_in2>;
+ coresight,hwid = <0>;
};
};
};
@@ -1030,7 +1058,9 @@
port {
etm3_out: endpoint {
+ direction = <1>;
remote-endpoint = <&kpss_in3>;
+ coresight,hwid = <0>;
};
};
};
--
2.7.4
Switch to the new coresight bindings for hardware ports
Cc: Nicolas Ferre <[email protected]>
Cc: Alexandre Belloni <[email protected]>
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
arch/arm/boot/dts/sama5d2.dtsi | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index 61f68e5..92ce7b8 100644
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -86,8 +86,9 @@
port {
etb_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm_out>;
+ coresight,hwid = <0>;
};
};
};
@@ -101,7 +102,9 @@
port {
etm_out: endpoint {
+ direction = <1>;
remote-endpoint = <&etb_in>;
+ coresight,hwid = <0>;
};
};
};
--
2.7.4
Switch to updated coresight bindings for hw ports
Cc: Andy Gross <[email protected]>
Cc: David Brown <[email protected]>
Cc: Ivan T. Ivanov <[email protected]>
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
arch/arm64/boot/dts/qcom/msm8916.dtsi | 55 ++++++++++++++++++++++++++---------
1 file changed, 41 insertions(+), 14 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 66b318e..40da823 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1101,8 +1101,9 @@
port {
tpiu_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out1>;
+ coresight,hwid = <0>;
};
};
};
@@ -1132,14 +1133,17 @@
port@4 {
reg = <4>;
funnel0_in4: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&funnel1_out>;
+ coresight,hwid = <4>;
};
};
port@8 {
- reg = <0>;
+ reg = <8>;
funnel0_out: endpoint {
+ direction = <1>;
remote-endpoint = <&etf_in>;
+ coresight,hwid = <0>;
};
};
};
@@ -1159,20 +1163,25 @@
port@0 {
reg = <0>;
replicator_out0: endpoint {
+ direction = <1>;
remote-endpoint = <&etr_in>;
+ coresight,hwid = <0>;
};
};
port@1 {
reg = <1>;
replicator_out1: endpoint {
+ direction = <1>;
remote-endpoint = <&tpiu_in>;
+ coresight,hwid = <1>;
};
};
port@2 {
- reg = <0>;
+ reg = <2>;
replicator_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etf_out>;
+ coresight,hwid = <0>;
};
};
};
@@ -1192,14 +1201,17 @@
port@0 {
reg = <0>;
etf_out: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&funnel0_out>;
+ coresight,hwid = <0>;
};
};
port@1 {
- reg = <0>;
+ reg = <1>;
etf_in: endpoint {
+ direction = <1>;
remote-endpoint = <&replicator_in>;
+ coresight,hwid = <0>;
};
};
};
@@ -1214,8 +1226,9 @@
port {
etr_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out0>;
+ coresight,hwid = <0>;
};
};
};
@@ -1234,35 +1247,41 @@
port@0 {
reg = <0>;
funnel1_in0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm0_out>;
+ coresight,hwid = <0>;
};
};
port@1 {
reg = <1>;
funnel1_in1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm1_out>;
+ coresight,hwid = <1>;
};
};
port@2 {
reg = <2>;
funnel1_in2: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm2_out>;
+ coresight,hwid = <2>;
};
};
port@3 {
reg = <3>;
funnel1_in3: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm3_out>;
+ coresight,hwid = <3>;
};
};
port@4 {
- reg = <0>;
+ reg = <4>;
funnel1_out: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel0_in4>;
+ coresight,hwid = <0>;
};
};
};
@@ -1311,7 +1330,9 @@
port {
etm0_out: endpoint {
- remote-endpoint = <&funnel1_in0>;
+ direction = <1>;
+ remote-endpoint = <&funnel1_in0>;
+ coresight,hwid = <0>;
};
};
};
@@ -1327,7 +1348,9 @@
port {
etm1_out: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel1_in1>;
+ coresight,hwid = <0>;
};
};
};
@@ -1343,7 +1366,9 @@
port {
etm2_out: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel1_in2>;
+ coresight,hwid = <0>;
};
};
};
@@ -1359,7 +1384,9 @@
port {
etm3_out: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel1_in3>;
+ coresight,hwid = <0>;
};
};
};
--
2.7.4
Switch to the new coresight bindings for hw ports
Cc: [email protected]
Cc: [email protected]
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
arch/arm64/boot/dts/sprd/sc9836.dtsi | 40 ++++++++++----
arch/arm64/boot/dts/sprd/sc9860.dtsi | 101 +++++++++++++++++++++++++----------
2 files changed, 102 insertions(+), 39 deletions(-)
diff --git a/arch/arm64/boot/dts/sprd/sc9836.dtsi b/arch/arm64/boot/dts/sprd/sc9836.dtsi
index 63894c4..27ccc29 100644
--- a/arch/arm64/boot/dts/sprd/sc9836.dtsi
+++ b/arch/arm64/boot/dts/sprd/sc9836.dtsi
@@ -52,8 +52,9 @@
clock-names = "apb_pclk";
port {
etf_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&funnel_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -71,48 +72,55 @@
port@0 {
reg = <0>;
funnel_out_port0: endpoint {
+ direction = <1>;
remote-endpoint = <&etf_in>;
+ coresight,hwid = <0>;
};
};
/* funnel input port 0-4 */
port@1 {
- reg = <0>;
+ reg = <1>;
funnel_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm0_out>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
funnel_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm1_out>;
+ coresight,hwid = <1>;
};
};
port@3 {
- reg = <2>;
+ reg = <3>;
funnel_in_port2: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm2_out>;
+ coresight,hwid = <2>;
};
};
port@4 {
- reg = <3>;
+ reg = <4>;
funnel_in_port3: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm3_out>;
+ coresight,hwid = <3>;
};
};
port@5 {
- reg = <4>;
+ reg = <5>;
funnel_in_port4: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&stm_out>;
+ coresight,hwid = <4>;
};
};
/* Other input ports aren't connected to anyone */
@@ -128,7 +136,9 @@
clock-names = "apb_pclk";
port {
etm0_out: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -142,7 +152,9 @@
clock-names = "apb_pclk";
port {
etm1_out: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -156,7 +168,9 @@
clock-names = "apb_pclk";
port {
etm2_out: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in_port2>;
+ coresight,hwid = <0>;
};
};
};
@@ -170,7 +184,9 @@
clock-names = "apb_pclk";
port {
etm3_out: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in_port3>;
+ coresight,hwid = <0>;
};
};
};
@@ -184,7 +200,9 @@
clock-names = "apb_pclk";
port {
stm_out: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in_port4>;
+ coresight,hwid = <0>;
};
};
};
diff --git a/arch/arm64/boot/dts/sprd/sc9860.dtsi b/arch/arm64/boot/dts/sprd/sc9860.dtsi
index 5dbfb79..1615014 100644
--- a/arch/arm64/boot/dts/sprd/sc9860.dtsi
+++ b/arch/arm64/boot/dts/sprd/sc9860.dtsi
@@ -309,25 +309,29 @@
port@0 {
reg = <0>;
soc_funnel_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&etb_in>;
+ coresight,hwid = <0>;
};
};
port@1 {
- reg = <0>;
+ reg = <1>;
soc_funnel_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&main_funnel_out_port>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <4>;
+ reg = <2>;
soc_funnel_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpioint =
<&stm_out_port>;
+ coresight,hwid = <4>;
};
};
};
@@ -340,9 +344,10 @@
clock-names = "apb_pclk";
port {
etb_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&soc_funnel_out_port>;
+ coresight,hwid = <0>;
};
};
};
@@ -356,8 +361,10 @@
clock-names = "apb_pclk";
port {
stm_out_port: endpoint {
+ direction = <1>;
remote-endpoint =
<&soc_funnel_in_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -374,40 +381,46 @@
port@0 {
reg = <0>;
cluster0_funnel_out_port: endpoint {
+ direction = <1>;
remote-endpoint =
<&cluster0_etf_in>;
+ coresight,hwid = <0>;
};
};
port@1 {
- reg = <0>;
+ reg = <1>;
cluster0_funnel_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm0_out>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
cluster0_funnel_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm1_out>;
+ coresight,hwid = <1>;
};
};
port@3 {
- reg = <2>;
+ reg = <3>;
cluster0_funnel_in_port2: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm2_out>;
+ coresight,hwid = <2>;
};
};
port@4 {
reg = <4>;
cluster0_funnel_in_port3: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm3_out>;
+ coresight,hwid = <4>;
};
};
};
@@ -425,40 +438,46 @@
port@0 {
reg = <0>;
cluster1_funnel_out_port: endpoint {
+ direction = <1>;
remote-endpoint =
<&cluster1_etf_in>;
+ coresight,hwid = <0>;
};
};
port@1 {
- reg = <0>;
+ reg = <1>;
cluster1_funnel_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm4_out>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
cluster1_funnel_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm5_out>;
+ coresight,hwid = <1>;
};
};
port@3 {
- reg = <2>;
+ reg = <3>;
cluster1_funnel_in_port2: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm6_out>;
+ coresight,hwid = <2>;
};
};
port@4 {
- reg = <3>;
+ reg = <4>;
cluster1_funnel_in_port3: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm7_out>;
+ coresight,hwid = <3>;
};
};
};
@@ -477,17 +496,20 @@
port@0 {
reg = <0>;
cluster0_etf_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&main_funnel_in_port0>;
+ coresight,hwid = <0>;
};
};
port@1 {
- reg = <0>;
+ reg = <1>;
cluster0_etf_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&cluster0_funnel_out_port>;
+ coresight,hwid = <0>;
};
};
};
@@ -506,17 +528,20 @@
port@0 {
reg = <0>;
cluster1_etf_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&main_funnel_in_port1>;
+ coresight,hwid = <0>;
};
};
port@1 {
- reg = <0>;
+ reg = <1>;
cluster1_etf_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&cluster1_funnel_out_port>;
+ coresight,hwid = <0>;
};
};
};
@@ -535,26 +560,30 @@
port@0 {
reg = <0>;
main_funnel_out_port: endpoint {
+ direction = <1>;
remote-endpoint =
<&soc_funnel_in_port0>;
+ coresight,hwid = <0>;
};
};
port@1 {
- reg = <0>;
+ reg = <1>;
main_funnel_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&cluster0_etf_out>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
main_funnel_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&cluster1_etf_out>;
+ coresight,hwid = <1>;
};
};
};
@@ -569,8 +598,10 @@
port {
etm0_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&cluster0_funnel_in_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -584,8 +615,10 @@
port {
etm1_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&cluster0_funnel_in_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -599,8 +632,10 @@
port {
etm2_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&cluster0_funnel_in_port2>;
+ coresight,hwid = <0>;
};
};
};
@@ -614,8 +649,10 @@
port {
etm3_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&cluster0_funnel_in_port3>;
+ coresight,hwid = <0>;
};
};
};
@@ -629,8 +666,10 @@
port {
etm4_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&cluster1_funnel_in_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -644,8 +683,10 @@
port {
etm5_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&cluster1_funnel_in_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -659,8 +700,10 @@
port {
etm6_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&cluster1_funnel_in_port2>;
+ coresight,hwid = <0>;
};
};
};
@@ -674,8 +717,10 @@
port {
etm7_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&cluster1_funnel_in_port3>;
+ coresight,hwid = <0>;
};
};
};
--
2.7.4
Switch to the updated coresight bindings.
Cc: Shawn Guo <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
arch/arm/boot/dts/imx7d.dtsi | 5 ++++-
arch/arm/boot/dts/imx7s.dtsi | 41 ++++++++++++++++++++++++++++++-----------
2 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index 200714e..5faff17 100644
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi
@@ -87,7 +87,9 @@
port {
etm1_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&ca_funnel_in_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -174,8 +176,9 @@
port@1 {
reg = <1>;
ca_funnel_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm1_out_port>;
+ coresight,hwid = <1>;
};
};
};
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 4d42335..8e90915 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -151,23 +151,28 @@
port@0 {
reg = <0>;
replicator_out_port0: endpoint {
+ direction = <1>;
remote-endpoint = <&tpiu_in_port>;
+ coresight,hwid = <0>;
};
};
port@1 {
reg = <1>;
replicator_out_port1: endpoint {
+ direction = <1>;
remote-endpoint = <&etr_in_port>;
+ coresight,hwid = <1>;
};
};
/* replicator input port */
port@2 {
- reg = <0>;
+ reg = <2>;
replicator_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etf_out_port>;
+ coresight,hwid = <0>;
};
};
};
@@ -203,16 +208,19 @@
port@0 {
reg = <0>;
ca_funnel_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm0_out_port>;
+ coresight,hwid = <0>;
};
};
/* funnel output port */
port@2 {
- reg = <0>;
+ reg = <2>;
ca_funnel_out_port0: endpoint {
+ direction = <1>;
remote-endpoint = <&hugo_funnel_in_port0>;
+ coresight,hwid = <0>;
};
};
@@ -229,7 +237,9 @@
port {
etm0_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&ca_funnel_in_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -248,22 +258,26 @@
port@0 {
reg = <0>;
hugo_funnel_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ca_funnel_out_port0>;
+ coresight,hwid = <0>;
};
};
port@1 {
reg = <1>;
hugo_funnel_in_port1: endpoint {
- slave-mode; /* M4 input */
+ direction = <0>; /* M4 input */
+ coresight,hwid = <1>;
};
};
port@2 {
- reg = <0>;
+ reg = <2>;
hugo_funnel_out_port0: endpoint {
+ direction = <1>;
remote-endpoint = <&etf_in_port>;
+ coresight,hwid = <0>;
};
};
@@ -284,15 +298,18 @@
port@0 {
reg = <0>;
etf_in_port: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&hugo_funnel_out_port0>;
+ coresight,hwid = <0>;
};
};
port@1 {
- reg = <0>;
+ reg = <1>;
etf_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&replicator_in_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -306,8 +323,9 @@
port {
etr_in_port: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -320,8 +338,9 @@
port {
tpiu_in_port: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out_port1>;
+ coresight,hwid = <0>;
};
};
};
--
2.7.4
Switch to updated coresight bindings for hw ports.
Cc: Sudeep Holla <[email protected]>
Cc: Liviu Dudau <[email protected]>
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
Changes since V1:
- Add support Juno for r1 & r2.
---
arch/arm64/boot/dts/arm/juno-base.dtsi | 82 ++++++++++++++++++++++---------
arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 26 +++++++---
arch/arm64/boot/dts/arm/juno.dts | 5 +-
3 files changed, 81 insertions(+), 32 deletions(-)
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index eb749c5..33b41ba 100644
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -122,15 +122,18 @@
port@0 {
reg = <0>;
etf0_in_port: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&main_funnel_out_port>;
+ coresight,hwid = <0>;
};
};
/* output port */
port@1 {
- reg = <0>;
+ reg = <1>;
etf0_out_port: endpoint {
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
};
@@ -145,8 +148,9 @@
power-domains = <&scpi_devpd 0>;
port {
tpiu_in_port: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out_port0>;
+ coresight,hwid = <0>;
};
};
};
@@ -168,23 +172,27 @@
reg = <0>;
main_funnel_out_port: endpoint {
remote-endpoint = <&etf0_in_port>;
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
/* input ports */
port@1 {
- reg = <0>;
+ reg = <1>;
main_funnel_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&cluster0_funnel_out_port>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
main_funnel_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&cluster1_funnel_out_port>;
+ coresight,hwid = <1>;
};
};
};
@@ -200,8 +208,9 @@
power-domains = <&scpi_devpd 0>;
port {
etr_in_port: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out_port1>;
+ coresight,hwid = <0>;
};
};
};
@@ -217,6 +226,8 @@
power-domains = <&scpi_devpd 0>;
port {
stm_out_port: endpoint {
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
};
@@ -240,6 +251,8 @@
port {
cluster0_etm0_out_port: endpoint {
remote-endpoint = <&cluster0_funnel_in_port0>;
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
};
@@ -259,22 +272,26 @@
reg = <0>;
cluster0_funnel_out_port: endpoint {
remote-endpoint = <&main_funnel_in_port0>;
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
port@1 {
- reg = <0>;
+ reg = <1>;
cluster0_funnel_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&cluster0_etm0_out_port>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
cluster0_funnel_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&cluster0_etm1_out_port>;
+ coresight,hwid = <1>;
};
};
};
@@ -299,6 +316,8 @@
port {
cluster0_etm1_out_port: endpoint {
remote-endpoint = <&cluster0_funnel_in_port1>;
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
};
@@ -322,6 +341,8 @@
port {
cluster1_etm0_out_port: endpoint {
remote-endpoint = <&cluster1_funnel_in_port0>;
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
};
@@ -341,36 +362,42 @@
reg = <0>;
cluster1_funnel_out_port: endpoint {
remote-endpoint = <&main_funnel_in_port1>;
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
port@1 {
- reg = <0>;
+ reg = <1>;
cluster1_funnel_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&cluster1_etm0_out_port>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
cluster1_funnel_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&cluster1_etm1_out_port>;
+ coresight,hwid = <1>;
};
};
port@3 {
- reg = <2>;
+ reg = <3>;
cluster1_funnel_in_port2: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&cluster1_etm2_out_port>;
+ coresight,hwid = <2>;
};
};
port@4 {
- reg = <3>;
+ reg = <4>;
cluster1_funnel_in_port3: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&cluster1_etm3_out_port>;
+ coresight,hwid = <3>;
};
};
};
@@ -395,6 +422,8 @@
port {
cluster1_etm1_out_port: endpoint {
remote-endpoint = <&cluster1_funnel_in_port1>;
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
};
@@ -418,6 +447,8 @@
port {
cluster1_etm2_out_port: endpoint {
remote-endpoint = <&cluster1_funnel_in_port2>;
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
};
@@ -441,6 +472,8 @@
port {
cluster1_etm3_out_port: endpoint {
remote-endpoint = <&cluster1_funnel_in_port3>;
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
};
@@ -462,6 +495,8 @@
reg = <0>;
replicator_out_port0: endpoint {
remote-endpoint = <&tpiu_in_port>;
+ coresight,hwid = <0>;
+ direction = <1>;
};
};
@@ -469,14 +504,17 @@
reg = <1>;
replicator_out_port1: endpoint {
remote-endpoint = <&etr_in_port>;
+ coresight,hwid = <1>;
+ direction = <1>;
};
};
/* replicator input port */
port@2 {
- reg = <0>;
+ reg = <2>;
replicator_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
+ coresight,hwid = <0>;
};
};
};
diff --git a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
index 0c43fb3..146a5d9 100644
--- a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
@@ -15,15 +15,18 @@
port@0 {
reg = <0>;
csys1_funnel_out_port: endpoint {
+ coresight,hwid = <0>;
+ direction = <1>;
remote-endpoint = <&etf1_in_port>;
};
};
/* input port */
port@1 {
- reg = <0>;
+ reg = <1>;
csys1_funnel_in_port0: endpoint {
- slave-mode;
+ coresight,hwid = <0>;
+ direction = <0>;
};
};
@@ -45,15 +48,18 @@
port@0 {
reg = <0>;
etf1_in_port: endpoint {
- slave-mode;
+ direction = <0>;
+ coresight,hwid = <0>;
remote-endpoint = <&csys1_funnel_out_port>;
};
};
/* output port */
port@1 {
- reg = <0>;
+ reg = <1>;
etf1_out_port: endpoint {
+ coresight,hwid = <0>;
+ direction = <1>;
remote-endpoint = <&csys2_funnel_in_port1>;
};
};
@@ -75,23 +81,27 @@
port@0 {
reg = <0>;
csys2_funnel_out_port: endpoint {
+ coresight,hwid = <0>;
+ direction = <1>;
remote-endpoint = <&replicator_in_port0>;
};
};
/* input ports */
port@1 {
- reg = <0>;
+ reg = <1>;
csys2_funnel_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
+ coresight,hwid = <0>;
remote-endpoint = <&etf0_out_port>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
csys2_funnel_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
+ coresight,hwid = <1>;
remote-endpoint = <&etf1_out_port>;
};
};
diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts
index c9236c4..27b8036 100644
--- a/arch/arm64/boot/dts/arm/juno.dts
+++ b/arch/arm64/boot/dts/arm/juno.dts
@@ -260,10 +260,11 @@
&main_funnel {
ports {
port@3 {
- reg = <2>;
+ reg = <3>;
main_funnel_in_port2: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&stm_out_port>;
+ coresight,hwid = <2>;
};
};
};
--
2.7.4
Switch to updated coresight bindings for hw ports.
Cc: [email protected]
Cc: [email protected]
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
.../arm64/boot/dts/hisilicon/hi6220-coresight.dtsi | 89 ++++++++++++++++------
1 file changed, 64 insertions(+), 25 deletions(-)
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-coresight.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220-coresight.dtsi
index 7afee5d..a394a65 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-coresight.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-coresight.dtsi
@@ -27,17 +27,20 @@
port@0 {
reg = <0>;
soc_funnel_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&etf_in>;
+ coresight,hwid = <0>;
};
};
port@1 {
- reg = <0>;
+ reg = <1>;
soc_funnel_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&acpu_funnel_out>;
+ coresight,hwid = <0>;
};
};
};
@@ -56,17 +59,20 @@
port@0 {
reg = <0>;
etf_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&soc_funnel_out>;
+ coresight,hwid = <0>;
};
};
port@1 {
- reg = <0>;
+ reg = <1>;
etf_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&replicator_in>;
+ coresight,hwid = <0>;
};
};
};
@@ -84,25 +90,30 @@
port@0 {
reg = <0>;
replicator_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&etf_out>;
+ coresight,hwid = <0>;
};
};
port@1 {
- reg = <0>;
+ reg = <1>;
replicator_out0: endpoint {
+ direction = <1>;
remote-endpoint =
<&etr_in>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
replicator_out1: endpoint {
+ direction = <1>;
remote-endpoint =
<&tpiu_in>;
+ coresight,hwid = <1>;
};
};
};
@@ -121,9 +132,10 @@
port@0 {
reg = <0>;
etr_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&replicator_out0>;
+ coresight,hwid = <0>;
};
};
};
@@ -142,9 +154,10 @@
port@0 {
reg = <0>;
tpiu_in: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&replicator_out1>;
+ coresight,hwid = <0>;
};
};
};
@@ -163,80 +176,90 @@
port@0 {
reg = <0>;
acpu_funnel_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&soc_funnel_in>;
+ coresight,hwid = <0>;
};
};
port@1 {
- reg = <0>;
+ reg = <1>;
acpu_funnel_in0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&etm0_out>;
+ coresight,hwid = <0>;
};
};
port@2 {
- reg = <1>;
+ reg = <2>;
acpu_funnel_in1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&etm1_out>;
+ coresight,hwid = <1>;
};
};
port@3 {
- reg = <2>;
+ reg = <3>;
acpu_funnel_in2: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&etm2_out>;
+ coresight,hwid = <2>;
};
};
port@4 {
- reg = <3>;
+ reg = <4>;
acpu_funnel_in3: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&etm3_out>;
+ coresight,hwid = <3>;
};
};
port@5 {
- reg = <4>;
+ reg = <5>;
acpu_funnel_in4: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&etm4_out>;
+ coresight,hwid = <4>;
};
};
port@6 {
- reg = <5>;
+ reg = <6>;
acpu_funnel_in5: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&etm5_out>;
+ coresight,hwid = <5>;
};
};
port@7 {
- reg = <6>;
+ reg = <7>;
acpu_funnel_in6: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&etm6_out>;
+ coresight,hwid = <6>;
};
};
port@8 {
- reg = <7>;
+ reg = <8>;
acpu_funnel_in7: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint =
<&etm7_out>;
+ coresight,hwid = <7>;
};
};
};
@@ -253,8 +276,10 @@
port {
etm0_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&acpu_funnel_in0>;
+ coresight,hwid = <0>;
};
};
};
@@ -270,8 +295,10 @@
port {
etm1_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&acpu_funnel_in1>;
+ coresight,hwid = <0>;
};
};
};
@@ -287,8 +314,10 @@
port {
etm2_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&acpu_funnel_in2>;
+ coresight,hwid = <0>;
};
};
};
@@ -304,8 +333,10 @@
port {
etm3_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&acpu_funnel_in3>;
+ coresight,hwid = <0>;
};
};
};
@@ -321,8 +352,10 @@
port {
etm4_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&acpu_funnel_in4>;
+ coresight,hwid = <0>;
};
};
};
@@ -338,8 +371,10 @@
port {
etm5_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&acpu_funnel_in5>;
+ coresight,hwid = <0>;
};
};
};
@@ -355,8 +390,10 @@
port {
etm6_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&acpu_funnel_in6>;
+ coresight,hwid = <0>;
};
};
};
@@ -372,8 +409,10 @@
port {
etm7_out: endpoint {
+ direction = <1>;
remote-endpoint =
<&acpu_funnel_in7>;
+ coresight,hwid = <0>;
};
};
};
--
2.7.4
So far we have relied on an undocumented property "slave-mode",
to indicate if the given port is input or not. Since we are
redefining the coresight bindings, define new property for the
"direction" of data flow for a given connection endpoint in the
device.
Each endpoint must define the following property.
- "direction" : 0 => Port is input
1 => Port is output
Cc: Sudeep Holla <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
.../devicetree/bindings/arm/coresight.txt | 24 ++++++++++++++--------
drivers/hwtracing/coresight/of_coresight.c | 22 ++++++++++++++++----
2 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt
index bf75ab3..ff382bc 100644
--- a/Documentation/devicetree/bindings/arm/coresight.txt
+++ b/Documentation/devicetree/bindings/arm/coresight.txt
@@ -103,9 +103,11 @@ with a specific direction of data flow, each connection must define the
following properties to uniquely identify the connection details.
* Direction of the data flow w.r.t the component :
- Each input port must have the following property defined at the "endpoint"
+ Each hardware port must have the following property defined at the "endpoint"
for the port.
- "slave-mode"
+ "direction" - 32bit integer, whose values are defined as follows :
+ 0 => the endpoint is an Input port
+ 1 => the endpoint is an Output port.
* Hardware Port number at the component:
- Each "endpoint" must define the hardware port of the local end of the
@@ -129,7 +131,7 @@ Example:
clock-names = "apb_pclk";
port {
etb_in_port: endpoint@0 {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out_port0>;
coresight,hwid = <0>;
};
@@ -144,7 +146,7 @@ Example:
clock-names = "apb_pclk";
port {
tpiu_in_port: endpoint@0 {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&replicator_out_port1>;
coresight,hwid = <0>;
};
@@ -166,6 +168,7 @@ Example:
port@0 {
reg = <0>;
replicator_out_port0: endpoint {
+ direction = <1>;
remote-endpoint = <&etb_in_port>;
coresight,hwid = <0>;
};
@@ -174,6 +177,7 @@ Example:
port@1 {
reg = <1>;
replicator_out_port1: endpoint {
+ direction = <1>;
remote-endpoint = <&tpiu_in_port>;
coresight,hwid = <1>;
};
@@ -183,7 +187,7 @@ Example:
port@2 {
reg = <1>;
replicator_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&funnel_out_port0>;
coresight,hwid = <0>;
};
@@ -205,6 +209,7 @@ Example:
port@0 {
reg = <0>;
funnel_out_port0: endpoint {
+ direction = <1>;
remote-endpoint =
<&replicator_in_port0>;
coresight,hwid = <0>;
@@ -215,7 +220,7 @@ Example:
port@1 {
reg = <1>;
funnel_in_port0: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm0_out_port>;
coresight,hwid = <0>;
};
@@ -224,7 +229,7 @@ Example:
port@2 {
reg = <2>;
funnel_in_port1: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&ptm1_out_port>;
coresight,hwid = <1>;
};
@@ -233,7 +238,7 @@ Example:
port@3 {
reg = <3>;
funnel_in_port2: endpoint {
- slave-mode;
+ direction = <0>;
remote-endpoint = <&etm0_out_port>;
coresight,hwid = <2>;
};
@@ -252,6 +257,7 @@ Example:
clock-names = "apb_pclk";
port {
ptm0_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in_port0>;
coresight,hwid = <0>;
};
@@ -267,6 +273,7 @@ Example:
clock-names = "apb_pclk";
port {
ptm1_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&funnel_in_port1>;
coresight,hwid = <0>;
};
@@ -284,6 +291,7 @@ Example:
clock-names = "apb_pclk";
port {
stm_out_port: endpoint {
+ direction = <1>;
remote-endpoint = <&main_funnel_in_port2>;
coresight,hwid = <0>;
};
diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
index d23d7dd..0d6e6a9 100644
--- a/drivers/hwtracing/coresight/of_coresight.c
+++ b/drivers/hwtracing/coresight/of_coresight.c
@@ -45,7 +45,20 @@ of_coresight_get_endpoint_device(struct device_node *endpoint)
endpoint, of_dev_node_match);
}
-static void of_coresight_get_ports(const struct device_node *node,
+static bool of_coresight_endpoint_is_input(struct device *dev,
+ struct device_node *ep_node)
+{
+ u32 dir;
+
+ if (!of_property_read_u32(ep_node, "direction", &dir))
+ return dir == 0;
+
+ dev_warn_once(dev, "Missing mandatory \"direction\" property!\n");
+ return of_property_read_bool(ep_node, "slave-mode");
+}
+
+static void of_coresight_get_ports(struct device *dev,
+ const struct device_node *node,
int *nr_inport, int *nr_outport)
{
struct device_node *ep = NULL;
@@ -56,7 +69,7 @@ static void of_coresight_get_ports(const struct device_node *node,
if (!ep)
break;
- if (of_property_read_bool(ep, "slave-mode"))
+ if (of_coresight_endpoint_is_input(dev, ep))
in++;
else
out++;
@@ -149,7 +162,7 @@ static int of_coresight_parse_endpoint(struct device *dev,
* No need to deal with input ports, processing for as
* processing for output ports will deal with them.
*/
- if (of_find_property(ep, "slave-mode", NULL))
+ if (of_coresight_endpoint_is_input(dev, ep))
break;
/* Parse the local port details */
@@ -212,7 +225,8 @@ of_get_coresight_platform_data(struct device *dev,
pdata->cpu = of_coresight_get_cpu(node);
/* Get the number of input and output port for this component */
- of_coresight_get_ports(node, &pdata->nr_inport, &pdata->nr_outport);
+ of_coresight_get_ports(dev, node,
+ &pdata->nr_inport, &pdata->nr_outport);
/* If there are not output connections, we are done */
if (!pdata->nr_outport)
--
2.7.4
If we fail to find the input / output port for a LINK component
while enabling a path, we should fail gracefully rather than
assuming port "0".
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
drivers/hwtracing/coresight/coresight.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
index 69e9136..3c1c058 100644
--- a/drivers/hwtracing/coresight/coresight.c
+++ b/drivers/hwtracing/coresight/coresight.c
@@ -107,7 +107,7 @@ static int coresight_find_link_inport(struct coresight_device *csdev,
dev_err(&csdev->dev, "couldn't find inport, parent: %s, child: %s\n",
dev_name(&parent->dev), dev_name(&csdev->dev));
- return 0;
+ return -ENODEV;
}
static int coresight_find_link_outport(struct coresight_device *csdev,
@@ -125,7 +125,7 @@ static int coresight_find_link_outport(struct coresight_device *csdev,
dev_err(&csdev->dev, "couldn't find outport, parent: %s, child: %s\n",
dev_name(&csdev->dev), dev_name(&child->dev));
- return 0;
+ return -ENODEV;
}
static int coresight_enable_sink(struct coresight_device *csdev, u32 mode)
@@ -178,6 +178,9 @@ static int coresight_enable_link(struct coresight_device *csdev,
else
refport = 0;
+ if (refport < 0)
+ return refport;
+
if (atomic_inc_return(&csdev->refcnt[refport]) == 1) {
if (link_ops(csdev)->enable) {
ret = link_ops(csdev)->enable(csdev, inport, outport);
--
2.7.4
The platform code parses the component connections and populates
a platform-description of the output connections in arrays of fields
(which is never freed). This is later copied in the coresight_register
to a newly allocated area, represented by coresight_connection(s).
This patch cleans up the code dealing with connections by making
use of the "coresight_connection" structure right at the platform
code and lets the generic driver simply re-use information provided
by the platform.
Thus making it reader friendly as well as avoiding the wastage of
unused memory.
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
drivers/hwtracing/coresight/coresight.c | 21 +-----------
drivers/hwtracing/coresight/of_coresight.c | 51 ++++++++++++------------------
include/linux/coresight.h | 9 ++----
3 files changed, 23 insertions(+), 58 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
index 2893cfe..69e9136 100644
--- a/drivers/hwtracing/coresight/coresight.c
+++ b/drivers/hwtracing/coresight/coresight.c
@@ -953,13 +953,11 @@ postcore_initcall(coresight_init);
struct coresight_device *coresight_register(struct coresight_desc *desc)
{
- int i;
int ret;
int link_subtype;
int nr_refcnts = 1;
atomic_t *refcnts = NULL;
struct coresight_device *csdev;
- struct coresight_connection *conns = NULL;
csdev = kzalloc(sizeof(*csdev), GFP_KERNEL);
if (!csdev) {
@@ -988,22 +986,7 @@ struct coresight_device *coresight_register(struct coresight_desc *desc)
csdev->nr_inport = desc->pdata->nr_inport;
csdev->nr_outport = desc->pdata->nr_outport;
- /* Initialise connections if there is at least one outport */
- if (csdev->nr_outport) {
- conns = kcalloc(csdev->nr_outport, sizeof(*conns), GFP_KERNEL);
- if (!conns) {
- ret = -ENOMEM;
- goto err_kzalloc_conns;
- }
-
- for (i = 0; i < csdev->nr_outport; i++) {
- conns[i].outport = desc->pdata->outports[i];
- conns[i].child_name = desc->pdata->child_names[i];
- conns[i].child_port = desc->pdata->child_ports[i];
- }
- }
-
- csdev->conns = conns;
+ csdev->conns = desc->pdata->conns;
csdev->type = desc->type;
csdev->subtype = desc->subtype;
@@ -1032,8 +1015,6 @@ struct coresight_device *coresight_register(struct coresight_desc *desc)
return csdev;
-err_kzalloc_conns:
- kfree(refcnts);
err_kzalloc_refcnts:
kfree(csdev);
err_kzalloc_csdev:
diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
index ada4f07..d01a9ce 100644
--- a/drivers/hwtracing/coresight/of_coresight.c
+++ b/drivers/hwtracing/coresight/of_coresight.c
@@ -70,26 +70,13 @@ static void of_coresight_get_ports(const struct device_node *node,
static int of_coresight_alloc_memory(struct device *dev,
struct coresight_platform_data *pdata)
{
- /* List of output port on this component */
- pdata->outports = devm_kzalloc(dev, pdata->nr_outport *
- sizeof(*pdata->outports),
- GFP_KERNEL);
- if (!pdata->outports)
- return -ENOMEM;
-
- /* Children connected to this component via @outports */
- pdata->child_names = devm_kzalloc(dev, pdata->nr_outport *
- sizeof(*pdata->child_names),
- GFP_KERNEL);
- if (!pdata->child_names)
- return -ENOMEM;
-
- /* Port number on the child this component is connected to */
- pdata->child_ports = devm_kzalloc(dev, pdata->nr_outport *
- sizeof(*pdata->child_ports),
- GFP_KERNEL);
- if (!pdata->child_ports)
- return -ENOMEM;
+ if (pdata->nr_outport) {
+ pdata->conns = devm_kzalloc(dev, pdata->nr_outport *
+ sizeof(*pdata->conns),
+ GFP_KERNEL);
+ if (!pdata->conns)
+ return -ENOMEM;
+ }
return 0;
}
@@ -113,24 +100,24 @@ EXPORT_SYMBOL_GPL(of_coresight_get_cpu);
/*
* of_coresight_parse_endpoint : Parse the given output endpoint @ep
- * and fill the connection information in @pdata[*@i].
+ * and fill the connection information in *@pconn.
*
* Parses the local port, remote device name and the remote port. Also
- * updates *@i to point to the next index, when an entry is added.
+ * updates *@pconn to point to the next record, when an entry is added.
*
* Returns :
* 0 - If the parsing completed without any fatal errors.
* -Errno - Fatal error, abort the scanning.
*/
static int of_coresight_parse_endpoint(struct device_node *ep,
- struct coresight_platform_data *pdata,
- int *i)
+ struct coresight_connection **pconn)
{
int ret = 0;
struct of_endpoint endpoint, rendpoint;
struct device_node *rparent = NULL;
struct device_node *rep = NULL;
struct device *rdev = NULL;
+ struct coresight_connection *conn = *pconn;
do {
/*
@@ -163,11 +150,11 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
break;
}
- pdata->outports[*i] = endpoint.port;
- pdata->child_names[*i] = dev_name(rdev);
- pdata->child_ports[*i] = rendpoint.port;
- /* Move the index */
- (*i)++;
+ conn->outport = endpoint.port;
+ conn->child_name = dev_name(rdev);
+ conn->child_port = rendpoint.port;
+ /* Move the connection record */
+ (*pconn)++;
} while (0);
if (rparent)
@@ -182,8 +169,9 @@ struct coresight_platform_data *
of_get_coresight_platform_data(struct device *dev,
const struct device_node *node)
{
- int i = 0, ret = 0;
+ int ret = 0;
struct coresight_platform_data *pdata;
+ struct coresight_connection *conn;
struct device_node *ep = NULL;
pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
@@ -205,13 +193,14 @@ of_get_coresight_platform_data(struct device *dev,
if (ret)
return ERR_PTR(ret);
+ conn = pdata->conns;
/* Iterate through each port to discover topology */
do {
/* Get a handle on a port */
ep = of_graph_get_next_endpoint(node, ep);
if (!ep)
break;
- ret = of_coresight_parse_endpoint(ep, pdata, &i);
+ ret = of_coresight_parse_endpoint(ep, &conn);
if (ret)
return ERR_PTR(ret);
} while (ep);
diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index 69a5c9f..2a75a15 100644
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -82,20 +82,15 @@ struct coresight_dev_subtype {
* @cpu: the CPU a source belongs to. Only applicable for ETM/PTMs.
* @name: name of the component as shown under sysfs.
* @nr_inport: number of input ports for this component.
- * @outports: list of remote endpoint port number.
- * @child_names:name of all child components connected to this device.
- * @child_ports:child component port number the current component is
- connected to.
* @nr_outport: number of output ports for this component.
+ * @conns: Array of nr_outport connections from this component
*/
struct coresight_platform_data {
int cpu;
const char *name;
int nr_inport;
- int *outports;
- const char **child_names;
- int *child_ports;
int nr_outport;
+ struct coresight_connection *conns;
};
/**
--
2.7.4
Before we update the bindings, document the current graph bindings
and usage of additional properties.
Cc: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
.../devicetree/bindings/arm/coresight.txt | 31 +++++++++++++++++++---
1 file changed, 27 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt
index 9aa30a1..ed6b555 100644
--- a/Documentation/devicetree/bindings/arm/coresight.txt
+++ b/Documentation/devicetree/bindings/arm/coresight.txt
@@ -52,9 +52,7 @@ its hardware characteristcs.
clocks the core of that coresight component. The latter clock
is optional.
- * port or ports: The representation of the component's port
- layout using the generic DT graph presentation found in
- "bindings/graph.txt".
+ * port or ports: see "Graph bindings for Coresight" below.
* Additional required properties for System Trace Macrocells (STM):
* reg: along with the physical base address and length of the register
@@ -71,7 +69,7 @@ its hardware characteristcs.
AMBA markee):
- "arm,coresight-replicator"
- * port or ports: same as above.
+ * port or ports: see "Graph bindings for Coresight" below.
* Optional properties for ETM/PTMs:
@@ -90,6 +88,31 @@ its hardware characteristcs.
* arm,scatter-gather: boolean. Indicates that the TMC-ETR can safely
use the SG mode on this system.
+Graph bindings for Coresight
+-------------------------------
+
+Coresight components are interconnected to create a data path for the flow of
+trace data generated from the "sources" to their collection points "sink".
+Each coresight component must describe the "input" and "output" connections.
+The connections must be described via generic DT graph bindings as described
+by the "bindings/graph.txt", where each "port" along with an "endpoint"
+component represents a hardware port and the connection.
+
+Since it is possible to have multiple connections for any coresight component
+with a specific direction of data flow, each connection must define the
+following properties to uniquely identify the connection details.
+
+ * Direction of the data flow w.r.t the component :
+ Each input port must have the following property defined at the "endpoint"
+ for the port.
+ "slave-mode"
+
+ * Hardware Port number at the component:
+ - The hardware port number is assumed to be the address of the "port"
+ component.
+
+
+
Example:
1. Sinks
--
2.7.4
commit 6403587a930c ("coresight: use put_device() instead of kfree()")
introduced a memory leak where, if we fail to register the device
for coresight_device, we don't free the "coresight_device" object,
which was allocated via kzalloc(). Fix this by jumping to the
appropriate error path.
Fixes: commit 6403587a930c ("coresight: use put_device() instead of kfree()")
Cc: Mathieu Poirier <[email protected]>
Cc: Arvind Yadav <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
drivers/hwtracing/coresight/coresight.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
index 4969b32..2893cfe 100644
--- a/drivers/hwtracing/coresight/coresight.c
+++ b/drivers/hwtracing/coresight/coresight.c
@@ -1020,7 +1020,7 @@ struct coresight_device *coresight_register(struct coresight_desc *desc)
ret = device_register(&csdev->dev);
if (ret) {
put_device(&csdev->dev);
- goto err_kzalloc_csdev;
+ goto err_kzalloc_refcnts;
}
mutex_lock(&coresight_mutex);
--
2.7.4
The coresight driver doesn't drop the references on the
remote endpoint/port nodes. Add the missing of_node_put()
calls. To make it easier to handle different corner cases
cleanly, move the parsing of an endpoint to separate
function.
Reported-by: Mathieu Poirier <[email protected]>
Signed-off-by: Suzuki K Poulose <[email protected]>
---
drivers/hwtracing/coresight/of_coresight.c | 139 +++++++++++++++++------------
1 file changed, 84 insertions(+), 55 deletions(-)
diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
index a33a92e..8a23c63 100644
--- a/drivers/hwtracing/coresight/of_coresight.c
+++ b/drivers/hwtracing/coresight/of_coresight.c
@@ -111,17 +111,80 @@ int of_coresight_get_cpu(const struct device_node *node)
}
EXPORT_SYMBOL_GPL(of_coresight_get_cpu);
+/*
+ * of_coresight_parse_endpoint : Parse the given output endpoint @ep
+ * and fill the connection information in @pdata[*@i].
+ *
+ * Parses the local port, remote device name and the remote port. Also
+ * updates *@i to point to the next index, when an entry is added.
+ *
+ * Returns :
+ * 0 - If the parsing completed without any fatal errors.
+ * -Errno - Fatal error, abort the scanning.
+ */
+static int of_coresight_parse_endpoint(struct device_node *ep,
+ struct coresight_platform_data *pdata,
+ int *i)
+{
+ int ret = 0;
+ struct of_endpoint endpoint, rendpoint;
+ struct device_node *rparent = NULL;
+ struct device_node *rport = NULL;
+ struct device *rdev = NULL;
+
+ do {
+ /*
+ * No need to deal with input ports, processing for as
+ * processing for output ports will deal with them.
+ */
+ if (of_find_property(ep, "slave-mode", NULL))
+ break;
+
+ /* Parse the local port details */
+ if (of_graph_parse_endpoint(ep, &endpoint))
+ break;
+ /*
+ * Get a handle on the remote port and parent
+ * attached to it.
+ */
+ rparent = of_graph_get_remote_port_parent(ep);
+ if (!rparent)
+ break;
+ rport = of_graph_get_remote_port(ep);
+ if (!rport)
+ break;
+ if (of_graph_parse_endpoint(rport, &rendpoint))
+ break;
+
+ /* If the remote device is not available, defer probing */
+ rdev = of_coresight_get_endpoint_device(rparent);
+ if (!rdev) {
+ ret = -EPROBE_DEFER;
+ break;
+ }
+
+ pdata->outports[*i] = endpoint.port;
+ pdata->child_names[*i] = dev_name(rdev);
+ pdata->child_ports[*i] = rendpoint.id;
+ /* Move the index */
+ (*i)++;
+ } while (0);
+
+ if (rparent)
+ of_node_put(rparent);
+ if (rport)
+ of_node_put(rport);
+
+ return ret;
+}
+
struct coresight_platform_data *
of_get_coresight_platform_data(struct device *dev,
const struct device_node *node)
{
int i = 0, ret = 0;
struct coresight_platform_data *pdata;
- struct of_endpoint endpoint, rendpoint;
- struct device *rdev;
struct device_node *ep = NULL;
- struct device_node *rparent = NULL;
- struct device_node *rport = NULL;
pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata)
@@ -129,63 +192,29 @@ of_get_coresight_platform_data(struct device *dev,
/* Use device name as sysfs handle */
pdata->name = dev_name(dev);
+ pdata->cpu = of_coresight_get_cpu(node);
/* Get the number of input and output port for this component */
of_coresight_get_ports(node, &pdata->nr_inport, &pdata->nr_outport);
- if (pdata->nr_outport) {
- ret = of_coresight_alloc_memory(dev, pdata);
+ /* If there are not output connections, we are done */
+ if (!pdata->nr_outport)
+ return pdata;
+
+ ret = of_coresight_alloc_memory(dev, pdata);
+ if (ret)
+ return ERR_PTR(ret);
+
+ /* Iterate through each port to discover topology */
+ do {
+ /* Get a handle on a port */
+ ep = of_graph_get_next_endpoint(node, ep);
+ if (!ep)
+ break;
+ ret = of_coresight_parse_endpoint(ep, pdata, &i);
if (ret)
return ERR_PTR(ret);
-
- /* Iterate through each port to discover topology */
- do {
- /* Get a handle on a port */
- ep = of_graph_get_next_endpoint(node, ep);
- if (!ep)
- break;
-
- /*
- * No need to deal with input ports, processing for as
- * processing for output ports will deal with them.
- */
- if (of_find_property(ep, "slave-mode", NULL))
- continue;
-
- /* Get a handle on the local endpoint */
- ret = of_graph_parse_endpoint(ep, &endpoint);
-
- if (ret)
- continue;
-
- /* The local out port number */
- pdata->outports[i] = endpoint.port;
-
- /*
- * Get a handle on the remote port and parent
- * attached to it.
- */
- rparent = of_graph_get_remote_port_parent(ep);
- rport = of_graph_get_remote_port(ep);
-
- if (!rparent || !rport)
- continue;
-
- if (of_graph_parse_endpoint(rport, &rendpoint))
- continue;
-
- rdev = of_coresight_get_endpoint_device(rparent);
- if (!rdev)
- return ERR_PTR(-EPROBE_DEFER);
-
- pdata->child_names[i] = dev_name(rdev);
- pdata->child_ports[i] = rendpoint.id;
-
- i++;
- } while (ep);
- }
-
- pdata->cpu = of_coresight_get_cpu(node);
+ } while (ep);
return pdata;
}
--
2.7.4
On 06/06/2018 07:44 AM, Arvind Yadav wrote:
> Hi Suzuki,
>
>
> On Wednesday 06 June 2018 03:13 AM, Suzuki K Poulose wrote:
>> commit 6403587a930c ("coresight: use put_device() instead of kfree()")
>> introduced a memory leak where, if we fail to register the device
>> for coresight_device, we don't free the "coresight_device" object,
>> which was allocated via kzalloc(). Fix this by jumping to the
>> appropriate error path.
> put_device() will decrement the last reference and then
> free the memory by calling dev->release.? Internally
> put_device() -> kobject_put() -> kobject_cleanup() which is
> responsible to call 'dev -> release' and also free other kobject
> resources. If you will see the coresight_device_release. There
> we are releasing all allocated memory. Still if you call kfree() again
> then it'll be redundancy.
You're right. I think it would be good to have a comment explaining this
to prevent this fix popping up in the future :-). I will add it
Thanks
Suzuki
On Tue, Jun 05, 2018 at 10:43:15PM +0100, Suzuki K Poulose wrote:
> Nobody uses the "clk" field in struct coresight_platform_data.
> Remove it.
>
> Cc: Mathieu Poirier <[email protected]>
> Signed-off-by: Suzuki K Poulose <[email protected]>
> ---
> include/linux/coresight.h | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/include/linux/coresight.h b/include/linux/coresight.h
> index e5421b8..69a5c9f 100644
> --- a/include/linux/coresight.h
> +++ b/include/linux/coresight.h
> @@ -87,7 +87,6 @@ struct coresight_dev_subtype {
> * @child_ports:child component port number the current component is
> connected to.
> * @nr_outport: number of output ports for this component.
> - * @clk: The clock this component is associated to.
> */
> struct coresight_platform_data {
> int cpu;
> @@ -97,7 +96,6 @@ struct coresight_platform_data {
> const char **child_names;
> int *child_ports;
> int nr_outport;
> - struct clk *clk;
> };
I'm going to queue this up for the next rc. No need to send it as part of
another revision.
Thanks,
Mathieu
>
> /**
> --
> 2.7.4
>
On Tue, Jun 05, 2018 at 10:43:13PM +0100, Suzuki K Poulose wrote:
> The coresight driver doesn't drop the references on the
> remote endpoint/port nodes. Add the missing of_node_put()
> calls. To make it easier to handle different corner cases
> cleanly, move the parsing of an endpoint to separate
> function.
Please split this as those are two different things.
>
> Reported-by: Mathieu Poirier <[email protected]>
> Signed-off-by: Suzuki K Poulose <[email protected]>
> ---
> drivers/hwtracing/coresight/of_coresight.c | 139 +++++++++++++++++------------
> 1 file changed, 84 insertions(+), 55 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
> index a33a92e..8a23c63 100644
> --- a/drivers/hwtracing/coresight/of_coresight.c
> +++ b/drivers/hwtracing/coresight/of_coresight.c
> @@ -111,17 +111,80 @@ int of_coresight_get_cpu(const struct device_node *node)
> }
> EXPORT_SYMBOL_GPL(of_coresight_get_cpu);
>
> +/*
> + * of_coresight_parse_endpoint : Parse the given output endpoint @ep
> + * and fill the connection information in @pdata[*@i].
> + *
> + * Parses the local port, remote device name and the remote port. Also
> + * updates *@i to point to the next index, when an entry is added.
> + *
> + * Returns :
> + * 0 - If the parsing completed without any fatal errors.
> + * -Errno - Fatal error, abort the scanning.
> + */
> +static int of_coresight_parse_endpoint(struct device_node *ep,
> + struct coresight_platform_data *pdata,
> + int *i)
> +{
> + int ret = 0;
> + struct of_endpoint endpoint, rendpoint;
> + struct device_node *rparent = NULL;
> + struct device_node *rport = NULL;
> + struct device *rdev = NULL;
> +
> + do {
> + /*
> + * No need to deal with input ports, processing for as
> + * processing for output ports will deal with them.
> + */
> + if (of_find_property(ep, "slave-mode", NULL))
> + break;
> +
> + /* Parse the local port details */
> + if (of_graph_parse_endpoint(ep, &endpoint))
> + break;
> + /*
> + * Get a handle on the remote port and parent
> + * attached to it.
> + */
> + rparent = of_graph_get_remote_port_parent(ep);
> + if (!rparent)
> + break;
> + rport = of_graph_get_remote_port(ep);
> + if (!rport)
> + break;
> + if (of_graph_parse_endpoint(rport, &rendpoint))
> + break;
> +
> + /* If the remote device is not available, defer probing */
> + rdev = of_coresight_get_endpoint_device(rparent);
> + if (!rdev) {
> + ret = -EPROBE_DEFER;
> + break;
> + }
> +
> + pdata->outports[*i] = endpoint.port;
> + pdata->child_names[*i] = dev_name(rdev);
> + pdata->child_ports[*i] = rendpoint.id;
> + /* Move the index */
> + (*i)++;
> + } while (0);
That's a clever way of coding a classic 'goto' block.
> +
> + if (rparent)
> + of_node_put(rparent);
> + if (rport)
> + of_node_put(rport);
Perfect - thank you for that.
> +
> + return ret;
> +}
> +
> struct coresight_platform_data *
> of_get_coresight_platform_data(struct device *dev,
> const struct device_node *node)
> {
> int i = 0, ret = 0;
> struct coresight_platform_data *pdata;
> - struct of_endpoint endpoint, rendpoint;
> - struct device *rdev;
> struct device_node *ep = NULL;
> - struct device_node *rparent = NULL;
> - struct device_node *rport = NULL;
>
> pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
> if (!pdata)
> @@ -129,63 +192,29 @@ of_get_coresight_platform_data(struct device *dev,
>
> /* Use device name as sysfs handle */
> pdata->name = dev_name(dev);
> + pdata->cpu = of_coresight_get_cpu(node);
>
> /* Get the number of input and output port for this component */
> of_coresight_get_ports(node, &pdata->nr_inport, &pdata->nr_outport);
>
> - if (pdata->nr_outport) {
> - ret = of_coresight_alloc_memory(dev, pdata);
> + /* If there are not output connections, we are done */
/not/no
> + if (!pdata->nr_outport)
> + return pdata;
> +
> + ret = of_coresight_alloc_memory(dev, pdata);
> + if (ret)
> + return ERR_PTR(ret);
> +
> + /* Iterate through each port to discover topology */
> + do {
> + /* Get a handle on a port */
> + ep = of_graph_get_next_endpoint(node, ep);
> + if (!ep)
> + break;
> + ret = of_coresight_parse_endpoint(ep, pdata, &i);
> if (ret)
> return ERR_PTR(ret);
> -
> - /* Iterate through each port to discover topology */
> - do {
> - /* Get a handle on a port */
> - ep = of_graph_get_next_endpoint(node, ep);
> - if (!ep)
> - break;
> -
> - /*
> - * No need to deal with input ports, processing for as
> - * processing for output ports will deal with them.
> - */
> - if (of_find_property(ep, "slave-mode", NULL))
> - continue;
> -
> - /* Get a handle on the local endpoint */
> - ret = of_graph_parse_endpoint(ep, &endpoint);
> -
> - if (ret)
> - continue;
> -
> - /* The local out port number */
> - pdata->outports[i] = endpoint.port;
> -
> - /*
> - * Get a handle on the remote port and parent
> - * attached to it.
> - */
> - rparent = of_graph_get_remote_port_parent(ep);
> - rport = of_graph_get_remote_port(ep);
> -
> - if (!rparent || !rport)
> - continue;
> -
> - if (of_graph_parse_endpoint(rport, &rendpoint))
> - continue;
> -
> - rdev = of_coresight_get_endpoint_device(rparent);
> - if (!rdev)
> - return ERR_PTR(-EPROBE_DEFER);
> -
> - pdata->child_names[i] = dev_name(rdev);
> - pdata->child_ports[i] = rendpoint.id;
> -
> - i++;
> - } while (ep);
> - }
> -
> - pdata->cpu = of_coresight_get_cpu(node);
> + } while (ep);
>
> return pdata;
> }
> --
> 2.7.4
>
On Tue, Jun 05, 2018 at 10:43:14PM +0100, Suzuki K Poulose wrote:
> When parsing the remote endpoint of an output port, we do :
> rport = of_graph_get_remote_port(ep);
> rparent = of_graph_get_remote_port_parent(ep);
>
> and then parse the "remote_port" as if it was the remote endpoint,
> which is wrong. The code worked fine because we used endpoint number
> as the port number. Let us fix it and optimise a bit as:
>
> remote_ep = of_graph_get_remote_endpoint(ep);
> if (remote_ep)
> remote_parent = of_graph_get_port_parent(remote_ep);
>
> and then, parse the remote_ep for the port/endpoint details.
>
> Cc: Mathieu Poirier <[email protected]>
> Signed-off-by: Suzuki K Poulose <[email protected]>
> ---
> drivers/hwtracing/coresight/of_coresight.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
> index 8a23c63..ada4f07 100644
> --- a/drivers/hwtracing/coresight/of_coresight.c
> +++ b/drivers/hwtracing/coresight/of_coresight.c
> @@ -129,7 +129,7 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
> int ret = 0;
> struct of_endpoint endpoint, rendpoint;
> struct device_node *rparent = NULL;
> - struct device_node *rport = NULL;
> + struct device_node *rep = NULL;
> struct device *rdev = NULL;
>
> do {
> @@ -144,16 +144,16 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
> if (of_graph_parse_endpoint(ep, &endpoint))
> break;
> /*
> - * Get a handle on the remote port and parent
> - * attached to it.
> + * Get a handle on the remote endpoint and the device it is
> + * attached to.
> */
> - rparent = of_graph_get_remote_port_parent(ep);
> + rep = of_graph_get_remote_endpoint(ep);
> + if (!rep)
> + break;
> + rparent = of_graph_get_port_parent(rep);
> if (!rparent)
> break;
> - rport = of_graph_get_remote_port(ep);
> - if (!rport)
> - break;
> - if (of_graph_parse_endpoint(rport, &rendpoint))
> + if (of_graph_parse_endpoint(rep, &rendpoint))
> break;
>
> /* If the remote device is not available, defer probing */
> @@ -165,15 +165,15 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
>
> pdata->outports[*i] = endpoint.port;
> pdata->child_names[*i] = dev_name(rdev);
> - pdata->child_ports[*i] = rendpoint.id;
> + pdata->child_ports[*i] = rendpoint.port;
> /* Move the index */
> (*i)++;
> } while (0);
>
> if (rparent)
> of_node_put(rparent);
> - if (rport)
> - of_node_put(rport);
> + if (rep)
> + of_node_put(rep);
>
> return ret;
> }
Reviewed-by: Mathieu Poirier <[email protected]>
(Please add to the next iteration so that I don't have to review again)
> --
> 2.7.4
>
On Tue, Jun 05, 2018 at 10:43:16PM +0100, Suzuki K Poulose wrote:
> The platform code parses the component connections and populates
> a platform-description of the output connections in arrays of fields
> (which is never freed). This is later copied in the coresight_register
> to a newly allocated area, represented by coresight_connection(s).
>
> This patch cleans up the code dealing with connections by making
> use of the "coresight_connection" structure right at the platform
> code and lets the generic driver simply re-use information provided
> by the platform.
>
> Thus making it reader friendly as well as avoiding the wastage of
> unused memory.
>
> Cc: Mathieu Poirier <[email protected]>
> Signed-off-by: Suzuki K Poulose <[email protected]>
> ---
> drivers/hwtracing/coresight/coresight.c | 21 +-----------
> drivers/hwtracing/coresight/of_coresight.c | 51 ++++++++++++------------------
> include/linux/coresight.h | 9 ++----
> 3 files changed, 23 insertions(+), 58 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
> index 2893cfe..69e9136 100644
> --- a/drivers/hwtracing/coresight/coresight.c
> +++ b/drivers/hwtracing/coresight/coresight.c
> @@ -953,13 +953,11 @@ postcore_initcall(coresight_init);
>
> struct coresight_device *coresight_register(struct coresight_desc *desc)
> {
> - int i;
> int ret;
> int link_subtype;
> int nr_refcnts = 1;
> atomic_t *refcnts = NULL;
> struct coresight_device *csdev;
> - struct coresight_connection *conns = NULL;
>
> csdev = kzalloc(sizeof(*csdev), GFP_KERNEL);
> if (!csdev) {
> @@ -988,22 +986,7 @@ struct coresight_device *coresight_register(struct coresight_desc *desc)
> csdev->nr_inport = desc->pdata->nr_inport;
> csdev->nr_outport = desc->pdata->nr_outport;
>
> - /* Initialise connections if there is at least one outport */
> - if (csdev->nr_outport) {
> - conns = kcalloc(csdev->nr_outport, sizeof(*conns), GFP_KERNEL);
> - if (!conns) {
> - ret = -ENOMEM;
> - goto err_kzalloc_conns;
> - }
> -
> - for (i = 0; i < csdev->nr_outport; i++) {
> - conns[i].outport = desc->pdata->outports[i];
> - conns[i].child_name = desc->pdata->child_names[i];
> - conns[i].child_port = desc->pdata->child_ports[i];
> - }
> - }
> -
> - csdev->conns = conns;
> + csdev->conns = desc->pdata->conns;
>
> csdev->type = desc->type;
> csdev->subtype = desc->subtype;
> @@ -1032,8 +1015,6 @@ struct coresight_device *coresight_register(struct coresight_desc *desc)
>
> return csdev;
>
> -err_kzalloc_conns:
> - kfree(refcnts);
> err_kzalloc_refcnts:
> kfree(csdev);
> err_kzalloc_csdev:
> diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
> index ada4f07..d01a9ce 100644
> --- a/drivers/hwtracing/coresight/of_coresight.c
> +++ b/drivers/hwtracing/coresight/of_coresight.c
> @@ -70,26 +70,13 @@ static void of_coresight_get_ports(const struct device_node *node,
> static int of_coresight_alloc_memory(struct device *dev,
> struct coresight_platform_data *pdata)
> {
> - /* List of output port on this component */
> - pdata->outports = devm_kzalloc(dev, pdata->nr_outport *
> - sizeof(*pdata->outports),
> - GFP_KERNEL);
> - if (!pdata->outports)
> - return -ENOMEM;
> -
> - /* Children connected to this component via @outports */
> - pdata->child_names = devm_kzalloc(dev, pdata->nr_outport *
> - sizeof(*pdata->child_names),
> - GFP_KERNEL);
> - if (!pdata->child_names)
> - return -ENOMEM;
> -
> - /* Port number on the child this component is connected to */
> - pdata->child_ports = devm_kzalloc(dev, pdata->nr_outport *
> - sizeof(*pdata->child_ports),
> - GFP_KERNEL);
> - if (!pdata->child_ports)
> - return -ENOMEM;
> + if (pdata->nr_outport) {
> + pdata->conns = devm_kzalloc(dev, pdata->nr_outport *
> + sizeof(*pdata->conns),
> + GFP_KERNEL);
> + if (!pdata->conns)
> + return -ENOMEM;
> + }
>
> return 0;
> }
> @@ -113,24 +100,24 @@ EXPORT_SYMBOL_GPL(of_coresight_get_cpu);
>
> /*
> * of_coresight_parse_endpoint : Parse the given output endpoint @ep
> - * and fill the connection information in @pdata[*@i].
> + * and fill the connection information in *@pconn.
> *
> * Parses the local port, remote device name and the remote port. Also
> - * updates *@i to point to the next index, when an entry is added.
> + * updates *@pconn to point to the next record, when an entry is added.
> *
> * Returns :
> * 0 - If the parsing completed without any fatal errors.
> * -Errno - Fatal error, abort the scanning.
> */
> static int of_coresight_parse_endpoint(struct device_node *ep,
> - struct coresight_platform_data *pdata,
> - int *i)
> + struct coresight_connection **pconn)
> {
> int ret = 0;
> struct of_endpoint endpoint, rendpoint;
> struct device_node *rparent = NULL;
> struct device_node *rep = NULL;
> struct device *rdev = NULL;
> + struct coresight_connection *conn = *pconn;
>
> do {
> /*
> @@ -163,11 +150,11 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
> break;
> }
>
> - pdata->outports[*i] = endpoint.port;
> - pdata->child_names[*i] = dev_name(rdev);
> - pdata->child_ports[*i] = rendpoint.port;
> - /* Move the index */
> - (*i)++;
> + conn->outport = endpoint.port;
> + conn->child_name = dev_name(rdev);
> + conn->child_port = rendpoint.port;
> + /* Move the connection record */
> + (*pconn)++;
> } while (0);
>
> if (rparent)
> @@ -182,8 +169,9 @@ struct coresight_platform_data *
> of_get_coresight_platform_data(struct device *dev,
> const struct device_node *node)
> {
> - int i = 0, ret = 0;
> + int ret = 0;
> struct coresight_platform_data *pdata;
> + struct coresight_connection *conn;
> struct device_node *ep = NULL;
>
> pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
> @@ -205,13 +193,14 @@ of_get_coresight_platform_data(struct device *dev,
> if (ret)
> return ERR_PTR(ret);
>
> + conn = pdata->conns;
> /* Iterate through each port to discover topology */
> do {
> /* Get a handle on a port */
> ep = of_graph_get_next_endpoint(node, ep);
> if (!ep)
> break;
> - ret = of_coresight_parse_endpoint(ep, pdata, &i);
> + ret = of_coresight_parse_endpoint(ep, &conn);
> if (ret)
> return ERR_PTR(ret);
> } while (ep);
> diff --git a/include/linux/coresight.h b/include/linux/coresight.h
> index 69a5c9f..2a75a15 100644
> --- a/include/linux/coresight.h
> +++ b/include/linux/coresight.h
> @@ -82,20 +82,15 @@ struct coresight_dev_subtype {
> * @cpu: the CPU a source belongs to. Only applicable for ETM/PTMs.
> * @name: name of the component as shown under sysfs.
> * @nr_inport: number of input ports for this component.
> - * @outports: list of remote endpoint port number.
> - * @child_names:name of all child components connected to this device.
> - * @child_ports:child component port number the current component is
> - connected to.
> * @nr_outport: number of output ports for this component.
> + * @conns: Array of nr_outport connections from this component
> */
> struct coresight_platform_data {
> int cpu;
> const char *name;
> int nr_inport;
> - int *outports;
> - const char **child_names;
> - int *child_ports;
> int nr_outport;
> + struct coresight_connection *conns;
> };
Reviewed-by: Mathieu Poirier <[email protected]>
>
> /**
> --
> 2.7.4
>
On Tue, Jun 05, 2018 at 10:43:17PM +0100, Suzuki K Poulose wrote:
> If we fail to find the input / output port for a LINK component
> while enabling a path, we should fail gracefully rather than
> assuming port "0".
>
> Cc: Mathieu Poirier <[email protected]>
> Signed-off-by: Suzuki K Poulose <[email protected]>
> ---
> drivers/hwtracing/coresight/coresight.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
> index 69e9136..3c1c058 100644
> --- a/drivers/hwtracing/coresight/coresight.c
> +++ b/drivers/hwtracing/coresight/coresight.c
> @@ -107,7 +107,7 @@ static int coresight_find_link_inport(struct coresight_device *csdev,
> dev_err(&csdev->dev, "couldn't find inport, parent: %s, child: %s\n",
> dev_name(&parent->dev), dev_name(&csdev->dev));
>
> - return 0;
> + return -ENODEV;
> }
>
> static int coresight_find_link_outport(struct coresight_device *csdev,
> @@ -125,7 +125,7 @@ static int coresight_find_link_outport(struct coresight_device *csdev,
> dev_err(&csdev->dev, "couldn't find outport, parent: %s, child: %s\n",
> dev_name(&csdev->dev), dev_name(&child->dev));
>
> - return 0;
> + return -ENODEV;
> }
>
> static int coresight_enable_sink(struct coresight_device *csdev, u32 mode)
> @@ -178,6 +178,9 @@ static int coresight_enable_link(struct coresight_device *csdev,
> else
> refport = 0;
>
> + if (refport < 0)
> + return refport;
> +
> if (atomic_inc_return(&csdev->refcnt[refport]) == 1) {
> if (link_ops(csdev)->enable) {
> ret = link_ops(csdev)->enable(csdev, inport, outport);
Queued for the next rc - no need to resend.
Thanks,
Mathieu
> --
> 2.7.4
>
On Tue, Jun 05, 2018 at 10:43:18PM +0100, Suzuki K Poulose wrote:
> Before we update the bindings, document the current graph bindings
> and usage of additional properties.
>
> Cc: Mathieu Poirier <[email protected]>
> Signed-off-by: Suzuki K Poulose <[email protected]>
Reviewed-by: Mathieu Poirier <[email protected]>
> ---
> .../devicetree/bindings/arm/coresight.txt | 31 +++++++++++++++++++---
> 1 file changed, 27 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt
> index 9aa30a1..ed6b555 100644
> --- a/Documentation/devicetree/bindings/arm/coresight.txt
> +++ b/Documentation/devicetree/bindings/arm/coresight.txt
> @@ -52,9 +52,7 @@ its hardware characteristcs.
> clocks the core of that coresight component. The latter clock
> is optional.
>
> - * port or ports: The representation of the component's port
> - layout using the generic DT graph presentation found in
> - "bindings/graph.txt".
> + * port or ports: see "Graph bindings for Coresight" below.
>
> * Additional required properties for System Trace Macrocells (STM):
> * reg: along with the physical base address and length of the register
> @@ -71,7 +69,7 @@ its hardware characteristcs.
> AMBA markee):
> - "arm,coresight-replicator"
>
> - * port or ports: same as above.
> + * port or ports: see "Graph bindings for Coresight" below.
>
> * Optional properties for ETM/PTMs:
>
> @@ -90,6 +88,31 @@ its hardware characteristcs.
> * arm,scatter-gather: boolean. Indicates that the TMC-ETR can safely
> use the SG mode on this system.
>
> +Graph bindings for Coresight
> +-------------------------------
> +
> +Coresight components are interconnected to create a data path for the flow of
> +trace data generated from the "sources" to their collection points "sink".
> +Each coresight component must describe the "input" and "output" connections.
> +The connections must be described via generic DT graph bindings as described
> +by the "bindings/graph.txt", where each "port" along with an "endpoint"
> +component represents a hardware port and the connection.
> +
> +Since it is possible to have multiple connections for any coresight component
> +with a specific direction of data flow, each connection must define the
> +following properties to uniquely identify the connection details.
> +
> + * Direction of the data flow w.r.t the component :
> + Each input port must have the following property defined at the "endpoint"
> + for the port.
> + "slave-mode"
> +
> + * Hardware Port number at the component:
> + - The hardware port number is assumed to be the address of the "port"
> + component.
> +
> +
> +
> Example:
>
> 1. Sinks
> --
> 2.7.4
>
On Tue, Jun 05, 2018 at 10:43:19PM +0100, Suzuki K Poulose wrote:
> The coresight drivers relied on default bindings for graph
> in DT, while reusing the "reg" field of the "ports" to indicate
> the actual hardware port number for the connections. However,
> with the rules getting stricter w.r.t to the address mismatch
> with the label, it is no longer possible to use the port address
> field for the hardware port number. Hence, we add an explicit
> property to denote the hardware port number, "coresight,hwid"
> which must be specified for each "endpoint".
>
> Cc: Mathieu Poirier <[email protected]>
> Cc: Sudeep Holla <[email protected]>
> Cc: Rob Herring <[email protected]>
> Signed-off-by: Suzuki K Poulose <[email protected]>
> ---
> .../devicetree/bindings/arm/coresight.txt | 29 ++++++++++---
> drivers/hwtracing/coresight/of_coresight.c | 49 +++++++++++++++++-----
> 2 files changed, 62 insertions(+), 16 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt
> index ed6b555..bf75ab3 100644
> --- a/Documentation/devicetree/bindings/arm/coresight.txt
> +++ b/Documentation/devicetree/bindings/arm/coresight.txt
> @@ -108,8 +108,13 @@ following properties to uniquely identify the connection details.
> "slave-mode"
>
> * Hardware Port number at the component:
> - - The hardware port number is assumed to be the address of the "port"
> - component.
> + - Each "endpoint" must define the hardware port of the local end of the
> + connection using the following property :
> +
> + "coresight,hwid" - 32bit integer, local hardware port.
> +
> + - [ ** Obsolete ** ] The hardware port number is assumed to be the address
> + of the "port" component.
>
>
>
> @@ -126,6 +131,7 @@ Example:
> etb_in_port: endpoint@0 {
> slave-mode;
> remote-endpoint = <&replicator_out_port0>;
> + coresight,hwid = <0>;
> };
> };
> };
> @@ -140,6 +146,7 @@ Example:
> tpiu_in_port: endpoint@0 {
> slave-mode;
> remote-endpoint = <&replicator_out_port1>;
> + coresight,hwid = <0>;
> };
> };
> };
> @@ -160,6 +167,7 @@ Example:
> reg = <0>;
> replicator_out_port0: endpoint {
> remote-endpoint = <&etb_in_port>;
> + coresight,hwid = <0>;
> };
> };
>
> @@ -167,15 +175,17 @@ Example:
> reg = <1>;
> replicator_out_port1: endpoint {
> remote-endpoint = <&tpiu_in_port>;
> + coresight,hwid = <1>;
> };
> };
>
> /* replicator input port */
> port@2 {
> - reg = <0>;
> + reg = <1>;
> replicator_in_port0: endpoint {
> slave-mode;
> remote-endpoint = <&funnel_out_port0>;
> + coresight,hwid = <0>;
> };
> };
> };
> @@ -197,31 +207,35 @@ Example:
> funnel_out_port0: endpoint {
> remote-endpoint =
> <&replicator_in_port0>;
> + coresight,hwid = <0>;
> };
> };
>
> /* funnel input ports */
> port@1 {
> - reg = <0>;
> + reg = <1>;
> funnel_in_port0: endpoint {
> slave-mode;
> remote-endpoint = <&ptm0_out_port>;
> + coresight,hwid = <0>;
> };
> };
>
> port@2 {
> - reg = <1>;
> + reg = <2>;
> funnel_in_port1: endpoint {
> slave-mode;
> remote-endpoint = <&ptm1_out_port>;
> + coresight,hwid = <1>;
> };
> };
>
> port@3 {
> - reg = <2>;
> + reg = <3>;
> funnel_in_port2: endpoint {
> slave-mode;
> remote-endpoint = <&etm0_out_port>;
> + coresight,hwid = <2>;
> };
> };
>
> @@ -239,6 +253,7 @@ Example:
> port {
> ptm0_out_port: endpoint {
> remote-endpoint = <&funnel_in_port0>;
> + coresight,hwid = <0>;
> };
> };
> };
> @@ -253,6 +268,7 @@ Example:
> port {
> ptm1_out_port: endpoint {
> remote-endpoint = <&funnel_in_port1>;
> + coresight,hwid = <0>;
> };
> };
> };
> @@ -269,6 +285,7 @@ Example:
> port {
> stm_out_port: endpoint {
> remote-endpoint = <&main_funnel_in_port2>;
> + coresight,hwid = <0>;
> };
> };
> };
For the binding part:
Reviewed-by: Mathieu Poirier <[email protected]>
> diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
> index d01a9ce..d23d7dd 100644
> --- a/drivers/hwtracing/coresight/of_coresight.c
> +++ b/drivers/hwtracing/coresight/of_coresight.c
> @@ -99,6 +99,31 @@ int of_coresight_get_cpu(const struct device_node *node)
> EXPORT_SYMBOL_GPL(of_coresight_get_cpu);
>
> /*
> + * of_coresight_endpoint_get_port_id : Get the hardware port number for the
> + * given endpoint device node. Prefer the explicit "coresight,hwid" property
> + * over the endpoint register id (obsolete bindings).
> + */
> +static int of_coresight_endpoint_get_port_id(struct device *dev,
> + struct device_node *ep_node)
> +{
> + struct of_endpoint ep;
> + int rc, port_id;
> +
> +
> + if (!of_property_read_u32(ep_node, "coresight,hwid", &port_id))
> + return port_id;
> +
> + rc = of_graph_parse_endpoint(ep_node, &ep);
> + if (rc)
> + return rc;
> + dev_warn_once(dev,
> + "ep%d: Mandatory \"coresight,hwid\" property missing.\n",
> + ep.port);
> + dev_warn_once(dev, "DT uses obsolete coresight bindings\n");
> + return ep.port;
> +}
> +
> +/*
> * of_coresight_parse_endpoint : Parse the given output endpoint @ep
> * and fill the connection information in *@pconn.
> *
> @@ -109,11 +134,11 @@ EXPORT_SYMBOL_GPL(of_coresight_get_cpu);
> * 0 - If the parsing completed without any fatal errors.
> * -Errno - Fatal error, abort the scanning.
> */
> -static int of_coresight_parse_endpoint(struct device_node *ep,
> +static int of_coresight_parse_endpoint(struct device *dev,
> + struct device_node *ep,
> struct coresight_connection **pconn)
> {
> - int ret = 0;
> - struct of_endpoint endpoint, rendpoint;
> + int ret = 0, local_port, child_port;
> struct device_node *rparent = NULL;
> struct device_node *rep = NULL;
> struct device *rdev = NULL;
> @@ -128,7 +153,8 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
> break;
>
> /* Parse the local port details */
> - if (of_graph_parse_endpoint(ep, &endpoint))
> + local_port = of_coresight_endpoint_get_port_id(dev, ep);
> + if (local_port < 0)
> break;
> /*
> * Get a handle on the remote endpoint and the device it is
> @@ -140,9 +166,6 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
> rparent = of_graph_get_port_parent(rep);
> if (!rparent)
> break;
> - if (of_graph_parse_endpoint(rep, &rendpoint))
> - break;
> -
> /* If the remote device is not available, defer probing */
> rdev = of_coresight_get_endpoint_device(rparent);
> if (!rdev) {
> @@ -150,9 +173,15 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
> break;
> }
>
> - conn->outport = endpoint.port;
> + child_port = of_coresight_endpoint_get_port_id(rdev, rep);
> + if (child_port < 0) {
> + ret = 0;
Why returning '0' on an error condition? Same for 'local_port' above.
> + break;
> + }
> +
> + conn->outport = local_port;
> conn->child_name = dev_name(rdev);
> - conn->child_port = rendpoint.port;
> + conn->child_port = child_port;
> /* Move the connection record */
> (*pconn)++;
> } while (0);
> @@ -200,7 +229,7 @@ of_get_coresight_platform_data(struct device *dev,
> ep = of_graph_get_next_endpoint(node, ep);
> if (!ep)
> break;
> - ret = of_coresight_parse_endpoint(ep, &conn);
> + ret = of_coresight_parse_endpoint(dev, ep, &conn);
> if (ret)
> return ERR_PTR(ret);
> } while (ep);
> --
> 2.7.4
>
On Tue, Jun 05, 2018 at 10:43:20PM +0100, Suzuki K Poulose wrote:
> So far we have relied on an undocumented property "slave-mode",
> to indicate if the given port is input or not. Since we are
> redefining the coresight bindings, define new property for the
> "direction" of data flow for a given connection endpoint in the
> device.
>
> Each endpoint must define the following property.
>
> - "direction" : 0 => Port is input
> 1 => Port is output
>
> Cc: Sudeep Holla <[email protected]>
> Cc: Rob Herring <[email protected]>
> Cc: Mathieu Poirier <[email protected]>
> Signed-off-by: Suzuki K Poulose <[email protected]>
> ---
> .../devicetree/bindings/arm/coresight.txt | 24 ++++++++++++++--------
> drivers/hwtracing/coresight/of_coresight.c | 22 ++++++++++++++++----
> 2 files changed, 34 insertions(+), 12 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt
> index bf75ab3..ff382bc 100644
> --- a/Documentation/devicetree/bindings/arm/coresight.txt
> +++ b/Documentation/devicetree/bindings/arm/coresight.txt
> @@ -103,9 +103,11 @@ with a specific direction of data flow, each connection must define the
> following properties to uniquely identify the connection details.
>
> * Direction of the data flow w.r.t the component :
> - Each input port must have the following property defined at the "endpoint"
> + Each hardware port must have the following property defined at the "endpoint"
> for the port.
> - "slave-mode"
> + "direction" - 32bit integer, whose values are defined as follows :
> + 0 => the endpoint is an Input port
> + 1 => the endpoint is an Output port.
>
> * Hardware Port number at the component:
> - Each "endpoint" must define the hardware port of the local end of the
> @@ -129,7 +131,7 @@ Example:
> clock-names = "apb_pclk";
> port {
> etb_in_port: endpoint@0 {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&replicator_out_port0>;
> coresight,hwid = <0>;
> };
> @@ -144,7 +146,7 @@ Example:
> clock-names = "apb_pclk";
> port {
> tpiu_in_port: endpoint@0 {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&replicator_out_port1>;
> coresight,hwid = <0>;
> };
> @@ -166,6 +168,7 @@ Example:
> port@0 {
> reg = <0>;
> replicator_out_port0: endpoint {
> + direction = <1>;
> remote-endpoint = <&etb_in_port>;
> coresight,hwid = <0>;
> };
> @@ -174,6 +177,7 @@ Example:
> port@1 {
> reg = <1>;
> replicator_out_port1: endpoint {
> + direction = <1>;
> remote-endpoint = <&tpiu_in_port>;
> coresight,hwid = <1>;
> };
> @@ -183,7 +187,7 @@ Example:
> port@2 {
> reg = <1>;
> replicator_in_port0: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&funnel_out_port0>;
> coresight,hwid = <0>;
> };
> @@ -205,6 +209,7 @@ Example:
> port@0 {
> reg = <0>;
> funnel_out_port0: endpoint {
> + direction = <1>;
> remote-endpoint =
> <&replicator_in_port0>;
> coresight,hwid = <0>;
> @@ -215,7 +220,7 @@ Example:
> port@1 {
> reg = <1>;
> funnel_in_port0: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&ptm0_out_port>;
> coresight,hwid = <0>;
> };
> @@ -224,7 +229,7 @@ Example:
> port@2 {
> reg = <2>;
> funnel_in_port1: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&ptm1_out_port>;
> coresight,hwid = <1>;
> };
> @@ -233,7 +238,7 @@ Example:
> port@3 {
> reg = <3>;
> funnel_in_port2: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&etm0_out_port>;
> coresight,hwid = <2>;
> };
> @@ -252,6 +257,7 @@ Example:
> clock-names = "apb_pclk";
> port {
> ptm0_out_port: endpoint {
> + direction = <1>;
> remote-endpoint = <&funnel_in_port0>;
> coresight,hwid = <0>;
> };
> @@ -267,6 +273,7 @@ Example:
> clock-names = "apb_pclk";
> port {
> ptm1_out_port: endpoint {
> + direction = <1>;
> remote-endpoint = <&funnel_in_port1>;
> coresight,hwid = <0>;
> };
> @@ -284,6 +291,7 @@ Example:
> clock-names = "apb_pclk";
> port {
> stm_out_port: endpoint {
> + direction = <1>;
> remote-endpoint = <&main_funnel_in_port2>;
> coresight,hwid = <0>;
> };
> diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
> index d23d7dd..0d6e6a9 100644
> --- a/drivers/hwtracing/coresight/of_coresight.c
> +++ b/drivers/hwtracing/coresight/of_coresight.c
> @@ -45,7 +45,20 @@ of_coresight_get_endpoint_device(struct device_node *endpoint)
> endpoint, of_dev_node_match);
> }
>
> -static void of_coresight_get_ports(const struct device_node *node,
> +static bool of_coresight_endpoint_is_input(struct device *dev,
> + struct device_node *ep_node)
> +{
> + u32 dir;
> +
> + if (!of_property_read_u32(ep_node, "direction", &dir))
> + return dir == 0;
> +
> + dev_warn_once(dev, "Missing mandatory \"direction\" property!\n");
> + return of_property_read_bool(ep_node, "slave-mode");
> +}
> +
> +static void of_coresight_get_ports(struct device *dev,
> + const struct device_node *node,
> int *nr_inport, int *nr_outport)
> {
> struct device_node *ep = NULL;
> @@ -56,7 +69,7 @@ static void of_coresight_get_ports(const struct device_node *node,
> if (!ep)
> break;
>
> - if (of_property_read_bool(ep, "slave-mode"))
> + if (of_coresight_endpoint_is_input(dev, ep))
> in++;
> else
> out++;
> @@ -149,7 +162,7 @@ static int of_coresight_parse_endpoint(struct device *dev,
> * No need to deal with input ports, processing for as
> * processing for output ports will deal with them.
> */
> - if (of_find_property(ep, "slave-mode", NULL))
> + if (of_coresight_endpoint_is_input(dev, ep))
> break;
>
> /* Parse the local port details */
> @@ -212,7 +225,8 @@ of_get_coresight_platform_data(struct device *dev,
> pdata->cpu = of_coresight_get_cpu(node);
>
> /* Get the number of input and output port for this component */
> - of_coresight_get_ports(node, &pdata->nr_inport, &pdata->nr_outport);
> + of_coresight_get_ports(dev, node,
> + &pdata->nr_inport, &pdata->nr_outport);
>
> /* If there are not output connections, we are done */
> if (!pdata->nr_outport)
For both the binding and the code:
Reviewed-by: Mathieu Poirier <[email protected]>
> --
> 2.7.4
>
On Tue, Jun 05, 2018 at 10:43:21PM +0100, Suzuki K Poulose wrote:
> Switch to updated coresight bindings for hw ports.
>
> Cc: Sudeep Holla <[email protected]>
> Cc: Liviu Dudau <[email protected]>
> Cc: Mathieu Poirier <[email protected]>
> Signed-off-by: Suzuki K Poulose <[email protected]>
> ---
> Changes since V1:
> - Add support Juno for r1 & r2.
> ---
Reviewed-by: Mathieu Poirier <[email protected]>
> arch/arm64/boot/dts/arm/juno-base.dtsi | 82 ++++++++++++++++++++++---------
> arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 26 +++++++---
> arch/arm64/boot/dts/arm/juno.dts | 5 +-
> 3 files changed, 81 insertions(+), 32 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
> index eb749c5..33b41ba 100644
> --- a/arch/arm64/boot/dts/arm/juno-base.dtsi
> +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
> @@ -122,15 +122,18 @@
> port@0 {
> reg = <0>;
> etf0_in_port: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&main_funnel_out_port>;
> + coresight,hwid = <0>;
> };
> };
>
> /* output port */
> port@1 {
> - reg = <0>;
> + reg = <1>;
> etf0_out_port: endpoint {
> + coresight,hwid = <0>;
> + direction = <1>;
> };
> };
> };
> @@ -145,8 +148,9 @@
> power-domains = <&scpi_devpd 0>;
> port {
> tpiu_in_port: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&replicator_out_port0>;
> + coresight,hwid = <0>;
> };
> };
> };
> @@ -168,23 +172,27 @@
> reg = <0>;
> main_funnel_out_port: endpoint {
> remote-endpoint = <&etf0_in_port>;
> + coresight,hwid = <0>;
> + direction = <1>;
> };
> };
>
> /* input ports */
> port@1 {
> - reg = <0>;
> + reg = <1>;
> main_funnel_in_port0: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&cluster0_funnel_out_port>;
> + coresight,hwid = <0>;
> };
> };
>
> port@2 {
> - reg = <1>;
> + reg = <2>;
> main_funnel_in_port1: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&cluster1_funnel_out_port>;
> + coresight,hwid = <1>;
> };
> };
> };
> @@ -200,8 +208,9 @@
> power-domains = <&scpi_devpd 0>;
> port {
> etr_in_port: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&replicator_out_port1>;
> + coresight,hwid = <0>;
> };
> };
> };
> @@ -217,6 +226,8 @@
> power-domains = <&scpi_devpd 0>;
> port {
> stm_out_port: endpoint {
> + coresight,hwid = <0>;
> + direction = <1>;
> };
> };
> };
> @@ -240,6 +251,8 @@
> port {
> cluster0_etm0_out_port: endpoint {
> remote-endpoint = <&cluster0_funnel_in_port0>;
> + coresight,hwid = <0>;
> + direction = <1>;
> };
> };
> };
> @@ -259,22 +272,26 @@
> reg = <0>;
> cluster0_funnel_out_port: endpoint {
> remote-endpoint = <&main_funnel_in_port0>;
> + coresight,hwid = <0>;
> + direction = <1>;
> };
> };
>
> port@1 {
> - reg = <0>;
> + reg = <1>;
> cluster0_funnel_in_port0: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&cluster0_etm0_out_port>;
> + coresight,hwid = <0>;
> };
> };
>
> port@2 {
> - reg = <1>;
> + reg = <2>;
> cluster0_funnel_in_port1: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&cluster0_etm1_out_port>;
> + coresight,hwid = <1>;
> };
> };
> };
> @@ -299,6 +316,8 @@
> port {
> cluster0_etm1_out_port: endpoint {
> remote-endpoint = <&cluster0_funnel_in_port1>;
> + coresight,hwid = <0>;
> + direction = <1>;
> };
> };
> };
> @@ -322,6 +341,8 @@
> port {
> cluster1_etm0_out_port: endpoint {
> remote-endpoint = <&cluster1_funnel_in_port0>;
> + coresight,hwid = <0>;
> + direction = <1>;
> };
> };
> };
> @@ -341,36 +362,42 @@
> reg = <0>;
> cluster1_funnel_out_port: endpoint {
> remote-endpoint = <&main_funnel_in_port1>;
> + coresight,hwid = <0>;
> + direction = <1>;
> };
> };
>
> port@1 {
> - reg = <0>;
> + reg = <1>;
> cluster1_funnel_in_port0: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&cluster1_etm0_out_port>;
> + coresight,hwid = <0>;
> };
> };
>
> port@2 {
> - reg = <1>;
> + reg = <2>;
> cluster1_funnel_in_port1: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&cluster1_etm1_out_port>;
> + coresight,hwid = <1>;
> };
> };
> port@3 {
> - reg = <2>;
> + reg = <3>;
> cluster1_funnel_in_port2: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&cluster1_etm2_out_port>;
> + coresight,hwid = <2>;
> };
> };
> port@4 {
> - reg = <3>;
> + reg = <4>;
> cluster1_funnel_in_port3: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&cluster1_etm3_out_port>;
> + coresight,hwid = <3>;
> };
> };
> };
> @@ -395,6 +422,8 @@
> port {
> cluster1_etm1_out_port: endpoint {
> remote-endpoint = <&cluster1_funnel_in_port1>;
> + coresight,hwid = <0>;
> + direction = <1>;
> };
> };
> };
> @@ -418,6 +447,8 @@
> port {
> cluster1_etm2_out_port: endpoint {
> remote-endpoint = <&cluster1_funnel_in_port2>;
> + coresight,hwid = <0>;
> + direction = <1>;
> };
> };
> };
> @@ -441,6 +472,8 @@
> port {
> cluster1_etm3_out_port: endpoint {
> remote-endpoint = <&cluster1_funnel_in_port3>;
> + coresight,hwid = <0>;
> + direction = <1>;
> };
> };
> };
> @@ -462,6 +495,8 @@
> reg = <0>;
> replicator_out_port0: endpoint {
> remote-endpoint = <&tpiu_in_port>;
> + coresight,hwid = <0>;
> + direction = <1>;
> };
> };
>
> @@ -469,14 +504,17 @@
> reg = <1>;
> replicator_out_port1: endpoint {
> remote-endpoint = <&etr_in_port>;
> + coresight,hwid = <1>;
> + direction = <1>;
> };
> };
>
> /* replicator input port */
> port@2 {
> - reg = <0>;
> + reg = <2>;
> replicator_in_port0: endpoint {
> - slave-mode;
> + direction = <0>;
> + coresight,hwid = <0>;
> };
> };
> };
> diff --git a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
> index 0c43fb3..146a5d9 100644
> --- a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
> +++ b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
> @@ -15,15 +15,18 @@
> port@0 {
> reg = <0>;
> csys1_funnel_out_port: endpoint {
> + coresight,hwid = <0>;
> + direction = <1>;
> remote-endpoint = <&etf1_in_port>;
> };
> };
>
> /* input port */
> port@1 {
> - reg = <0>;
> + reg = <1>;
> csys1_funnel_in_port0: endpoint {
> - slave-mode;
> + coresight,hwid = <0>;
> + direction = <0>;
> };
> };
>
> @@ -45,15 +48,18 @@
> port@0 {
> reg = <0>;
> etf1_in_port: endpoint {
> - slave-mode;
> + direction = <0>;
> + coresight,hwid = <0>;
> remote-endpoint = <&csys1_funnel_out_port>;
> };
> };
>
> /* output port */
> port@1 {
> - reg = <0>;
> + reg = <1>;
> etf1_out_port: endpoint {
> + coresight,hwid = <0>;
> + direction = <1>;
> remote-endpoint = <&csys2_funnel_in_port1>;
> };
> };
> @@ -75,23 +81,27 @@
> port@0 {
> reg = <0>;
> csys2_funnel_out_port: endpoint {
> + coresight,hwid = <0>;
> + direction = <1>;
> remote-endpoint = <&replicator_in_port0>;
> };
> };
>
> /* input ports */
> port@1 {
> - reg = <0>;
> + reg = <1>;
> csys2_funnel_in_port0: endpoint {
> - slave-mode;
> + direction = <0>;
> + coresight,hwid = <0>;
> remote-endpoint = <&etf0_out_port>;
> };
> };
>
> port@2 {
> - reg = <1>;
> + reg = <2>;
> csys2_funnel_in_port1: endpoint {
> - slave-mode;
> + direction = <0>;
> + coresight,hwid = <1>;
> remote-endpoint = <&etf1_out_port>;
> };
> };
> diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts
> index c9236c4..27b8036 100644
> --- a/arch/arm64/boot/dts/arm/juno.dts
> +++ b/arch/arm64/boot/dts/arm/juno.dts
> @@ -260,10 +260,11 @@
> &main_funnel {
> ports {
> port@3 {
> - reg = <2>;
> + reg = <3>;
> main_funnel_in_port2: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&stm_out_port>;
> + coresight,hwid = <2>;
> };
> };
> };
> --
> 2.7.4
>
On 8 June 2018 at 15:49, Mathieu Poirier <[email protected]> wrote:
> On Tue, Jun 05, 2018 at 10:43:21PM +0100, Suzuki K Poulose wrote:
>> Switch to updated coresight bindings for hw ports.
>>
>> Cc: Sudeep Holla <[email protected]>
>> Cc: Liviu Dudau <[email protected]>
>> Cc: Mathieu Poirier <[email protected]>
>> Signed-off-by: Suzuki K Poulose <[email protected]>
>> ---
>> Changes since V1:
>> - Add support Juno for r1 & r2.
>> ---
>
> Reviewed-by: Mathieu Poirier <[email protected]>
Sudeep please hold on before applying this as there is more work to be
done on this set.
>
>> arch/arm64/boot/dts/arm/juno-base.dtsi | 82 ++++++++++++++++++++++---------
>> arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 26 +++++++---
>> arch/arm64/boot/dts/arm/juno.dts | 5 +-
>> 3 files changed, 81 insertions(+), 32 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
>> index eb749c5..33b41ba 100644
>> --- a/arch/arm64/boot/dts/arm/juno-base.dtsi
>> +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
>> @@ -122,15 +122,18 @@
>> port@0 {
>> reg = <0>;
>> etf0_in_port: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&main_funnel_out_port>;
>> + coresight,hwid = <0>;
>> };
>> };
>>
>> /* output port */
>> port@1 {
>> - reg = <0>;
>> + reg = <1>;
>> etf0_out_port: endpoint {
>> + coresight,hwid = <0>;
>> + direction = <1>;
>> };
>> };
>> };
>> @@ -145,8 +148,9 @@
>> power-domains = <&scpi_devpd 0>;
>> port {
>> tpiu_in_port: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&replicator_out_port0>;
>> + coresight,hwid = <0>;
>> };
>> };
>> };
>> @@ -168,23 +172,27 @@
>> reg = <0>;
>> main_funnel_out_port: endpoint {
>> remote-endpoint = <&etf0_in_port>;
>> + coresight,hwid = <0>;
>> + direction = <1>;
>> };
>> };
>>
>> /* input ports */
>> port@1 {
>> - reg = <0>;
>> + reg = <1>;
>> main_funnel_in_port0: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&cluster0_funnel_out_port>;
>> + coresight,hwid = <0>;
>> };
>> };
>>
>> port@2 {
>> - reg = <1>;
>> + reg = <2>;
>> main_funnel_in_port1: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&cluster1_funnel_out_port>;
>> + coresight,hwid = <1>;
>> };
>> };
>> };
>> @@ -200,8 +208,9 @@
>> power-domains = <&scpi_devpd 0>;
>> port {
>> etr_in_port: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&replicator_out_port1>;
>> + coresight,hwid = <0>;
>> };
>> };
>> };
>> @@ -217,6 +226,8 @@
>> power-domains = <&scpi_devpd 0>;
>> port {
>> stm_out_port: endpoint {
>> + coresight,hwid = <0>;
>> + direction = <1>;
>> };
>> };
>> };
>> @@ -240,6 +251,8 @@
>> port {
>> cluster0_etm0_out_port: endpoint {
>> remote-endpoint = <&cluster0_funnel_in_port0>;
>> + coresight,hwid = <0>;
>> + direction = <1>;
>> };
>> };
>> };
>> @@ -259,22 +272,26 @@
>> reg = <0>;
>> cluster0_funnel_out_port: endpoint {
>> remote-endpoint = <&main_funnel_in_port0>;
>> + coresight,hwid = <0>;
>> + direction = <1>;
>> };
>> };
>>
>> port@1 {
>> - reg = <0>;
>> + reg = <1>;
>> cluster0_funnel_in_port0: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&cluster0_etm0_out_port>;
>> + coresight,hwid = <0>;
>> };
>> };
>>
>> port@2 {
>> - reg = <1>;
>> + reg = <2>;
>> cluster0_funnel_in_port1: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&cluster0_etm1_out_port>;
>> + coresight,hwid = <1>;
>> };
>> };
>> };
>> @@ -299,6 +316,8 @@
>> port {
>> cluster0_etm1_out_port: endpoint {
>> remote-endpoint = <&cluster0_funnel_in_port1>;
>> + coresight,hwid = <0>;
>> + direction = <1>;
>> };
>> };
>> };
>> @@ -322,6 +341,8 @@
>> port {
>> cluster1_etm0_out_port: endpoint {
>> remote-endpoint = <&cluster1_funnel_in_port0>;
>> + coresight,hwid = <0>;
>> + direction = <1>;
>> };
>> };
>> };
>> @@ -341,36 +362,42 @@
>> reg = <0>;
>> cluster1_funnel_out_port: endpoint {
>> remote-endpoint = <&main_funnel_in_port1>;
>> + coresight,hwid = <0>;
>> + direction = <1>;
>> };
>> };
>>
>> port@1 {
>> - reg = <0>;
>> + reg = <1>;
>> cluster1_funnel_in_port0: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&cluster1_etm0_out_port>;
>> + coresight,hwid = <0>;
>> };
>> };
>>
>> port@2 {
>> - reg = <1>;
>> + reg = <2>;
>> cluster1_funnel_in_port1: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&cluster1_etm1_out_port>;
>> + coresight,hwid = <1>;
>> };
>> };
>> port@3 {
>> - reg = <2>;
>> + reg = <3>;
>> cluster1_funnel_in_port2: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&cluster1_etm2_out_port>;
>> + coresight,hwid = <2>;
>> };
>> };
>> port@4 {
>> - reg = <3>;
>> + reg = <4>;
>> cluster1_funnel_in_port3: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&cluster1_etm3_out_port>;
>> + coresight,hwid = <3>;
>> };
>> };
>> };
>> @@ -395,6 +422,8 @@
>> port {
>> cluster1_etm1_out_port: endpoint {
>> remote-endpoint = <&cluster1_funnel_in_port1>;
>> + coresight,hwid = <0>;
>> + direction = <1>;
>> };
>> };
>> };
>> @@ -418,6 +447,8 @@
>> port {
>> cluster1_etm2_out_port: endpoint {
>> remote-endpoint = <&cluster1_funnel_in_port2>;
>> + coresight,hwid = <0>;
>> + direction = <1>;
>> };
>> };
>> };
>> @@ -441,6 +472,8 @@
>> port {
>> cluster1_etm3_out_port: endpoint {
>> remote-endpoint = <&cluster1_funnel_in_port3>;
>> + coresight,hwid = <0>;
>> + direction = <1>;
>> };
>> };
>> };
>> @@ -462,6 +495,8 @@
>> reg = <0>;
>> replicator_out_port0: endpoint {
>> remote-endpoint = <&tpiu_in_port>;
>> + coresight,hwid = <0>;
>> + direction = <1>;
>> };
>> };
>>
>> @@ -469,14 +504,17 @@
>> reg = <1>;
>> replicator_out_port1: endpoint {
>> remote-endpoint = <&etr_in_port>;
>> + coresight,hwid = <1>;
>> + direction = <1>;
>> };
>> };
>>
>> /* replicator input port */
>> port@2 {
>> - reg = <0>;
>> + reg = <2>;
>> replicator_in_port0: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> + coresight,hwid = <0>;
>> };
>> };
>> };
>> diff --git a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
>> index 0c43fb3..146a5d9 100644
>> --- a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
>> +++ b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
>> @@ -15,15 +15,18 @@
>> port@0 {
>> reg = <0>;
>> csys1_funnel_out_port: endpoint {
>> + coresight,hwid = <0>;
>> + direction = <1>;
>> remote-endpoint = <&etf1_in_port>;
>> };
>> };
>>
>> /* input port */
>> port@1 {
>> - reg = <0>;
>> + reg = <1>;
>> csys1_funnel_in_port0: endpoint {
>> - slave-mode;
>> + coresight,hwid = <0>;
>> + direction = <0>;
>> };
>> };
>>
>> @@ -45,15 +48,18 @@
>> port@0 {
>> reg = <0>;
>> etf1_in_port: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> + coresight,hwid = <0>;
>> remote-endpoint = <&csys1_funnel_out_port>;
>> };
>> };
>>
>> /* output port */
>> port@1 {
>> - reg = <0>;
>> + reg = <1>;
>> etf1_out_port: endpoint {
>> + coresight,hwid = <0>;
>> + direction = <1>;
>> remote-endpoint = <&csys2_funnel_in_port1>;
>> };
>> };
>> @@ -75,23 +81,27 @@
>> port@0 {
>> reg = <0>;
>> csys2_funnel_out_port: endpoint {
>> + coresight,hwid = <0>;
>> + direction = <1>;
>> remote-endpoint = <&replicator_in_port0>;
>> };
>> };
>>
>> /* input ports */
>> port@1 {
>> - reg = <0>;
>> + reg = <1>;
>> csys2_funnel_in_port0: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> + coresight,hwid = <0>;
>> remote-endpoint = <&etf0_out_port>;
>> };
>> };
>>
>> port@2 {
>> - reg = <1>;
>> + reg = <2>;
>> csys2_funnel_in_port1: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> + coresight,hwid = <1>;
>> remote-endpoint = <&etf1_out_port>;
>> };
>> };
>> diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts
>> index c9236c4..27b8036 100644
>> --- a/arch/arm64/boot/dts/arm/juno.dts
>> +++ b/arch/arm64/boot/dts/arm/juno.dts
>> @@ -260,10 +260,11 @@
>> &main_funnel {
>> ports {
>> port@3 {
>> - reg = <2>;
>> + reg = <3>;
>> main_funnel_in_port2: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&stm_out_port>;
>> + coresight,hwid = <2>;
>> };
>> };
>> };
>> --
>> 2.7.4
>>
On 08/06/18 20:55, Mathieu Poirier wrote:
> On Tue, Jun 05, 2018 at 10:43:13PM +0100, Suzuki K Poulose wrote:
>> The coresight driver doesn't drop the references on the
>> remote endpoint/port nodes. Add the missing of_node_put()
>> calls. To make it easier to handle different corner cases
>> cleanly, move the parsing of an endpoint to separate
>> function.
>
> Please split this as those are two different things.
Mathieu,
I can do that, its only that if someone were to backport
the fix for an older kernel, they would need to pick up these
two patches, which is still fine.
>
>>
>> Reported-by: Mathieu Poirier <[email protected]>
>> Signed-off-by: Suzuki K Poulose <[email protected]>
>> ---
>> drivers/hwtracing/coresight/of_coresight.c | 139 +++++++++++++++++------------
>> 1 file changed, 84 insertions(+), 55 deletions(-)
>>
>> diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
>> index a33a92e..8a23c63 100644
>> --- a/drivers/hwtracing/coresight/of_coresight.c
>> +++ b/drivers/hwtracing/coresight/of_coresight.c
>> +static int of_coresight_parse_endpoint(struct device_node *ep,
>> + struct coresight_platform_data *pdata,
>> + int *i)
>> +{
>> + int ret = 0;
>> + struct of_endpoint endpoint, rendpoint;
>> + struct device_node *rparent = NULL;
>> + struct device_node *rport = NULL;
>> + struct device *rdev = NULL;
>> +
>> + do {
...
>> + } while (0);
>
> That's a clever way of coding a classic 'goto' block.
>
>> +
>> + if (rparent)
>> + of_node_put(rparent);
>> + if (rport)
>> + of_node_put(rport);
>
> Perfect - thank you for that.
>
>> pdata->name = dev_name(dev);
>> + pdata->cpu = of_coresight_get_cpu(node);
>>
>> /* Get the number of input and output port for this component */
>> of_coresight_get_ports(node, &pdata->nr_inport, &pdata->nr_outport);
>>
>> - if (pdata->nr_outport) {
>> - ret = of_coresight_alloc_memory(dev, pdata);
>> + /* If there are not output connections, we are done */
>
> /not/no
Thanks for spotting.
Suzuki
On 08/06/18 22:22, Mathieu Poirier wrote:
> On Tue, Jun 05, 2018 at 10:43:19PM +0100, Suzuki K Poulose wrote:
>> The coresight drivers relied on default bindings for graph
>> in DT, while reusing the "reg" field of the "ports" to indicate
>> the actual hardware port number for the connections. However,
>> with the rules getting stricter w.r.t to the address mismatch
>> with the label, it is no longer possible to use the port address
>> field for the hardware port number. Hence, we add an explicit
>> property to denote the hardware port number, "coresight,hwid"
>> which must be specified for each "endpoint".
>>
>> Cc: Mathieu Poirier <[email protected]>
>> Cc: Sudeep Holla <[email protected]>
>> Cc: Rob Herring <[email protected]>
>> Signed-off-by: Suzuki K Poulose <[email protected]>
>> ---
>> .../devicetree/bindings/arm/coresight.txt | 29 ++++++++++---
>> drivers/hwtracing/coresight/of_coresight.c | 49 +++++++++++++++++-----
>> 2 files changed, 62 insertions(+), 16 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt
>> index ed6b555..bf75ab3 100644
>> --- a/Documentation/devicetree/bindings/arm/coresight.txt
>> +++ b/Documentation/devicetree/bindings/arm/coresight.txt
>> @@ -108,8 +108,13 @@ following properties to uniquely identify the connection details.
>> "slave-mode"
>> };
>
> For the binding part:
> Reviewed-by: Mathieu Poirier <[email protected]>
>
>> diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
>> index d01a9ce..d23d7dd 100644
>> --- a/drivers/hwtracing/coresight/of_coresight.c
>> +++ b/drivers/hwtracing/coresight/of_coresight.c
...
>> +/*
>> * of_coresight_parse_endpoint : Parse the given output endpoint @ep
>> * and fill the connection information in *@pconn.
>> *
>> @@ -109,11 +134,11 @@ EXPORT_SYMBOL_GPL(of_coresight_get_cpu);
>> * 0 - If the parsing completed without any fatal errors.
Please note the return value description here. Further comments below.
>> * -Errno - Fatal error, abort the scanning.
>> */
>> -static int of_coresight_parse_endpoint(struct device_node *ep,
>> +static int of_coresight_parse_endpoint(struct device *dev,
>> + struct device_node *ep,
>> struct coresight_connection **pconn)
>> {
>> - int ret = 0;
>> - struct of_endpoint endpoint, rendpoint;
>> + int ret = 0, local_port, child_port;
>> struct device_node *rparent = NULL;
>> struct device_node *rep = NULL;
>> struct device *rdev = NULL;
>> @@ -128,7 +153,8 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
>> break;
>>
>> /* Parse the local port details */
>> - if (of_graph_parse_endpoint(ep, &endpoint))
>> + local_port = of_coresight_endpoint_get_port_id(dev, ep);
>> + if (local_port < 0)
>> break;
>> /*
>> * Get a handle on the remote endpoint and the device it is
>> @@ -140,9 +166,6 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
>> rparent = of_graph_get_port_parent(rep);
>> if (!rparent)
>> break;
>> - if (of_graph_parse_endpoint(rep, &rendpoint))
>> - break;
>> -
>> /* If the remote device is not available, defer probing */
>> rdev = of_coresight_get_endpoint_device(rparent);
>> if (!rdev) {
>> @@ -150,9 +173,15 @@ static int of_coresight_parse_endpoint(struct device_node *ep,
>> break;
>> }
>>
>> - conn->outport = endpoint.port;
>> + child_port = of_coresight_endpoint_get_port_id(rdev, rep);
>> + if (child_port < 0) {
>> + ret = 0;
>
> Why returning '0' on an error condition? Same for 'local_port' above.
>
If we are unable to parse a port, we can simply ignore the port and continue, which
is what we have today with the existing code. I didn't change it and still think
it is the best effort thing. We could spit a warning for such cases, if really needed.
Also, the parsing code almost never fails at the moment. If it fails to find "reg" field,
it is assumed to be '0'. Either way ignoring it seems harmless. That said I am open
to suggestions.
Cheers
Suzuki
On 11/06/18 17:52, Mathieu Poirier wrote:
> On 11 June 2018 at 03:22, Suzuki K Poulose <[email protected]> wrote:
>> On 08/06/18 22:22, Mathieu Poirier wrote:
>>>
>>> On Tue, Jun 05, 2018 at 10:43:19PM +0100, Suzuki K Poulose wrote:
>>>>
>>>> The coresight drivers relied on default bindings for graph
>>>> in DT, while reusing the "reg" field of the "ports" to indicate
>>>> the actual hardware port number for the connections. However,
>>>> with the rules getting stricter w.r.t to the address mismatch
>>>> with the label, it is no longer possible to use the port address
>>>> field for the hardware port number. Hence, we add an explicit
>>>> property to denote the hardware port number, "coresight,hwid"
>>>> which must be specified for each "endpoint".
>>>>
>>>> Cc: Mathieu Poirier <[email protected]>
>>>> Cc: Sudeep Holla <[email protected]>
>>>> Cc: Rob Herring <[email protected]>
>>>> Signed-off-by: Suzuki K Poulose <[email protected]>
>>>> ---
>>>> .../devicetree/bindings/arm/coresight.txt | 29 ++++++++++---
>>>> drivers/hwtracing/coresight/of_coresight.c | 49
>>>> +++++++++++++++++-----
>>>> 2 files changed, 62 insertions(+), 16 deletions(-)
>>>>
>>>> diff --git a/Documentation/devicetree/bindings/arm/coresight.txt
>>>> b/Documentation/devicetree/bindings/arm/coresight.txt
>>>> index ed6b555..bf75ab3 100644
>>>> --- a/Documentation/devicetree/bindings/arm/coresight.txt
>>>> +++ b/Documentation/devicetree/bindings/arm/coresight.txt
>>>> @@ -108,8 +108,13 @@ following properties to uniquely identify the
>>>> connection details.
>>>> "slave-mode"
>>
>>
>>
>>>> };
>>>
>>>
>>> For the binding part:
>>> Reviewed-by: Mathieu Poirier <[email protected]>
...
>>>> @@ -140,9 +166,6 @@ static int of_coresight_parse_endpoint(struct
>>>> device_node *ep,
>>>> rparent = of_graph_get_port_parent(rep);
>>>> if (!rparent)
>>>> break;
>>>> - if (of_graph_parse_endpoint(rep, &rendpoint))
>>>> - break;
>>>> -
>>>> /* If the remote device is not available, defer probing
>>>> */
>>>> rdev = of_coresight_get_endpoint_device(rparent);
>>>> if (!rdev) {
>>>> @@ -150,9 +173,15 @@ static int of_coresight_parse_endpoint(struct
>>>> device_node *ep,
>>>> break;
>>>> }
>>>> - conn->outport = endpoint.port;
>>>> + child_port = of_coresight_endpoint_get_port_id(rdev,
>>>> rep);
>>>> + if (child_port < 0) {
>>>> + ret = 0;
>>>
>>>
>>> Why returning '0' on an error condition? Same for 'local_port' above.
>>>
>>
>> If we are unable to parse a port, we can simply ignore the port and
>> continue, which
>> is what we have today with the existing code. I didn't change it and still
>> think
>> it is the best effort thing. We could spit a warning for such cases, if
>> really needed.
>> Also, the parsing code almost never fails at the moment. If it fails to find
>> "reg" field,
>> it is assumed to be '0'. Either way ignoring it seems harmless. That said I
>> am open
>> to suggestions.
>
> Looking at the original code I remember not mandating enpoints to be
> valid for debugging purposes. That certainly helps when building up a
> device tree file but also has the side effect of silently overlooking
> specification problems. Fortunately the revamping you did on that
> part of the code makes it very easy to change that, something I think
> we should take advantage of (it can only lead to positive scenarios
> where defective specifications get pointed out).
>
> That being said and because the original behaviour is just as
> permissive, you can leave as is.
Thanks. So can I assume the Reviewed-by applies for the code now ?
Suzuki
On 11 June 2018 at 03:22, Suzuki K Poulose <[email protected]> wrote:
> On 08/06/18 22:22, Mathieu Poirier wrote:
>>
>> On Tue, Jun 05, 2018 at 10:43:19PM +0100, Suzuki K Poulose wrote:
>>>
>>> The coresight drivers relied on default bindings for graph
>>> in DT, while reusing the "reg" field of the "ports" to indicate
>>> the actual hardware port number for the connections. However,
>>> with the rules getting stricter w.r.t to the address mismatch
>>> with the label, it is no longer possible to use the port address
>>> field for the hardware port number. Hence, we add an explicit
>>> property to denote the hardware port number, "coresight,hwid"
>>> which must be specified for each "endpoint".
>>>
>>> Cc: Mathieu Poirier <[email protected]>
>>> Cc: Sudeep Holla <[email protected]>
>>> Cc: Rob Herring <[email protected]>
>>> Signed-off-by: Suzuki K Poulose <[email protected]>
>>> ---
>>> .../devicetree/bindings/arm/coresight.txt | 29 ++++++++++---
>>> drivers/hwtracing/coresight/of_coresight.c | 49
>>> +++++++++++++++++-----
>>> 2 files changed, 62 insertions(+), 16 deletions(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/arm/coresight.txt
>>> b/Documentation/devicetree/bindings/arm/coresight.txt
>>> index ed6b555..bf75ab3 100644
>>> --- a/Documentation/devicetree/bindings/arm/coresight.txt
>>> +++ b/Documentation/devicetree/bindings/arm/coresight.txt
>>> @@ -108,8 +108,13 @@ following properties to uniquely identify the
>>> connection details.
>>> "slave-mode"
>
>
>
>>> };
>>
>>
>> For the binding part:
>> Reviewed-by: Mathieu Poirier <[email protected]>
>>
>>> diff --git a/drivers/hwtracing/coresight/of_coresight.c
>>> b/drivers/hwtracing/coresight/of_coresight.c
>>> index d01a9ce..d23d7dd 100644
>>> --- a/drivers/hwtracing/coresight/of_coresight.c
>>> +++ b/drivers/hwtracing/coresight/of_coresight.c
>
>
> ...
>
>>> +/*
>>> * of_coresight_parse_endpoint : Parse the given output endpoint @ep
>>> * and fill the connection information in *@pconn.
>>> *
>>> @@ -109,11 +134,11 @@ EXPORT_SYMBOL_GPL(of_coresight_get_cpu);
>>> * 0 - If the parsing completed without any fatal errors.
>
>
> Please note the return value description here. Further comments below.
>
>>> * -Errno - Fatal error, abort the scanning.
>>> */
>>> -static int of_coresight_parse_endpoint(struct device_node *ep,
>>> +static int of_coresight_parse_endpoint(struct device *dev,
>>> + struct device_node *ep,
>>> struct coresight_connection
>>> **pconn)
>>> {
>>> - int ret = 0;
>>> - struct of_endpoint endpoint, rendpoint;
>>> + int ret = 0, local_port, child_port;
>>> struct device_node *rparent = NULL;
>>> struct device_node *rep = NULL;
>>> struct device *rdev = NULL;
>>> @@ -128,7 +153,8 @@ static int of_coresight_parse_endpoint(struct
>>> device_node *ep,
>>> break;
>>> /* Parse the local port details */
>>> - if (of_graph_parse_endpoint(ep, &endpoint))
>>> + local_port = of_coresight_endpoint_get_port_id(dev, ep);
>>> + if (local_port < 0)
>>> break;
>>> /*
>>> * Get a handle on the remote endpoint and the device it
>>> is
>>> @@ -140,9 +166,6 @@ static int of_coresight_parse_endpoint(struct
>>> device_node *ep,
>>> rparent = of_graph_get_port_parent(rep);
>>> if (!rparent)
>>> break;
>>> - if (of_graph_parse_endpoint(rep, &rendpoint))
>>> - break;
>>> -
>>> /* If the remote device is not available, defer probing
>>> */
>>> rdev = of_coresight_get_endpoint_device(rparent);
>>> if (!rdev) {
>>> @@ -150,9 +173,15 @@ static int of_coresight_parse_endpoint(struct
>>> device_node *ep,
>>> break;
>>> }
>>> - conn->outport = endpoint.port;
>>> + child_port = of_coresight_endpoint_get_port_id(rdev,
>>> rep);
>>> + if (child_port < 0) {
>>> + ret = 0;
>>
>>
>> Why returning '0' on an error condition? Same for 'local_port' above.
>>
>
> If we are unable to parse a port, we can simply ignore the port and
> continue, which
> is what we have today with the existing code. I didn't change it and still
> think
> it is the best effort thing. We could spit a warning for such cases, if
> really needed.
> Also, the parsing code almost never fails at the moment. If it fails to find
> "reg" field,
> it is assumed to be '0'. Either way ignoring it seems harmless. That said I
> am open
> to suggestions.
Looking at the original code I remember not mandating enpoints to be
valid for debugging purposes. That certainly helps when building up a
device tree file but also has the side effect of silently overlooking
specification problems. Fortunately the revamping you did on that
part of the code makes it very easy to change that, something I think
we should take advantage of (it can only lead to positive scenarios
where defective specifications get pointed out).
That being said and because the original behaviour is just as
permissive, you can leave as is.
Thanks,
Mathieu
>
> Cheers
> Suzuki
On 11 June 2018 at 10:55, Suzuki K Poulose <[email protected]> wrote:
> On 11/06/18 17:52, Mathieu Poirier wrote:
>>
>> On 11 June 2018 at 03:22, Suzuki K Poulose <[email protected]> wrote:
>>>
>>> On 08/06/18 22:22, Mathieu Poirier wrote:
>>>>
>>>>
>>>> On Tue, Jun 05, 2018 at 10:43:19PM +0100, Suzuki K Poulose wrote:
>>>>>
>>>>>
>>>>> The coresight drivers relied on default bindings for graph
>>>>> in DT, while reusing the "reg" field of the "ports" to indicate
>>>>> the actual hardware port number for the connections. However,
>>>>> with the rules getting stricter w.r.t to the address mismatch
>>>>> with the label, it is no longer possible to use the port address
>>>>> field for the hardware port number. Hence, we add an explicit
>>>>> property to denote the hardware port number, "coresight,hwid"
>>>>> which must be specified for each "endpoint".
>>>>>
>>>>> Cc: Mathieu Poirier <[email protected]>
>>>>> Cc: Sudeep Holla <[email protected]>
>>>>> Cc: Rob Herring <[email protected]>
>>>>> Signed-off-by: Suzuki K Poulose <[email protected]>
>>>>> ---
>>>>> .../devicetree/bindings/arm/coresight.txt | 29
>>>>> ++++++++++---
>>>>> drivers/hwtracing/coresight/of_coresight.c | 49
>>>>> +++++++++++++++++-----
>>>>> 2 files changed, 62 insertions(+), 16 deletions(-)
>>>>>
>>>>> diff --git a/Documentation/devicetree/bindings/arm/coresight.txt
>>>>> b/Documentation/devicetree/bindings/arm/coresight.txt
>>>>> index ed6b555..bf75ab3 100644
>>>>> --- a/Documentation/devicetree/bindings/arm/coresight.txt
>>>>> +++ b/Documentation/devicetree/bindings/arm/coresight.txt
>>>>> @@ -108,8 +108,13 @@ following properties to uniquely identify the
>>>>> connection details.
>>>>> "slave-mode"
>>>
>>>
>>>
>>>
>>>>> };
>>>>
>>>>
>>>>
>>>> For the binding part:
>>>> Reviewed-by: Mathieu Poirier <[email protected]>
>
>
> ...
>
>>>>> @@ -140,9 +166,6 @@ static int of_coresight_parse_endpoint(struct
>>>>> device_node *ep,
>>>>> rparent = of_graph_get_port_parent(rep);
>>>>> if (!rparent)
>>>>> break;
>>>>> - if (of_graph_parse_endpoint(rep, &rendpoint))
>>>>> - break;
>>>>> -
>>>>> /* If the remote device is not available, defer
>>>>> probing
>>>>> */
>>>>> rdev = of_coresight_get_endpoint_device(rparent);
>>>>> if (!rdev) {
>>>>> @@ -150,9 +173,15 @@ static int of_coresight_parse_endpoint(struct
>>>>> device_node *ep,
>>>>> break;
>>>>> }
>>>>> - conn->outport = endpoint.port;
>>>>> + child_port = of_coresight_endpoint_get_port_id(rdev,
>>>>> rep);
>>>>> + if (child_port < 0) {
>>>>> + ret = 0;
>>>>
>>>>
>>>>
>>>> Why returning '0' on an error condition? Same for 'local_port' above.
>>>>
>>>
>>> If we are unable to parse a port, we can simply ignore the port and
>>> continue, which
>>> is what we have today with the existing code. I didn't change it and
>>> still
>>> think
>>> it is the best effort thing. We could spit a warning for such cases, if
>>> really needed.
>>> Also, the parsing code almost never fails at the moment. If it fails to
>>> find
>>> "reg" field,
>>> it is assumed to be '0'. Either way ignoring it seems harmless. That said
>>> I
>>> am open
>>> to suggestions.
>>
>>
>> Looking at the original code I remember not mandating enpoints to be
>> valid for debugging purposes. That certainly helps when building up a
>> device tree file but also has the side effect of silently overlooking
>> specification problems. Fortunately the revamping you did on that
>> part of the code makes it very easy to change that, something I think
>> we should take advantage of (it can only lead to positive scenarios
>> where defective specifications get pointed out).
>>
>> That being said and because the original behaviour is just as
>> permissive, you can leave as is.
>
>
> Thanks. So can I assume the Reviewed-by applies for the code now ?
Yes
>
> Suzuki
On 08/06/18 22:52, Mathieu Poirier wrote:
> On 8 June 2018 at 15:49, Mathieu Poirier <[email protected]> wrote:
>> On Tue, Jun 05, 2018 at 10:43:21PM +0100, Suzuki K Poulose wrote:
>>> Switch to updated coresight bindings for hw ports.
>>>
>>> Cc: Sudeep Holla <[email protected]>
>>> Cc: Liviu Dudau <[email protected]>
>>> Cc: Mathieu Poirier <[email protected]>
>>> Signed-off-by: Suzuki K Poulose <[email protected]>
>>> ---
>>> Changes since V1:
>>> - Add support Juno for r1 & r2.
>>> ---
>>
>> Reviewed-by: Mathieu Poirier <[email protected]>
>
> Sudeep please hold on before applying this as there is more work to be
> done on this set.
Mathieu,
I will wait for Rob / Frank to have a say on the bindings before I post the
next update.
Cheers
Suzuki
On Fri, Jun 08, 2018 at 03:52:58PM -0600, Mathieu Poirier wrote:
> On 8 June 2018 at 15:49, Mathieu Poirier <[email protected]> wrote:
> > On Tue, Jun 05, 2018 at 10:43:21PM +0100, Suzuki K Poulose wrote:
> >> Switch to updated coresight bindings for hw ports.
> >>
> >> Cc: Sudeep Holla <[email protected]>
> >> Cc: Liviu Dudau <[email protected]>
> >> Cc: Mathieu Poirier <[email protected]>
> >> Signed-off-by: Suzuki K Poulose <[email protected]>
> >> ---
> >> Changes since V1:
> >> - Add support Juno for r1 & r2.
> >> ---
> >
> > Reviewed-by: Mathieu Poirier <[email protected]>
>
> Sudeep please hold on before applying this as there is more work to be
> done on this set.
>
Sure, I plan to apply the DT changes only after the driver changes are
queued by you or whichever tree it's channelled through. I was already
told the same to Suzuki.
--
Regards,
Sudeep
Hi Stefan,
Can you take a look at the patch? Thanks.
Shawn
On Tue, Jun 05, 2018 at 10:43:26PM +0100, Suzuki K Poulose wrote:
> Switch to the updated coresight bindings.
>
> Cc: Shawn Guo <[email protected]>
> Cc: Sascha Hauer <[email protected]>
> Cc: Pengutronix Kernel Team <[email protected]>
> Cc: Fabio Estevam <[email protected]>
> Cc: Mathieu Poirier <[email protected]>
> Signed-off-by: Suzuki K Poulose <[email protected]>
> ---
> arch/arm/boot/dts/imx7d.dtsi | 5 ++++-
> arch/arm/boot/dts/imx7s.dtsi | 41 ++++++++++++++++++++++++++++++-----------
> 2 files changed, 34 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
> index 200714e..5faff17 100644
> --- a/arch/arm/boot/dts/imx7d.dtsi
> +++ b/arch/arm/boot/dts/imx7d.dtsi
> @@ -87,7 +87,9 @@
>
> port {
> etm1_out_port: endpoint {
> + direction = <1>;
> remote-endpoint = <&ca_funnel_in_port1>;
> + coresight,hwid = <0>;
> };
> };
> };
> @@ -174,8 +176,9 @@
> port@1 {
> reg = <1>;
> ca_funnel_in_port1: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&etm1_out_port>;
> + coresight,hwid = <1>;
> };
> };
> };
> diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
> index 4d42335..8e90915 100644
> --- a/arch/arm/boot/dts/imx7s.dtsi
> +++ b/arch/arm/boot/dts/imx7s.dtsi
> @@ -151,23 +151,28 @@
> port@0 {
> reg = <0>;
> replicator_out_port0: endpoint {
> + direction = <1>;
> remote-endpoint = <&tpiu_in_port>;
> + coresight,hwid = <0>;
> };
> };
>
> port@1 {
> reg = <1>;
> replicator_out_port1: endpoint {
> + direction = <1>;
> remote-endpoint = <&etr_in_port>;
> + coresight,hwid = <1>;
> };
> };
>
> /* replicator input port */
> port@2 {
> - reg = <0>;
> + reg = <2>;
> replicator_in_port0: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&etf_out_port>;
> + coresight,hwid = <0>;
> };
> };
> };
> @@ -203,16 +208,19 @@
> port@0 {
> reg = <0>;
> ca_funnel_in_port0: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&etm0_out_port>;
> + coresight,hwid = <0>;
> };
> };
>
> /* funnel output port */
> port@2 {
> - reg = <0>;
> + reg = <2>;
> ca_funnel_out_port0: endpoint {
> + direction = <1>;
> remote-endpoint = <&hugo_funnel_in_port0>;
> + coresight,hwid = <0>;
> };
> };
>
> @@ -229,7 +237,9 @@
>
> port {
> etm0_out_port: endpoint {
> + direction = <1>;
> remote-endpoint = <&ca_funnel_in_port0>;
> + coresight,hwid = <0>;
> };
> };
> };
> @@ -248,22 +258,26 @@
> port@0 {
> reg = <0>;
> hugo_funnel_in_port0: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&ca_funnel_out_port0>;
> + coresight,hwid = <0>;
> };
> };
>
> port@1 {
> reg = <1>;
> hugo_funnel_in_port1: endpoint {
> - slave-mode; /* M4 input */
> + direction = <0>; /* M4 input */
> + coresight,hwid = <1>;
> };
> };
>
> port@2 {
> - reg = <0>;
> + reg = <2>;
> hugo_funnel_out_port0: endpoint {
> + direction = <1>;
> remote-endpoint = <&etf_in_port>;
> + coresight,hwid = <0>;
> };
> };
>
> @@ -284,15 +298,18 @@
> port@0 {
> reg = <0>;
> etf_in_port: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&hugo_funnel_out_port0>;
> + coresight,hwid = <0>;
> };
> };
>
> port@1 {
> - reg = <0>;
> + reg = <1>;
> etf_out_port: endpoint {
> + direction = <1>;
> remote-endpoint = <&replicator_in_port0>;
> + coresight,hwid = <0>;
> };
> };
> };
> @@ -306,8 +323,9 @@
>
> port {
> etr_in_port: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&replicator_out_port1>;
> + coresight,hwid = <0>;
> };
> };
> };
> @@ -320,8 +338,9 @@
>
> port {
> tpiu_in_port: endpoint {
> - slave-mode;
> + direction = <0>;
> remote-endpoint = <&replicator_out_port1>;
> + coresight,hwid = <0>;
> };
> };
> };
> --
> 2.7.4
>
On 19.06.2018 04:12, Shawn Guo wrote:
> Hi Stefan,
>
> Can you take a look at the patch? Thanks.
>
> Shawn
>
> On Tue, Jun 05, 2018 at 10:43:26PM +0100, Suzuki K Poulose wrote:
>> Switch to the updated coresight bindings.
Looks good to me.
Reviewed-by: Stefan Agner <[email protected]>
--
Stefan
>>
>> Cc: Shawn Guo <[email protected]>
>> Cc: Sascha Hauer <[email protected]>
>> Cc: Pengutronix Kernel Team <[email protected]>
>> Cc: Fabio Estevam <[email protected]>
>> Cc: Mathieu Poirier <[email protected]>
>> Signed-off-by: Suzuki K Poulose <[email protected]>
>> ---
>> arch/arm/boot/dts/imx7d.dtsi | 5 ++++-
>> arch/arm/boot/dts/imx7s.dtsi | 41 ++++++++++++++++++++++++++++++-----------
>> 2 files changed, 34 insertions(+), 12 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
>> index 200714e..5faff17 100644
>> --- a/arch/arm/boot/dts/imx7d.dtsi
>> +++ b/arch/arm/boot/dts/imx7d.dtsi
>> @@ -87,7 +87,9 @@
>>
>> port {
>> etm1_out_port: endpoint {
>> + direction = <1>;
>> remote-endpoint = <&ca_funnel_in_port1>;
>> + coresight,hwid = <0>;
>> };
>> };
>> };
>> @@ -174,8 +176,9 @@
>> port@1 {
>> reg = <1>;
>> ca_funnel_in_port1: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&etm1_out_port>;
>> + coresight,hwid = <1>;
>> };
>> };
>> };
>> diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
>> index 4d42335..8e90915 100644
>> --- a/arch/arm/boot/dts/imx7s.dtsi
>> +++ b/arch/arm/boot/dts/imx7s.dtsi
>> @@ -151,23 +151,28 @@
>> port@0 {
>> reg = <0>;
>> replicator_out_port0: endpoint {
>> + direction = <1>;
>> remote-endpoint = <&tpiu_in_port>;
>> + coresight,hwid = <0>;
>> };
>> };
>>
>> port@1 {
>> reg = <1>;
>> replicator_out_port1: endpoint {
>> + direction = <1>;
>> remote-endpoint = <&etr_in_port>;
>> + coresight,hwid = <1>;
>> };
>> };
>>
>> /* replicator input port */
>> port@2 {
>> - reg = <0>;
>> + reg = <2>;
>> replicator_in_port0: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&etf_out_port>;
>> + coresight,hwid = <0>;
>> };
>> };
>> };
>> @@ -203,16 +208,19 @@
>> port@0 {
>> reg = <0>;
>> ca_funnel_in_port0: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&etm0_out_port>;
>> + coresight,hwid = <0>;
>> };
>> };
>>
>> /* funnel output port */
>> port@2 {
>> - reg = <0>;
>> + reg = <2>;
>> ca_funnel_out_port0: endpoint {
>> + direction = <1>;
>> remote-endpoint = <&hugo_funnel_in_port0>;
>> + coresight,hwid = <0>;
>> };
>> };
>>
>> @@ -229,7 +237,9 @@
>>
>> port {
>> etm0_out_port: endpoint {
>> + direction = <1>;
>> remote-endpoint = <&ca_funnel_in_port0>;
>> + coresight,hwid = <0>;
>> };
>> };
>> };
>> @@ -248,22 +258,26 @@
>> port@0 {
>> reg = <0>;
>> hugo_funnel_in_port0: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&ca_funnel_out_port0>;
>> + coresight,hwid = <0>;
>> };
>> };
>>
>> port@1 {
>> reg = <1>;
>> hugo_funnel_in_port1: endpoint {
>> - slave-mode; /* M4 input */
>> + direction = <0>; /* M4 input */
>> + coresight,hwid = <1>;
>> };
>> };
>>
>> port@2 {
>> - reg = <0>;
>> + reg = <2>;
>> hugo_funnel_out_port0: endpoint {
>> + direction = <1>;
>> remote-endpoint = <&etf_in_port>;
>> + coresight,hwid = <0>;
>> };
>> };
>>
>> @@ -284,15 +298,18 @@
>> port@0 {
>> reg = <0>;
>> etf_in_port: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&hugo_funnel_out_port0>;
>> + coresight,hwid = <0>;
>> };
>> };
>>
>> port@1 {
>> - reg = <0>;
>> + reg = <1>;
>> etf_out_port: endpoint {
>> + direction = <1>;
>> remote-endpoint = <&replicator_in_port0>;
>> + coresight,hwid = <0>;
>> };
>> };
>> };
>> @@ -306,8 +323,9 @@
>>
>> port {
>> etr_in_port: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&replicator_out_port1>;
>> + coresight,hwid = <0>;
>> };
>> };
>> };
>> @@ -320,8 +338,9 @@
>>
>> port {
>> tpiu_in_port: endpoint {
>> - slave-mode;
>> + direction = <0>;
>> remote-endpoint = <&replicator_out_port1>;
>> + coresight,hwid = <0>;
>> };
>> };
>> };
>> --
>> 2.7.4
>>
>
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Mon, 18 Jun 2018 at 20:13, Shawn Guo <[email protected]> wrote:
>
> Hi Stefan,
>
> Can you take a look at the patch? Thanks.
>
These bindings are still being discussed and patches related to them
shouldn't be merged. The next iteration of this patchset will not
included individual modifications to device tree files, that will be
left for a later time when bindings have been agreed upon.
Thanks,
Mathieu
> Shawn
>
> On Tue, Jun 05, 2018 at 10:43:26PM +0100, Suzuki K Poulose wrote:
> > Switch to the updated coresight bindings.
> >
> > Cc: Shawn Guo <[email protected]>
> > Cc: Sascha Hauer <[email protected]>
> > Cc: Pengutronix Kernel Team <[email protected]>
> > Cc: Fabio Estevam <[email protected]>
> > Cc: Mathieu Poirier <[email protected]>
> > Signed-off-by: Suzuki K Poulose <[email protected]>
> > ---
> > arch/arm/boot/dts/imx7d.dtsi | 5 ++++-
> > arch/arm/boot/dts/imx7s.dtsi | 41 ++++++++++++++++++++++++++++++-----------
> > 2 files changed, 34 insertions(+), 12 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
> > index 200714e..5faff17 100644
> > --- a/arch/arm/boot/dts/imx7d.dtsi
> > +++ b/arch/arm/boot/dts/imx7d.dtsi
> > @@ -87,7 +87,9 @@
> >
> > port {
> > etm1_out_port: endpoint {
> > + direction = <1>;
> > remote-endpoint = <&ca_funnel_in_port1>;
> > + coresight,hwid = <0>;
> > };
> > };
> > };
> > @@ -174,8 +176,9 @@
> > port@1 {
> > reg = <1>;
> > ca_funnel_in_port1: endpoint {
> > - slave-mode;
> > + direction = <0>;
> > remote-endpoint = <&etm1_out_port>;
> > + coresight,hwid = <1>;
> > };
> > };
> > };
> > diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
> > index 4d42335..8e90915 100644
> > --- a/arch/arm/boot/dts/imx7s.dtsi
> > +++ b/arch/arm/boot/dts/imx7s.dtsi
> > @@ -151,23 +151,28 @@
> > port@0 {
> > reg = <0>;
> > replicator_out_port0: endpoint {
> > + direction = <1>;
> > remote-endpoint = <&tpiu_in_port>;
> > + coresight,hwid = <0>;
> > };
> > };
> >
> > port@1 {
> > reg = <1>;
> > replicator_out_port1: endpoint {
> > + direction = <1>;
> > remote-endpoint = <&etr_in_port>;
> > + coresight,hwid = <1>;
> > };
> > };
> >
> > /* replicator input port */
> > port@2 {
> > - reg = <0>;
> > + reg = <2>;
> > replicator_in_port0: endpoint {
> > - slave-mode;
> > + direction = <0>;
> > remote-endpoint = <&etf_out_port>;
> > + coresight,hwid = <0>;
> > };
> > };
> > };
> > @@ -203,16 +208,19 @@
> > port@0 {
> > reg = <0>;
> > ca_funnel_in_port0: endpoint {
> > - slave-mode;
> > + direction = <0>;
> > remote-endpoint = <&etm0_out_port>;
> > + coresight,hwid = <0>;
> > };
> > };
> >
> > /* funnel output port */
> > port@2 {
> > - reg = <0>;
> > + reg = <2>;
> > ca_funnel_out_port0: endpoint {
> > + direction = <1>;
> > remote-endpoint = <&hugo_funnel_in_port0>;
> > + coresight,hwid = <0>;
> > };
> > };
> >
> > @@ -229,7 +237,9 @@
> >
> > port {
> > etm0_out_port: endpoint {
> > + direction = <1>;
> > remote-endpoint = <&ca_funnel_in_port0>;
> > + coresight,hwid = <0>;
> > };
> > };
> > };
> > @@ -248,22 +258,26 @@
> > port@0 {
> > reg = <0>;
> > hugo_funnel_in_port0: endpoint {
> > - slave-mode;
> > + direction = <0>;
> > remote-endpoint = <&ca_funnel_out_port0>;
> > + coresight,hwid = <0>;
> > };
> > };
> >
> > port@1 {
> > reg = <1>;
> > hugo_funnel_in_port1: endpoint {
> > - slave-mode; /* M4 input */
> > + direction = <0>; /* M4 input */
> > + coresight,hwid = <1>;
> > };
> > };
> >
> > port@2 {
> > - reg = <0>;
> > + reg = <2>;
> > hugo_funnel_out_port0: endpoint {
> > + direction = <1>;
> > remote-endpoint = <&etf_in_port>;
> > + coresight,hwid = <0>;
> > };
> > };
> >
> > @@ -284,15 +298,18 @@
> > port@0 {
> > reg = <0>;
> > etf_in_port: endpoint {
> > - slave-mode;
> > + direction = <0>;
> > remote-endpoint = <&hugo_funnel_out_port0>;
> > + coresight,hwid = <0>;
> > };
> > };
> >
> > port@1 {
> > - reg = <0>;
> > + reg = <1>;
> > etf_out_port: endpoint {
> > + direction = <1>;
> > remote-endpoint = <&replicator_in_port0>;
> > + coresight,hwid = <0>;
> > };
> > };
> > };
> > @@ -306,8 +323,9 @@
> >
> > port {
> > etr_in_port: endpoint {
> > - slave-mode;
> > + direction = <0>;
> > remote-endpoint = <&replicator_out_port1>;
> > + coresight,hwid = <0>;
> > };
> > };
> > };
> > @@ -320,8 +338,9 @@
> >
> > port {
> > tpiu_in_port: endpoint {
> > - slave-mode;
> > + direction = <0>;
> > remote-endpoint = <&replicator_out_port1>;
> > + coresight,hwid = <0>;
> > };
> > };
> > };
> > --
> > 2.7.4
> >
On 05/06/2018 22:43:29+0100, Suzuki K Poulose wrote:
> Switch to the new coresight bindings for hardware ports
>
> Cc: Nicolas Ferre <[email protected]>
> Cc: Alexandre Belloni <[email protected]>
> Cc: Mathieu Poirier <[email protected]>
> Signed-off-by: Suzuki K Poulose <[email protected]>
> ---
> arch/arm/boot/dts/sama5d2.dtsi | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
Applied, thanks.
--
Alexandre Belloni, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
On 19/06/18 22:24, Alexandre Belloni wrote:
> On 05/06/2018 22:43:29+0100, Suzuki K Poulose wrote:
>> Switch to the new coresight bindings for hardware ports
>>
>> Cc: Nicolas Ferre <[email protected]>
>> Cc: Alexandre Belloni <[email protected]>
>> Cc: Mathieu Poirier <[email protected]>
>> Signed-off-by: Suzuki K Poulose <[email protected]>
>> ---
>> arch/arm/boot/dts/sama5d2.dtsi | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
> Applied, thanks.
>
Alexandre,
Please hold off applying this change, as we are yet to come to an
agreement on this. Sorry for the trouble. See [0]
[0] http://lists.infradead.org/pipermail/linux-arm-kernel/2018-June/582269.html
Kind regards
Suzuki
On 05/06/18 22:43, Suzuki K Poulose wrote:
> Coresight uses DT graph bindings to describe the connections of the
> components. However we have some undocumented usage of the bindings
> to describe some of the properties of the connections.
>
> The coresight driver needs to know the hardware ports invovled
> in the connection and the direction of data flow to effectively
> manage the trace sessions. So far we have relied on the "port"
> address (as described by the generic graph bindings) to represent
> the hardware port of the component for a connection.
>
...
> There were three options considered for the hardware port number scheme:
>
...
> 3) Use explicit properties (implemented in the series) for the hardware
> port id and direction. We define a new property "coresight,hwid" for
> each endpoint in coresight devices to specify the hardware port number
> explicitly. Also use a separate property "direction" to specify the
> direction of the data flow.
>
> e.g,
>
> port@0{
> reg = <0>;
> endpoint {
> direction = <1>; // Output
> coresight,hwid = <0>; // Port # 0
> }
> };
>
> port@1{
> reg = <1>;
> endpoint {
> direction = <0>; // Input
> coresight,hwid = <0>; // Port # 0
> };
> };
>
> Pros:
> - The bindings are formal and reader friendly, and less prone to errors.
> Cons:
> - Backward compatibility is lost.
>
>
> This series implements Option (3) listed above and falls back to the old
> bindings if the new bindings are not available. This allows the systems
> with old bindings work with the new driver. The driver now issues a warning
> (once) when it encounters the old bindings.
....
> dts: juno: Update coresight bindings for hw port
> dts: hisilicon: Update coresight bindings for hw ports
> dts: spreadtrum: Update coresight bindings for hw ports
> dts: qcom: Update coresight bindings for hw ports
> dts: arm: hisilicon: Update coresight bindings for hardware port
> dts: arm: imx7{d,s}: Update coresight binding for hardware ports
> dts: arm: omap: Update coresight bindings for hardware ports
> dts: arm: qcom: Update coresight bindings for hardware ports
> dts: sama5d2: Update coresight bindings for hardware ports
> dts: ste-dbx5x0: Update coresight bindings for hardware port
> dts: tc2: Update coresight bindings for hardware ports
>
All,
Pleas hold on with applying the DTS changes listed above. There are
still some on going discussions on the bindings and we are yet to
come to a conclusion [0]. And there are high chances that these might
change. Sorry for the inconvenience.
[0] http://lists.infradead.org/pipermail/linux-arm-kernel/2018-June/582269.html
Kind regards
Suzuki
On 20/06/2018 10:44:29+0100, Suzuki K Poulose wrote:
> On 19/06/18 22:24, Alexandre Belloni wrote:
> > On 05/06/2018 22:43:29+0100, Suzuki K Poulose wrote:
> > > Switch to the new coresight bindings for hardware ports
> > >
> > > Cc: Nicolas Ferre <[email protected]>
> > > Cc: Alexandre Belloni <[email protected]>
> > > Cc: Mathieu Poirier <[email protected]>
> > > Signed-off-by: Suzuki K Poulose <[email protected]>
> > > ---
> > > arch/arm/boot/dts/sama5d2.dtsi | 5 ++++-
> > > 1 file changed, 4 insertions(+), 1 deletion(-)
> > >
> > Applied, thanks.
> >
>
> Alexandre,
>
> Please hold off applying this change, as we are yet to come to an
> agreement on this. Sorry for the trouble. See [0]
>
I've removed it.
--
Alexandre Belloni, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
On Tue, Jun 5, 2018 at 11:45 PM Suzuki K Poulose <[email protected]> wrote:
> Switch to the new coresight bindings
>
> Cc: Linus Walleij <[email protected]>
> Cc: Mathieu Poirier <[email protected]>
> Signed-off-by: Suzuki K Poulose <[email protected]>
I think I was requested in another mail to hold back applying this
patch until it's been discussed.
I will apply once Mathieu (etc) ACKs the series.
Yours,
Linus Walleij
On 26/06/18 10:30, Linus Walleij wrote:
> On Tue, Jun 5, 2018 at 11:45 PM Suzuki K Poulose <[email protected]> wrote:
>
>> Switch to the new coresight bindings
>>
>> Cc: Linus Walleij <[email protected]>
>> Cc: Mathieu Poirier <[email protected]>
>> Signed-off-by: Suzuki K Poulose <[email protected]>
>
> I think I was requested in another mail to hold back applying this
> patch until it's been discussed.
>
> I will apply once Mathieu (etc) ACKs the series.
Linus,
Yes, thats right. Please ignore this for now.
Suzuki
* Suzuki K Poulose <[email protected]> [180605 14:48]:
> Switch to the new coresight bindings for hardware ports
So is this patch safe for me to pick separately for v4.19?
Regards,
Tony
Hi Tony,
On 07/03/2018 08:09 AM, Tony Lindgren wrote:
> * Suzuki K Poulose <[email protected]> [180605 14:48]:
>> Switch to the new coresight bindings for hardware ports
>
> So is this patch safe for me to pick separately for v4.19?
No. Please ignore this for now. The bindings are still under
discussion. Sorry for the inconvenience.
Suzuki
* Suzuki K Poulose <[email protected]> [180703 08:01]:
>
>
> Hi Tony,
>
> On 07/03/2018 08:09 AM, Tony Lindgren wrote:
> > * Suzuki K Poulose <[email protected]> [180605 14:48]:
> > > Switch to the new coresight bindings for hardware ports
> >
> > So is this patch safe for me to pick separately for v4.19?
>
> No. Please ignore this for now. The bindings are still under
> discussion. Sorry for the inconvenience.
OK will do thanks.
Tony