Add SM8150 and SM8250 interconnect drivers
v2 cover Add SM8150 and SM8250 interconnect drivers
Most of this is generated from downstream dts using a script.
There are a couple things I'm still not sure about:
* When to set keepalive in DEFINE_QBCM macro (set to all false)
* Size for the reg fields. For the size I just used 0x1000.
v2: single yaml file for RPMh interconnect bindings, drop display RSC
Jonathan Marek (7):
dt-bindings: interconnect: single yaml file for RPMh interconnect
drivers
dt-bindings: interconnect: Add Qualcomm SM8150 DT bindings
dt-bindings: interconnect: Add Qualcomm SM8250 DT bindings
interconnect: qcom: Add SM8150 interconnect provider driver
interconnect: qcom: Add SM8250 interconnect provider driver
arm64: dts: qcom: sm8150: add interconnect nodes
arm64: dts: qcom: sm8250: add interconnect nodes
.../{qcom,sc7180.yaml => qcom,rpmh.yaml} | 55 +-
.../bindings/interconnect/qcom,sdm845.yaml | 74 --
arch/arm64/boot/dts/qcom/sm8150.dtsi | 82 +++
arch/arm64/boot/dts/qcom/sm8250.dtsi | 82 +++
drivers/interconnect/qcom/Kconfig | 20 +
drivers/interconnect/qcom/Makefile | 4 +
drivers/interconnect/qcom/sm8150.c | 639 +++++++++++++++++
drivers/interconnect/qcom/sm8150.h | 153 ++++
drivers/interconnect/qcom/sm8250.c | 655 ++++++++++++++++++
drivers/interconnect/qcom/sm8250.h | 163 +++++
.../dt-bindings/interconnect/qcom,sm8150.h | 163 +++++
.../dt-bindings/interconnect/qcom,sm8250.h | 173 +++++
12 files changed, 2186 insertions(+), 77 deletions(-)
rename Documentation/devicetree/bindings/interconnect/{qcom,sc7180.yaml => qcom,rpmh.yaml} (56%)
delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm845.yaml
create mode 100644 drivers/interconnect/qcom/sm8150.c
create mode 100644 drivers/interconnect/qcom/sm8150.h
create mode 100644 drivers/interconnect/qcom/sm8250.c
create mode 100644 drivers/interconnect/qcom/sm8250.h
create mode 100644 include/dt-bindings/interconnect/qcom,sm8150.h
create mode 100644 include/dt-bindings/interconnect/qcom,sm8250.hSignature · 1 line
2.26.1
PATCH v2 1/7 dt-bindings: interconnect: single yaml file for RPMh interconnect drivers
These two bindings are almost identical, so combine them into one. This will make it easier to add the sm8150 and sm8250 interconnect bindings.
---
.../{qcom,sc7180.yaml => qcom,rpmh.yaml} | 33 ++++++++-
.../bindings/interconnect/qcom,sdm845.yaml | 74 -------------------
2 files changed, 30 insertions(+), 77 deletions(-)
rename Documentation/devicetree/bindings/interconnect/{qcom,sc7180.yaml => qcom,rpmh.yaml} (67%)
delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm845.yamlDocumentation/devicetree/bindings/interconnect/qcom,rpmh.yaml renamed from Documentation/devicetree/bindings/interconnect/qcom,sc7180.yaml +30 -3
@@ -1,16 +1,17 @@ # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) %YAML 1.2 --- -$id: http://devicetree.org/schemas/interconnect/qcom,sc7180.yaml# +$id: http://devicetree.org/schemas/interconnect/qcom,rpmh.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Qualcomm SC7180 Network-On-Chip Interconnect +title: Qualcomm RPMh Network-On-Chip Interconnect maintainers: + - Georgi Djakov <[email protected]> - Odelu Kukatla <[email protected]> description: | - SC7180 interconnect providers support system bandwidth requirements through + RPMh interconnect providers support system bandwidth requirements through RPMh hardware accelerators known as Bus Clock Manager (BCM). The provider is able to communicate with the BCM through the Resource State Coordinator (RSC) associated with each execution environment. Provider nodes must point to at
@@ -36,6 +37,14 @@ properties: - qcom,sc7180-npu-noc - qcom,sc7180-qup-virt - qcom,sc7180-system-noc + - qcom,sdm845-aggre1-noc + - qcom,sdm845-aggre2-noc + - qcom,sdm845-config-noc + - qcom,sdm845-dc-noc + - qcom,sdm845-gladiator-noc + - qcom,sdm845-mem-noc + - qcom,sdm845-mmss-noc + - qcom,sdm845-system-noc '#interconnect-cells': const: 1
@@ -60,6 +69,24 @@ required: additionalProperties: false examples: + - | + #include <dt-bindings/interconnect/qcom,sdm845.h> + + mem_noc: interconnect@1380000 { + compatible = "qcom,sdm845-mem-noc"; + reg = <0x01380000 0x27200>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + mmss_noc: interconnect@1740000 { + compatible = "qcom,sdm845-mmss-noc"; + reg = <0x01740000 0x1c1000>; + #interconnect-cells = <1>; + qcom,bcm-voter-names = "apps", "disp"; + qcom,bcm-voters = <&apps_bcm_voter>, <&disp_bcm_voter>; + }; + - | #include <dt-bindings/interconnect/qcom,sc7180.h>
Documentation/devicetree/bindings/interconnect/qcom,sdm845.yaml deleted +0 -74
74 lines not on this page · raw message
Signature · 1 line
2.26.1
Rob Herring
maintainerRe: [PATCH v2 1/7] dt-bindings: interconnect: single yaml file for RPMh interconnect drivers
Quoted 11 lines · Jonathan Marek
These two bindings are almost identical, so combine them into one. This will make it easier to add the sm8150 and sm8250 interconnect bindings.
Signed-off-by Jonathan Marek <[email protected]>--- .../{qcom,sc7180.yaml => qcom,rpmh.yaml} | 33 ++++++++- .../bindings/interconnect/qcom,sdm845.yaml | 74 ------------------- 2 files changed, 30 insertions(+), 77 deletions(-) rename Documentation/devicetree/bindings/interconnect/{qcom,sc7180.yaml => qcom,rpmh.yaml} (67%) delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm845.yaml
My bot found errors running 'make dt_binding_check' on your patch:
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:14:0: warning: "MASTER_SDCC_2" redefined
#define MASTER_SDCC_2 3
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:14:0: note: this is the location of the previous definition
#define MASTER_SDCC_2 2
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:17:0: warning: "SLAVE_A1NOC_SNOC" redefined
#define SLAVE_A1NOC_SNOC 6
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:19:0: note: this is the location of the previous definition
#define SLAVE_A1NOC_SNOC 7
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:18:0: warning: "SLAVE_SERVICE_A1NOC" redefined
#define SLAVE_SERVICE_A1NOC 7
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:20:0: note: this is the location of the previous definition
#define SLAVE_SERVICE_A1NOC 8
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:24:0: warning: "MASTER_CRYPTO" redefined
#define MASTER_CRYPTO 4
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:26:0: note: this is the location of the previous definition
#define MASTER_CRYPTO 3
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:25:0: warning: "MASTER_IPA" redefined
#define MASTER_IPA 5
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:27:0: note: this is the location of the previous definition
#define MASTER_IPA 4
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:27:0: warning: "SLAVE_A2NOC_SNOC" redefined
#define SLAVE_A2NOC_SNOC 7
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:32:0: note: this is the location of the previous definition
#define SLAVE_A2NOC_SNOC 9
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:28:0: warning: "SLAVE_SERVICE_A2NOC" redefined
#define SLAVE_SERVICE_A2NOC 8
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:34:0: note: this is the location of the previous definition
#define SLAVE_SERVICE_A2NOC 11
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:30:0: warning: "MASTER_CAMNOC_HF0_UNCOMP" redefined
#define MASTER_CAMNOC_HF0_UNCOMP 0
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:123:0: note: this is the location of the previous definition
#define MASTER_CAMNOC_HF0_UNCOMP 13
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:31:0: warning: "MASTER_CAMNOC_HF1_UNCOMP" redefined
#define MASTER_CAMNOC_HF1_UNCOMP 1
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:124:0: note: this is the location of the previous definition
#define MASTER_CAMNOC_HF1_UNCOMP 14
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:32:0: warning: "MASTER_CAMNOC_SF_UNCOMP" redefined
#define MASTER_CAMNOC_SF_UNCOMP 2
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:125:0: note: this is the location of the previous definition
#define MASTER_CAMNOC_SF_UNCOMP 15
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:33:0: warning: "SLAVE_CAMNOC_UNCOMP" redefined
#define SLAVE_CAMNOC_UNCOMP 3
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:126:0: note: this is the location of the previous definition
#define SLAVE_CAMNOC_UNCOMP 16
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:39:0: warning: "MASTER_SNOC_CNOC" redefined
#define MASTER_SNOC_CNOC 0
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:38:0: note: this is the location of the previous definition
#define MASTER_SNOC_CNOC 2
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:40:0: warning: "MASTER_QDSS_DAP" redefined
#define MASTER_QDSS_DAP 1
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:39:0: note: this is the location of the previous definition
#define MASTER_QDSS_DAP 3
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:41:0: warning: "SLAVE_A1NOC_CFG" redefined
#define SLAVE_A1NOC_CFG 2
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:40:0: note: this is the location of the previous definition
#define SLAVE_A1NOC_CFG 4
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:42:0: warning: "SLAVE_A2NOC_CFG" redefined
#define SLAVE_A2NOC_CFG 3
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:41:0: note: this is the location of the previous definition
#define SLAVE_A2NOC_CFG 5
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:48:0: warning: "SLAVE_CAMERA_CFG" redefined
#define SLAVE_CAMERA_CFG 9
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:44:0: note: this is the location of the previous definition
#define SLAVE_CAMERA_CFG 8
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:51:0: warning: "SLAVE_CLK_CTL" redefined
#define SLAVE_CLK_CTL 12
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:45:0: note: this is the location of the previous definition
#define SLAVE_CLK_CTL 9
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:52:0: warning: "SLAVE_RBCPR_CX_CFG" redefined
#define SLAVE_RBCPR_CX_CFG 13
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:47:0: note: this is the location of the previous definition
#define SLAVE_RBCPR_CX_CFG 11
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:54:0: warning: "SLAVE_CRYPTO_0_CFG" redefined
#define SLAVE_CRYPTO_0_CFG 15
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:48:0: note: this is the location of the previous definition
#define SLAVE_CRYPTO_0_CFG 12
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:55:0: warning: "SLAVE_DCC_CFG" redefined
#define SLAVE_DCC_CFG 16
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:49:0: note: this is the location of the previous definition
#define SLAVE_DCC_CFG 13
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:56:0: warning: "SLAVE_CNOC_DDRSS" redefined
#define SLAVE_CNOC_DDRSS 17
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:50:0: note: this is the location of the previous definition
#define SLAVE_CNOC_DDRSS 14
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:57:0: warning: "SLAVE_DISPLAY_CFG" redefined
#define SLAVE_DISPLAY_CFG 18
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:51:0: note: this is the location of the previous definition
#define SLAVE_DISPLAY_CFG 15
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:61:0: warning: "SLAVE_GLM" redefined
#define SLAVE_GLM 22
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:52:0: note: this is the location of the previous definition
#define SLAVE_GLM 16
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:62:0: warning: "SLAVE_GFX3D_CFG" redefined
#define SLAVE_GFX3D_CFG 23
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:53:0: note: this is the location of the previous definition
#define SLAVE_GFX3D_CFG 17
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:63:0: warning: "SLAVE_IMEM_CFG" redefined
#define SLAVE_IMEM_CFG 24
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:54:0: note: this is the location of the previous definition
#define SLAVE_IMEM_CFG 18
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:64:0: warning: "SLAVE_IPA_CFG" redefined
#define SLAVE_IPA_CFG 25
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:55:0: note: this is the location of the previous definition
#define SLAVE_IPA_CFG 19
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:65:0: warning: "SLAVE_CNOC_MNOC_CFG" redefined
#define SLAVE_CNOC_MNOC_CFG 26
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:56:0: note: this is the location of the previous definition
#define SLAVE_CNOC_MNOC_CFG 20
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:70:0: warning: "SLAVE_PDM" redefined
#define SLAVE_PDM 31
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:59:0: note: this is the location of the previous definition
#define SLAVE_PDM 23
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:71:0: warning: "SLAVE_PIMEM_CFG" redefined
#define SLAVE_PIMEM_CFG 32
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:61:0: note: this is the location of the previous definition
#define SLAVE_PIMEM_CFG 25
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:72:0: warning: "SLAVE_PRNG" redefined
#define SLAVE_PRNG 33
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:62:0: note: this is the location of the previous definition
#define SLAVE_PRNG 26
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:73:0: warning: "SLAVE_QDSS_CFG" redefined
#define SLAVE_QDSS_CFG 34
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:63:0: note: this is the location of the previous definition
#define SLAVE_QDSS_CFG 27
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:79:0: warning: "SLAVE_SDCC_2" redefined
#define SLAVE_SDCC_2 40
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:66:0: note: this is the location of the previous definition
#define SLAVE_SDCC_2 30
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:81:0: warning: "SLAVE_SNOC_CFG" redefined
#define SLAVE_SNOC_CFG 42
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:68:0: note: this is the location of the previous definition
#define SLAVE_SNOC_CFG 32
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:82:0: warning: "SLAVE_TCSR" redefined
#define SLAVE_TCSR 43
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:71:0: note: this is the location of the previous definition
#define SLAVE_TCSR 35
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:84:0: warning: "SLAVE_TLMM_NORTH" redefined
#define SLAVE_TLMM_NORTH 45
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:72:0: note: this is the location of the previous definition
#define SLAVE_TLMM_NORTH 36
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:85:0: warning: "SLAVE_TLMM_SOUTH" redefined
#define SLAVE_TLMM_SOUTH 46
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:73:0: note: this is the location of the previous definition
#define SLAVE_TLMM_SOUTH 37
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:86:0: warning: "SLAVE_UFS_MEM_CFG" redefined
#define SLAVE_UFS_MEM_CFG 47
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:76:0: note: this is the location of the previous definition
#define SLAVE_UFS_MEM_CFG 40
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:88:0: warning: "SLAVE_VENUS_CFG" redefined
#define SLAVE_VENUS_CFG 49
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:79:0: note: this is the location of the previous definition
#define SLAVE_VENUS_CFG 43
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:90:0: warning: "SLAVE_VSENSE_CTRL_CFG" redefined
#define SLAVE_VSENSE_CTRL_CFG 51
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:80:0: note: this is the location of the previous definition
#define SLAVE_VSENSE_CTRL_CFG 44
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:91:0: warning: "SLAVE_SERVICE_CNOC" redefined
#define SLAVE_SERVICE_CNOC 52
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:82:0: note: this is the location of the previous definition
#define SLAVE_SERVICE_CNOC 46
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:95:0: warning: "SLAVE_LLCC_CFG" redefined
#define SLAVE_LLCC_CFG 2
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:85:0: note: this is the location of the previous definition
#define SLAVE_LLCC_CFG 1
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:101:0: warning: "MASTER_MNOC_HF_MEM_NOC" redefined
#define MASTER_MNOC_HF_MEM_NOC 4
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:97:0: note: this is the location of the previous definition
#define MASTER_MNOC_HF_MEM_NOC 3
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:102:0: warning: "MASTER_MNOC_SF_MEM_NOC" redefined
#define MASTER_MNOC_SF_MEM_NOC 5
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:98:0: note: this is the location of the previous definition
#define MASTER_MNOC_SF_MEM_NOC 4
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:103:0: warning: "MASTER_SNOC_GC_MEM_NOC" redefined
#define MASTER_SNOC_GC_MEM_NOC 6
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:99:0: note: this is the location of the previous definition
#define MASTER_SNOC_GC_MEM_NOC 5
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:104:0: warning: "MASTER_SNOC_SF_MEM_NOC" redefined
#define MASTER_SNOC_SF_MEM_NOC 7
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:100:0: note: this is the location of the previous definition
#define MASTER_SNOC_SF_MEM_NOC 6
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:105:0: warning: "MASTER_GFX3D" redefined
#define MASTER_GFX3D 8
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:101:0: note: this is the location of the previous definition
#define MASTER_GFX3D 7
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:106:0: warning: "SLAVE_MSS_PROC_MS_MPU_CFG" redefined
#define SLAVE_MSS_PROC_MS_MPU_CFG 9
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:102:0: note: this is the location of the previous definition
#define SLAVE_MSS_PROC_MS_MPU_CFG 8
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:108:0: warning: "SLAVE_LLCC" redefined
#define SLAVE_LLCC 11
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:104:0: note: this is the location of the previous definition
#define SLAVE_LLCC 10
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:114:0: warning: "MASTER_LLCC" redefined
#define MASTER_LLCC 0
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:107:0: note: this is the location of the previous definition
#define MASTER_LLCC 13
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:115:0: warning: "SLAVE_EBI1" redefined
#define SLAVE_EBI1 1
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:108:0: note: this is the location of the previous definition
#define SLAVE_EBI1 14
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:122:0: warning: "MASTER_ROTATOR" redefined
#define MASTER_ROTATOR 5
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:116:0: note: this is the location of the previous definition
#define MASTER_ROTATOR 6
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:123:0: warning: "MASTER_VIDEO_P0" redefined
#define MASTER_VIDEO_P0 6
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:117:0: note: this is the location of the previous definition
#define MASTER_VIDEO_P0 7
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:124:0: warning: "MASTER_VIDEO_PROC" redefined
#define MASTER_VIDEO_PROC 7
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:119:0: note: this is the location of the previous definition
#define MASTER_VIDEO_PROC 9
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:125:0: warning: "SLAVE_MNOC_HF_MEM_NOC" redefined
#define SLAVE_MNOC_HF_MEM_NOC 8
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:121:0: note: this is the location of the previous definition
#define SLAVE_MNOC_HF_MEM_NOC 11
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:126:0: warning: "SLAVE_MNOC_SF_MEM_NOC" redefined
#define SLAVE_MNOC_SF_MEM_NOC 9
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:120:0: note: this is the location of the previous definition
#define SLAVE_MNOC_SF_MEM_NOC 10
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:127:0: warning: "SLAVE_SERVICE_MNOC" redefined
#define SLAVE_SERVICE_MNOC 10
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:122:0: note: this is the location of the previous definition
#define SLAVE_SERVICE_MNOC 12
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:150:0: warning: "MASTER_PIMEM" redefined
#define MASTER_PIMEM 4
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:134:0: note: this is the location of the previous definition
#define MASTER_PIMEM 6
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:151:0: warning: "SLAVE_APPSS" redefined
#define SLAVE_APPSS 5
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:136:0: note: this is the location of the previous definition
#define SLAVE_APPSS 8
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:152:0: warning: "SLAVE_SNOC_CNOC" redefined
#define SLAVE_SNOC_CNOC 6
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:137:0: note: this is the location of the previous definition
#define SLAVE_SNOC_CNOC 9
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:155:0: warning: "SLAVE_IMEM" redefined
#define SLAVE_IMEM 9
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:140:0: note: this is the location of the previous definition
#define SLAVE_IMEM 12
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:156:0: warning: "SLAVE_PIMEM" redefined
#define SLAVE_PIMEM 10
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:143:0: note: this is the location of the previous definition
#define SLAVE_PIMEM 15
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:157:0: warning: "SLAVE_SERVICE_SNOC" redefined
#define SLAVE_SERVICE_SNOC 11
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:144:0: note: this is the location of the previous definition
#define SLAVE_SERVICE_SNOC 16
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:158:0: warning: "SLAVE_QDSS_STM" redefined
#define SLAVE_QDSS_STM 12
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:145:0: note: this is the location of the previous definition
#define SLAVE_QDSS_STM 17
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:53:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sc7180.h:159:0: warning: "SLAVE_TCU" redefined
#define SLAVE_TCU 13
In file included from Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:19:0:./scripts/dtc/include-prefixes/dt-bindings/interconnect/qcom,sdm845.h:146:0: note: this is the location of the previous definition
#define SLAVE_TCU 18
Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dts:69.40-74.11: ERROR (duplicate_label): /example-1/interconnect@1740000: Duplicate label 'mmss_noc' on /example-1/interconnect@1740000 and /example-0/interconnect@1740000
ERROR: Input tree has errors, aborting (use -f to force output)scripts/Makefile.lib:315: recipe for target 'Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dt.yaml' failed
make[1]: *** [Documentation/devicetree/bindings/interconnect/qcom,rpmh.example.dt.yaml] Error 2
make[1]: *** Waiting for unfinished jobs....
Makefile:1347: recipe for target 'dt_binding_check' failed
make: *** [dt_binding_check] Error 2
See https://patchwork.ozlabs.org/patch/1328116
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure dt-schema is up to date:
pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade
Please check and re-submit.
PATCH v2 2/7 dt-bindings: interconnect: Add Qualcomm SM8150 DT bindings
In reply to Jonathan MarekThe Qualcomm SM8150 platform has several bus fabrics that could be controlled and tuned dynamically according to the bandwidth demand.
--- .../bindings/interconnect/qcom,rpmh.yaml | 11 ++ .../dt-bindings/interconnect/qcom,sm8150.h | 163 ++++++++++++++++++ 2 files changed, 174 insertions(+) create mode 100644 include/dt-bindings/interconnect/qcom,sm8150.h
Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml +11 -0
@@ -45,6 +45,17 @@ properties: - qcom,sdm845-mem-noc - qcom,sdm845-mmss-noc - qcom,sdm845-system-noc + - qcom,sm8150-aggre1-noc + - qcom,sm8150-aggre2-noc + - qcom,sm8150-camnoc-noc + - qcom,sm8150-compute-noc + - qcom,sm8150-config-noc + - qcom,sm8150-dc-noc + - qcom,sm8150-gem-noc + - qcom,sm8150-ipa-virt + - qcom,sm8150-mc-virt + - qcom,sm8150-mmss-noc + - qcom,sm8150-system-noc '#interconnect-cells': const: 1
include/dt-bindings/interconnect/qcom,sm8150.h new file +163 -0
163 lines not on this page · raw message
Signature · 1 line
2.26.1
Re: [PATCH v2 2/7] dt-bindings: interconnect: Add Qualcomm SM8150 DT bindings
Quoted 10 lines · Jonathan Marek
The Qualcomm SM8150 platform has several bus fabrics that could be controlled and tuned dynamically according to the bandwidth demand.
Signed-off-by Jonathan Marek <[email protected]>--- .../bindings/interconnect/qcom,rpmh.yaml | 11 ++ .../dt-bindings/interconnect/qcom,sm8150.h | 163 ++++++++++++++++++ 2 files changed, 174 insertions(+) create mode 100644 include/dt-bindings/interconnect/qcom,sm8150.h
PATCH v2 3/7 dt-bindings: interconnect: Add Qualcomm SM8250 DT bindings
In reply to Jonathan MarekThe Qualcomm SM8250 platform has several bus fabrics that could be controlled and tuned dynamically according to the bandwidth demand.
--- .../bindings/interconnect/qcom,rpmh.yaml | 11 ++ .../dt-bindings/interconnect/qcom,sm8250.h | 173 ++++++++++++++++++ 2 files changed, 184 insertions(+) create mode 100644 include/dt-bindings/interconnect/qcom,sm8250.h
Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml +11 -0
@@ -56,6 +56,17 @@ properties: - qcom,sm8150-mc-virt - qcom,sm8150-mmss-noc - qcom,sm8150-system-noc + - qcom,sm8250-aggre1-noc + - qcom,sm8250-aggre2-noc + - qcom,sm8250-compute-noc + - qcom,sm8250-config-noc + - qcom,sm8250-dc-noc + - qcom,sm8250-gem-noc + - qcom,sm8250-ipa-virt + - qcom,sm8250-mc-virt + - qcom,sm8250-mmss-noc + - qcom,sm8250-npu-noc + - qcom,sm8250-system-noc '#interconnect-cells': const: 1
include/dt-bindings/interconnect/qcom,sm8250.h new file +173 -0
173 lines not on this page · raw message
Signature · 1 line
2.26.1
Re: [PATCH v2 3/7] dt-bindings: interconnect: Add Qualcomm SM8250 DT bindings
Quoted 10 lines · Jonathan Marek
The Qualcomm SM8250 platform has several bus fabrics that could be controlled and tuned dynamically according to the bandwidth demand.
Signed-off-by Jonathan Marek <[email protected]>--- .../bindings/interconnect/qcom,rpmh.yaml | 11 ++ .../dt-bindings/interconnect/qcom,sm8250.h | 173 ++++++++++++++++++ 2 files changed, 184 insertions(+) create mode 100644 include/dt-bindings/interconnect/qcom,sm8250.h
PATCH v2 4/7 interconnect: qcom: Add SM8150 interconnect provider driver
In reply to Jonathan MarekAdd driver for the Qualcomm interconnect buses found in SM8150 based platforms. The topology consists of several NoCs that are controlled by a remote processor that collects the aggregated bandwidth for each master-slave pairs.
Based on SC7180 driver and generated from downstream dts.
--- drivers/interconnect/qcom/Kconfig | 10 + drivers/interconnect/qcom/Makefile | 2 + drivers/interconnect/qcom/sm8150.c | 639 +++++++++++++++++++++++++++++ drivers/interconnect/qcom/sm8150.h | 153 +++++++ 4 files changed, 804 insertions(+) create mode 100644 drivers/interconnect/qcom/sm8150.c create mode 100644 drivers/interconnect/qcom/sm8150.h
drivers/interconnect/qcom/Kconfig +10 -0
@@ -65,5 +65,15 @@ config INTERCONNECT_QCOM_SDM845 This is a driver for the Qualcomm Network-on-Chip on sdm845-based platforms. +config INTERCONNECT_QCOM_SM8150 + tristate "Qualcomm SM8150 interconnect driver" + depends on INTERCONNECT_QCOM + depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST + select INTERCONNECT_QCOM_RPMH + select INTERCONNECT_QCOM_BCM_VOTER + help + This is a driver for the Qualcomm Network-on-Chip on sm8150-based + platforms. + config INTERCONNECT_QCOM_SMD_RPM tristate
drivers/interconnect/qcom/Makefile +2 -0
@@ -8,6 +8,7 @@ qnoc-qcs404-objs := qcs404.o icc-rpmh-obj := icc-rpmh.o qnoc-sc7180-objs := sc7180.o qnoc-sdm845-objs := sdm845.o +qnoc-sm8150-objs := sm8150.o icc-smd-rpm-objs := smd-rpm.o obj-$(CONFIG_INTERCONNECT_QCOM_BCM_VOTER) += icc-bcm-voter.o
@@ -18,4 +19,5 @@ obj-$(CONFIG_INTERCONNECT_QCOM_QCS404) += qnoc-qcs404.o obj-$(CONFIG_INTERCONNECT_QCOM_RPMH) += icc-rpmh.o obj-$(CONFIG_INTERCONNECT_QCOM_SC7180) += qnoc-sc7180.o obj-$(CONFIG_INTERCONNECT_QCOM_SDM845) += qnoc-sdm845.o +obj-$(CONFIG_INTERCONNECT_QCOM_SM8150) += qnoc-sm8150.o obj-$(CONFIG_INTERCONNECT_QCOM_SMD_RPM) += icc-smd-rpm.o
drivers/interconnect/qcom/sm8150.c new file +639 -0
639 lines not on this page · raw message
drivers/interconnect/qcom/sm8150.h new file +153 -0
153 lines not on this page · raw message
Signature · 1 line
2.26.1
Re: [PATCH v2 4/7] interconnect: qcom: Add SM8150 interconnect provider driver
Hey Jonathan,
Thanks for the patch!
Quoted 234 lines · Jonathan Marek
Add driver for the Qualcomm interconnect buses found in SM8150 based platforms. The topology consists of several NoCs that are controlled by a remote processor that collects the aggregated bandwidth for each master-slave pairs.
Based on SC7180 driver and generated from downstream dts.
Signed-off-by Jonathan Marek <[email protected]>--- drivers/interconnect/qcom/Kconfig | 10 + drivers/interconnect/qcom/Makefile | 2 + drivers/interconnect/qcom/sm8150.c | 639 +++++++++++++++++++++++++++++ drivers/interconnect/qcom/sm8150.h | 153 +++++++ 4 files changed, 804 insertions(+) create mode 100644 drivers/interconnect/qcom/sm8150.c create mode 100644 drivers/interconnect/qcom/sm8150.hdrivers/interconnect/qcom/Kconfig +10
-0@@ -65,5 +65,15 @@ config INTERCONNECT_QCOM_SDM845 This is a driver for the Qualcomm Network-on-Chip on sdm845-based platforms. +config INTERCONNECT_QCOM_SM8150 + tristate "Qualcomm SM8150 interconnect driver" + depends on INTERCONNECT_QCOM + depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST + select INTERCONNECT_QCOM_RPMH + select INTERCONNECT_QCOM_BCM_VOTER + help + This is a driver for the Qualcomm Network-on-Chip on sm8150-based + platforms. + config INTERCONNECT_QCOM_SMD_RPM tristatedrivers/interconnect/qcom/Makefile +1
-0@@ -8,6 +8,7 @@ qnoc-qcs404-objs := qcs404.o icc-rpmh-obj := icc-rpmh.o qnoc-sc7180-objs := sc7180.o qnoc-sdm845-objs := sdm845.o +qnoc-sm8150-objs := sm8150.o icc-smd-rpm-objs := smd-rpm.o obj-$(CONFIG_INTERCONNECT_QCOM_BCM_VOTER) += icc-bcm-voter.o@@ -18,4 +19,5 @@ obj-$(CONFIG_INTERCONNECT_QCOM_QCS404) +=qnoc-qcs404.o
obj-$(CONFIG_INTERCONNECT_QCOM_RPMH) += icc-rpmh.o obj-$(CONFIG_INTERCONNECT_QCOM_SC7180) += qnoc-sc7180.o obj-$(CONFIG_INTERCONNECT_QCOM_SDM845) += qnoc-sdm845.odrivers/interconnect/qcom/Makefile +1
-0+obj-$(CONFIG_INTERCONNECT_QCOM_SM8150) += qnoc-sm8150.o obj-$(CONFIG_INTERCONNECT_QCOM_SMD_RPM) += icc-smd-rpm.odrivers/interconnect/qcom/sm8150.c new file +18
-0@@ -0,0 +1,639 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2020, The Linux Foundation. All rights reserved. +* +*/ + +#include <linux/device.h> +#include <linux/interconnect.h> +#include <linux/interconnect-provider.h> +#include <linux/module.h> +#include <linux/of_platform.h> +#include <dt-bindings/interconnect/qcom,sm8150.h> + +#include "bcm-voter.h" +#include "icc-rpmh.h" +#include "sm8150.h" + +DEFINE_QNODE(qhm_a1noc_cfg, SM8150_MASTER_A1NOC_CFG, 1, 4,
SM8150_SLAVE_SERVICE_A1NOC);
+DEFINE_QNODE(qhm_qup0,SM8150_MASTER_QUP_0, 1, 4,SM8150_A1NOC_SNOC_SLV);
+DEFINE_QNODE(xm_emac,SM8150_MASTER_EMAC, 1, 8,SM8150_A1NOC_SNOC_SLV);
+DEFINE_QNODE(xm_ufs_mem,SM8150_MASTER_UFS_MEM, 1, 8,SM8150_A1NOC_SNOC_SLV);
+DEFINE_QNODE(xm_usb3_0,SM8150_MASTER_USB3, 1, 8,SM8150_A1NOC_SNOC_SLV);
+DEFINE_QNODE(xm_usb3_1,SM8150_MASTER_USB3_1, 1, 8,SM8150_A1NOC_SNOC_SLV);
+DEFINE_QNODE(qhm_a2noc_cfg,SM8150_MASTER_A2NOC_CFG, 1, 4,SM8150_SLAVE_SERVICE_A2NOC); +DEFINE_QNODE(qhm_qdss_bam,SM8150_MASTER_QDSS_BAM, 1, 4,SM8150_A2NOC_SNOC_SLV);
+DEFINE_QNODE(qhm_qspi,SM8150_MASTER_QSPI, 1, 4,SM8150_A2NOC_SNOC_SLV);
+DEFINE_QNODE(qhm_qup1,SM8150_MASTER_QUP_1, 1, 4,SM8150_A2NOC_SNOC_SLV);
+DEFINE_QNODE(qhm_qup2,SM8150_MASTER_QUP_2, 1, 4,SM8150_A2NOC_SNOC_SLV); +DEFINE_QNODE(qhm_sensorss_ahb,SM8150_MASTER_SENSORS_AHB, 1, 4,SM8150_A2NOC_SNOC_SLV);
+DEFINE_QNODE(qhm_tsif,SM8150_MASTER_TSIF, 1, 4,SM8150_A2NOC_SNOC_SLV);
+DEFINE_QNODE(qnm_cnoc,SM8150_MASTER_CNOC_A2NOC, 1, 8,SM8150_A2NOC_SNOC_SLV);
+DEFINE_QNODE(qxm_crypto,SM8150_MASTER_CRYPTO_CORE_0, 1, 8,SM8150_A2NOC_SNOC_SLV);drivers/interconnect/qcom/sm8150.c new file +2
-0+DEFINE_QNODE (qxm_ipa,SM8150_MASTER_IPA ,1 ,8 ,SM8150_A2NOC_SNOC_SLV ); +DEFINE_QNODE(xm_pcie3_0, SM8150_MASTER_PCIE, 1, 8,
SM8150_SLAVE_ANOC_PCIE_GEM_NOC);
+DEFINE_QNODE(xm_pcie3_1,SM8150_MASTER_PCIE_1, 1, 8,SM8150_SLAVE_ANOC_PCIE_GEM_NOC);
+DEFINE_QNODE(xm_qdss_etr,SM8150_MASTER_QDSS_ETR, 1, 8,SM8150_A2NOC_SNOC_SLV);
+DEFINE_QNODE(xm_sdc2,SM8150_MASTER_SDCC_2, 1, 8,SM8150_A2NOC_SNOC_SLV);
+DEFINE_QNODE(xm_sdc4,SM8150_MASTER_SDCC_4, 1, 8,SM8150_A2NOC_SNOC_SLV); +DEFINE_QNODE(qxm_camnoc_hf0_uncomp,SM8150_MASTER_CAMNOC_HF0_UNCOMP, 1, 32,SM8150_SLAVE_CAMNOC_UNCOMP); +DEFINE_QNODE(qxm_camnoc_hf1_uncomp,SM8150_MASTER_CAMNOC_HF1_UNCOMP, 1, 32,SM8150_SLAVE_CAMNOC_UNCOMP); +DEFINE_QNODE(qxm_camnoc_sf_uncomp,SM8150_MASTER_CAMNOC_SF_UNCOMP, 1, 32,SM8150_SLAVE_CAMNOC_UNCOMP);
+DEFINE_QNODE(qnm_npu,SM8150_MASTER_NPU, 1, 32,SM8150_SLAVE_CDSP_MEM_NOC);
+DEFINE_QNODE(qhm_spdm,SM8150_MASTER_SPDM, 1, 4,SM8150_SLAVE_CNOC_A2NOC);
+DEFINE_QNODE(qnm_snoc,SM8150_SNOC_CNOC_MAS, 1, 8,SM8150_SLAVE_TLMM_SOUTH,SM8150_SLAVE_CDSP_CFG,SM8150_SLAVE_SPSS_CFG,SM8150_SLAVE_CAMERA_CFG,SM8150_SLAVE_SDCC_4,SM8150_SLAVE_SDCC_2,SM8150_SLAVE_CNOC_MNOC_CFG,SM8150_SLAVE_EMAC_CFG,SM8150_SLAVE_UFS_MEM_CFG,SM8150_SLAVE_TLMM_EAST,SM8150_SLAVE_SSC_CFG,SM8150_SLAVE_SNOC_CFG,SM8150_SLAVE_NORTH_PHY_CFG,SM8150_SLAVE_QUP_0,SM8150_SLAVE_GLM,SM8150_SLAVE_PCIE_1_CFG,SM8150_SLAVE_A2NOC_CFG,SM8150_SLAVE_QDSS_CFG,SM8150_SLAVE_DISPLAY_CFG,SM8150_SLAVE_TCSR,SM8150_SLAVE_CNOC_DDRSS,SM8150_SLAVE_RBCPR_MMCX_CFG,SM8150_SLAVE_NPU_CFG,SM8150_SLAVE_PCIE_0_CFG,SM8150_SLAVE_GRAPHICS_3D_CFG,SM8150_SLAVE_VENUS_CFG,SM8150_SLAVE_TSIF,SM8150_SLAVE_IPA_CFG,SM8150_SLAVE_CLK_CTL,SM8150_SLAVE_AOP,SM8150_SLAVE_QUP_1,SM8150_SLAVE_AHB2PHY_SOUTH,SM8150_SLAVE_USB3_1,SM8150_SLAVE_SERVICE_CNOC,SM8150_SLAVE_UFS_CARD_CFG,SM8150_SLAVE_QUP_2,SM8150_SLAVE_RBCPR_CX_CFG,SM8150_SLAVE_TLMM_WEST,SM8150_SLAVE_A1NOC_CFG,SM8150_SLAVE_AOSS,SM8150_SLAVE_PRNG,SM8150_SLAVE_VSENSE_CTRL_CFG,SM8150_SLAVE_QSPI,SM8150_SLAVE_USB3,SM8150_SLAVE_SPDM_WRAPPER,SM8150_SLAVE_CRYPTO_0_CFG,SM8150_SLAVE_PIMEM_CFG,SM8150_SLAVE_TLMM_NORTH,SM8150_SLAVE_RBCPR_MX_CFG,SM8150_SLAVE_IMEM_CFG); +DEFINE_QNODE(xm_qdss_dap,SM8150_MASTER_QDSS_DAP, 1, 8,SM8150_SLAVE_TLMM_SOUTH,SM8150_SLAVE_CDSP_CFG,SM8150_SLAVE_SPSS_CFG,SM8150_SLAVE_CAMERA_CFG,SM8150_SLAVE_SDCC_4,SM8150_SLAVE_SDCC_2,SM8150_SLAVE_CNOC_MNOC_CFG,SM8150_SLAVE_EMAC_CFG,SM8150_SLAVE_UFS_MEM_CFG,SM8150_SLAVE_TLMM_EAST,SM8150_SLAVE_SSC_CFG,SM8150_SLAVE_SNOC_CFG,SM8150_SLAVE_NORTH_PHY_CFG,SM8150_SLAVE_QUP_0,SM8150_SLAVE_GLM,SM8150_SLAVE_PCIE_1_CFG,SM8150_SLAVE_A2NOC_CFG,SM8150_SLAVE_QDSS_CFG,SM8150_SLAVE_DISPLAY_CFG,SM8150_SLAVE_TCSR,SM8150_SLAVE_CNOC_DDRSS,SM8150_SLAVE_CNOC_A2NOC,SM8150_SLAVE_RBCPR_MMCX_CFG,SM8150_SLAVE_NPU_CFG,SM8150_SLAVE_PCIE_0_CFG,SM8150_SLAVE_GRAPHICS_3D_CFG,SM8150_SLAVE_VENUS_CFG,SM8150_SLAVE_TSIF,SM8150_SLAVE_IPA_CFG,SM8150_SLAVE_CLK_CTL,SM8150_SLAVE_AOP,SM8150_SLAVE_QUP_1,SM8150_SLAVE_AHB2PHY_SOUTH,SM8150_SLAVE_USB3_1,SM8150_SLAVE_SERVICE_CNOC,SM8150_SLAVE_UFS_CARD_CFG,SM8150_SLAVE_QUP_2,SM8150_SLAVE_RBCPR_CX_CFG,SM8150_SLAVE_TLMM_WEST,SM8150_SLAVE_A1NOC_CFG,SM8150_SLAVE_AOSS,SM8150_SLAVE_PRNG,SM8150_SLAVE_VSENSE_CTRL_CFG,SM8150_SLAVE_QSPI,SM8150_SLAVE_USB3,SM8150_SLAVE_SPDM_WRAPPER,SM8150_SLAVE_CRYPTO_0_CFG,SM8150_SLAVE_PIMEM_CFG,SM8150_SLAVE_TLMM_NORTH,SM8150_SLAVE_RBCPR_MX_CFG,SM8150_SLAVE_IMEM_CFG); +DEFINE_QNODE(qhm_cnoc_dc_noc,SM8150_MASTER_CNOC_DC_NOC, 1, 4,SM8150_SLAVE_GEM_NOC_CFG,SM8150_SLAVE_LLCC_CFG); +DEFINE_QNODE(acm_apps,SM8150_MASTER_AMPSS_M0, 2, 32,SM8150_SLAVE_ECC,SM8150_SLAVE_LLCC,SM8150_SLAVE_GEM_NOC_SNOC); +DEFINE_QNODE(acm_gpu_tcu,SM8150_MASTER_GPU_TCU, 1, 8,SM8150_SLAVE_LLCC,SM8150_SLAVE_GEM_NOC_SNOC); +DEFINE_QNODE(acm_sys_tcu,SM8150_MASTER_SYS_TCU, 1, 8,SM8150_SLAVE_LLCC,SM8150_SLAVE_GEM_NOC_SNOC); +DEFINE_QNODE(qhm_gemnoc_cfg,SM8150_MASTER_GEM_NOC_CFG, 1, 4,SM8150_SLAVE_SERVICE_GEM_NOC,SM8150_SLAVE_MSS_PROC_MS_MPU_CFG); +DEFINE_QNODE(qnm_cmpnoc,SM8150_MASTER_COMPUTE_NOC, 2, 32,SM8150_SLAVE_ECC,SM8150_SLAVE_LLCC,SM8150_SLAVE_GEM_NOC_SNOC); +DEFINE_QNODE(qnm_gpu,SM8150_MASTER_GRAPHICS_3D, 2, 32,SM8150_SLAVE_LLCC,SM8150_SLAVE_GEM_NOC_SNOC); +DEFINE_QNODE(qnm_mnoc_hf,SM8150_MASTER_MNOC_HF_MEM_NOC, 2, 32,SM8150_SLAVE_LLCC);
+DEFINE_QNODE(qnm_mnoc_sf,SM8150_MASTER_MNOC_SF_MEM_NOC, 1, 32,SM8150_SLAVE_LLCC,SM8150_SLAVE_GEM_NOC_SNOC); +DEFINE_QNODE(qnm_pcie,SM8150_MASTER_GEM_NOC_PCIE_SNOC, 1, 16,SM8150_SLAVE_LLCC,SM8150_SLAVE_GEM_NOC_SNOC); +DEFINE_QNODE(qnm_snoc_gc,SM8150_MASTER_SNOC_GC_MEM_NOC, 1, 8,SM8150_SLAVE_LLCC);
+DEFINE_QNODE(qnm_snoc_sf,SM8150_MASTER_SNOC_SF_MEM_NOC, 1, 16,SM8150_SLAVE_LLCC);drivers/interconnect/qcom/sm8150.c new file +2
-0+DEFINE_QNODE (qxm_ecc,SM8150_MASTER_ECC ,2 ,32 ,SM8150_SLAVE_LLCC ); +DEFINE_QNODE(ipa_core_master, SM8150_MASTER_IPA_CORE, 1, 8,
SM8150_SLAVE_IPA_CORE);drivers/interconnect/qcom/sm8150.c new file +2
-0+DEFINE_QNODE (llcc_mc,SM8150_MASTER_LLCC ,4 ,4 ,SM8150_SLAVE_EBI_CH0 ); +DEFINE_QNODE(qhm_mnoc_cfg, SM8150_MASTER_CNOC_MNOC_CFG, 1, 4,
SM8150_SLAVE_SERVICE_MNOC);
+DEFINE_QNODE(qxm_camnoc_hf0,SM8150_MASTER_CAMNOC_HF0, 1, 32,SM8150_SLAVE_MNOC_HF_MEM_NOC); +DEFINE_QNODE(qxm_camnoc_hf1,SM8150_MASTER_CAMNOC_HF1, 1, 32,SM8150_SLAVE_MNOC_HF_MEM_NOC);
+DEFINE_QNODE(qxm_camnoc_sf,SM8150_MASTER_CAMNOC_SF, 1, 32,SM8150_SLAVE_MNOC_SF_MEM_NOC);
+DEFINE_QNODE(qxm_mdp0,SM8150_MASTER_MDP_PORT0, 1, 32,SM8150_SLAVE_MNOC_HF_MEM_NOC);
+DEFINE_QNODE(qxm_mdp1,SM8150_MASTER_MDP_PORT1, 1, 32,SM8150_SLAVE_MNOC_HF_MEM_NOC);
+DEFINE_QNODE(qxm_rot,SM8150_MASTER_ROTATOR, 1, 32,SM8150_SLAVE_MNOC_SF_MEM_NOC);
+DEFINE_QNODE(qxm_venus0,SM8150_MASTER_VIDEO_P0, 1, 32,SM8150_SLAVE_MNOC_SF_MEM_NOC);
+DEFINE_QNODE(qxm_venus1,SM8150_MASTER_VIDEO_P1, 1, 32,SM8150_SLAVE_MNOC_SF_MEM_NOC); +DEFINE_QNODE(qxm_venus_arm9,SM8150_MASTER_VIDEO_PROC, 1, 8,SM8150_SLAVE_MNOC_SF_MEM_NOC);
+DEFINE_QNODE(qhm_snoc_cfg,SM8150_MASTER_SNOC_CFG, 1, 4,SM8150_SLAVE_SERVICE_SNOC);
+DEFINE_QNODE(qnm_aggre1_noc,SM8150_A1NOC_SNOC_MAS, 1, 16,SM8150_SLAVE_SNOC_GEM_NOC_SF,SM8150_SLAVE_PIMEM,SM8150_SLAVE_OCIMEM,SM8150_SLAVE_APPSS,SM8150_SNOC_CNOC_SLV,SM8150_SLAVE_QDSS_STM); +DEFINE_QNODE(qnm_aggre2_noc,SM8150_A2NOC_SNOC_MAS, 1, 16,SM8150_SLAVE_SNOC_GEM_NOC_SF,SM8150_SLAVE_PIMEM,SM8150_SLAVE_OCIMEM,SM8150_SLAVE_APPSS,SM8150_SNOC_CNOC_SLV,SM8150_SLAVE_PCIE_0,SM8150_SLAVE_PCIE_1,SM8150_SLAVE_TCU,SM8150_SLAVE_QDSS_STM);
Quoted 8 lines
+DEFINE_QNODE(qnm_gemnoc,
SM8150_MASTER_GEM_NOC_SNOC, 1, 8,SM8150_SLAVE_PIMEM,SM8150_SLAVE_OCIMEM,SM8150_SLAVE_APPSS,SM8150_SNOC_CNOC_SLV,SM8150_SLAVE_TCU,SM8150_SLAVE_QDSS_STM); +DEFINE_QNODE(qxm_pimem,SM8150_MASTER_PIMEM, 1, 8,SM8150_SLAVE_SNOC_GEM_NOC_GC,SM8150_SLAVE_OCIMEM); +DEFINE_QNODE(xm_gic,SM8150_MASTER_GIC, 1, 8,SM8150_SLAVE_SNOC_GEM_NOC_GC,SM8150_SLAVE_OCIMEM); +DEFINE_QNODE(alc,SM8150_MASTER_ALC, 1, 1);
You can safely remove the ^^ icc node
and the bcm_alc since it will not be
voted from kernel. We seem to do the
same for the SC7180 icc provider as
well.
Quoted 92 lines
+DEFINE_QNODE(qns_a1noc_snoc,
SM8150_A1NOC_SNOC_SLV, 1, 16,SM8150_A1NOC_SNOC_MAS);drivers/interconnect/qcom/sm8150.c new file +2
-0+DEFINE_QNODE (srvc_aggre1_noc,SM8150_SLAVE_SERVICE_A1NOC ,1 ,4 ); +DEFINE_QNODE(qns_a2noc_snoc, SM8150_A2NOC_SNOC_SLV, 1, 16,
SM8150_A2NOC_SNOC_MAS);
+DEFINE_QNODE(qns_pcie_mem_noc,SM8150_SLAVE_ANOC_PCIE_GEM_NOC, 1, 16,SM8150_MASTER_GEM_NOC_PCIE_SNOC);drivers/interconnect/qcom/sm8150.c new file +3
-0+DEFINE_QNODE (srvc_aggre2_noc,SM8150_SLAVE_SERVICE_A2NOC ,1 ,4 ); +DEFINE_QNODE (qns_camnoc_uncomp,SM8150_SLAVE_CAMNOC_UNCOMP ,1 ,32 ); +DEFINE_QNODE(qns_cdsp_mem_noc, SM8150_SLAVE_CDSP_MEM_NOC, 2, 32,
SM8150_MASTER_COMPUTE_NOC); +DEFINE_QNODE(qhs_a1_noc_cfg,SM8150_SLAVE_A1NOC_CFG, 1, 4,SM8150_MASTER_A1NOC_CFG); +DEFINE_QNODE(qhs_a2_noc_cfg,SM8150_SLAVE_A2NOC_CFG, 1, 4,SM8150_MASTER_A2NOC_CFG);drivers/interconnect/qcom/sm8150.c new file +11
-0+DEFINE_QNODE (qhs_ahb2phy_south,SM8150_SLAVE_AHB2PHY_SOUTH ,1 ,4 ); +DEFINE_QNODE (qhs_aop,SM8150_SLAVE_AOP ,1 ,4 ); +DEFINE_QNODE (qhs_aoss,SM8150_SLAVE_AOSS ,1 ,4 ); +DEFINE_QNODE (qhs_camera_cfg,SM8150_SLAVE_CAMERA_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_clk_ctl,SM8150_SLAVE_CLK_CTL ,1 ,4 ); +DEFINE_QNODE (qhs_compute_dsp,SM8150_SLAVE_CDSP_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_cpr_cx,SM8150_SLAVE_RBCPR_CX_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_cpr_mmcx,SM8150_SLAVE_RBCPR_MMCX_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_cpr_mx,SM8150_SLAVE_RBCPR_MX_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_crypto0_cfg,SM8150_SLAVE_CRYPTO_0_CFG ,1 ,4 ); +DEFINE_QNODE(qhs_ddrss_cfg, SM8150_SLAVE_CNOC_DDRSS, 1, 4,
SM8150_MASTER_CNOC_DC_NOC);drivers/interconnect/qcom/sm8150.c new file +7
-0+DEFINE_QNODE (qhs_display_cfg,SM8150_SLAVE_DISPLAY_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_emac_cfg,SM8150_SLAVE_EMAC_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_glm,SM8150_SLAVE_GLM ,1 ,4 ); +DEFINE_QNODE (qhs_gpuss_cfg,SM8150_SLAVE_GRAPHICS_3D_CFG ,1 ,8 ); +DEFINE_QNODE (qhs_imem_cfg,SM8150_SLAVE_IMEM_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_ipa,SM8150_SLAVE_IPA_CFG ,1 ,4 ); +DEFINE_QNODE(qhs_mnoc_cfg, SM8150_SLAVE_CNOC_MNOC_CFG, 1, 4,
SM8150_MASTER_CNOC_MNOC_CFG);drivers/interconnect/qcom/sm8150.c new file +14
-0+DEFINE_QNODE (qhs_npu_cfg,SM8150_SLAVE_NPU_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_pcie0_cfg,SM8150_SLAVE_PCIE_0_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_pcie1_cfg,SM8150_SLAVE_PCIE_1_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_phy_refgen_north,SM8150_SLAVE_NORTH_PHY_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_pimem_cfg,SM8150_SLAVE_PIMEM_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_prng,SM8150_SLAVE_PRNG ,1 ,4 ); +DEFINE_QNODE (qhs_qdss_cfg,SM8150_SLAVE_QDSS_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_qspi,SM8150_SLAVE_QSPI ,1 ,4 ); +DEFINE_QNODE (qhs_qupv3_east,SM8150_SLAVE_QUP_2 ,1 ,4 ); +DEFINE_QNODE (qhs_qupv3_north,SM8150_SLAVE_QUP_1 ,1 ,4 ); +DEFINE_QNODE (qhs_qupv3_south,SM8150_SLAVE_QUP_0 ,1 ,4 ); +DEFINE_QNODE (qhs_sdc2,SM8150_SLAVE_SDCC_2 ,1 ,4 ); +DEFINE_QNODE (qhs_sdc4,SM8150_SLAVE_SDCC_4 ,1 ,4 ); +DEFINE_QNODE(qhs_snoc_cfg, SM8150_SLAVE_SNOC_CFG, 1, 4,
SM8150_MASTER_SNOC_CFG);drivers/interconnect/qcom/sm8150.c new file +16
-0+DEFINE_QNODE (qhs_spdm,SM8150_SLAVE_SPDM_WRAPPER ,1 ,4 ); +DEFINE_QNODE (qhs_spss_cfg,SM8150_SLAVE_SPSS_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_ssc_cfg,SM8150_SLAVE_SSC_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_tcsr,SM8150_SLAVE_TCSR ,1 ,4 ); +DEFINE_QNODE (qhs_tlmm_east,SM8150_SLAVE_TLMM_EAST ,1 ,4 ); +DEFINE_QNODE (qhs_tlmm_north,SM8150_SLAVE_TLMM_NORTH ,1 ,4 ); +DEFINE_QNODE (qhs_tlmm_south,SM8150_SLAVE_TLMM_SOUTH ,1 ,4 ); +DEFINE_QNODE (qhs_tlmm_west,SM8150_SLAVE_TLMM_WEST ,1 ,4 ); +DEFINE_QNODE (qhs_tsif,SM8150_SLAVE_TSIF ,1 ,4 ); +DEFINE_QNODE (qhs_ufs_card_cfg,SM8150_SLAVE_UFS_CARD_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_ufs_mem_cfg,SM8150_SLAVE_UFS_MEM_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_usb3_0,SM8150_SLAVE_USB3 ,1 ,4 ); +DEFINE_QNODE (qhs_usb3_1,SM8150_SLAVE_USB3_1 ,1 ,4 ); +DEFINE_QNODE (qhs_venus_cfg,SM8150_SLAVE_VENUS_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_vsense_ctrl_cfg,SM8150_SLAVE_VSENSE_CTRL_CFG ,1 ,4 ); +DEFINE_QNODE(qns_cnoc_a2noc, SM8150_SLAVE_CNOC_A2NOC, 1, 8,
SM8150_MASTER_CNOC_A2NOC);drivers/interconnect/qcom/sm8150.c new file +3
-0+DEFINE_QNODE (srvc_cnoc,SM8150_SLAVE_SERVICE_CNOC ,1 ,4 ); +DEFINE_QNODE (qhs_llcc,SM8150_SLAVE_LLCC_CFG ,1 ,4 ); +DEFINE_QNODE(qhs_memnoc, SM8150_SLAVE_GEM_NOC_CFG, 1, 4,
SM8150_MASTER_GEM_NOC_CFG); +DEFINE_QNODE(qhs_mdsp_ms_mpu_cfg,SM8150_SLAVE_MSS_PROC_MS_MPU_CFG, 1, 4);drivers/interconnect/qcom/sm8150.c new file +2
-0+DEFINE_QNODE (qns_ecc,SM8150_SLAVE_ECC ,1 ,32 ); +DEFINE_QNODE(qns_gem_noc_snoc, SM8150_SLAVE_GEM_NOC_SNOC, 1, 8,
SM8150_MASTER_GEM_NOC_SNOC);drivers/interconnect/qcom/sm8150.c new file +5
-0+DEFINE_QNODE (qns_llcc,SM8150_SLAVE_LLCC ,4 ,16 ,SM8150_MASTER_LLCC ); +DEFINE_QNODE (srvc_gemnoc,SM8150_SLAVE_SERVICE_GEM_NOC ,1 ,4 ); +DEFINE_QNODE (ipa_core_slave,SM8150_SLAVE_IPA_CORE ,1 ,8 ); +DEFINE_QNODE (ebi,SM8150_SLAVE_EBI_CH0 ,4 ,4 ); +DEFINE_QNODE(qns2_mem_noc, SM8150_SLAVE_MNOC_SF_MEM_NOC, 1, 32,
SM8150_MASTER_MNOC_SF_MEM_NOC); +DEFINE_QNODE(qns_mem_noc_hf,SM8150_SLAVE_MNOC_HF_MEM_NOC, 2, 32,SM8150_MASTER_MNOC_HF_MEM_NOC);drivers/interconnect/qcom/sm8150.c new file +3
-0+DEFINE_QNODE (srvc_mnoc,SM8150_SLAVE_SERVICE_MNOC ,1 ,4 ); +DEFINE_QNODE (qhs_apss,SM8150_SLAVE_APPSS ,1 ,8 ); +DEFINE_QNODE(qns_cnoc, SM8150_SNOC_CNOC_SLV, 1, 8,
SM8150_SNOC_CNOC_MAS);
+DEFINE_QNODE(qns_gemnoc_gc,SM8150_SLAVE_SNOC_GEM_NOC_GC, 1, 8,SM8150_MASTER_SNOC_GC_MEM_NOC); +DEFINE_QNODE(qns_gemnoc_sf,SM8150_SLAVE_SNOC_GEM_NOC_SF, 1, 16,SM8150_MASTER_SNOC_SF_MEM_NOC);
drivers/interconnect/qcom/sm8150.c line 159
Quoted 8 lines
drivers/interconnect/qcom/sm8150.c new file +8
-0+DEFINE_QNODE (qxs_imem,SM8150_SLAVE_OCIMEM ,1 ,8 ); +DEFINE_QNODE (qxs_pimem,SM8150_SLAVE_PIMEM ,1 ,8 ); +DEFINE_QNODE (srvc_snoc,SM8150_SLAVE_SERVICE_SNOC ,1 ,4 ); +DEFINE_QNODE (xs_pcie_0,SM8150_SLAVE_PCIE_0 ,1 ,8 ); +DEFINE_QNODE (xs_pcie_1,SM8150_SLAVE_PCIE_1 ,1 ,8 ); +DEFINE_QNODE (xs_qdss_stm,SM8150_SLAVE_QDSS_STM ,1 ,4 ); +DEFINE_QNODE (xs_sys_tcu_cfg,SM8150_SLAVE_TCU ,1 ,8 ); +
You can keepalive enabled for SH0,
MC0, MM0, SN0 and CN0.
Quoted 658 lines
drivers/interconnect/qcom/sm8150.c new file +6
-0+DEFINE_QBCM (bcm_acv,"ACV" , false, &ebi); +DEFINE_QBCM (bcm_alc,"ALC" , false, &alc); +DEFINE_QBCM (bcm_mc0,"MC0" , false, &ebi); +DEFINE_QBCM (bcm_sh0,"SH0" , false, &qns_llcc); +DEFINE_QBCM (bcm_mm0,"MM0" , false, &qns_mem_noc_hf); +DEFINE_QBCM(bcm_mm1, "MM1", false, &qxm_camnoc_hf0_uncomp,
&qxm_camnoc_hf1_uncomp,&qxm_camnoc_sf_uncomp,&qxm_camnoc_hf0,&qxm_camnoc_hf1,&qxm_mdp0,&qxm_mdp1);drivers/interconnect/qcom/sm8150.c new file +4
-0+DEFINE_QBCM (bcm_sh2,"SH2" , false, &qns_gem_noc_snoc); +DEFINE_QBCM (bcm_mm2,"MM2" , false, &qxm_camnoc_sf, &qns2_mem_noc); +DEFINE_QBCM (bcm_sh3,"SH3" , false, &acm_gpu_tcu, &acm_sys_tcu); +DEFINE_QBCM(bcm_mm3, "MM3", false, &qxm_rot, &qxm_venus0,
&qxm_venus1,&qxm_venus_arm9);drivers/interconnect/qcom/sm8150.c new file +9
-0+DEFINE_QBCM (bcm_sh4,"SH4" , false, &qnm_cmpnoc); +DEFINE_QBCM (bcm_sh5,"SH5" , false, &acm_apps); +DEFINE_QBCM (bcm_sn0,"SN0" , false, &qns_gemnoc_sf); +DEFINE_QBCM (bcm_co0,"CO0" , false, &qns_cdsp_mem_noc); +DEFINE_QBCM (bcm_ce0,"CE0" , false, &qxm_crypto); +DEFINE_QBCM (bcm_sn1,"SN1" , false, &qxs_imem); +DEFINE_QBCM (bcm_co1,"CO1" , false, &qnm_npu); +DEFINE_QBCM (bcm_ip0,"IP0" , false, &ipa_core_slave); +DEFINE_QBCM(bcm_cn0, "CN0", false, &qhm_spdm, &qnm_snoc,
&qhs_a1_noc_cfg,&qhs_a2_noc_cfg,&qhs_ahb2phy_south,&qhs_aop,&qhs_aoss,&qhs_camera_cfg,&qhs_clk_ctl,&qhs_compute_dsp,&qhs_cpr_cx,&qhs_cpr_mmcx,&qhs_cpr_mx,&qhs_crypto0_cfg,&qhs_ddrss_cfg,&qhs_display_cfg,&qhs_emac_cfg,&qhs_glm,&qhs_gpuss_cfg,&qhs_imem_cfg,&qhs_ipa,&qhs_mnoc_cfg,&qhs_npu_cfg,&qhs_pcie0_cfg,&qhs_pcie1_cfg,&qhs_phy_refgen_north,&qhs_pimem_cfg,&qhs_prng,&qhs_qdss_cfg,&qhs_qspi,&qhs_qupv3_east,&qhs_qupv3_north,&qhs_qupv3_south,&qhs_sdc2,&qhs_sdc4,&qhs_snoc_cfg,&qhs_spdm,&qhs_spss_cfg,&qhs_ssc_cfg,&qhs_tcsr,&qhs_tlmm_east,&qhs_tlmm_north,&qhs_tlmm_south,&qhs_tlmm_west,&qhs_tsif,&qhs_ufs_card_cfg,&qhs_ufs_mem_cfg,&qhs_usb3_0,&qhs_usb3_1,&qhs_venus_cfg,&qhs_vsense_ctrl_cfg,&qns_cnoc_a2noc,&srvc_cnoc);drivers/interconnect/qcom/sm8150.c new file +3
-0+DEFINE_QBCM (bcm_qup0,"QUP0" , false, &qhm_qup0, &qhm_qup1, &qhm_qup2); +DEFINE_QBCM (bcm_sn2,"SN2" , false, &qns_gemnoc_gc); +DEFINE_QBCM(bcm_sn3, "SN3", false, &srvc_aggre1_noc,
&srvc_aggre2_noc,&qns_cnoc);drivers/interconnect/qcom/sm8150.c new file +350
-0+DEFINE_QBCM (bcm_sn4,"SN4" , false, &qxs_pimem); +DEFINE_QBCM (bcm_sn5,"SN5" , false, &xs_qdss_stm); +DEFINE_QBCM (bcm_sn8,"SN8" , false, &xs_pcie_0, &xs_pcie_1); +DEFINE_QBCM (bcm_sn9,"SN9" , false, &qnm_aggre1_noc); +DEFINE_QBCM (bcm_sn11,"SN11" , false, &qnm_aggre2_noc); +DEFINE_QBCM (bcm_sn12,"SN12" , false, &qxm_pimem, &xm_gic); +DEFINE_QBCM (bcm_sn14,"SN14" , false, &qns_pcie_mem_noc); +DEFINE_QBCM (bcm_sn15,"SN15" , false, &qnm_gemnoc); + +static struct qcom_icc_bcm *aggre1_noc_bcms[] = { + &bcm_qup0, + &bcm_sn3, +}; + +static struct qcom_icc_node *aggre1_noc_nodes[] = { + [MASTER_A1NOC_CFG ] = &qhm_a1noc_cfg, + [MASTER_QUP_0 ] = &qhm_qup0, + [MASTER_EMAC ] = &xm_emac, + [MASTER_UFS_MEM ] = &xm_ufs_mem, + [MASTER_USB3 ] = &xm_usb3_0, + [MASTER_USB3_1 ] = &xm_usb3_1, + [A1NOC_SNOC_SLV ] = &qns_a1noc_snoc, + [SLAVE_SERVICE_A1NOC ] = &srvc_aggre1_noc, +}; + +static struct qcom_icc_desc sm8150_aggre1_noc = { + .nodes = aggre1_noc_nodes, + .num_nodes =ARRAY_SIZE (aggre1_noc_nodes), + .bcms = aggre1_noc_bcms, + .num_bcms =ARRAY_SIZE (aggre1_noc_bcms), +}; + +static struct qcom_icc_bcm *aggre2_noc_bcms[] = { + &bcm_ce0, + &bcm_qup0, + &bcm_sn14, + &bcm_sn3, +}; + +static struct qcom_icc_node *aggre2_noc_nodes[] = { + [MASTER_A2NOC_CFG ] = &qhm_a2noc_cfg, + [MASTER_QDSS_BAM ] = &qhm_qdss_bam, + [MASTER_QSPI ] = &qhm_qspi, + [MASTER_QUP_1 ] = &qhm_qup1, + [MASTER_QUP_2 ] = &qhm_qup2, + [MASTER_SENSORS_AHB ] = &qhm_sensorss_ahb, + [MASTER_TSIF ] = &qhm_tsif, + [MASTER_CNOC_A2NOC ] = &qnm_cnoc, + [MASTER_CRYPTO_CORE_0 ] = &qxm_crypto, + [MASTER_IPA ] = &qxm_ipa, + [MASTER_PCIE ] = &xm_pcie3_0, + [MASTER_PCIE_1 ] = &xm_pcie3_1, + [MASTER_QDSS_ETR ] = &xm_qdss_etr, + [MASTER_SDCC_2 ] = &xm_sdc2, + [MASTER_SDCC_4 ] = &xm_sdc4, + [A2NOC_SNOC_SLV ] = &qns_a2noc_snoc, + [SLAVE_ANOC_PCIE_GEM_NOC ] = &qns_pcie_mem_noc, + [SLAVE_SERVICE_A2NOC ] = &srvc_aggre2_noc, +}; + +static struct qcom_icc_desc sm8150_aggre2_noc = { + .nodes = aggre2_noc_nodes, + .num_nodes =ARRAY_SIZE (aggre2_noc_nodes), + .bcms = aggre2_noc_bcms, + .num_bcms =ARRAY_SIZE (aggre2_noc_bcms), +}; + +static struct qcom_icc_bcm *camnoc_virt_bcms[] = { + &bcm_mm1, +}; + +static struct qcom_icc_node *camnoc_virt_nodes[] = { + [MASTER_CAMNOC_HF0_UNCOMP ] = &qxm_camnoc_hf0_uncomp, + [MASTER_CAMNOC_HF1_UNCOMP ] = &qxm_camnoc_hf1_uncomp, + [MASTER_CAMNOC_SF_UNCOMP ] = &qxm_camnoc_sf_uncomp, + [SLAVE_CAMNOC_UNCOMP ] = &qns_camnoc_uncomp, +}; + +static struct qcom_icc_desc sm8150_camnoc_virt = { + .nodes = camnoc_virt_nodes, + .num_nodes =ARRAY_SIZE (camnoc_virt_nodes), + .bcms = camnoc_virt_bcms, + .num_bcms =ARRAY_SIZE (camnoc_virt_bcms), +}; + +static struct qcom_icc_bcm *compute_noc_bcms[] = { + &bcm_co0, + &bcm_co1, +}; + +static struct qcom_icc_node *compute_noc_nodes[] = { + [MASTER_NPU ] = &qnm_npu, + [SLAVE_CDSP_MEM_NOC ] = &qns_cdsp_mem_noc, +}; + +static struct qcom_icc_desc sm8150_compute_noc = { + .nodes = compute_noc_nodes, + .num_nodes =ARRAY_SIZE (compute_noc_nodes), + .bcms = compute_noc_bcms, + .num_bcms =ARRAY_SIZE (compute_noc_bcms), +}; + +static struct qcom_icc_bcm *config_noc_bcms[] = { + &bcm_cn0, +}; + +static struct qcom_icc_node *config_noc_nodes[] = { + [MASTER_SPDM ] = &qhm_spdm, + [SNOC_CNOC_MAS ] = &qnm_snoc, + [MASTER_QDSS_DAP ] = &xm_qdss_dap, + [SLAVE_A1NOC_CFG ] = &qhs_a1_noc_cfg, + [SLAVE_A2NOC_CFG ] = &qhs_a2_noc_cfg, + [SLAVE_AHB2PHY_SOUTH ] = &qhs_ahb2phy_south, + [SLAVE_AOP ] = &qhs_aop, + [SLAVE_AOSS ] = &qhs_aoss, + [SLAVE_CAMERA_CFG ] = &qhs_camera_cfg, + [SLAVE_CLK_CTL ] = &qhs_clk_ctl, + [SLAVE_CDSP_CFG ] = &qhs_compute_dsp, + [SLAVE_RBCPR_CX_CFG ] = &qhs_cpr_cx, + [SLAVE_RBCPR_MMCX_CFG ] = &qhs_cpr_mmcx, + [SLAVE_RBCPR_MX_CFG ] = &qhs_cpr_mx, + [SLAVE_CRYPTO_0_CFG ] = &qhs_crypto0_cfg, + [SLAVE_CNOC_DDRSS ] = &qhs_ddrss_cfg, + [SLAVE_DISPLAY_CFG ] = &qhs_display_cfg, + [SLAVE_EMAC_CFG ] = &qhs_emac_cfg, + [SLAVE_GLM ] = &qhs_glm, + [SLAVE_GRAPHICS_3D_CFG ] = &qhs_gpuss_cfg, + [SLAVE_IMEM_CFG ] = &qhs_imem_cfg, + [SLAVE_IPA_CFG ] = &qhs_ipa, + [SLAVE_CNOC_MNOC_CFG ] = &qhs_mnoc_cfg, + [SLAVE_NPU_CFG ] = &qhs_npu_cfg, + [SLAVE_PCIE_0_CFG ] = &qhs_pcie0_cfg, + [SLAVE_PCIE_1_CFG ] = &qhs_pcie1_cfg, + [SLAVE_NORTH_PHY_CFG ] = &qhs_phy_refgen_north, + [SLAVE_PIMEM_CFG ] = &qhs_pimem_cfg, + [SLAVE_PRNG ] = &qhs_prng, + [SLAVE_QDSS_CFG ] = &qhs_qdss_cfg, + [SLAVE_QSPI ] = &qhs_qspi, + [SLAVE_QUP_2 ] = &qhs_qupv3_east, + [SLAVE_QUP_1 ] = &qhs_qupv3_north, + [SLAVE_QUP_0 ] = &qhs_qupv3_south, + [SLAVE_SDCC_2 ] = &qhs_sdc2, + [SLAVE_SDCC_4 ] = &qhs_sdc4, + [SLAVE_SNOC_CFG ] = &qhs_snoc_cfg, + [SLAVE_SPDM_WRAPPER ] = &qhs_spdm, + [SLAVE_SPSS_CFG ] = &qhs_spss_cfg, + [SLAVE_SSC_CFG ] = &qhs_ssc_cfg, + [SLAVE_TCSR ] = &qhs_tcsr, + [SLAVE_TLMM_EAST ] = &qhs_tlmm_east, + [SLAVE_TLMM_NORTH ] = &qhs_tlmm_north, + [SLAVE_TLMM_SOUTH ] = &qhs_tlmm_south, + [SLAVE_TLMM_WEST ] = &qhs_tlmm_west, + [SLAVE_TSIF ] = &qhs_tsif, + [SLAVE_UFS_CARD_CFG ] = &qhs_ufs_card_cfg, + [SLAVE_UFS_MEM_CFG ] = &qhs_ufs_mem_cfg, + [SLAVE_USB3 ] = &qhs_usb3_0, + [SLAVE_USB3_1 ] = &qhs_usb3_1, + [SLAVE_VENUS_CFG ] = &qhs_venus_cfg, + [SLAVE_VSENSE_CTRL_CFG ] = &qhs_vsense_ctrl_cfg, + [SLAVE_CNOC_A2NOC ] = &qns_cnoc_a2noc, + [SLAVE_SERVICE_CNOC ] = &srvc_cnoc, +}; + +static struct qcom_icc_desc sm8150_config_noc = { + .nodes = config_noc_nodes, + .num_nodes =ARRAY_SIZE (config_noc_nodes), + .bcms = config_noc_bcms, + .num_bcms =ARRAY_SIZE (config_noc_bcms), +}; + +static struct qcom_icc_bcm *dc_noc_bcms[] = { +}; + +static struct qcom_icc_node *dc_noc_nodes[] = { + [MASTER_CNOC_DC_NOC ] = &qhm_cnoc_dc_noc, + [SLAVE_LLCC_CFG ] = &qhs_llcc, + [SLAVE_GEM_NOC_CFG ] = &qhs_memnoc, +}; + +static struct qcom_icc_desc sm8150_dc_noc = { + .nodes = dc_noc_nodes, + .num_nodes =ARRAY_SIZE (dc_noc_nodes), + .bcms = dc_noc_bcms, + .num_bcms =ARRAY_SIZE (dc_noc_bcms), +}; + +static struct qcom_icc_bcm *gem_noc_bcms[] = { + &bcm_sh0, + &bcm_sh2, + &bcm_sh3, + &bcm_sh4, + &bcm_sh5, +}; + +static struct qcom_icc_node *gem_noc_nodes[] = { + [MASTER_AMPSS_M0 ] = &acm_apps, + [MASTER_GPU_TCU ] = &acm_gpu_tcu, + [MASTER_SYS_TCU ] = &acm_sys_tcu, + [MASTER_GEM_NOC_CFG ] = &qhm_gemnoc_cfg, + [MASTER_COMPUTE_NOC ] = &qnm_cmpnoc, + [MASTER_GRAPHICS_3D ] = &qnm_gpu, + [MASTER_MNOC_HF_MEM_NOC ] = &qnm_mnoc_hf, + [MASTER_MNOC_SF_MEM_NOC ] = &qnm_mnoc_sf, + [MASTER_GEM_NOC_PCIE_SNOC ] = &qnm_pcie, + [MASTER_SNOC_GC_MEM_NOC ] = &qnm_snoc_gc, + [MASTER_SNOC_SF_MEM_NOC ] = &qnm_snoc_sf, + [MASTER_ECC ] = &qxm_ecc, + [SLAVE_MSS_PROC_MS_MPU_CFG ] = &qhs_mdsp_ms_mpu_cfg, + [SLAVE_ECC ] = &qns_ecc, + [SLAVE_GEM_NOC_SNOC ] = &qns_gem_noc_snoc, + [SLAVE_LLCC ] = &qns_llcc, + [SLAVE_SERVICE_GEM_NOC ] = &srvc_gemnoc, +}; + +static struct qcom_icc_desc sm8150_gem_noc = { + .nodes = gem_noc_nodes, + .num_nodes =ARRAY_SIZE (gem_noc_nodes), + .bcms = gem_noc_bcms, + .num_bcms =ARRAY_SIZE (gem_noc_bcms), +}; + +static struct qcom_icc_bcm *ipa_virt_bcms[] = { + &bcm_ip0, +}; + +static struct qcom_icc_node *ipa_virt_nodes[] = { + [MASTER_IPA_CORE ] = &ipa_core_master, + [SLAVE_IPA_CORE ] = &ipa_core_slave, +}; + +static struct qcom_icc_desc sm8150_ipa_virt = { + .nodes = ipa_virt_nodes, + .num_nodes =ARRAY_SIZE (ipa_virt_nodes), + .bcms = ipa_virt_bcms, + .num_bcms =ARRAY_SIZE (ipa_virt_bcms), +}; + +static struct qcom_icc_bcm *mc_virt_bcms[] = { + &bcm_acv, + &bcm_alc, + &bcm_mc0, +}; + +static struct qcom_icc_node *mc_virt_nodes[] = { + [MASTER_LLCC ] = &llcc_mc, + [MASTER_ALC ] = &alc, + [SLAVE_EBI_CH0 ] = &ebi, +}; + +static struct qcom_icc_desc sm8150_mc_virt = { + .nodes = mc_virt_nodes, + .num_nodes =ARRAY_SIZE (mc_virt_nodes), + .bcms = mc_virt_bcms, + .num_bcms =ARRAY_SIZE (mc_virt_bcms), +}; + +static struct qcom_icc_bcm *mmss_noc_bcms[] = { + &bcm_mm0, + &bcm_mm1, + &bcm_mm2, + &bcm_mm3, +}; + +static struct qcom_icc_node *mmss_noc_nodes[] = { + [MASTER_CNOC_MNOC_CFG ] = &qhm_mnoc_cfg, + [MASTER_CAMNOC_HF0 ] = &qxm_camnoc_hf0, + [MASTER_CAMNOC_HF1 ] = &qxm_camnoc_hf1, + [MASTER_CAMNOC_SF ] = &qxm_camnoc_sf, + [MASTER_MDP_PORT0 ] = &qxm_mdp0, + [MASTER_MDP_PORT1 ] = &qxm_mdp1, + [MASTER_ROTATOR ] = &qxm_rot, + [MASTER_VIDEO_P0 ] = &qxm_venus0, + [MASTER_VIDEO_P1 ] = &qxm_venus1, + [MASTER_VIDEO_PROC ] = &qxm_venus_arm9, + [SLAVE_MNOC_SF_MEM_NOC ] = &qns2_mem_noc, + [SLAVE_MNOC_HF_MEM_NOC ] = &qns_mem_noc_hf, + [SLAVE_SERVICE_MNOC ] = &srvc_mnoc, +}; + +static struct qcom_icc_desc sm8150_mmss_noc = { + .nodes = mmss_noc_nodes, + .num_nodes =ARRAY_SIZE (mmss_noc_nodes), + .bcms = mmss_noc_bcms, + .num_bcms =ARRAY_SIZE (mmss_noc_bcms), +}; + +static struct qcom_icc_bcm *system_noc_bcms[] = { + &bcm_sn0, + &bcm_sn1, + &bcm_sn11, + &bcm_sn12, + &bcm_sn15, + &bcm_sn2, + &bcm_sn3, + &bcm_sn4, + &bcm_sn5, + &bcm_sn8, + &bcm_sn9, +}; + +static struct qcom_icc_node *system_noc_nodes[] = { + [MASTER_SNOC_CFG ] = &qhm_snoc_cfg, + [A1NOC_SNOC_MAS ] = &qnm_aggre1_noc, + [A2NOC_SNOC_MAS ] = &qnm_aggre2_noc, + [MASTER_GEM_NOC_SNOC ] = &qnm_gemnoc, + [MASTER_PIMEM ] = &qxm_pimem, + [MASTER_GIC ] = &xm_gic, + [SLAVE_APPSS ] = &qhs_apss, + [SNOC_CNOC_SLV ] = &qns_cnoc, + [SLAVE_SNOC_GEM_NOC_GC ] = &qns_gemnoc_gc, + [SLAVE_SNOC_GEM_NOC_SF ] = &qns_gemnoc_sf, + [SLAVE_OCIMEM ] = &qxs_imem, + [SLAVE_PIMEM ] = &qxs_pimem, + [SLAVE_SERVICE_SNOC ] = &srvc_snoc, + [SLAVE_PCIE_0 ] = &xs_pcie_0, + [SLAVE_PCIE_1 ] = &xs_pcie_1, + [SLAVE_QDSS_STM ] = &xs_qdss_stm, + [SLAVE_TCU ] = &xs_sys_tcu_cfg, +}; + +static struct qcom_icc_desc sm8150_system_noc = { + .nodes = system_noc_nodes, + .num_nodes =ARRAY_SIZE (system_noc_nodes), + .bcms = system_noc_bcms, + .num_bcms =ARRAY_SIZE (system_noc_bcms), +}; + +static int qnoc_probe (struct platform_device *pdev) +{ +const struct qcom_icc_desc *desc; +struct icc_onecell_data *data; +struct icc_provider *provider; +struct qcom_icc_node **qnodes; +struct qcom_icc_provider *qp; +struct icc_node *node; +size_t num_nodes, i; +int ret; + + desc =device_get_match_data (&pdev->dev); +if (!desc) +return -EINVAL ; + + qnodes = desc->nodes; + num_nodes = desc->num_nodes; + + qp =devm_kzalloc (&pdev->dev,sizeof (*qp),GFP_KERNEL ); +if (!qp) +return -ENOMEM ; + + data = devm_kcalloc(&pdev->dev, num_nodes, sizeof(*node),
GFP_KERNEL);drivers/interconnect/qcom/sm8150.c new file +108
-0+if (!data) +return -ENOMEM ; + + provider = &qp->provider; + provider->dev = &pdev->dev; + provider->set = qcom_icc_set; + provider->pre_aggregate = qcom_icc_pre_aggregate; + provider->aggregate = qcom_icc_aggregate; + provider->xlate = of_icc_xlate_onecell; +INIT_LIST_HEAD (&provider->nodes); + provider->data = data; + + qp->dev = &pdev->dev; + qp->bcms = desc->bcms; + qp->num_bcms = desc->num_bcms; + + qp->voter =of_bcm_voter_get (qp->dev,NULL ); +if (IS_ERR (qp->voter)) +return PTR_ERR (qp->voter); + + ret =icc_provider_add (provider); +if (ret) { +dev_err (&pdev->dev,"error adding interconnect provider\n" ); +return ret; + } + +for (i =0 ; i < num_nodes; i++) { +size_t j; + +if (!qnodes[i]) +continue ; + + node =icc_node_create (qnodes[i]->id); +if (IS_ERR (node)) { + ret =PTR_ERR (node); + goto err; + } + + node->name = qnodes[i]->name; + node->data = qnodes[i]; +icc_node_add (node, provider); + +for (j =0 ; j < qnodes[i]->num_links; j++) +icc_link_create (node, qnodes[i]->links[j]); + + data->nodes[i] = node; + } + data->num_nodes = num_nodes; + +for (i =0 ; i < qp->num_bcms; i++) +qcom_icc_bcm_init (qp->bcms[i], &pdev->dev); + +platform_set_drvdata (pdev, qp); + +return 0 ; +err: +icc_nodes_remove (provider); +icc_provider_del (provider); +return ret; +} + +static int qnoc_remove (struct platform_device *pdev) +{ +struct qcom_icc_provider *qp =platform_get_drvdata (pdev); + +icc_nodes_remove (&qp->provider); +return icc_provider_del (&qp->provider); +} + +static const struct of_device_id qnoc_of_match[] = { + { .compatible ="qcom,sm8150-aggre1-noc" , + .data = &sm8150_aggre1_noc}, + { .compatible ="qcom,sm8150-aggre2-noc" , + .data = &sm8150_aggre2_noc}, + { .compatible ="qcom,sm8150-camnoc-virt" , + .data = &sm8150_camnoc_virt}, + { .compatible ="qcom,sm8150-compute-noc" , + .data = &sm8150_compute_noc}, + { .compatible ="qcom,sm8150-config-noc" , + .data = &sm8150_config_noc}, + { .compatible ="qcom,sm8150-dc-noc" , + .data = &sm8150_dc_noc}, + { .compatible ="qcom,sm8150-gem-noc" , + .data = &sm8150_gem_noc}, + { .compatible ="qcom,sm8150-ipa-virt" , + .data = &sm8150_ipa_virt}, + { .compatible ="qcom,sm8150-mc-virt" , + .data = &sm8150_mc_virt}, + { .compatible ="qcom,sm8150-mmss-noc" , + .data = &sm8150_mmss_noc}, + { .compatible ="qcom,sm8150-system-noc" , + .data = &sm8150_system_noc}, + { } +}; +MODULE_DEVICE_TABLE (of, qnoc_of_match); + +static struct platform_driver qnoc_driver = { + .probe = qnoc_probe, + .remove = qnoc_remove, + .driver = { + .name ="qnoc-sm8150" , + .of_match_table = qnoc_of_match, + }, +}; +module_platform_driver (qnoc_driver); + +MODULE_DESCRIPTION ("Qualcomm SM8150 NoC driver" ); +MODULE_LICENSE ("GPL v2" );drivers/interconnect/qcom/sm8150.h new file +153
-0@@ -0,0 +1,153 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Qualcomm #define SM8250 interconnect IDs +* +* Copyright (c) 2020, The Linux Foundation. All rights reserved. +*/ + +#ifndef __DRIVERS_INTERCONNECT_QCOM_SM8150_H +#define __DRIVERS_INTERCONNECT_QCOM_SM8150_H + +#define SM8150_A1NOC_SNOC_MAS 0 +#define SM8150_A1NOC_SNOC_SLV 1 +#define SM8150_A2NOC_SNOC_MAS 2 +#define SM8150_A2NOC_SNOC_SLV 3 +#define SM8150_MASTER_A1NOC_CFG 4 +#define SM8150_MASTER_A2NOC_CFG 5 +#define SM8150_MASTER_ALC 6 +#define SM8150_MASTER_AMPSS_M0 7 +#define SM8150_MASTER_CAMNOC_HF0 8 +#define SM8150_MASTER_CAMNOC_HF0_UNCOMP 9 +#define SM8150_MASTER_CAMNOC_HF1 10 +#define SM8150_MASTER_CAMNOC_HF1_UNCOMP 11 +#define SM8150_MASTER_CAMNOC_SF 12 +#define SM8150_MASTER_CAMNOC_SF_UNCOMP 13 +#define SM8150_MASTER_CNOC_A2NOC 14 +#define SM8150_MASTER_CNOC_DC_NOC 15 +#define SM8150_MASTER_CNOC_MNOC_CFG 16 +#define SM8150_MASTER_COMPUTE_NOC 17 +#define SM8150_MASTER_CRYPTO_CORE_0 18 +#define SM8150_MASTER_ECC 19 +#define SM8150_MASTER_EMAC 20 +#define SM8150_MASTER_GEM_NOC_CFG 21 +#define SM8150_MASTER_GEM_NOC_PCIE_SNOC 22 +#define SM8150_MASTER_GEM_NOC_SNOC 23 +#define SM8150_MASTER_GIC 24 +#define SM8150_MASTER_GPU_TCU 25 +#define SM8150_MASTER_GRAPHICS_3D 26 +#define SM8150_MASTER_IPA 27 +#define SM8150_MASTER_IPA_CORE 28 +#define SM8150_MASTER_LLCC 29 +#define SM8150_MASTER_MDP_PORT0 30 +#define SM8150_MASTER_MDP_PORT1 31 +#define SM8150_MASTER_MNOC_HF_MEM_NOC 32 +#define SM8150_MASTER_MNOC_SF_MEM_NOC 33 +#define SM8150_MASTER_NPU 34 +#define SM8150_MASTER_PCIE 35 +#define SM8150_MASTER_PCIE_1 36 +#define SM8150_MASTER_PIMEM 37 +#define SM8150_MASTER_QDSS_BAM 38 +#define SM8150_MASTER_QDSS_DAP 39 +#define SM8150_MASTER_QDSS_ETR 40 +#define SM8150_MASTER_QSPI 41 +#define SM8150_MASTER_QUP_0 42 +#define SM8150_MASTER_QUP_1 43 +#define SM8150_MASTER_QUP_2 44 +#define SM8150_MASTER_ROTATOR 45 +#define SM8150_MASTER_SDCC_2 46 +#define SM8150_MASTER_SDCC_4 47 +#define SM8150_MASTER_SENSORS_AHB 48 +#define SM8150_MASTER_SNOC_CFG 49 +#define SM8150_MASTER_SNOC_GC_MEM_NOC 50 +#define SM8150_MASTER_SNOC_SF_MEM_NOC 51 +#define SM8150_MASTER_SPDM 52 +#define SM8150_MASTER_SYS_TCU 53 +#define SM8150_MASTER_TSIF 54 +#define SM8150_MASTER_UFS_MEM 55 +#define SM8150_MASTER_USB3 56 +#define SM8150_MASTER_USB3_1 57 +#define SM8150_MASTER_VIDEO_P0 58 +#define SM8150_MASTER_VIDEO_P1 59 +#define SM8150_MASTER_VIDEO_PROC 60 +#define SM8150_SLAVE_A1NOC_CFG 61 +#define SM8150_SLAVE_A2NOC_CFG 62 +#define SM8150_SLAVE_AHB2PHY_SOUTH 63 +#define SM8150_SLAVE_ANOC_PCIE_GEM_NOC 64 +#define SM8150_SLAVE_AOP 65 +#define SM8150_SLAVE_AOSS 66 +#define SM8150_SLAVE_APPSS 67 +#define SM8150_SLAVE_CAMERA_CFG 68 +#define SM8150_SLAVE_CAMNOC_UNCOMP 69 +#define SM8150_SLAVE_CDSP_CFG 70 +#define SM8150_SLAVE_CDSP_MEM_NOC 71 +#define SM8150_SLAVE_CLK_CTL 72 +#define SM8150_SLAVE_CNOC_A2NOC 73 +#define SM8150_SLAVE_CNOC_DDRSS 74 +#define SM8150_SLAVE_CNOC_MNOC_CFG 75 +#define SM8150_SLAVE_CRYPTO_0_CFG 76 +#define SM8150_SLAVE_DISPLAY_CFG 77 +#define SM8150_SLAVE_EBI_CH0 78 +#define SM8150_SLAVE_ECC 79 +#define SM8150_SLAVE_EMAC_CFG 80 +#define SM8150_SLAVE_GEM_NOC_CFG 81 +#define SM8150_SLAVE_GEM_NOC_SNOC 82 +#define SM8150_SLAVE_GLM 83 +#define SM8150_SLAVE_GRAPHICS_3D_CFG 84 +#define SM8150_SLAVE_IMEM_CFG 85 +#define SM8150_SLAVE_IPA_CFG 86 +#define SM8150_SLAVE_IPA_CORE 87 +#define SM8150_SLAVE_LLCC 88 +#define SM8150_SLAVE_LLCC_CFG 89 +#define SM8150_SLAVE_MNOC_HF_MEM_NOC 90 +#define SM8150_SLAVE_MNOC_SF_MEM_NOC 91 +#define SM8150_SLAVE_MSS_PROC_MS_MPU_CFG 92 +#define SM8150_SLAVE_NORTH_PHY_CFG 93 +#define SM8150_SLAVE_NPU_CFG 94 +#define SM8150_SLAVE_OCIMEM 95 +#define SM8150_SLAVE_PCIE_0 96 +#define SM8150_SLAVE_PCIE_0_CFG 97 +#define SM8150_SLAVE_PCIE_1 98 +#define SM8150_SLAVE_PCIE_1_CFG 99 +#define SM8150_SLAVE_PIMEM 100 +#define SM8150_SLAVE_PIMEM_CFG 101 +#define SM8150_SLAVE_PRNG 102 +#define SM8150_SLAVE_QDSS_CFG 103 +#define SM8150_SLAVE_QDSS_STM 104 +#define SM8150_SLAVE_QSPI 105 +#define SM8150_SLAVE_QUP_0 106 +#define SM8150_SLAVE_QUP_1 107 +#define SM8150_SLAVE_QUP_2 108 +#define SM8150_SLAVE_RBCPR_CX_CFG 109 +#define SM8150_SLAVE_RBCPR_MMCX_CFG 110 +#define SM8150_SLAVE_RBCPR_MX_CFG 111 +#define SM8150_SLAVE_SDCC_2 112 +#define SM8150_SLAVE_SDCC_4 113 +#define SM8150_SLAVE_SERVICE_A1NOC 114 +#define SM8150_SLAVE_SERVICE_A2NOC 115 +#define SM8150_SLAVE_SERVICE_CNOC 116 +#define SM8150_SLAVE_SERVICE_GEM_NOC 117 +#define SM8150_SLAVE_SERVICE_MNOC 118 +#define SM8150_SLAVE_SERVICE_SNOC 119 +#define SM8150_SLAVE_SNOC_CFG 120 +#define SM8150_SLAVE_SNOC_GEM_NOC_GC 121 +#define SM8150_SLAVE_SNOC_GEM_NOC_SF 122 +#define SM8150_SLAVE_SPDM_WRAPPER 123 +#define SM8150_SLAVE_SPSS_CFG 124 +#define SM8150_SLAVE_SSC_CFG 125 +#define SM8150_SLAVE_TCSR 126 +#define SM8150_SLAVE_TCU 127 +#define SM8150_SLAVE_TLMM_EAST 128 +#define SM8150_SLAVE_TLMM_NORTH 129 +#define SM8150_SLAVE_TLMM_SOUTH 130 +#define SM8150_SLAVE_TLMM_WEST 131 +#define SM8150_SLAVE_TSIF 132 +#define SM8150_SLAVE_UFS_CARD_CFG 133 +#define SM8150_SLAVE_UFS_MEM_CFG 134 +#define SM8150_SLAVE_USB3 135 +#define SM8150_SLAVE_USB3_1 136 +#define SM8150_SLAVE_VENUS_CFG 137 +#define SM8150_SLAVE_VSENSE_CTRL_CFG 138 +#define SM8150_SNOC_CNOC_MAS 139 +#define SM8150_SNOC_CNOC_SLV 140 + +#endif
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v2 5/7 interconnect: qcom: Add SM8250 interconnect provider driver
In reply to Jonathan MarekAdd driver for the Qualcomm interconnect buses found in SM8250 based platforms. The topology consists of several NoCs that are controlled by a remote processor that collects the aggregated bandwidth for each master-slave pairs.
Based on SC7180 driver and generated from downstream dts.
--- drivers/interconnect/qcom/Kconfig | 10 + drivers/interconnect/qcom/Makefile | 2 + drivers/interconnect/qcom/sm8250.c | 655 +++++++++++++++++++++++++++++ drivers/interconnect/qcom/sm8250.h | 163 +++++++ 4 files changed, 830 insertions(+) create mode 100644 drivers/interconnect/qcom/sm8250.c create mode 100644 drivers/interconnect/qcom/sm8250.h
drivers/interconnect/qcom/Kconfig +10 -0
@@ -75,5 +75,15 @@ config INTERCONNECT_QCOM_SM8150 This is a driver for the Qualcomm Network-on-Chip on sm8150-based platforms. +config INTERCONNECT_QCOM_SM8250 + tristate "Qualcomm SM8250 interconnect driver" + depends on INTERCONNECT_QCOM + depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST + select INTERCONNECT_QCOM_RPMH + select INTERCONNECT_QCOM_BCM_VOTER + help + This is a driver for the Qualcomm Network-on-Chip on sm8250-based + platforms. + config INTERCONNECT_QCOM_SMD_RPM tristate
drivers/interconnect/qcom/Makefile +2 -0
@@ -9,6 +9,7 @@ icc-rpmh-obj := icc-rpmh.o qnoc-sc7180-objs := sc7180.o qnoc-sdm845-objs := sdm845.o qnoc-sm8150-objs := sm8150.o +qnoc-sm8250-objs := sm8250.o icc-smd-rpm-objs := smd-rpm.o obj-$(CONFIG_INTERCONNECT_QCOM_BCM_VOTER) += icc-bcm-voter.o
@@ -20,4 +21,5 @@ obj-$(CONFIG_INTERCONNECT_QCOM_RPMH) += icc-rpmh.o obj-$(CONFIG_INTERCONNECT_QCOM_SC7180) += qnoc-sc7180.o obj-$(CONFIG_INTERCONNECT_QCOM_SDM845) += qnoc-sdm845.o obj-$(CONFIG_INTERCONNECT_QCOM_SM8150) += qnoc-sm8150.o +obj-$(CONFIG_INTERCONNECT_QCOM_SM8250) += qnoc-sm8250.o obj-$(CONFIG_INTERCONNECT_QCOM_SMD_RPM) += icc-smd-rpm.o
drivers/interconnect/qcom/sm8250.c new file +655 -0
655 lines not on this page · raw message
drivers/interconnect/qcom/sm8250.h new file +163 -0
163 lines not on this page · raw message
Signature · 1 line
2.26.1
Re: [PATCH v2 5/7] interconnect: qcom: Add SM8250 interconnect provider driver
Hey Jonathan,
Thanks for the patch!
Quoted 234 lines · Jonathan Marek
Add driver for the Qualcomm interconnect buses found in SM8250 based platforms. The topology consists of several NoCs that are controlled by a remote processor that collects the aggregated bandwidth for each master-slave pairs.
Based on SC7180 driver and generated from downstream dts.
Signed-off-by Jonathan Marek <[email protected]>--- drivers/interconnect/qcom/Kconfig | 10 + drivers/interconnect/qcom/Makefile | 2 + drivers/interconnect/qcom/sm8250.c | 655 +++++++++++++++++++++++++++++ drivers/interconnect/qcom/sm8250.h | 163 +++++++ 4 files changed, 830 insertions(+) create mode 100644 drivers/interconnect/qcom/sm8250.c create mode 100644 drivers/interconnect/qcom/sm8250.hdrivers/interconnect/qcom/Kconfig +10
-0@@ -75,5 +75,15 @@ config INTERCONNECT_QCOM_SM8150 This is a driver for the Qualcomm Network-on-Chip on sm8150-based platforms. +config INTERCONNECT_QCOM_SM8250 + tristate "Qualcomm SM8250 interconnect driver" + depends on INTERCONNECT_QCOM + depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST + select INTERCONNECT_QCOM_RPMH + select INTERCONNECT_QCOM_BCM_VOTER + help + This is a driver for the Qualcomm Network-on-Chip on sm8250-based + platforms. + config INTERCONNECT_QCOM_SMD_RPM tristatedrivers/interconnect/qcom/Makefile +2
-0@@ -9,6 +9,7 @@ icc-rpmh-obj := icc-rpmh.o qnoc-sc7180-objs := sc7180.o qnoc-sdm845-objs := sdm845.o qnoc-sm8150-objs := sm8150.o +qnoc-sm8250-objs := sm8250.o icc-smd-rpm-objs := smd-rpm.o obj-$(CONFIG_INTERCONNECT_QCOM_BCM_VOTER) += icc-bcm-voter.o@@ -20,4 +21,5 @@ obj-$(CONFIG_INTERCONNECT_QCOM_RPMH) += icc-rpmh.o obj-$(CONFIG_INTERCONNECT_QCOM_SC7180) += qnoc-sc7180.o obj-$(CONFIG_INTERCONNECT_QCOM_SDM845) += qnoc-sdm845.o obj-$(CONFIG_INTERCONNECT_QCOM_SM8150) += qnoc-sm8150.o +obj-$(CONFIG_INTERCONNECT_QCOM_SM8250) += qnoc-sm8250.o obj-$(CONFIG_INTERCONNECT_QCOM_SMD_RPM) += icc-smd-rpm.odrivers/interconnect/qcom/sm8250.c new file +18
-0@@ -0,0 +1,655 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2020, The Linux Foundation. All rights reserved. +* +*/ + +#include <linux/device.h> +#include <linux/interconnect.h> +#include <linux/interconnect-provider.h> +#include <linux/module.h> +#include <linux/of_platform.h> +#include <dt-bindings/interconnect/qcom,sm8250.h> + +#include "bcm-voter.h" +#include "icc-rpmh.h" +#include "sm8250.h" + +DEFINE_QNODE(qhm_a1noc_cfg, SM8250_MASTER_A1NOC_CFG, 1, 4,
SM8250_SLAVE_SERVICE_A1NOC); +DEFINE_QNODE(qhm_qspi,SM8250_MASTER_QSPI_0, 1, 4,SM8250_A1NOC_SNOC_SLV);
+DEFINE_QNODE(qhm_qup1,SM8250_MASTER_QUP_1, 1, 4,SM8250_A1NOC_SNOC_SLV);
+DEFINE_QNODE(qhm_qup2,SM8250_MASTER_QUP_2, 1, 4,SM8250_A1NOC_SNOC_SLV);
+DEFINE_QNODE(qhm_tsif,SM8250_MASTER_TSIF, 1, 4,SM8250_A1NOC_SNOC_SLV); +DEFINE_QNODE(xm_pcie3_modem,SM8250_MASTER_PCIE_2, 1, 8,SM8250_SLAVE_ANOC_PCIE_GEM_NOC_1); +DEFINE_QNODE(xm_sdc4,SM8250_MASTER_SDCC_4, 1, 8,SM8250_A1NOC_SNOC_SLV);
+DEFINE_QNODE(xm_ufs_mem,SM8250_MASTER_UFS_MEM, 1, 8,SM8250_A1NOC_SNOC_SLV);
+DEFINE_QNODE(xm_usb3_0,SM8250_MASTER_USB3, 1, 8,SM8250_A1NOC_SNOC_SLV);
+DEFINE_QNODE(xm_usb3_1,SM8250_MASTER_USB3_1, 1, 8,SM8250_A1NOC_SNOC_SLV); +DEFINE_QNODE(qhm_a2noc_cfg,SM8250_MASTER_A2NOC_CFG, 1, 4,SM8250_SLAVE_SERVICE_A2NOC); +DEFINE_QNODE(qhm_qdss_bam,SM8250_MASTER_QDSS_BAM, 1, 4,SM8250_A2NOC_SNOC_SLV);
+DEFINE_QNODE(qhm_qup0,SM8250_MASTER_QUP_0, 1, 4,SM8250_A2NOC_SNOC_SLV);
+DEFINE_QNODE(qnm_cnoc,SM8250_MASTER_CNOC_A2NOC, 1, 8,SM8250_A2NOC_SNOC_SLV);
+DEFINE_QNODE(qxm_crypto,SM8250_MASTER_CRYPTO_CORE_0, 1, 8,SM8250_A2NOC_SNOC_SLV);drivers/interconnect/qcom/sm8250.c new file +2
-0+DEFINE_QNODE (qxm_ipa,SM8250_MASTER_IPA ,1 ,8 ,SM8250_A2NOC_SNOC_SLV ); +DEFINE_QNODE(xm_pcie3_0, SM8250_MASTER_PCIE, 1, 8,
SM8250_SLAVE_ANOC_PCIE_GEM_NOC);
+DEFINE_QNODE(xm_pcie3_1,SM8250_MASTER_PCIE_1, 1, 8,SM8250_SLAVE_ANOC_PCIE_GEM_NOC);
+DEFINE_QNODE(xm_qdss_etr,SM8250_MASTER_QDSS_ETR, 1, 8,SM8250_A2NOC_SNOC_SLV);
+DEFINE_QNODE(xm_sdc2,SM8250_MASTER_SDCC_2, 1, 8,SM8250_A2NOC_SNOC_SLV);
+DEFINE_QNODE(xm_ufs_card,SM8250_MASTER_UFS_CARD, 1, 8,SM8250_A2NOC_SNOC_SLV);
+DEFINE_QNODE(qnm_npu,SM8250_MASTER_NPU, 2, 32,SM8250_SLAVE_CDSP_MEM_NOC);
+DEFINE_QNODE(qnm_snoc,SM8250_SNOC_CNOC_MAS, 1, 8,SM8250_SLAVE_CDSP_CFG,SM8250_SLAVE_CAMERA_CFG,SM8250_SLAVE_TLMM_SOUTH,SM8250_SLAVE_TLMM_NORTH,SM8250_SLAVE_SDCC_4,SM8250_SLAVE_TLMM_WEST,SM8250_SLAVE_SDCC_2,SM8250_SLAVE_CNOC_MNOC_CFG,SM8250_SLAVE_UFS_MEM_CFG,SM8250_SLAVE_SNOC_CFG,SM8250_SLAVE_PDM,SM8250_SLAVE_CX_RDPM,SM8250_SLAVE_PCIE_1_CFG,SM8250_SLAVE_A2NOC_CFG,SM8250_SLAVE_QDSS_CFG,SM8250_SLAVE_DISPLAY_CFG,SM8250_SLAVE_PCIE_2_CFG,SM8250_SLAVE_TCSR,SM8250_SLAVE_DCC_CFG,SM8250_SLAVE_CNOC_DDRSS,SM8250_SLAVE_IPC_ROUTER_CFG,SM8250_SLAVE_PCIE_0_CFG,SM8250_SLAVE_RBCPR_MMCX_CFG,SM8250_SLAVE_NPU_CFG,SM8250_SLAVE_AHB2PHY_SOUTH,SM8250_SLAVE_AHB2PHY_NORTH,SM8250_SLAVE_GRAPHICS_3D_CFG,SM8250_SLAVE_VENUS_CFG,SM8250_SLAVE_TSIF,SM8250_SLAVE_IPA_CFG,SM8250_SLAVE_IMEM_CFG,SM8250_SLAVE_USB3,SM8250_SLAVE_SERVICE_CNOC,SM8250_SLAVE_UFS_CARD_CFG,SM8250_SLAVE_USB3_1,SM8250_SLAVE_LPASS,SM8250_SLAVE_RBCPR_CX_CFG,SM8250_SLAVE_A1NOC_CFG,SM8250_SLAVE_AOSS,SM8250_SLAVE_PRNG,SM8250_SLAVE_VSENSE_CTRL_CFG,SM8250_SLAVE_QSPI_0,SM8250_SLAVE_CRYPTO_0_CFG,SM8250_SLAVE_PIMEM_CFG,SM8250_SLAVE_RBCPR_MX_CFG,SM8250_SLAVE_QUP_0,SM8250_SLAVE_QUP_1,SM8250_SLAVE_QUP_2,SM8250_SLAVE_CLK_CTL); +DEFINE_QNODE(xm_qdss_dap,SM8250_MASTER_QDSS_DAP, 1, 8,SM8250_SLAVE_CDSP_CFG,SM8250_SLAVE_CAMERA_CFG,SM8250_SLAVE_TLMM_SOUTH,SM8250_SLAVE_TLMM_NORTH,SM8250_SLAVE_SDCC_4,SM8250_SLAVE_TLMM_WEST,SM8250_SLAVE_SDCC_2,SM8250_SLAVE_CNOC_MNOC_CFG,SM8250_SLAVE_UFS_MEM_CFG,SM8250_SLAVE_SNOC_CFG,SM8250_SLAVE_PDM,SM8250_SLAVE_CX_RDPM,SM8250_SLAVE_PCIE_1_CFG,SM8250_SLAVE_A2NOC_CFG,SM8250_SLAVE_QDSS_CFG,SM8250_SLAVE_DISPLAY_CFG,SM8250_SLAVE_PCIE_2_CFG,SM8250_SLAVE_TCSR,SM8250_SLAVE_DCC_CFG,SM8250_SLAVE_CNOC_DDRSS,SM8250_SLAVE_IPC_ROUTER_CFG,SM8250_SLAVE_CNOC_A2NOC,SM8250_SLAVE_PCIE_0_CFG,SM8250_SLAVE_RBCPR_MMCX_CFG,SM8250_SLAVE_NPU_CFG,SM8250_SLAVE_AHB2PHY_SOUTH,SM8250_SLAVE_AHB2PHY_NORTH,SM8250_SLAVE_GRAPHICS_3D_CFG,SM8250_SLAVE_VENUS_CFG,SM8250_SLAVE_TSIF,SM8250_SLAVE_IPA_CFG,SM8250_SLAVE_IMEM_CFG,SM8250_SLAVE_USB3,SM8250_SLAVE_SERVICE_CNOC,SM8250_SLAVE_UFS_CARD_CFG,SM8250_SLAVE_USB3_1,SM8250_SLAVE_LPASS,SM8250_SLAVE_RBCPR_CX_CFG,SM8250_SLAVE_A1NOC_CFG,SM8250_SLAVE_AOSS,SM8250_SLAVE_PRNG,SM8250_SLAVE_VSENSE_CTRL_CFG,SM8250_SLAVE_QSPI_0,SM8250_SLAVE_CRYPTO_0_CFG,SM8250_SLAVE_PIMEM_CFG,SM8250_SLAVE_RBCPR_MX_CFG,SM8250_SLAVE_QUP_0,SM8250_SLAVE_QUP_1,SM8250_SLAVE_QUP_2,SM8250_SLAVE_CLK_CTL); +DEFINE_QNODE(qhm_cnoc_dc_noc,SM8250_MASTER_CNOC_DC_NOC, 1, 4,SM8250_SLAVE_GEM_NOC_CFG,SM8250_SLAVE_LLCC_CFG); +DEFINE_QNODE(alm_gpu_tcu,SM8250_MASTER_GPU_TCU, 1, 8,SM8250_SLAVE_LLCC,SM8250_SLAVE_GEM_NOC_SNOC); +DEFINE_QNODE(alm_sys_tcu,SM8250_MASTER_SYS_TCU, 1, 8,SM8250_SLAVE_LLCC,SM8250_SLAVE_GEM_NOC_SNOC); +DEFINE_QNODE(chm_apps,SM8250_MASTER_AMPSS_M0, 2, 32,SM8250_SLAVE_LLCC,SM8250_SLAVE_GEM_NOC_SNOC,SM8250_SLAVE_MEM_NOC_PCIE_SNOC); +DEFINE_QNODE(qhm_gemnoc_cfg,SM8250_MASTER_GEM_NOC_CFG, 1, 4,SM8250_SLAVE_SERVICE_GEM_NOC_2,SM8250_SLAVE_SERVICE_GEM_NOC_1,SM8250_SLAVE_SERVICE_GEM_NOC);
+DEFINE_QNODE(qnm_cmpnoc,SM8250_MASTER_COMPUTE_NOC, 2, 32,SM8250_SLAVE_LLCC,SM8250_SLAVE_GEM_NOC_SNOC); +DEFINE_QNODE(qnm_gpu,SM8250_MASTER_GRAPHICS_3D, 2, 32,SM8250_SLAVE_LLCC,SM8250_SLAVE_GEM_NOC_SNOC); +DEFINE_QNODE(qnm_mnoc_hf,SM8250_MASTER_MNOC_HF_MEM_NOC, 2, 32,SM8250_SLAVE_LLCC);
+DEFINE_QNODE(qnm_mnoc_sf,SM8250_MASTER_MNOC_SF_MEM_NOC, 2, 32,SM8250_SLAVE_LLCC,SM8250_SLAVE_GEM_NOC_SNOC); +DEFINE_QNODE(qnm_pcie,SM8250_MASTER_ANOC_PCIE_GEM_NOC, 1, 16,SM8250_SLAVE_LLCC,SM8250_SLAVE_GEM_NOC_SNOC); +DEFINE_QNODE(qnm_snoc_gc,SM8250_MASTER_SNOC_GC_MEM_NOC, 1, 8,SM8250_SLAVE_LLCC);
+DEFINE_QNODE(qnm_snoc_sf,SM8250_MASTER_SNOC_SF_MEM_NOC, 1, 16,SM8250_SLAVE_LLCC,SM8250_SLAVE_GEM_NOC_SNOC,SM8250_SLAVE_MEM_NOC_PCIE_SNOC); +DEFINE_QNODE(ipa_core_master,SM8250_MASTER_IPA_CORE, 1, 8,SM8250_SLAVE_IPA_CORE);drivers/interconnect/qcom/sm8250.c new file +2
-0+DEFINE_QNODE (llcc_mc,SM8250_MASTER_LLCC ,4 ,4 ,SM8250_SLAVE_EBI_CH0 ); +DEFINE_QNODE(qhm_mnoc_cfg, SM8250_MASTER_CNOC_MNOC_CFG, 1, 4,
SM8250_SLAVE_SERVICE_MNOC);
+DEFINE_QNODE(qnm_camnoc_hf,SM8250_MASTER_CAMNOC_HF, 2, 32,SM8250_SLAVE_MNOC_HF_MEM_NOC); +DEFINE_QNODE(qnm_camnoc_icp,SM8250_MASTER_CAMNOC_ICP, 1, 8,SM8250_SLAVE_MNOC_SF_MEM_NOC); +DEFINE_QNODE(qnm_camnoc_sf,SM8250_MASTER_CAMNOC_SF, 2, 32,SM8250_SLAVE_MNOC_SF_MEM_NOC);
+DEFINE_QNODE(qnm_video0,SM8250_MASTER_VIDEO_P0, 1, 32,SM8250_SLAVE_MNOC_SF_MEM_NOC);
+DEFINE_QNODE(qnm_video1,SM8250_MASTER_VIDEO_P1, 1, 32,SM8250_SLAVE_MNOC_SF_MEM_NOC); +DEFINE_QNODE(qnm_video_cvp,SM8250_MASTER_VIDEO_PROC, 1, 32,SM8250_SLAVE_MNOC_SF_MEM_NOC);
+DEFINE_QNODE(qxm_mdp0,SM8250_MASTER_MDP_PORT0, 1, 32,SM8250_SLAVE_MNOC_HF_MEM_NOC);
+DEFINE_QNODE(qxm_mdp1,SM8250_MASTER_MDP_PORT1, 1, 32,SM8250_SLAVE_MNOC_HF_MEM_NOC);
+DEFINE_QNODE(qxm_rot,SM8250_MASTER_ROTATOR, 1, 32,SM8250_SLAVE_MNOC_SF_MEM_NOC);
+DEFINE_QNODE(amm_npu_sys,SM8250_MASTER_NPU_SYS, 4, 32,SM8250_SLAVE_NPU_COMPUTE_NOC); +DEFINE_QNODE(amm_npu_sys_cdp_w,SM8250_MASTER_NPU_CDP, 2, 16,SM8250_SLAVE_NPU_COMPUTE_NOC);
+DEFINE_QNODE(qhm_cfg,SM8250_MASTER_NPU_NOC_CFG, 1, 4,SM8250_SLAVE_SERVICE_NPU_NOC,SM8250_SLAVE_ISENSE_CFG,SM8250_SLAVE_NPU_LLM_CFG,SM8250_SLAVE_NPU_INT_DMA_BWMON_CFG,SM8250_SLAVE_NPU_CP,SM8250_SLAVE_NPU_TCM,SM8250_SLAVE_NPU_CAL_DP0,SM8250_SLAVE_NPU_CAL_DP1,SM8250_SLAVE_NPU_DPM); +DEFINE_QNODE(qhm_snoc_cfg,SM8250_MASTER_SNOC_CFG, 1, 4,SM8250_SLAVE_SERVICE_SNOC);
+DEFINE_QNODE(qnm_aggre1_noc,SM8250_A1NOC_SNOC_MAS, 1, 16,SM8250_SLAVE_SNOC_GEM_NOC_SF); +DEFINE_QNODE(qnm_aggre2_noc,SM8250_A2NOC_SNOC_MAS, 1, 16,SM8250_SLAVE_SNOC_GEM_NOC_SF);
+DEFINE_QNODE(qnm_gemnoc,SM8250_MASTER_GEM_NOC_SNOC, 1, 16,SM8250_SLAVE_PIMEM,SM8250_SLAVE_OCIMEM,SM8250_SLAVE_APPSS,
Quoted 8 lines
SM8250_SNOC_CNOC_SLV,SM8250_SLAVE_TCU,SM8250_SLAVE_QDSS_STM); +DEFINE_QNODE(qnm_gemnoc_pcie,SM8250_MASTER_GEM_NOC_PCIE_SNOC, 1, 8,SM8250_SLAVE_PCIE_2,SM8250_SLAVE_PCIE_0,SM8250_SLAVE_PCIE_1); +DEFINE_QNODE(qxm_pimem,SM8250_MASTER_PIMEM, 1, 8,SM8250_SLAVE_SNOC_GEM_NOC_GC);
+DEFINE_QNODE(xm_gic,SM8250_MASTER_GIC, 1, 8,SM8250_SLAVE_SNOC_GEM_NOC_GC);
+DEFINE_QNODE(alc,SM8250_MASTER_ALC, 1, 1);
You can safely remove the ^^ icc node
and the bcm_alc since it will not be
voted from kernel. We seem to do the
same for the SC7180 icc provider as
well.
Quoted 105 lines
+DEFINE_QNODE(qns_a1noc_snoc,
SM8250_A1NOC_SNOC_SLV, 1, 16,SM8250_A1NOC_SNOC_MAS); +DEFINE_QNODE(qns_pcie_modem_mem_noc,SM8250_SLAVE_ANOC_PCIE_GEM_NOC_1, 1, 16,SM8250_MASTER_ANOC_PCIE_GEM_NOC);drivers/interconnect/qcom/sm8250.c new file +2
-0+DEFINE_QNODE (srvc_aggre1_noc,SM8250_SLAVE_SERVICE_A1NOC ,1 ,4 ); +DEFINE_QNODE(qns_a2noc_snoc, SM8250_A2NOC_SNOC_SLV, 1, 16,
SM8250_A2NOC_SNOC_MAS);
+DEFINE_QNODE(qns_pcie_mem_noc,SM8250_SLAVE_ANOC_PCIE_GEM_NOC, 1, 16,SM8250_MASTER_ANOC_PCIE_GEM_NOC);drivers/interconnect/qcom/sm8250.c new file +2
-0+DEFINE_QNODE (srvc_aggre2_noc,SM8250_SLAVE_SERVICE_A2NOC ,1 ,4 ); +DEFINE_QNODE(qns_cdsp_mem_noc, SM8250_SLAVE_CDSP_MEM_NOC, 2, 32,
SM8250_MASTER_COMPUTE_NOC); +DEFINE_QNODE(qhs_a1_noc_cfg,SM8250_SLAVE_A1NOC_CFG, 1, 4,SM8250_MASTER_A1NOC_CFG); +DEFINE_QNODE(qhs_a2_noc_cfg,SM8250_SLAVE_A2NOC_CFG, 1, 4,SM8250_MASTER_A2NOC_CFG);drivers/interconnect/qcom/sm8250.c new file +13
-0+DEFINE_QNODE (qhs_ahb2phy0,SM8250_SLAVE_AHB2PHY_SOUTH ,1 ,4 ); +DEFINE_QNODE (qhs_ahb2phy1,SM8250_SLAVE_AHB2PHY_NORTH ,1 ,4 ); +DEFINE_QNODE (qhs_aoss,SM8250_SLAVE_AOSS ,1 ,4 ); +DEFINE_QNODE (qhs_camera_cfg,SM8250_SLAVE_CAMERA_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_clk_ctl,SM8250_SLAVE_CLK_CTL ,1 ,4 ); +DEFINE_QNODE (qhs_compute_dsp,SM8250_SLAVE_CDSP_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_cpr_cx,SM8250_SLAVE_RBCPR_CX_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_cpr_mmcx,SM8250_SLAVE_RBCPR_MMCX_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_cpr_mx,SM8250_SLAVE_RBCPR_MX_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_crypto0_cfg,SM8250_SLAVE_CRYPTO_0_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_cx_rdpm,SM8250_SLAVE_CX_RDPM ,1 ,4 ); +DEFINE_QNODE (qhs_dcc_cfg,SM8250_SLAVE_DCC_CFG ,1 ,4 ); +DEFINE_QNODE(qhs_ddrss_cfg, SM8250_SLAVE_CNOC_DDRSS, 1, 4,
SM8250_MASTER_CNOC_DC_NOC);drivers/interconnect/qcom/sm8250.c new file +7
-0+DEFINE_QNODE (qhs_display_cfg,SM8250_SLAVE_DISPLAY_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_gpuss_cfg,SM8250_SLAVE_GRAPHICS_3D_CFG ,1 ,8 ); +DEFINE_QNODE (qhs_imem_cfg,SM8250_SLAVE_IMEM_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_ipa,SM8250_SLAVE_IPA_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_ipc_router,SM8250_SLAVE_IPC_ROUTER_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_lpass_cfg,SM8250_SLAVE_LPASS ,1 ,4 ); +DEFINE_QNODE(qhs_mnoc_cfg, SM8250_SLAVE_CNOC_MNOC_CFG, 1, 4,
SM8250_MASTER_CNOC_MNOC_CFG); +DEFINE_QNODE(qhs_npu_cfg,SM8250_SLAVE_NPU_CFG, 1, 4,SM8250_MASTER_NPU_NOC_CFG);drivers/interconnect/qcom/sm8250.c new file +14
-0+DEFINE_QNODE (qhs_pcie0_cfg,SM8250_SLAVE_PCIE_0_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_pcie1_cfg,SM8250_SLAVE_PCIE_1_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_pcie_modem_cfg,SM8250_SLAVE_PCIE_2_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_pdm,SM8250_SLAVE_PDM ,1 ,4 ); +DEFINE_QNODE (qhs_pimem_cfg,SM8250_SLAVE_PIMEM_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_prng,SM8250_SLAVE_PRNG ,1 ,4 ); +DEFINE_QNODE (qhs_qdss_cfg,SM8250_SLAVE_QDSS_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_qspi,SM8250_SLAVE_QSPI_0 ,1 ,4 ); +DEFINE_QNODE (qhs_qup0,SM8250_SLAVE_QUP_0 ,1 ,4 ); +DEFINE_QNODE (qhs_qup1,SM8250_SLAVE_QUP_1 ,1 ,4 ); +DEFINE_QNODE (qhs_qup2,SM8250_SLAVE_QUP_2 ,1 ,4 ); +DEFINE_QNODE (qhs_sdc2,SM8250_SLAVE_SDCC_2 ,1 ,4 ); +DEFINE_QNODE (qhs_sdc4,SM8250_SLAVE_SDCC_4 ,1 ,4 ); +DEFINE_QNODE(qhs_snoc_cfg, SM8250_SLAVE_SNOC_CFG, 1, 4,
SM8250_MASTER_SNOC_CFG);drivers/interconnect/qcom/sm8250.c new file +12
-0+DEFINE_QNODE (qhs_tcsr,SM8250_SLAVE_TCSR ,1 ,4 ); +DEFINE_QNODE (qhs_tlmm0,SM8250_SLAVE_TLMM_NORTH ,1 ,4 ); +DEFINE_QNODE (qhs_tlmm1,SM8250_SLAVE_TLMM_SOUTH ,1 ,4 ); +DEFINE_QNODE (qhs_tlmm2,SM8250_SLAVE_TLMM_WEST ,1 ,4 ); +DEFINE_QNODE (qhs_tsif,SM8250_SLAVE_TSIF ,1 ,4 ); +DEFINE_QNODE (qhs_ufs_card_cfg,SM8250_SLAVE_UFS_CARD_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_ufs_mem_cfg,SM8250_SLAVE_UFS_MEM_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_usb3_0,SM8250_SLAVE_USB3 ,1 ,4 ); +DEFINE_QNODE (qhs_usb3_1,SM8250_SLAVE_USB3_1 ,1 ,4 ); +DEFINE_QNODE (qhs_venus_cfg,SM8250_SLAVE_VENUS_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_vsense_ctrl_cfg,SM8250_SLAVE_VSENSE_CTRL_CFG ,1 ,4 ); +DEFINE_QNODE(qns_cnoc_a2noc, SM8250_SLAVE_CNOC_A2NOC, 1, 8,
SM8250_MASTER_CNOC_A2NOC);drivers/interconnect/qcom/sm8250.c new file +3
-0+DEFINE_QNODE (srvc_cnoc,SM8250_SLAVE_SERVICE_CNOC ,1 ,4 ); +DEFINE_QNODE (qhs_llcc,SM8250_SLAVE_LLCC_CFG ,1 ,4 ); +DEFINE_QNODE(qhs_memnoc, SM8250_SLAVE_GEM_NOC_CFG, 1, 4,
SM8250_MASTER_GEM_NOC_CFG); +DEFINE_QNODE(qns_gem_noc_snoc,SM8250_SLAVE_GEM_NOC_SNOC, 1, 16,SM8250_MASTER_GEM_NOC_SNOC);drivers/interconnect/qcom/sm8250.c new file +2
-0+DEFINE_QNODE (qns_llcc,SM8250_SLAVE_LLCC ,4 ,16 ,SM8250_MASTER_LLCC ); +DEFINE_QNODE(qns_sys_pcie, SM8250_SLAVE_MEM_NOC_PCIE_SNOC, 1, 8,
SM8250_MASTER_GEM_NOC_PCIE_SNOC);drivers/interconnect/qcom/sm8250.c new file +6
-0+DEFINE_QNODE (srvc_even_gemnoc,SM8250_SLAVE_SERVICE_GEM_NOC_1 ,1 ,4 ); +DEFINE_QNODE (srvc_odd_gemnoc,SM8250_SLAVE_SERVICE_GEM_NOC_2 ,1 ,4 ); +DEFINE_QNODE (srvc_sys_gemnoc,SM8250_SLAVE_SERVICE_GEM_NOC ,1 ,4 ); +DEFINE_QNODE (ipa_core_slave,SM8250_SLAVE_IPA_CORE ,1 ,8 ); +DEFINE_QNODE (ebi,SM8250_SLAVE_EBI_CH0 ,4 ,4 ); +DEFINE_QNODE(qns_mem_noc_hf, SM8250_SLAVE_MNOC_HF_MEM_NOC, 2, 32,
SM8250_MASTER_MNOC_HF_MEM_NOC); +DEFINE_QNODE(qns_mem_noc_sf,SM8250_SLAVE_MNOC_SF_MEM_NOC, 2, 32,SM8250_MASTER_MNOC_SF_MEM_NOC);drivers/interconnect/qcom/sm8250.c new file +13
-0+DEFINE_QNODE (srvc_mnoc,SM8250_SLAVE_SERVICE_MNOC ,1 ,4 ); +DEFINE_QNODE (qhs_cal_dp0,SM8250_SLAVE_NPU_CAL_DP0 ,1 ,4 ); +DEFINE_QNODE (qhs_cal_dp1,SM8250_SLAVE_NPU_CAL_DP1 ,1 ,4 ); +DEFINE_QNODE (qhs_cp,SM8250_SLAVE_NPU_CP ,1 ,4 ); +DEFINE_QNODE (qhs_dma_bwmon,SM8250_SLAVE_NPU_INT_DMA_BWMON_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_dpm,SM8250_SLAVE_NPU_DPM ,1 ,4 ); +DEFINE_QNODE (qhs_isense,SM8250_SLAVE_ISENSE_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_llm,SM8250_SLAVE_NPU_LLM_CFG ,1 ,4 ); +DEFINE_QNODE (qhs_tcm,SM8250_SLAVE_NPU_TCM ,1 ,4 ); +DEFINE_QNODE (qns_npu_sys,SM8250_SLAVE_NPU_COMPUTE_NOC ,2 ,32 ); +DEFINE_QNODE (srvc_noc,SM8250_SLAVE_SERVICE_NPU_NOC ,1 ,4 ); +DEFINE_QNODE (qhs_apss,SM8250_SLAVE_APPSS ,1 ,8 ); +DEFINE_QNODE(qns_cnoc, SM8250_SNOC_CNOC_SLV, 1, 8,
SM8250_SNOC_CNOC_MAS);
+DEFINE_QNODE(qns_gemnoc_gc,SM8250_SLAVE_SNOC_GEM_NOC_GC, 1, 8,SM8250_MASTER_SNOC_GC_MEM_NOC); +DEFINE_QNODE(qns_gemnoc_sf,SM8250_SLAVE_SNOC_GEM_NOC_SF, 1, 16,SM8250_MASTER_SNOC_SF_MEM_NOC);
drivers/interconnect/qcom/sm8250.c line 169
Quoted 9 lines
drivers/interconnect/qcom/sm8250.c new file +9
-0+DEFINE_QNODE (qxs_imem,SM8250_SLAVE_OCIMEM ,1 ,8 ); +DEFINE_QNODE (qxs_pimem,SM8250_SLAVE_PIMEM ,1 ,8 ); +DEFINE_QNODE (srvc_snoc,SM8250_SLAVE_SERVICE_SNOC ,1 ,4 ); +DEFINE_QNODE (xs_pcie_0,SM8250_SLAVE_PCIE_0 ,1 ,8 ); +DEFINE_QNODE (xs_pcie_1,SM8250_SLAVE_PCIE_1 ,1 ,8 ); +DEFINE_QNODE (xs_pcie_modem,SM8250_SLAVE_PCIE_2 ,1 ,8 ); +DEFINE_QNODE (xs_qdss_stm,SM8250_SLAVE_QDSS_STM ,1 ,4 ); +DEFINE_QNODE (xs_sys_tcu_cfg,SM8250_SLAVE_TCU ,1 ,8 ); +
You can keepalive enabled for SH0,
MC0, MM0, SN0 and CN0.
Quoted 672 lines
drivers/interconnect/qcom/sm8250.c new file +8
-0+DEFINE_QBCM (bcm_acv,"ACV" , false, &ebi); +DEFINE_QBCM (bcm_alc,"ALC" , false, &alc); +DEFINE_QBCM (bcm_mc0,"MC0" , false, &ebi); +DEFINE_QBCM (bcm_sh0,"SH0" , false, &qns_llcc); +DEFINE_QBCM (bcm_mm0,"MM0" , false, &qns_mem_noc_hf); +DEFINE_QBCM (bcm_ce0,"CE0" , false, &qxm_crypto); +DEFINE_QBCM (bcm_ip0,"IP0" , false, &ipa_core_slave); +DEFINE_QBCM(bcm_mm1, "MM1", false, &qnm_camnoc_hf, &qxm_mdp0,
&qxm_mdp1);drivers/interconnect/qcom/sm8250.c new file +5
-0+DEFINE_QBCM (bcm_sh2,"SH2" , false, &alm_gpu_tcu, &alm_sys_tcu); +DEFINE_QBCM (bcm_mm2,"MM2" , false, &qns_mem_noc_sf); +DEFINE_QBCM (bcm_qup0,"QUP0" , false, &qhm_qup1, &qhm_qup2, &qhm_qup0); +DEFINE_QBCM (bcm_sh3,"SH3" , false, &qnm_cmpnoc); +DEFINE_QBCM(bcm_mm3, "MM3", false, &qnm_camnoc_icp, &qnm_camnoc_sf,
&qnm_video0,&qnm_video1,&qnm_video_cvp);drivers/interconnect/qcom/sm8250.c new file +4
-0+DEFINE_QBCM (bcm_sh4,"SH4" , false, &chm_apps); +DEFINE_QBCM (bcm_sn0,"SN0" , false, &qns_gemnoc_sf); +DEFINE_QBCM (bcm_co0,"CO0" , false, &qns_cdsp_mem_noc); +DEFINE_QBCM(bcm_cn0, "CN0", false, &qnm_snoc, &xm_qdss_dap,
&qhs_a1_noc_cfg,&qhs_a2_noc_cfg,&qhs_ahb2phy0,&qhs_ahb2phy1,&qhs_aoss,&qhs_camera_cfg,&qhs_clk_ctl,&qhs_compute_dsp,&qhs_cpr_cx,&qhs_cpr_mmcx,&qhs_cpr_mx,&qhs_crypto0_cfg,&qhs_cx_rdpm,&qhs_dcc_cfg,&qhs_ddrss_cfg,&qhs_display_cfg,&qhs_gpuss_cfg,&qhs_imem_cfg,&qhs_ipa,&qhs_ipc_router,&qhs_lpass_cfg,&qhs_mnoc_cfg,&qhs_npu_cfg,&qhs_pcie0_cfg,&qhs_pcie1_cfg,&qhs_pcie_modem_cfg,&qhs_pdm,&qhs_pimem_cfg,&qhs_prng,&qhs_qdss_cfg,&qhs_qspi,&qhs_qup0,&qhs_qup1,&qhs_qup2,&qhs_sdc2,&qhs_sdc4,&qhs_snoc_cfg,&qhs_tcsr,&qhs_tlmm0,&qhs_tlmm1,&qhs_tlmm2,&qhs_tsif,&qhs_ufs_card_cfg,&qhs_ufs_mem_cfg,&qhs_usb3_0,&qhs_usb3_1,&qhs_venus_cfg,&qhs_vsense_ctrl_cfg,&qns_cnoc_a2noc,&srvc_cnoc);drivers/interconnect/qcom/sm8250.c new file +12
-0+DEFINE_QBCM (bcm_sn1,"SN1" , false, &qxs_imem); +DEFINE_QBCM (bcm_sn2,"SN2" , false, &qns_gemnoc_gc); +DEFINE_QBCM (bcm_co2,"CO2" , false, &qnm_npu); +DEFINE_QBCM (bcm_sn3,"SN3" , false, &qxs_pimem); +DEFINE_QBCM (bcm_sn4,"SN4" , false, &xs_qdss_stm); +DEFINE_QBCM (bcm_sn5,"SN5" , false, &xs_pcie_modem); +DEFINE_QBCM (bcm_sn6,"SN6" , false, &xs_pcie_0, &xs_pcie_1); +DEFINE_QBCM (bcm_sn7,"SN7" , false, &qnm_aggre1_noc); +DEFINE_QBCM (bcm_sn8,"SN8" , false, &qnm_aggre2_noc); +DEFINE_QBCM (bcm_sn9,"SN9" , false, &qnm_gemnoc_pcie); +DEFINE_QBCM (bcm_sn11,"SN11" , false, &qnm_gemnoc); +DEFINE_QBCM(bcm_sn12, "SN12", false, &qns_pcie_modem_mem_noc,
&qns_pcie_mem_noc);drivers/interconnect/qcom/sm8250.c new file +349
-0+ +static struct qcom_icc_bcm *aggre1_noc_bcms[] = { + &bcm_qup0, + &bcm_sn12, +}; + +static struct qcom_icc_node *aggre1_noc_nodes[] = { + [MASTER_A1NOC_CFG ] = &qhm_a1noc_cfg, + [MASTER_QSPI_0 ] = &qhm_qspi, + [MASTER_QUP_1 ] = &qhm_qup1, + [MASTER_QUP_2 ] = &qhm_qup2, + [MASTER_TSIF ] = &qhm_tsif, + [MASTER_PCIE_2 ] = &xm_pcie3_modem, + [MASTER_SDCC_4 ] = &xm_sdc4, + [MASTER_UFS_MEM ] = &xm_ufs_mem, + [MASTER_USB3 ] = &xm_usb3_0, + [MASTER_USB3_1 ] = &xm_usb3_1, + [A1NOC_SNOC_SLV ] = &qns_a1noc_snoc, + [SLAVE_ANOC_PCIE_GEM_NOC_1 ] = &qns_pcie_modem_mem_noc, + [SLAVE_SERVICE_A1NOC ] = &srvc_aggre1_noc, +}; + +static struct qcom_icc_desc sm8250_aggre1_noc = { + .nodes = aggre1_noc_nodes, + .num_nodes =ARRAY_SIZE (aggre1_noc_nodes), + .bcms = aggre1_noc_bcms, + .num_bcms =ARRAY_SIZE (aggre1_noc_bcms), +}; + +static struct qcom_icc_bcm *aggre2_noc_bcms[] = { + &bcm_ce0, + &bcm_qup0, + &bcm_sn12, +}; + +static struct qcom_icc_node *aggre2_noc_nodes[] = { + [MASTER_A2NOC_CFG ] = &qhm_a2noc_cfg, + [MASTER_QDSS_BAM ] = &qhm_qdss_bam, + [MASTER_QUP_0 ] = &qhm_qup0, + [MASTER_CNOC_A2NOC ] = &qnm_cnoc, + [MASTER_CRYPTO_CORE_0 ] = &qxm_crypto, + [MASTER_IPA ] = &qxm_ipa, + [MASTER_PCIE ] = &xm_pcie3_0, + [MASTER_PCIE_1 ] = &xm_pcie3_1, + [MASTER_QDSS_ETR ] = &xm_qdss_etr, + [MASTER_SDCC_2 ] = &xm_sdc2, + [MASTER_UFS_CARD ] = &xm_ufs_card, + [A2NOC_SNOC_SLV ] = &qns_a2noc_snoc, + [SLAVE_ANOC_PCIE_GEM_NOC ] = &qns_pcie_mem_noc, + [SLAVE_SERVICE_A2NOC ] = &srvc_aggre2_noc, +}; + +static struct qcom_icc_desc sm8250_aggre2_noc = { + .nodes = aggre2_noc_nodes, + .num_nodes =ARRAY_SIZE (aggre2_noc_nodes), + .bcms = aggre2_noc_bcms, + .num_bcms =ARRAY_SIZE (aggre2_noc_bcms), +}; + +static struct qcom_icc_bcm *compute_noc_bcms[] = { + &bcm_co0, + &bcm_co2, +}; + +static struct qcom_icc_node *compute_noc_nodes[] = { + [MASTER_NPU ] = &qnm_npu, + [SLAVE_CDSP_MEM_NOC ] = &qns_cdsp_mem_noc, +}; + +static struct qcom_icc_desc sm8250_compute_noc = { + .nodes = compute_noc_nodes, + .num_nodes =ARRAY_SIZE (compute_noc_nodes), + .bcms = compute_noc_bcms, + .num_bcms =ARRAY_SIZE (compute_noc_bcms), +}; + +static struct qcom_icc_bcm *config_noc_bcms[] = { + &bcm_cn0, +}; + +static struct qcom_icc_node *config_noc_nodes[] = { + [SNOC_CNOC_MAS ] = &qnm_snoc, + [MASTER_QDSS_DAP ] = &xm_qdss_dap, + [SLAVE_A1NOC_CFG ] = &qhs_a1_noc_cfg, + [SLAVE_A2NOC_CFG ] = &qhs_a2_noc_cfg, + [SLAVE_AHB2PHY_SOUTH ] = &qhs_ahb2phy0, + [SLAVE_AHB2PHY_NORTH ] = &qhs_ahb2phy1, + [SLAVE_AOSS ] = &qhs_aoss, + [SLAVE_CAMERA_CFG ] = &qhs_camera_cfg, + [SLAVE_CLK_CTL ] = &qhs_clk_ctl, + [SLAVE_CDSP_CFG ] = &qhs_compute_dsp, + [SLAVE_RBCPR_CX_CFG ] = &qhs_cpr_cx, + [SLAVE_RBCPR_MMCX_CFG ] = &qhs_cpr_mmcx, + [SLAVE_RBCPR_MX_CFG ] = &qhs_cpr_mx, + [SLAVE_CRYPTO_0_CFG ] = &qhs_crypto0_cfg, + [SLAVE_CX_RDPM ] = &qhs_cx_rdpm, + [SLAVE_DCC_CFG ] = &qhs_dcc_cfg, + [SLAVE_CNOC_DDRSS ] = &qhs_ddrss_cfg, + [SLAVE_DISPLAY_CFG ] = &qhs_display_cfg, + [SLAVE_GRAPHICS_3D_CFG ] = &qhs_gpuss_cfg, + [SLAVE_IMEM_CFG ] = &qhs_imem_cfg, + [SLAVE_IPA_CFG ] = &qhs_ipa, + [SLAVE_IPC_ROUTER_CFG ] = &qhs_ipc_router, + [SLAVE_LPASS ] = &qhs_lpass_cfg, + [SLAVE_CNOC_MNOC_CFG ] = &qhs_mnoc_cfg, + [SLAVE_NPU_CFG ] = &qhs_npu_cfg, + [SLAVE_PCIE_0_CFG ] = &qhs_pcie0_cfg, + [SLAVE_PCIE_1_CFG ] = &qhs_pcie1_cfg, + [SLAVE_PCIE_2_CFG ] = &qhs_pcie_modem_cfg, + [SLAVE_PDM ] = &qhs_pdm, + [SLAVE_PIMEM_CFG ] = &qhs_pimem_cfg, + [SLAVE_PRNG ] = &qhs_prng, + [SLAVE_QDSS_CFG ] = &qhs_qdss_cfg, + [SLAVE_QSPI_0 ] = &qhs_qspi, + [SLAVE_QUP_0 ] = &qhs_qup0, + [SLAVE_QUP_1 ] = &qhs_qup1, + [SLAVE_QUP_2 ] = &qhs_qup2, + [SLAVE_SDCC_2 ] = &qhs_sdc2, + [SLAVE_SDCC_4 ] = &qhs_sdc4, + [SLAVE_SNOC_CFG ] = &qhs_snoc_cfg, + [SLAVE_TCSR ] = &qhs_tcsr, + [SLAVE_TLMM_NORTH ] = &qhs_tlmm0, + [SLAVE_TLMM_SOUTH ] = &qhs_tlmm1, + [SLAVE_TLMM_WEST ] = &qhs_tlmm2, + [SLAVE_TSIF ] = &qhs_tsif, + [SLAVE_UFS_CARD_CFG ] = &qhs_ufs_card_cfg, + [SLAVE_UFS_MEM_CFG ] = &qhs_ufs_mem_cfg, + [SLAVE_USB3 ] = &qhs_usb3_0, + [SLAVE_USB3_1 ] = &qhs_usb3_1, + [SLAVE_VENUS_CFG ] = &qhs_venus_cfg, + [SLAVE_VSENSE_CTRL_CFG ] = &qhs_vsense_ctrl_cfg, + [SLAVE_CNOC_A2NOC ] = &qns_cnoc_a2noc, + [SLAVE_SERVICE_CNOC ] = &srvc_cnoc, +}; + +static struct qcom_icc_desc sm8250_config_noc = { + .nodes = config_noc_nodes, + .num_nodes =ARRAY_SIZE (config_noc_nodes), + .bcms = config_noc_bcms, + .num_bcms =ARRAY_SIZE (config_noc_bcms), +}; + +static struct qcom_icc_bcm *dc_noc_bcms[] = { +}; + +static struct qcom_icc_node *dc_noc_nodes[] = { + [MASTER_CNOC_DC_NOC ] = &qhm_cnoc_dc_noc, + [SLAVE_LLCC_CFG ] = &qhs_llcc, + [SLAVE_GEM_NOC_CFG ] = &qhs_memnoc, +}; + +static struct qcom_icc_desc sm8250_dc_noc = { + .nodes = dc_noc_nodes, + .num_nodes =ARRAY_SIZE (dc_noc_nodes), + .bcms = dc_noc_bcms, + .num_bcms =ARRAY_SIZE (dc_noc_bcms), +}; + +static struct qcom_icc_bcm *gem_noc_bcms[] = { + &bcm_sh0, + &bcm_sh2, + &bcm_sh3, + &bcm_sh4, +}; + +static struct qcom_icc_node *gem_noc_nodes[] = { + [MASTER_GPU_TCU ] = &alm_gpu_tcu, + [MASTER_SYS_TCU ] = &alm_sys_tcu, + [MASTER_AMPSS_M0 ] = &chm_apps, + [MASTER_GEM_NOC_CFG ] = &qhm_gemnoc_cfg, + [MASTER_COMPUTE_NOC ] = &qnm_cmpnoc, + [MASTER_GRAPHICS_3D ] = &qnm_gpu, + [MASTER_MNOC_HF_MEM_NOC ] = &qnm_mnoc_hf, + [MASTER_MNOC_SF_MEM_NOC ] = &qnm_mnoc_sf, + [MASTER_ANOC_PCIE_GEM_NOC ] = &qnm_pcie, + [MASTER_SNOC_GC_MEM_NOC ] = &qnm_snoc_gc, + [MASTER_SNOC_SF_MEM_NOC ] = &qnm_snoc_sf, + [SLAVE_GEM_NOC_SNOC ] = &qns_gem_noc_snoc, + [SLAVE_LLCC ] = &qns_llcc, + [SLAVE_MEM_NOC_PCIE_SNOC ] = &qns_sys_pcie, + [SLAVE_SERVICE_GEM_NOC_1 ] = &srvc_even_gemnoc, + [SLAVE_SERVICE_GEM_NOC_2 ] = &srvc_odd_gemnoc, + [SLAVE_SERVICE_GEM_NOC ] = &srvc_sys_gemnoc, +}; + +static struct qcom_icc_desc sm8250_gem_noc = { + .nodes = gem_noc_nodes, + .num_nodes =ARRAY_SIZE (gem_noc_nodes), + .bcms = gem_noc_bcms, + .num_bcms =ARRAY_SIZE (gem_noc_bcms), +}; + +static struct qcom_icc_bcm *ipa_virt_bcms[] = { + &bcm_ip0, +}; + +static struct qcom_icc_node *ipa_virt_nodes[] = { + [MASTER_IPA_CORE ] = &ipa_core_master, + [SLAVE_IPA_CORE ] = &ipa_core_slave, +}; + +static struct qcom_icc_desc sm8250_ipa_virt = { + .nodes = ipa_virt_nodes, + .num_nodes =ARRAY_SIZE (ipa_virt_nodes), + .bcms = ipa_virt_bcms, + .num_bcms =ARRAY_SIZE (ipa_virt_bcms), +}; + +static struct qcom_icc_bcm *mc_virt_bcms[] = { + &bcm_acv, + &bcm_alc, + &bcm_mc0, +}; + +static struct qcom_icc_node *mc_virt_nodes[] = { + [MASTER_LLCC ] = &llcc_mc, + [MASTER_ALC ] = &alc, + [SLAVE_EBI_CH0 ] = &ebi, +}; + +static struct qcom_icc_desc sm8250_mc_virt = { + .nodes = mc_virt_nodes, + .num_nodes =ARRAY_SIZE (mc_virt_nodes), + .bcms = mc_virt_bcms, + .num_bcms =ARRAY_SIZE (mc_virt_bcms), +}; + +static struct qcom_icc_bcm *mmss_noc_bcms[] = { + &bcm_mm0, + &bcm_mm1, + &bcm_mm2, + &bcm_mm3, +}; + +static struct qcom_icc_node *mmss_noc_nodes[] = { + [MASTER_CNOC_MNOC_CFG ] = &qhm_mnoc_cfg, + [MASTER_CAMNOC_HF ] = &qnm_camnoc_hf, + [MASTER_CAMNOC_ICP ] = &qnm_camnoc_icp, + [MASTER_CAMNOC_SF ] = &qnm_camnoc_sf, + [MASTER_VIDEO_P0 ] = &qnm_video0, + [MASTER_VIDEO_P1 ] = &qnm_video1, + [MASTER_VIDEO_PROC ] = &qnm_video_cvp, + [MASTER_MDP_PORT0 ] = &qxm_mdp0, + [MASTER_MDP_PORT1 ] = &qxm_mdp1, + [MASTER_ROTATOR ] = &qxm_rot, + [SLAVE_MNOC_HF_MEM_NOC ] = &qns_mem_noc_hf, + [SLAVE_MNOC_SF_MEM_NOC ] = &qns_mem_noc_sf, + [SLAVE_SERVICE_MNOC ] = &srvc_mnoc, +}; + +static struct qcom_icc_desc sm8250_mmss_noc = { + .nodes = mmss_noc_nodes, + .num_nodes =ARRAY_SIZE (mmss_noc_nodes), + .bcms = mmss_noc_bcms, + .num_bcms =ARRAY_SIZE (mmss_noc_bcms), +}; + +static struct qcom_icc_bcm *npu_noc_bcms[] = { +}; + +static struct qcom_icc_node *npu_noc_nodes[] = { + [MASTER_NPU_SYS ] = &amm_npu_sys, + [MASTER_NPU_CDP ] = &amm_npu_sys_cdp_w, + [MASTER_NPU_NOC_CFG ] = &qhm_cfg, + [SLAVE_NPU_CAL_DP0 ] = &qhs_cal_dp0, + [SLAVE_NPU_CAL_DP1 ] = &qhs_cal_dp1, + [SLAVE_NPU_CP ] = &qhs_cp, + [SLAVE_NPU_INT_DMA_BWMON_CFG ] = &qhs_dma_bwmon, + [SLAVE_NPU_DPM ] = &qhs_dpm, + [SLAVE_ISENSE_CFG ] = &qhs_isense, + [SLAVE_NPU_LLM_CFG ] = &qhs_llm, + [SLAVE_NPU_TCM ] = &qhs_tcm, + [SLAVE_NPU_COMPUTE_NOC ] = &qns_npu_sys, + [SLAVE_SERVICE_NPU_NOC ] = &srvc_noc, +}; + +static struct qcom_icc_desc sm8250_npu_noc = { + .nodes = npu_noc_nodes, + .num_nodes =ARRAY_SIZE (npu_noc_nodes), + .bcms = npu_noc_bcms, + .num_bcms =ARRAY_SIZE (npu_noc_bcms), +}; + +static struct qcom_icc_bcm *system_noc_bcms[] = { + &bcm_sn0, + &bcm_sn1, + &bcm_sn11, + &bcm_sn2, + &bcm_sn3, + &bcm_sn4, + &bcm_sn5, + &bcm_sn6, + &bcm_sn7, + &bcm_sn8, + &bcm_sn9, +}; + +static struct qcom_icc_node *system_noc_nodes[] = { + [MASTER_SNOC_CFG ] = &qhm_snoc_cfg, + [A1NOC_SNOC_MAS ] = &qnm_aggre1_noc, + [A2NOC_SNOC_MAS ] = &qnm_aggre2_noc, + [MASTER_GEM_NOC_SNOC ] = &qnm_gemnoc, + [MASTER_GEM_NOC_PCIE_SNOC ] = &qnm_gemnoc_pcie, + [MASTER_PIMEM ] = &qxm_pimem, + [MASTER_GIC ] = &xm_gic, + [SLAVE_APPSS ] = &qhs_apss, + [SNOC_CNOC_SLV ] = &qns_cnoc, + [SLAVE_SNOC_GEM_NOC_GC ] = &qns_gemnoc_gc, + [SLAVE_SNOC_GEM_NOC_SF ] = &qns_gemnoc_sf, + [SLAVE_OCIMEM ] = &qxs_imem, + [SLAVE_PIMEM ] = &qxs_pimem, + [SLAVE_SERVICE_SNOC ] = &srvc_snoc, + [SLAVE_PCIE_0 ] = &xs_pcie_0, + [SLAVE_PCIE_1 ] = &xs_pcie_1, + [SLAVE_PCIE_2 ] = &xs_pcie_modem, + [SLAVE_QDSS_STM ] = &xs_qdss_stm, + [SLAVE_TCU ] = &xs_sys_tcu_cfg, +}; + +static struct qcom_icc_desc sm8250_system_noc = { + .nodes = system_noc_nodes, + .num_nodes =ARRAY_SIZE (system_noc_nodes), + .bcms = system_noc_bcms, + .num_bcms =ARRAY_SIZE (system_noc_bcms), +}; + +static int qnoc_probe (struct platform_device *pdev) +{ +const struct qcom_icc_desc *desc; +struct icc_onecell_data *data; +struct icc_provider *provider; +struct qcom_icc_node **qnodes; +struct qcom_icc_provider *qp; +struct icc_node *node; +size_t num_nodes, i; +int ret; + + desc =device_get_match_data (&pdev->dev); +if (!desc) +return -EINVAL ; + + qnodes = desc->nodes; + num_nodes = desc->num_nodes; + + qp =devm_kzalloc (&pdev->dev,sizeof (*qp),GFP_KERNEL ); +if (!qp) +return -ENOMEM ; + + data = devm_kcalloc(&pdev->dev, num_nodes, sizeof(*node),
GFP_KERNEL);drivers/interconnect/qcom/sm8250.c new file +108
-0+if (!data) +return -ENOMEM ; + + provider = &qp->provider; + provider->dev = &pdev->dev; + provider->set = qcom_icc_set; + provider->pre_aggregate = qcom_icc_pre_aggregate; + provider->aggregate = qcom_icc_aggregate; + provider->xlate = of_icc_xlate_onecell; +INIT_LIST_HEAD (&provider->nodes); + provider->data = data; + + qp->dev = &pdev->dev; + qp->bcms = desc->bcms; + qp->num_bcms = desc->num_bcms; + + qp->voter =of_bcm_voter_get (qp->dev,NULL ); +if (IS_ERR (qp->voter)) +return PTR_ERR (qp->voter); + + ret =icc_provider_add (provider); +if (ret) { +dev_err (&pdev->dev,"error adding interconnect provider\n" ); +return ret; + } + +for (i =0 ; i < num_nodes; i++) { +size_t j; + +if (!qnodes[i]) +continue ; + + node =icc_node_create (qnodes[i]->id); +if (IS_ERR (node)) { + ret =PTR_ERR (node); + goto err; + } + + node->name = qnodes[i]->name; + node->data = qnodes[i]; +icc_node_add (node, provider); + +for (j =0 ; j < qnodes[i]->num_links; j++) +icc_link_create (node, qnodes[i]->links[j]); + + data->nodes[i] = node; + } + data->num_nodes = num_nodes; + +for (i =0 ; i < qp->num_bcms; i++) +qcom_icc_bcm_init (qp->bcms[i], &pdev->dev); + +platform_set_drvdata (pdev, qp); + +return 0 ; +err: +icc_nodes_remove (provider); +icc_provider_del (provider); +return ret; +} + +static int qnoc_remove (struct platform_device *pdev) +{ +struct qcom_icc_provider *qp =platform_get_drvdata (pdev); + +icc_nodes_remove (&qp->provider); +return icc_provider_del (&qp->provider); +} + +static const struct of_device_id qnoc_of_match[] = { + { .compatible ="qcom,sm8250-aggre1-noc" , + .data = &sm8250_aggre1_noc}, + { .compatible ="qcom,sm8250-aggre2-noc" , + .data = &sm8250_aggre2_noc}, + { .compatible ="qcom,sm8250-compute-noc" , + .data = &sm8250_compute_noc}, + { .compatible ="qcom,sm8250-config-noc" , + .data = &sm8250_config_noc}, + { .compatible ="qcom,sm8250-dc-noc" , + .data = &sm8250_dc_noc}, + { .compatible ="qcom,sm8250-gem-noc" , + .data = &sm8250_gem_noc}, + { .compatible ="qcom,sm8250-ipa-virt" , + .data = &sm8250_ipa_virt}, + { .compatible ="qcom,sm8250-mc-virt" , + .data = &sm8250_mc_virt}, + { .compatible ="qcom,sm8250-mmss-noc" , + .data = &sm8250_mmss_noc}, + { .compatible ="qcom,sm8250-npu-noc" , + .data = &sm8250_npu_noc}, + { .compatible ="qcom,sm8250-system-noc" , + .data = &sm8250_system_noc}, + { } +}; +MODULE_DEVICE_TABLE (of, qnoc_of_match); + +static struct platform_driver qnoc_driver = { + .probe = qnoc_probe, + .remove = qnoc_remove, + .driver = { + .name ="qnoc-sm8250" , + .of_match_table = qnoc_of_match, + }, +}; +module_platform_driver (qnoc_driver); + +MODULE_DESCRIPTION ("Qualcomm SM8250 NoC driver" ); +MODULE_LICENSE ("GPL v2" );drivers/interconnect/qcom/sm8250.h new file +163
-0@@ -0,0 +1,163 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Qualcomm #define SM8250 interconnect IDs +* +* Copyright (c) 2020, The Linux Foundation. All rights reserved. +*/ + +#ifndef __DRIVERS_INTERCONNECT_QCOM_SM8250_H +#define __DRIVERS_INTERCONNECT_QCOM_SM8250_H + +#define SM8250_A1NOC_SNOC_MAS 0 +#define SM8250_A1NOC_SNOC_SLV 1 +#define SM8250_A2NOC_SNOC_MAS 2 +#define SM8250_A2NOC_SNOC_SLV 3 +#define SM8250_MASTER_A1NOC_CFG 4 +#define SM8250_MASTER_A2NOC_CFG 5 +#define SM8250_MASTER_ALC 6 +#define SM8250_MASTER_AMPSS_M0 7 +#define SM8250_MASTER_ANOC_PCIE_GEM_NOC 8 +#define SM8250_MASTER_CAMNOC_HF 9 +#define SM8250_MASTER_CAMNOC_ICP 10 +#define SM8250_MASTER_CAMNOC_SF 11 +#define SM8250_MASTER_CNOC_A2NOC 12 +#define SM8250_MASTER_CNOC_DC_NOC 13 +#define SM8250_MASTER_CNOC_MNOC_CFG 14 +#define SM8250_MASTER_COMPUTE_NOC 15 +#define SM8250_MASTER_CRYPTO_CORE_0 16 +#define SM8250_MASTER_GEM_NOC_CFG 17 +#define SM8250_MASTER_GEM_NOC_PCIE_SNOC 18 +#define SM8250_MASTER_GEM_NOC_SNOC 19 +#define SM8250_MASTER_GIC 20 +#define SM8250_MASTER_GPU_TCU 21 +#define SM8250_MASTER_GRAPHICS_3D 22 +#define SM8250_MASTER_IPA 23 +#define SM8250_MASTER_IPA_CORE 24 +#define SM8250_MASTER_LLCC 25 +#define SM8250_MASTER_MDP_PORT0 26 +#define SM8250_MASTER_MDP_PORT1 27 +#define SM8250_MASTER_MNOC_HF_MEM_NOC 28 +#define SM8250_MASTER_MNOC_SF_MEM_NOC 29 +#define SM8250_MASTER_NPU 30 +#define SM8250_MASTER_NPU_CDP 31 +#define SM8250_MASTER_NPU_NOC_CFG 32 +#define SM8250_MASTER_NPU_SYS 33 +#define SM8250_MASTER_PCIE 34 +#define SM8250_MASTER_PCIE_1 35 +#define SM8250_MASTER_PCIE_2 36 +#define SM8250_MASTER_PIMEM 37 +#define SM8250_MASTER_QDSS_BAM 38 +#define SM8250_MASTER_QDSS_DAP 39 +#define SM8250_MASTER_QDSS_ETR 40 +#define SM8250_MASTER_QSPI_0 41 +#define SM8250_MASTER_QUP_0 42 +#define SM8250_MASTER_QUP_1 43 +#define SM8250_MASTER_QUP_2 44 +#define SM8250_MASTER_ROTATOR 45 +#define SM8250_MASTER_SDCC_2 46 +#define SM8250_MASTER_SDCC_4 47 +#define SM8250_MASTER_SNOC_CFG 48 +#define SM8250_MASTER_SNOC_GC_MEM_NOC 49 +#define SM8250_MASTER_SNOC_SF_MEM_NOC 50 +#define SM8250_MASTER_SYS_TCU 51 +#define SM8250_MASTER_TSIF 52 +#define SM8250_MASTER_UFS_CARD 53 +#define SM8250_MASTER_UFS_MEM 54 +#define SM8250_MASTER_USB3 55 +#define SM8250_MASTER_USB3_1 56 +#define SM8250_MASTER_VIDEO_P0 57 +#define SM8250_MASTER_VIDEO_P1 58 +#define SM8250_MASTER_VIDEO_PROC 59 +#define SM8250_SLAVE_A1NOC_CFG 60 +#define SM8250_SLAVE_A2NOC_CFG 61 +#define SM8250_SLAVE_AHB2PHY_NORTH 62 +#define SM8250_SLAVE_AHB2PHY_SOUTH 63 +#define SM8250_SLAVE_ANOC_PCIE_GEM_NOC 64 +#define SM8250_SLAVE_ANOC_PCIE_GEM_NOC_1 65 +#define SM8250_SLAVE_AOSS 66 +#define SM8250_SLAVE_APPSS 67 +#define SM8250_SLAVE_CAMERA_CFG 68 +#define SM8250_SLAVE_CDSP_CFG 69 +#define SM8250_SLAVE_CDSP_MEM_NOC 70 +#define SM8250_SLAVE_CLK_CTL 71 +#define SM8250_SLAVE_CNOC_A2NOC 72 +#define SM8250_SLAVE_CNOC_DDRSS 73 +#define SM8250_SLAVE_CNOC_MNOC_CFG 74 +#define SM8250_SLAVE_CRYPTO_0_CFG 75 +#define SM8250_SLAVE_CX_RDPM 76 +#define SM8250_SLAVE_DCC_CFG 77 +#define SM8250_SLAVE_DISPLAY_CFG 78 +#define SM8250_SLAVE_EBI_CH0 79 +#define SM8250_SLAVE_GEM_NOC_CFG 80 +#define SM8250_SLAVE_GEM_NOC_SNOC 81 +#define SM8250_SLAVE_GRAPHICS_3D_CFG 82 +#define SM8250_SLAVE_IMEM_CFG 83 +#define SM8250_SLAVE_IPA_CFG 84 +#define SM8250_SLAVE_IPA_CORE 85 +#define SM8250_SLAVE_IPC_ROUTER_CFG 86 +#define SM8250_SLAVE_ISENSE_CFG 87 +#define SM8250_SLAVE_LLCC 88 +#define SM8250_SLAVE_LLCC_CFG 89 +#define SM8250_SLAVE_LPASS 90 +#define SM8250_SLAVE_MEM_NOC_PCIE_SNOC 91 +#define SM8250_SLAVE_MNOC_HF_MEM_NOC 92 +#define SM8250_SLAVE_MNOC_SF_MEM_NOC 93 +#define SM8250_SLAVE_NPU_CAL_DP0 94 +#define SM8250_SLAVE_NPU_CAL_DP1 95 +#define SM8250_SLAVE_NPU_CFG 96 +#define SM8250_SLAVE_NPU_COMPUTE_NOC 97 +#define SM8250_SLAVE_NPU_CP 98 +#define SM8250_SLAVE_NPU_DPM 99 +#define SM8250_SLAVE_NPU_INT_DMA_BWMON_CFG 100 +#define SM8250_SLAVE_NPU_LLM_CFG 101 +#define SM8250_SLAVE_NPU_TCM 102 +#define SM8250_SLAVE_OCIMEM 103 +#define SM8250_SLAVE_PCIE_0 104 +#define SM8250_SLAVE_PCIE_0_CFG 105 +#define SM8250_SLAVE_PCIE_1 106 +#define SM8250_SLAVE_PCIE_1_CFG 107 +#define SM8250_SLAVE_PCIE_2 108 +#define SM8250_SLAVE_PCIE_2_CFG 109 +#define SM8250_SLAVE_PDM 110 +#define SM8250_SLAVE_PIMEM 111 +#define SM8250_SLAVE_PIMEM_CFG 112 +#define SM8250_SLAVE_PRNG 113 +#define SM8250_SLAVE_QDSS_CFG 114 +#define SM8250_SLAVE_QDSS_STM 115 +#define SM8250_SLAVE_QSPI_0 116 +#define SM8250_SLAVE_QUP_0 117 +#define SM8250_SLAVE_QUP_1 118 +#define SM8250_SLAVE_QUP_2 119 +#define SM8250_SLAVE_RBCPR_CX_CFG 120 +#define SM8250_SLAVE_RBCPR_MMCX_CFG 121 +#define SM8250_SLAVE_RBCPR_MX_CFG 122 +#define SM8250_SLAVE_SDCC_2 123 +#define SM8250_SLAVE_SDCC_4 124 +#define SM8250_SLAVE_SERVICE_A1NOC 125 +#define SM8250_SLAVE_SERVICE_A2NOC 126 +#define SM8250_SLAVE_SERVICE_CNOC 127 +#define SM8250_SLAVE_SERVICE_GEM_NOC 128 +#define SM8250_SLAVE_SERVICE_GEM_NOC_1 129 +#define SM8250_SLAVE_SERVICE_GEM_NOC_2 130 +#define SM8250_SLAVE_SERVICE_MNOC 131 +#define SM8250_SLAVE_SERVICE_NPU_NOC 132 +#define SM8250_SLAVE_SERVICE_SNOC 133 +#define SM8250_SLAVE_SNOC_CFG 134 +#define SM8250_SLAVE_SNOC_GEM_NOC_GC 135 +#define SM8250_SLAVE_SNOC_GEM_NOC_SF 136 +#define SM8250_SLAVE_TCSR 137 +#define SM8250_SLAVE_TCU 138 +#define SM8250_SLAVE_TLMM_NORTH 139 +#define SM8250_SLAVE_TLMM_SOUTH 140 +#define SM8250_SLAVE_TLMM_WEST 141 +#define SM8250_SLAVE_TSIF 142 +#define SM8250_SLAVE_UFS_CARD_CFG 143 +#define SM8250_SLAVE_UFS_MEM_CFG 144 +#define SM8250_SLAVE_USB3 145 +#define SM8250_SLAVE_USB3_1 146 +#define SM8250_SLAVE_VENUS_CFG 147 +#define SM8250_SLAVE_VSENSE_CTRL_CFG 148 +#define SM8250_SNOC_CNOC_MAS 149 +#define SM8250_SNOC_CNOC_SLV 150 + +#endif
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v2 6/7 arm64: dts: qcom: sm8150: add interconnect nodes
In reply to Jonathan MarekAdd the interconnect dts nodes for sm8150.
--- arch/arm64/boot/dts/qcom/sm8150.dtsi | 82 ++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+)
arch/arm64/boot/dts/qcom/sm8150.dtsi +82 -0
@@ -11,6 +11,7 @@ #include <dt-bindings/clock/qcom,rpmh.h> #include <dt-bindings/clock/qcom,gcc-sm8150.h> #include <dt-bindings/clock/qcom,gpucc-sm8150.h> +#include <dt-bindings/interconnect/qcom,sm8150.h> #include <dt-bindings/thermal/thermal.h> / {
@@ -440,6 +441,69 @@ uart2: serial@a90000 { }; }; + dc_noc: interconnect@14e0000 { + compatible = "qcom,sm8150-dc-noc"; + reg = <0 0x014e0000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + config_noc: interconnect@1500000 { + compatible = "qcom,sm8150-config-noc"; + reg = <0 0x01500000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + camnoc_virt: interconnect@1620000 { + compatible = "qcom,sm8150-camnoc-virt"; + reg = <0 0x01620000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + ipa_virt: interconnect-ipa@1620000 { + compatible = "qcom,sm8150-ipa-virt"; + reg = <0 0x01620000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + system_noc: interconnect@1629000 { + compatible = "qcom,sm8150-system-noc"; + reg = <0 0x01629000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + aggre1_noc: interconnect@16e4000 { + compatible = "qcom,sm8150-aggre1-noc"; + reg = <0 0x016e4000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + aggre2_noc: interconnect@1706000 { + compatible = "qcom,sm8150-aggre2-noc"; + reg = <0 0x01706000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + compute_noc: interconnect@1720000 { + compatible = "qcom,sm8150-compute-noc"; + reg = <0 0x01720000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + mmss_noc: interconnect@1749000 { + compatible = "qcom,sm8150-mmss-noc"; + reg = <0 0x01749000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + ufs_mem_hc: ufshc@1d84000 { compatible = "qcom,sm8150-ufshc", "qcom,ufshc", "jedec,ufs-2.0";
@@ -860,6 +924,20 @@ usb_2_ssphy: lane@88eb200 { }; }; + mc_virt: interconnect@9680000 { + compatible = "qcom,sm8150-mc-virt"; + reg = <0 0x09680000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + gem_noc: interconnect@96ab000 { + compatible = "qcom,sm8150-gem-noc"; + reg = <0 0x096ab000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + usb_1: usb@a6f8800 { compatible = "qcom,sm8150-dwc3", "qcom,dwc3"; reg = <0 0x0a6f8800 0 0x400>;
@@ -1280,6 +1358,10 @@ rpmhpd_opp_turbo_l1: opp11 { }; }; }; + + apps_bcm_voter: bcm_voter { + compatible = "qcom,bcm-voter"; + }; }; cpufreq_hw: cpufreq@18323000 {
Signature · 1 line
2.26.1
Re: [PATCH v2 6/7] arm64: dts: qcom: sm8150: add interconnect nodes
Hey Jonathan,
Thanks for the patch! Please use the
suggested register space definitions
instead.
Quoted 21 lines · Jonathan Marek
Add the interconnect dts nodes for sm8150.
Signed-off-by Jonathan Marek <[email protected]>--- arch/arm64/boot/dts/qcom/sm8150.dtsi | 82 ++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+)arch/arm64/boot/dts/qcom/sm8150.dtsi +1
-0@@ -11,6 +11,7 @@ #include <dt-bindings/clock/qcom,rpmh.h> #include <dt-bindings/clock/qcom,gcc-sm8150.h> #include <dt-bindings/clock/qcom,gpucc-sm8150.h> +#include <dt-bindings/interconnect/qcom,sm8150.h> #include <dt-bindings/thermal/thermal.h> / {
arch/arm64/boot/dts/qcom/sm8150.dtsi uart2: serial@a90000 { · line 446
Quoted 6 lines
arch/arm64/boot/dts/qcom/sm8150.dtsi +3
-0@@ -440,6 +441,69 @@ uart2: serial@a90000 { }; }; + dc_noc: interconnect@14e0000 { + compatible = "qcom,sm8150-dc-noc"; + reg = <0 0x014e0000 0 0x1000>;
0x09160000 0x3200
arch/arm64/boot/dts/qcom/sm8150.dtsi uart2: serial@a90000 { · line 453
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8150.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + config_noc: interconnect@1500000 { + compatible = "qcom,sm8150-config-noc"; + reg = <0 0x01500000 0 0x1000>;
0x01500000 0x7400
arch/arm64/boot/dts/qcom/sm8150.dtsi uart2: serial@a90000 { · line 460
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8150.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + camnoc_virt: interconnect@1620000 { + compatible = "qcom,sm8150-camnoc-virt"; + reg = <0 0x01620000 0 0x1000>;
0x0ac00000 0x1000
arch/arm64/boot/dts/qcom/sm8150.dtsi uart2: serial@a90000 { · line 467
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8150.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + ipa_virt: interconnect-ipa@1620000 { + compatible = "qcom,sm8150-ipa-virt"; + reg = <0 0x01620000 0 0x1000>;
0x01e00000 0x1000
arch/arm64/boot/dts/qcom/sm8150.dtsi uart2: serial@a90000 {
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8150.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + system_noc: interconnect@1629000 { + compatible = "qcom,sm8150-system-noc"; + reg = <0 0x01500000 0 0x1000>;
0x01620000 0x19400
arch/arm64/boot/dts/qcom/sm8150.dtsi uart2: serial@a90000 { · line 481
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8150.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + aggre1_noc: interconnect@16e4000 { + compatible = "qcom,sm8150-aggre1-noc"; + reg = <0 0x016e4000 0 0x1000>;
0x016e0000 0xd080
arch/arm64/boot/dts/qcom/sm8150.dtsi uart2: serial@a90000 { · line 488
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8150.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + aggre2_noc: interconnect@1706000 { + compatible = "qcom,sm8150-aggre2-noc"; + reg = <0 0x01706000 0 0x1000>;
0x01700000 0x3b100
arch/arm64/boot/dts/qcom/sm8150.dtsi uart2: serial@a90000 { · line 495
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8150.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + compute_noc: interconnect@1720000 { + compatible = "qcom,sm8150-compute-noc"; + reg = <0 0x01720000 0 0x1000>;
0x01720000 0x7000
arch/arm64/boot/dts/qcom/sm8150.dtsi uart2: serial@a90000 { · line 502
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8150.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + mmss_noc: interconnect@1749000 { + compatible = "qcom,sm8150-mmss-noc"; + reg = <0 0x01749000 0 0x1000>;
0x01740000 0x1c100
Quoted 8 lines
arch/arm64/boot/dts/qcom/sm8150.dtsi +4
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + ufs_mem_hc: ufshc@1d84000 { compatible = "qcom,sm8150-ufshc", "qcom,ufshc", "jedec,ufs-2.0";
arch/arm64/boot/dts/qcom/sm8150.dtsi usb_2_ssphy: lane@88eb200 { · line 929
Quoted 6 lines
arch/arm64/boot/dts/qcom/sm8150.dtsi +3
-0@@ -860,6 +924,20 @@ usb_2_ssphy: lane@88eb200 { }; }; + mc_virt: interconnect@9680000 { + compatible = "qcom,sm8150-mc-virt"; + reg = <0 0x09680000 0 0x1000>;
0x0163a000 0x1000
arch/arm64/boot/dts/qcom/sm8150.dtsi usb_2_ssphy: lane@88eb200 { · line 936
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8150.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + gem_noc: interconnect@96ab000 { + compatible = "qcom,sm8150-gem-noc"; + reg = <0 0x096ab000 0 0x1000>;
0x09680000 0x3e200
Quoted 18 lines
arch/arm64/boot/dts/qcom/sm8150.dtsi +8
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + usb_1: usb@a6f8800 { compatible = "qcom,sm8150-dwc3", "qcom,dwc3"; reg = <0 0x0a6f8800 0 0x400>;@@ -1280,6 +1358,10 @@ rpmhpd_opp_turbo_l1: opp11 { }; }; }; + + apps_bcm_voter: bcm_voter { + compatible = "qcom,bcm-voter"; + }; }; cpufreq_hw: cpufreq@18323000 {
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v2 7/7 arm64: dts: qcom: sm8250: add interconnect nodes
In reply to Jonathan MarekAdd the interconnect dts nodes for sm8250.
--- arch/arm64/boot/dts/qcom/sm8250.dtsi | 82 ++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+)
arch/arm64/boot/dts/qcom/sm8250.dtsi +82 -0
@@ -11,6 +11,7 @@ #include <dt-bindings/power/qcom-aoss-qmp.h> #include <dt-bindings/power/qcom-rpmpd.h> #include <dt-bindings/soc/qcom,rpmh-rsc.h> +#include <dt-bindings/interconnect/qcom,sm8250.h> / { interrupt-parent = <&intc>;
@@ -978,6 +979,55 @@ spi13: spi@a94000 { }; }; + config_noc: interconnect@1500000 { + compatible = "qcom,sm8250-config-noc"; + reg = <0 0x01500000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + ipa_virt: interconnect@1620000 { + compatible = "qcom,sm8250-ipa-virt"; + reg = <0 0x01620000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + system_noc: interconnect@1632000 { + compatible = "qcom,sm8250-system-noc"; + reg = <0 0x01632000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + aggre1_noc: interconnect@16e2000 { + compatible = "qcom,sm8250-aggre1-noc"; + reg = <0 0x016e2000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + aggre2_noc: interconnect@1703000 { + compatible = "qcom,sm8250-aggre2-noc"; + reg = <0 0x01703000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + compute_noc: interconnect@1733000 { + compatible = "qcom,sm8250-compute-noc"; + reg = <0 0x01733000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + mmss_noc: interconnect@174a000 { + compatible = "qcom,sm8250-mmss-noc"; + reg = <0 0x0174a000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + ufs_mem_hc: ufshc@1d84000 { compatible = "qcom,sm8250-ufshc", "qcom,ufshc", "jedec,ufs-2.0";
@@ -1364,6 +1414,34 @@ usb_2_ssphy: lane@88eb200 { }; }; + dc_noc: interconnect@90c0000 { + compatible = "qcom,sm8250-dc-noc"; + reg = <0 0x090c0000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + mc_virt: interconnect@9100000 { + compatible = "qcom,sm8250-mc-virt"; + reg = <0 0x09100000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + gem_noc: interconnect@9121000 { + compatible = "qcom,sm8250-gem-noc"; + reg = <0 0x09121000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + npu_noc: interconnect@9990000 { + compatible = "qcom,sm8250-npu-noc"; + reg = <0 0x09990000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + usb_1: usb@a6f8800 { compatible = "qcom,sm8250-dwc3", "qcom,dwc3"; reg = <0 0x0a6f8800 0 0x400>;
@@ -2359,6 +2437,10 @@ rpmhpd_opp_turbo_l1: opp10 { }; }; }; + + apps_bcm_voter: bcm_voter { + compatible = "qcom,bcm-voter"; + }; }; };
Signature · 1 line
2.26.1
Re: [PATCH v2 7/7] arm64: dts: qcom: sm8250: add interconnect nodes
Hey Jonathan,
Thanks for the patch! Please use the
suggested register space definitions
instead.
Quoted 13 lines · Jonathan Marek
Add the interconnect dts nodes for sm8250.
Signed-off-by Jonathan Marek <[email protected]>--- arch/arm64/boot/dts/qcom/sm8250.dtsi | 82 ++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+)arch/arm64/boot/dts/qcom/sm8250.dtsi +0
-0
arch/arm64/boot/dts/qcom/sm8250.dtsi line 14
Quoted 4 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +1
-0@@ -11,6 +11,7 @@ #include <dt-bindings/power/qcom-aoss-qmp.h> #include <dt-bindings/power/qcom-rpmpd.h> #include <dt-bindings/soc/qcom,rpmh-rsc.h> +#include <dt-bindings/interconnect/qcom,sm8250.h>
please fix ^^ sort order
arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 984
Quoted 10 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +3
-0/ { interrupt-parent = <&intc>;@@ -978,6 +979,55 @@ spi13: spi@a94000 { }; }; + config_noc: interconnect@1500000 { + compatible = "qcom,sm8250-config-noc"; + reg = <0 0x01500000 0 0x1000>;
0x01500000 0xa580
arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 991
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + ipa_virt: interconnect@1620000 { + compatible = "qcom,sm8250-ipa-virt"; + reg = <0 0x01620000 0 0x1000>;
0x01e00000 0x1000
arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 998
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + system_noc: interconnect@1632000 { + compatible = "qcom,sm8250-system-noc"; + reg = <0 0x01632000 0 0x1000>;
0x01620000 0x1C200
arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1005
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + aggre1_noc: interconnect@16e2000 { + compatible = "qcom,sm8250-aggre1-noc"; + reg = <0 0x016e2000 0 0x1000>;
0x016e0000 0x1f180
arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1012
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + aggre2_noc: interconnect@1703000 { + compatible = "qcom,sm8250-aggre2-noc"; + reg = <0 0x01703000 0 0x1000>;
0x01700000 0x33000
arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1019
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + compute_noc: interconnect@1733000 { + compatible = "qcom,sm8250-compute-noc"; + reg = <0 0x01733000 0 0x1000>;
0x01733000 0xd180
arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1026
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + mmss_noc: interconnect@174a000 { + compatible = "qcom,sm8250-mmss-noc"; + reg = <0 0x0174a000 0 0x1000>;
0x01740000 0x1f080
Quoted 8 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +4
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + ufs_mem_hc: ufshc@1d84000 { compatible = "qcom,sm8250-ufshc", "qcom,ufshc", "jedec,ufs-2.0";
arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1419
Quoted 6 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +3
-0@@ -1364,6 +1414,34 @@ usb_2_ssphy: lane@88eb200 { }; }; + dc_noc: interconnect@90c0000 { + compatible = "qcom,sm8250-dc-noc"; + reg = <0 0x090c0000 0 0x1000>;
0x090c0000 0x4200
arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1426
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + mc_virt: interconnect@9100000 { + compatible = "qcom,sm8250-mc-virt"; + reg = <0 0x09100000 0 0x1000>;
0x0163d000 0x1000
arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1433
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + gem_noc: interconnect@9121000 { + compatible = "qcom,sm8250-gem-noc"; + reg = <0 0x09121000 0 0x1000>;
0x09100000 0xb4000
arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1440
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + npu_noc: interconnect@9990000 { + compatible = "qcom,sm8250-npu-noc"; + reg = <0 0x09990000 0 0x1000>;
0x09990000 0x1600
Quoted 17 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +8
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + usb_1: usb@a6f8800 { compatible = "qcom,sm8250-dwc3", "qcom,dwc3"; reg = <0 0x0a6f8800 0 0x400>;@@ -2359,6 +2437,10 @@ rpmhpd_opp_turbo_l1: opp10 { }; }; }; + + apps_bcm_voter: bcm_voter { + compatible = "qcom,bcm-voter"; + }; }; };
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v2 7/7] arm64: dts: qcom: sm8250: add interconnect nodes
Quoted 6 lines · Sibi Sankar
Hey Jonathan,
Thanks for the patch! Please use the
suggested register space definitions
instead.
Thanks for the suggestions, I was unsure what to use for the sizes. The reg field is unused by the upstream driver so it is hard to figure out.
However, I'm not sure about some of your suggestions for the base address. For example, for "mc_virt" you suggest 0x0163d000, and I have 0x09100000. In the downstream dts, "mc_virt-base" is 0x9100000 and qcom,base-offset for fab_mc_virt is 0. Do you have an explanation for why your suggestion is so different?
Quoted 159 lines · Jonathan Marek
Quoted 13 lines
Add the interconnect dts nodes for sm8250.
Signed-off-by Jonathan Marek <[email protected]>---
arch/arm64/boot/dts/qcom/sm8250.dtsi | 82 ++++++++++++++++++++++++++++1 file changed, 82 insertions(+)arch/arm64/boot/dts/qcom/sm8250.dtsi +0
-0arch/arm64/boot/dts/qcom/sm8250.dtsi line 14
Quoted 4 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +1
-0@@ -11,6 +11,7 @@ #include <dt-bindings/power/qcom-aoss-qmp.h> #include <dt-bindings/power/qcom-rpmpd.h> #include <dt-bindings/soc/qcom,rpmh-rsc.h> +#include <dt-bindings/interconnect/qcom,sm8250.h>please fix ^^ sort order
arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 984
Quoted 10 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +3
-0/ { interrupt-parent = <&intc>;@@ -978,6 +979,55 @@ spi13: spi@a94000 { }; }; + config_noc: interconnect@1500000 { + compatible = "qcom,sm8250-config-noc"; + reg = <0 0x01500000 0 0x1000>;
0x015000000xa580arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 991
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + ipa_virt: interconnect@1620000 { + compatible = "qcom,sm8250-ipa-virt"; + reg = <0 0x01620000 0 0x1000>;
0x01e000000x1000arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 998
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + system_noc: interconnect@1632000 { + compatible = "qcom,sm8250-system-noc"; + reg = <0 0x01632000 0 0x1000>;
0x016200000x1C200arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1005
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + aggre1_noc: interconnect@16e2000 { + compatible = "qcom,sm8250-aggre1-noc"; + reg = <0 0x016e2000 0 0x1000>;
0x016e00000x1f180arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1012
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + aggre2_noc: interconnect@1703000 { + compatible = "qcom,sm8250-aggre2-noc"; + reg = <0 0x01703000 0 0x1000>;
0x017000000x33000arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1019
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + compute_noc: interconnect@1733000 { + compatible = "qcom,sm8250-compute-noc"; + reg = <0 0x01733000 0 0x1000>;
0x017330000xd180arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1026
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + mmss_noc: interconnect@174a000 { + compatible = "qcom,sm8250-mmss-noc"; + reg = <0 0x0174a000 0 0x1000>;
0x017400000x1f080Quoted 8 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +4
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + ufs_mem_hc: ufshc@1d84000 { compatible = "qcom,sm8250-ufshc", "qcom,ufshc", "jedec,ufs-2.0";arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1419
Quoted 6 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +3
-0@@ -1364,6 +1414,34 @@ usb_2_ssphy: lane@88eb200 { }; }; + dc_noc: interconnect@90c0000 { + compatible = "qcom,sm8250-dc-noc"; + reg = <0 0x090c0000 0 0x1000>;
0x090c00000x4200arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1426
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + mc_virt: interconnect@9100000 { + compatible = "qcom,sm8250-mc-virt"; + reg = <0 0x09100000 0 0x1000>;
0x0163d0000x1000arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1433
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + gem_noc: interconnect@9121000 { + compatible = "qcom,sm8250-gem-noc"; + reg = <0 0x09121000 0 0x1000>;
0x091000000xb4000arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1440
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + npu_noc: interconnect@9990000 { + compatible = "qcom,sm8250-npu-noc"; + reg = <0 0x09990000 0 0x1000>;
0x099900000x1600Quoted 17 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +8
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + usb_1: usb@a6f8800 { compatible = "qcom,sm8250-dwc3", "qcom,dwc3"; reg = <0 0x0a6f8800 0 0x400>;@@ -2359,6 +2437,10 @@ rpmhpd_opp_turbo_l1: opp10 { }; }; }; + + apps_bcm_voter: bcm_voter { + compatible = "qcom,bcm-voter"; + }; }; };
Re: [PATCH v2 7/7] arm64: dts: qcom: sm8250: add interconnect nodes
Quoted 12 lines · Jonathan Marek
Quoted 6 lines · Sibi Sankar
Hey Jonathan,
Thanks for the patch! Please use the
suggested register space definitions
instead.Thanks for the suggestions, I was unsure what to use for the sizes. The reg field is unused by the upstream driver so it is hard to figure out.
Quoted 5 lines
However, I'm not sure about some of your suggestions for the base address. For example, for "
mc_virt" you suggest0x0163d000, and I have0x09100000. In the downstream dts, "mc_virt-base" is0x9100000and qcom,base-offset forfab_mc_virtis 0. Do you have an explanation for why your suggestion is so different?
AFAIK for providers with virt suffix the
register space definition is just an
arbitrary choice and doesn't matter.
Since mc_virt was just re-using gem_noc
address space I suggested we stick to
how it was done on sc7180 i.e place it
between system_noc and aggre1_noc.
Quoted 161 lines
Quoted 161 lines · Jonathan Marek
Quoted 14 lines
Add the interconnect dts nodes for sm8250.
Signed-off-by Jonathan Marek <[email protected]>---
arch/arm64/boot/dts/qcom/sm8250.dtsi | 82
++++++++++++++++++++++++++++1 file changed, 82 insertions(+)arch/arm64/boot/dts/qcom/sm8250.dtsi +0
-0arch/arm64/boot/dts/qcom/sm8250.dtsi line 14
Quoted 4 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +1
-0@@ -11,6 +11,7 @@ #include <dt-bindings/power/qcom-aoss-qmp.h> #include <dt-bindings/power/qcom-rpmpd.h> #include <dt-bindings/soc/qcom,rpmh-rsc.h> +#include <dt-bindings/interconnect/qcom,sm8250.h>please fix ^^ sort order
arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 984
Quoted 10 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +3
-0/ { interrupt-parent = <&intc>;@@ -978,6 +979,55 @@ spi13: spi@a94000 { }; }; + config_noc: interconnect@1500000 { + compatible = "qcom,sm8250-config-noc"; + reg = <0 0x01500000 0 0x1000>;
0x015000000xa580arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 991
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + ipa_virt: interconnect@1620000 { + compatible = "qcom,sm8250-ipa-virt"; + reg = <0 0x01620000 0 0x1000>;
0x01e000000x1000arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 998
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + system_noc: interconnect@1632000 { + compatible = "qcom,sm8250-system-noc"; + reg = <0 0x01632000 0 0x1000>;
0x016200000x1C200arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1005
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + aggre1_noc: interconnect@16e2000 { + compatible = "qcom,sm8250-aggre1-noc"; + reg = <0 0x016e2000 0 0x1000>;
0x016e00000x1f180arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1012
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + aggre2_noc: interconnect@1703000 { + compatible = "qcom,sm8250-aggre2-noc"; + reg = <0 0x01703000 0 0x1000>;
0x017000000x33000arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1019
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + compute_noc: interconnect@1733000 { + compatible = "qcom,sm8250-compute-noc"; + reg = <0 0x01733000 0 0x1000>;
0x017330000xd180arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1026
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + mmss_noc: interconnect@174a000 { + compatible = "qcom,sm8250-mmss-noc"; + reg = <0 0x0174a000 0 0x1000>;
0x017400000x1f080Quoted 8 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +4
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + ufs_mem_hc: ufshc@1d84000 { compatible = "qcom,sm8250-ufshc", "qcom,ufshc", "jedec,ufs-2.0";arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1419
Quoted 6 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +3
-0@@ -1364,6 +1414,34 @@ usb_2_ssphy: lane@88eb200 { }; }; + dc_noc: interconnect@90c0000 { + compatible = "qcom,sm8250-dc-noc"; + reg = <0 0x090c0000 0 0x1000>;
0x090c00000x4200arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1426
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + mc_virt: interconnect@9100000 { + compatible = "qcom,sm8250-mc-virt"; + reg = <0 0x09100000 0 0x1000>;
0x0163d0000x1000arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1433
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + gem_noc: interconnect@9121000 { + compatible = "qcom,sm8250-gem-noc"; + reg = <0 0x09121000 0 0x1000>;
0x091000000xb4000arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1440
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + npu_noc: interconnect@9990000 { + compatible = "qcom,sm8250-npu-noc"; + reg = <0 0x09990000 0 0x1000>;
0x099900000x1600Quoted 17 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +8
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + usb_1: usb@a6f8800 { compatible = "qcom,sm8250-dwc3", "qcom,dwc3"; reg = <0 0x0a6f8800 0 0x400>;@@ -2359,6 +2437,10 @@ rpmhpd_opp_turbo_l1: opp10 { }; }; }; + + apps_bcm_voter: bcm_voter { + compatible = "qcom,bcm-voter"; + }; }; };
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v2 7/7] arm64: dts: qcom: sm8250: add interconnect nodes
Quoted 19 lines · Sibi Sankar
Quoted 12 lines · Jonathan Marek
Quoted 6 lines · Sibi Sankar
Hey Jonathan,
Thanks for the patch! Please use the
suggested register space definitions
instead.Thanks for the suggestions, I was unsure what to use for the sizes. The reg field is unused by the upstream driver so it is hard to figure out.
Quoted 5 lines
However, I'm not sure about some of your suggestions for the base address. For example, for "
mc_virt" you suggest0x0163d000, and I have0x09100000. In the downstream dts, "mc_virt-base" is0x9100000and qcom,base-offset forfab_mc_virtis 0. Do you have an explanation for why your suggestion is so different?
Quoted 8 lines
AFAIK for providers with virt suffix the register space definition is just an arbitrary choice and doesn't matter. Since
mc_virtwas just re-usinggem_nocaddress space I suggested we stick to how it was done on sc7180 i.e place it betweensystem_nocandaggre1_noc.
I sent a v3 with most of your suggestions applied as-is, except for:
- sm8150: aggre2_noc, reduced size to 0x20000 to avoid overlap with compute_noc region
- sm8250: compute_noc, reduced size to 0xa180 to avoid overlap with mmss_noc region (could have been 0xd000, but 0xa180 makes it match the region in the downstream dts, so seemed more likely to be correct)
I did notice other inconsistencies, but since this is unused by the upstream driver I don't want to think about it too much..
Quoted 161 lines
Quoted 160 lines
Quoted 160 lines · Jonathan Marek
Quoted 13 lines
Add the interconnect dts nodes for sm8250.
Signed-off-by Jonathan Marek <[email protected]>---
arch/arm64/boot/dts/qcom/sm8250.dtsi | 82 ++++++++++++++++++++++++++++1 file changed, 82 insertions(+)arch/arm64/boot/dts/qcom/sm8250.dtsi +0
-0arch/arm64/boot/dts/qcom/sm8250.dtsi line 14
Quoted 4 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +1
-0@@ -11,6 +11,7 @@ #include <dt-bindings/power/qcom-aoss-qmp.h> #include <dt-bindings/power/qcom-rpmpd.h> #include <dt-bindings/soc/qcom,rpmh-rsc.h> +#include <dt-bindings/interconnect/qcom,sm8250.h>please fix ^^ sort order
arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 984
Quoted 10 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +3
-0/ { interrupt-parent = <&intc>;@@ -978,6 +979,55 @@ spi13: spi@a94000 { }; }; + config_noc: interconnect@1500000 { + compatible = "qcom,sm8250-config-noc"; + reg = <0 0x01500000 0 0x1000>;
0x015000000xa580arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 991
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + ipa_virt: interconnect@1620000 { + compatible = "qcom,sm8250-ipa-virt"; + reg = <0 0x01620000 0 0x1000>;
0x01e000000x1000arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 998
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + system_noc: interconnect@1632000 { + compatible = "qcom,sm8250-system-noc"; + reg = <0 0x01632000 0 0x1000>;
0x016200000x1C200arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1005
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + aggre1_noc: interconnect@16e2000 { + compatible = "qcom,sm8250-aggre1-noc"; + reg = <0 0x016e2000 0 0x1000>;
0x016e00000x1f180arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1012
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + aggre2_noc: interconnect@1703000 { + compatible = "qcom,sm8250-aggre2-noc"; + reg = <0 0x01703000 0 0x1000>;
0x017000000x33000arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1019
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + compute_noc: interconnect@1733000 { + compatible = "qcom,sm8250-compute-noc"; + reg = <0 0x01733000 0 0x1000>;
0x017330000xd180arch/arm64/boot/dts/qcom/sm8250.dtsi spi13: spi@a94000 { · line 1026
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + mmss_noc: interconnect@174a000 { + compatible = "qcom,sm8250-mmss-noc"; + reg = <0 0x0174a000 0 0x1000>;
0x017400000x1f080Quoted 8 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +4
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + ufs_mem_hc: ufshc@1d84000 { compatible = "qcom,sm8250-ufshc", "qcom,ufshc", "jedec,ufs-2.0";arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1419
Quoted 6 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +3
-0@@ -1364,6 +1414,34 @@ usb_2_ssphy: lane@88eb200 { }; }; + dc_noc: interconnect@90c0000 { + compatible = "qcom,sm8250-dc-noc"; + reg = <0 0x090c0000 0 0x1000>;
0x090c00000x4200arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1426
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + mc_virt: interconnect@9100000 { + compatible = "qcom,sm8250-mc-virt"; + reg = <0 0x09100000 0 0x1000>;
0x0163d0000x1000arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1433
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + gem_noc: interconnect@9121000 { + compatible = "qcom,sm8250-gem-noc"; + reg = <0 0x09121000 0 0x1000>;
0x091000000xb4000arch/arm64/boot/dts/qcom/sm8250.dtsi usb_2_ssphy: lane@88eb200 { · line 1440
Quoted 7 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +7
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + + npu_noc: interconnect@9990000 { + compatible = "qcom,sm8250-npu-noc"; + reg = <0 0x09990000 0 0x1000>;
0x099900000x1600Quoted 17 lines
arch/arm64/boot/dts/qcom/sm8250.dtsi +8
-0+ #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + usb_1: usb@a6f8800 { compatible = "qcom,sm8250-dwc3", "qcom,dwc3"; reg = <0 0x0a6f8800 0 0x400>;@@ -2359,6 +2437,10 @@ rpmhpd_opp_turbo_l1: opp10 { }; }; }; + + apps_bcm_voter: bcm_voter { + compatible = "qcom,bcm-voter"; + }; }; };