[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20200513212251.GA279327@builder.lan>
Date: Wed, 13 May 2020 14:22:51 -0700
From: Bjorn Andersson <bjorn.andersson@...aro.org>
To: michael.srba@...nam.cz
Cc: Andy Gross <agross@...nel.org>,
Jeffrey Hugo <jeffrey.l.hugo@...il.com>,
Rob Herring <robh+dt@...nel.org>,
Mathieu Poirier <mathieu.poirier@...aro.org>,
Suzuki K Poulose <suzuki.poulose@....com>,
Mike Leach <mike.leach@...aro.org>,
linux-arm-msm@...r.kernel.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, ~postmarketos/upstreaming@...ts.sr.ht
Subject: Re: [PATCH] arm64: dts: qcom: msm8916: Disable coresight by default
On Wed 13 May 11:47 PDT 2020, michael.srba@...nam.cz wrote:
> From: Michael Srba <michael.srba@...nam.cz>
>
> On some msm8916 devices, attempts at initializing coresight cause the boot to
> fail. This was fixed by disabling the coresight-related nodes in the board dts
> files. However, a cleaner approach was chosen for fixing the same issue on
> msm8998: disabling coresight by default, and enabling it in board dts files
> where desired.
>
> This patch implements the same solution for msm8916, removes now redundant
> overwrites in board specific dts files and and enables coresight in db410c's
> board dts in order to keep the current behavior.
>
Applied, with Jeff's r-b.
Thanks,
Bjorn
> Fixes: b1fcc5702a41 ("arm64: dts: qcom: msm8916: Add CTI options")
> Signed-off-by: Michael Srba <michael.srba@...nam.cz>
>
> ---
> arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 21 +++++++++++
> .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 23 ------------
> .../qcom/msm8916-samsung-a2015-common.dtsi | 23 ------------
> arch/arm64/boot/dts/qcom/msm8916.dtsi | 35 +++++++++++++++++++
> 4 files changed, 56 insertions(+), 46 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
> index 14982762088d..07c150b0ed54 100644
> --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
> +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
> @@ -519,6 +519,27 @@ mpps@...0 {
> wcnss@...b000 {
> status = "okay";
> };
> +
> + tpiu@...000 { status = "okay"; };
> + funnel@...000 { status = "okay"; };
> + replicator@...000 { status = "okay"; };
> + etf@...000 { status = "okay"; };
> + etr@...000 { status = "okay"; };
> + funnel@...000 { status = "okay"; };
> + debug@...000 { status = "okay"; };
> + debug@...000 { status = "okay"; };
> + debug@...000 { status = "okay"; };
> + debug@...000 { status = "okay"; };
> + etm@...000 { status = "okay"; };
> + etm@...000 { status = "okay"; };
> + etm@...000 { status = "okay"; };
> + etm@...000 { status = "okay"; };
> + cti@...000 { status = "okay"; };
> + cti@...000 { status = "okay"; };
> + cti@...000 { status = "okay"; };
> + cti@...000 { status = "okay"; };
> + cti@...000 { status = "okay"; };
> + cti@...000 { status = "okay"; };
> };
>
> usb2513 {
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
> index d1ccb9472c8b..691eb1a87bc9 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
> @@ -82,29 +82,6 @@ phy {
> wcnss@...b000 {
> status = "okay";
> };
> -
> - /*
> - * Attempting to enable these devices causes a "synchronous
> - * external abort". Suspected cause is that the debug power
> - * domain is not enabled by default on this device.
> - * Disable these devices for now to avoid the crash.
> - *
> - * See: https://lore.kernel.org/linux-arm-msm/20190618202623.GA53651@gerhold.net/
> - */
> - tpiu@...000 { status = "disabled"; };
> - funnel@...000 { status = "disabled"; };
> - replicator@...000 { status = "disabled"; };
> - etf@...000 { status = "disabled"; };
> - etr@...000 { status = "disabled"; };
> - funnel@...000 { status = "disabled"; };
> - debug@...000 { status = "disabled"; };
> - debug@...000 { status = "disabled"; };
> - debug@...000 { status = "disabled"; };
> - debug@...000 { status = "disabled"; };
> - etm@...000 { status = "disabled"; };
> - etm@...000 { status = "disabled"; };
> - etm@...000 { status = "disabled"; };
> - etm@...000 { status = "disabled"; };
> };
>
> // FIXME: Use extcon device provided by charger driver when available
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
> index 43c5e0f882f1..af812f76e8be 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
> @@ -75,29 +75,6 @@ phy {
> wcnss@...b000 {
> status = "okay";
> };
> -
> - /*
> - * Attempting to enable these devices causes a "synchronous
> - * external abort". Suspected cause is that the debug power
> - * domain is not enabled by default on this device.
> - * Disable these devices for now to avoid the crash.
> - *
> - * See: https://lore.kernel.org/linux-arm-msm/20190618202623.GA53651@gerhold.net/
> - */
> - tpiu@...000 { status = "disabled"; };
> - funnel@...000 { status = "disabled"; };
> - replicator@...000 { status = "disabled"; };
> - etf@...000 { status = "disabled"; };
> - etr@...000 { status = "disabled"; };
> - funnel@...000 { status = "disabled"; };
> - debug@...000 { status = "disabled"; };
> - debug@...000 { status = "disabled"; };
> - debug@...000 { status = "disabled"; };
> - debug@...000 { status = "disabled"; };
> - etm@...000 { status = "disabled"; };
> - etm@...000 { status = "disabled"; };
> - etm@...000 { status = "disabled"; };
> - etm@...000 { status = "disabled"; };
> };
>
> gpio-keys {
> diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
> index 8b429954ea29..5cf117e247df 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
> @@ -1228,6 +1228,8 @@ tpiu@...000 {
> clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> clock-names = "apb_pclk", "atclk";
>
> + status = "disabled";
> +
> in-ports {
> port {
> tpiu_in: endpoint {
> @@ -1244,6 +1246,8 @@ funnel@...000 {
> clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> clock-names = "apb_pclk", "atclk";
>
> + status = "disabled";
> +
> in-ports {
> #address-cells = <1>;
> #size-cells = <0>;
> @@ -1283,6 +1287,8 @@ replicator@...000 {
> clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> clock-names = "apb_pclk", "atclk";
>
> + status = "disabled";
> +
> out-ports {
> #address-cells = <1>;
> #size-cells = <0>;
> @@ -1317,6 +1323,8 @@ etf@...000 {
> clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> clock-names = "apb_pclk", "atclk";
>
> + status = "disabled";
> +
> in-ports {
> port {
> etf_in: endpoint {
> @@ -1341,6 +1349,8 @@ etr@...000 {
> clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> clock-names = "apb_pclk", "atclk";
>
> + status = "disabled";
> +
> in-ports {
> port {
> etr_in: endpoint {
> @@ -1357,6 +1367,8 @@ funnel@...000 { /* APSS funnel only 4 inputs are used */
> clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> clock-names = "apb_pclk", "atclk";
>
> + status = "disabled";
> +
> in-ports {
> #address-cells = <1>;
> #size-cells = <0>;
> @@ -1402,6 +1414,7 @@ debug@...000 {
> clocks = <&rpmcc RPM_QDSS_CLK>;
> clock-names = "apb_pclk";
> cpu = <&CPU0>;
> + status = "disabled";
> };
>
> debug@...000 {
> @@ -1410,6 +1423,7 @@ debug@...000 {
> clocks = <&rpmcc RPM_QDSS_CLK>;
> clock-names = "apb_pclk";
> cpu = <&CPU1>;
> + status = "disabled";
> };
>
> debug@...000 {
> @@ -1418,6 +1432,7 @@ debug@...000 {
> clocks = <&rpmcc RPM_QDSS_CLK>;
> clock-names = "apb_pclk";
> cpu = <&CPU2>;
> + status = "disabled";
> };
>
> debug@...000 {
> @@ -1426,6 +1441,7 @@ debug@...000 {
> clocks = <&rpmcc RPM_QDSS_CLK>;
> clock-names = "apb_pclk";
> cpu = <&CPU3>;
> + status = "disabled";
> };
>
> etm0: etm@...000 {
> @@ -1438,6 +1454,8 @@ etm0: etm@...000 {
>
> cpu = <&CPU0>;
>
> + status = "disabled";
> +
> out-ports {
> port {
> etm0_out: endpoint {
> @@ -1457,6 +1475,8 @@ etm1: etm@...000 {
>
> cpu = <&CPU1>;
>
> + status = "disabled";
> +
> out-ports {
> port {
> etm1_out: endpoint {
> @@ -1476,6 +1496,8 @@ etm2: etm@...000 {
>
> cpu = <&CPU2>;
>
> + status = "disabled";
> +
> out-ports {
> port {
> etm2_out: endpoint {
> @@ -1495,6 +1517,8 @@ etm3: etm@...000 {
>
> cpu = <&CPU3>;
>
> + status = "disabled";
> +
> out-ports {
> port {
> etm3_out: endpoint {
> @@ -1512,6 +1536,8 @@ cti@...000 {
>
> clocks = <&rpmcc RPM_QDSS_CLK>;
> clock-names = "apb_pclk";
> +
> + status = "disabled";
> };
>
> /* CTI 1 - TPIU connections */
> @@ -1521,6 +1547,8 @@ cti@...000 {
>
> clocks = <&rpmcc RPM_QDSS_CLK>;
> clock-names = "apb_pclk";
> +
> + status = "disabled";
> };
>
> /* CTIs 2-11 - no information - not instantiated */
> @@ -1538,6 +1566,7 @@ cti@...000 {
> cpu = <&CPU0>;
> arm,cs-dev-assoc = <&etm0>;
>
> + status = "disabled";
> };
>
> /* CTI - CPU-1 */
> @@ -1551,6 +1580,8 @@ cti@...000 {
>
> cpu = <&CPU1>;
> arm,cs-dev-assoc = <&etm1>;
> +
> + status = "disabled";
> };
>
> /* CTI - CPU-2 */
> @@ -1564,6 +1595,8 @@ cti@...000 {
>
> cpu = <&CPU2>;
> arm,cs-dev-assoc = <&etm2>;
> +
> + status = "disabled";
> };
>
> /* CTI - CPU-3 */
> @@ -1577,6 +1610,8 @@ cti@...000 {
>
> cpu = <&CPU3>;
> arm,cs-dev-assoc = <&etm3>;
> +
> + status = "disabled";
> };
>
>
> --
> 2.24.0
>
Powered by blists - more mailing lists