mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-16 14:30:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'icc-hawi' into icc-next

Browse Source 
Add interconnect bindings and RPMh-based interconnect
driver support for the upcoming Qualcomm Hawi SoC.

* icc-hawi
  dt-bindings: interconnect: qcom-bwmon: Add Hawi cpu-bwmon compatible
  dt-bindings: interconnect: qcom-bwmon: Add Hawi llcc-bwmon compatible
  dt-bindings: interconnect: qcom: document the RPMh NoC for Hawi SoC
  interconnect: qcom: add Hawi interconnect provider driver

Link: https://patch.msgid.link/20260506-icc-hawi-v4-0-35447fdc482b@oss.qualcomm.com
Signed-off-by: Georgi Djakov <djakov@kernel.org>
This commit is contained in:
Georgi Djakov
2026-05-21 22:52:10 +03:00
parent 67a4412db0 ffaa88a084
commit 0d0a40e3f8
6 changed files with 2337 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
Documentation/devicetree/bindings/interconnect/qcom,hawi-rpmh.yaml Normal file
View File

@@ -0,0 +1,131 @@
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/interconnect/qcom,hawi-rpmh.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm RPMh Network-On-Chip Interconnect on Hawi
maintainers:
- Vivek Aknurwar <vivek.aknurwar@oss.qualcomm.com>
description: |
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
least one RPMh device child node pertaining to their RSC and each provider
can map to multiple RPMh resources.
See also: include/dt-bindings/interconnect/qcom,hawi-rpmh.h
properties:
compatible:
enum:
- qcom,hawi-aggre1-noc
- qcom,hawi-clk-virt
- qcom,hawi-cnoc-main
- qcom,hawi-gem-noc
- qcom,hawi-llclpi-noc
- qcom,hawi-lpass-ag-noc
- qcom,hawi-lpass-lpiaon-noc
- qcom,hawi-lpass-lpicx-noc
- qcom,hawi-mc-virt
- qcom,hawi-mmss-noc
- qcom,hawi-nsp-noc
- qcom,hawi-pcie-anoc
- qcom,hawi-stdst-cfg
- qcom,hawi-stdst-main
- qcom,hawi-system-noc
reg:
maxItems: 1
clocks:
minItems: 2
maxItems: 3
required:
- compatible
allOf:
- $ref: qcom,rpmh-common.yaml#
- if:
properties:
compatible:
contains:
enum:
- qcom,hawi-clk-virt
- qcom,hawi-mc-virt
then:
properties:
reg: false
else:
required:
- reg
- if:
properties:
compatible:
contains:
enum:
- qcom,hawi-pcie-anoc
then:
properties:
clocks:
items:
- description: aggre-NOC PCIe AXI clock
- description: cfg-NOC PCIe a-NOC AHB clock
- if:
properties:
compatible:
contains:
enum:
- qcom,hawi-aggre1-noc
then:
properties:
clocks:
items:
- description: aggre UFS PHY AXI clock
- description: aggre USB3 PRIM AXI clock
- description: RPMH CC IPA clock
- if:
properties:
compatible:
contains:
enum:
- qcom,hawi-aggre1-noc
- qcom,hawi-pcie-anoc
then:
required:
- clocks
else:
properties:
clocks: false
unevaluatedProperties: false
examples:
- |
soc {
#address-cells = <2>;
#size-cells = <2>;
clk_virt: interconnect-0 {
compatible = "qcom,hawi-clk-virt";
#interconnect-cells = <2>;
qcom,bcm-voters = <&apps_bcm_voter>;
};
aggre_noc: interconnect@f00000 {
compatible = "qcom,hawi-aggre1-noc";
reg = <0x0 0xf00000 0x0 0x54400>;
#interconnect-cells = <2>;
clocks = <&gcc_aggre_ufs_phy_axi_clk>,
<&gcc_aggre_usb3_prim_axi_clk>,
<&rpmhcc_ipa_clk>;
qcom,bcm-voters = <&apps_bcm_voter>;
};
};

2
Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
View File

@@ -26,6 +26,7 @@ properties:
- items:
- enum:
- qcom,glymur-cpu-bwmon
- qcom,hawi-cpu-bwmon
- qcom,kaanapali-cpu-bwmon
- qcom,qcm2290-cpu-bwmon
- qcom,qcs615-cpu-bwmon
@@ -45,6 +46,7 @@ properties:
- const: qcom,sdm845-bwmon # BWMON v4, unified register space
- items:
- enum:
- qcom,hawi-llcc-bwmon
- qcom,qcs615-llcc-bwmon
- qcom,qcs8300-llcc-bwmon
- qcom,sa8775p-llcc-bwmon

9
drivers/interconnect/qcom/Kconfig
View File

@@ -26,6 +26,15 @@ config INTERCONNECT_QCOM_GLYMUR
This is a driver for the Qualcomm Network-on-Chip on glymur-based
platforms.
config INTERCONNECT_QCOM_HAWI
tristate "Qualcomm HAWI interconnect driver"
depends on INTERCONNECT_QCOM_RPMH_POSSIBLE
select INTERCONNECT_QCOM_RPMH
select INTERCONNECT_QCOM_BCM_VOTER
help
This is a driver for the Qualcomm Network-on-Chip on hawi-based
platforms.
config INTERCONNECT_QCOM_KAANAPALI
tristate "Qualcomm Kaanapali interconnect driver"
depends on INTERCONNECT_QCOM_RPMH_POSSIBLE

2
drivers/interconnect/qcom/Makefile
View File

@@ -6,6 +6,7 @@ interconnect_qcom-y := icc-common.o
icc-bcm-voter-objs := bcm-voter.o
qnoc-eliza-objs := eliza.o
qnoc-glymur-objs := glymur.o
qnoc-hawi-objs := hawi.o
qnoc-kaanapali-objs := kaanapali.o
qnoc-milos-objs := milos.o
qnoc-msm8909-objs := msm8909.o
@@ -53,6 +54,7 @@ icc-smd-rpm-objs := smd-rpm.o icc-rpm.o icc-rpm-clocks.o
obj-$(CONFIG_INTERCONNECT_QCOM_BCM_VOTER) += icc-bcm-voter.o
obj-$(CONFIG_INTERCONNECT_QCOM_ELIZA) += qnoc-eliza.o
obj-$(CONFIG_INTERCONNECT_QCOM_GLYMUR) += qnoc-glymur.o
obj-$(CONFIG_INTERCONNECT_QCOM_HAWI) += qnoc-hawi.o
obj-$(CONFIG_INTERCONNECT_QCOM_KAANAPALI) += qnoc-kaanapali.o
obj-$(CONFIG_INTERCONNECT_QCOM_MILOS) += qnoc-milos.o
obj-$(CONFIG_INTERCONNECT_QCOM_MSM8909) += qnoc-msm8909.o

2028
drivers/interconnect/qcom/hawi.c Normal file
View File

File diff suppressed because it is too large Load Diff

165
include/dt-bindings/interconnect/qcom,hawi-rpmh.h Normal file
View File

@@ -0,0 +1,165 @@
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
/*
* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
*/
#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_HAWI_H
#define __DT_BINDINGS_INTERCONNECT_QCOM_HAWI_H
#define MASTER_QSPI_0 0
#define MASTER_QUP_2 1
#define MASTER_QUP_3 2
#define MASTER_QUP_4 3
#define MASTER_CRYPTO 4
#define MASTER_IPA 5
#define MASTER_QUP_1 6
#define MASTER_SOCCP_PROC 7
#define MASTER_QDSS_ETR 8
#define MASTER_QDSS_ETR_1 9
#define MASTER_SDCC_2 10
#define MASTER_SDCC_4 11
#define MASTER_UFS_MEM 12
#define MASTER_USB3 13
#define SLAVE_A1NOC_SNOC 14
#define MASTER_DDR_EFF_VETO 0
#define MASTER_QUP_CORE_0 1
#define MASTER_QUP_CORE_1 2
#define MASTER_QUP_CORE_2 3
#define MASTER_QUP_CORE_3 4
#define MASTER_QUP_CORE_4 5
#define SLAVE_DDR_EFF_VETO 6
#define SLAVE_QUP_CORE_0 7
#define SLAVE_QUP_CORE_1 8
#define SLAVE_QUP_CORE_2 9
#define SLAVE_QUP_CORE_3 10
#define SLAVE_QUP_CORE_4 11
#define MASTER_GEM_NOC_CNOC 0
#define MASTER_GEM_NOC_PCIE_SNOC 1
#define SLAVE_AOSS 2
#define SLAVE_IPA_CFG 3
#define SLAVE_IPC_ROUTER_FENCE 4
#define SLAVE_SOCCP 5
#define SLAVE_TME_CFG 6
#define SLAVE_CNOC_CFG 7
#define SLAVE_DDRSS_CFG 8
#define SLAVE_IMEM 9
#define SLAVE_PCIE_0 10
#define SLAVE_PCIE_1 11
#define MASTER_GIC 0
#define MASTER_GPU_TCU 1
#define MASTER_SYS_TCU 2
#define MASTER_APPSS_PROC 3
#define MASTER_GFX3D 4
#define MASTER_LPASS_GEM_NOC 5
#define MASTER_MSS_PROC 6
#define MASTER_MNOC_HF_MEM_NOC 7
#define MASTER_MNOC_SF_MEM_NOC 8
#define MASTER_COMPUTE_NOC 9
#define MASTER_ANOC_PCIE_GEM_NOC 10
#define MASTER_QPACE 11
#define MASTER_SNOC_SF_MEM_NOC 12
#define MASTER_WLAN_Q6 13
#define SLAVE_GEM_NOC_CNOC 14
#define SLAVE_LLCC 15
#define SLAVE_MEM_NOC_PCIE_SNOC 16
#define MASTER_LPIAON_NOC_LLCLPI_NOC 0
#define SLAVE_LPASS_LPI_CC 1
#define SLAVE_LLCC_ISLAND 2
#define SLAVE_SERVICE_LLCLPI_NOC 3
#define SLAVE_SERVICE_LLCLPI_NOC_CHIPCX 4
#define MASTER_LPIAON_NOC 0
#define SLAVE_LPASS_GEM_NOC 1
#define MASTER_LPASS_LPINOC 0
#define SLAVE_LPIAON_NOC_LLCLPI_NOC 1
#define SLAVE_LPIAON_NOC_LPASS_AG_NOC 2
#define MASTER_LPASS_PROC 0
#define SLAVE_LPICX_NOC_LPIAON_NOC 1
#define MASTER_LLCC 0
#define MASTER_DDR_RT 1
#define SLAVE_EBI1 2
#define SLAVE_DDR_RT 3
#define MASTER_CAMNOC_HF 0
#define MASTER_CAMNOC_NRT_ICP_SF 1
#define MASTER_CAMNOC_RT_CDM_SF 2
#define MASTER_CAMNOC_SF 3
#define MASTER_MDP 4
#define MASTER_MDSS_DCP 5
#define MASTER_CDSP_HCP 6
#define MASTER_VIDEO_CV_PROC 7
#define MASTER_VIDEO_EVA 8
#define MASTER_VIDEO_MVP 9
#define MASTER_VIDEO_V_PROC 10
#define SLAVE_MNOC_HF_MEM_NOC 11
#define SLAVE_MNOC_SF_MEM_NOC 12
#define MASTER_CDSP_PROC 0
#define SLAVE_CDSP_MEM_NOC 1
#define MASTER_PCIE_ANOC_CFG 0
#define MASTER_PCIE_0 1
#define MASTER_PCIE_1 2
#define SLAVE_ANOC_PCIE_GEM_NOC 3
#define SLAVE_SERVICE_PCIE_ANOC 4
#define MASTER_CFG_CENTER 0
#define MASTER_CFG_EAST 1
#define MASTER_CFG_MM 2
#define MASTER_CFG_NORTH 3
#define MASTER_CFG_SOUTH 4
#define MASTER_CFG_SOUTHWEST 5
#define SLAVE_AHB2PHY_SOUTH 6
#define SLAVE_BOOT_ROM 7
#define SLAVE_CAMERA_CFG 8
#define SLAVE_CLK_CTL 9
#define SLAVE_CRYPTO_CFG 10
#define SLAVE_DISPLAY_CFG 11
#define SLAVE_EVA_CFG 12
#define SLAVE_GFX3D_CFG 13
#define SLAVE_I2C 14
#define SLAVE_IMEM_CFG 15
#define SLAVE_IPC_ROUTER_CFG 16
#define SLAVE_IRIS_CFG 17
#define SLAVE_CNOC_MSS 18
#define SLAVE_PCIE_0_CFG 19
#define SLAVE_PCIE_1_CFG 20
#define SLAVE_PRNG 21
#define SLAVE_QSPI_0 22
#define SLAVE_QUP_1 23
#define SLAVE_QUP_2 24
#define SLAVE_QUP_3 25
#define SLAVE_QUP_4 26
#define SLAVE_SDCC_2 27
#define SLAVE_SDCC_4 28
#define SLAVE_TLMM 29
#define SLAVE_UFS_MEM_CFG 30
#define SLAVE_USB3 31
#define SLAVE_VSENSE_CTRL_CFG 32
#define SLAVE_PCIE_ANOC_CFG 33
#define SLAVE_QDSS_CFG 34
#define SLAVE_QDSS_STM 35
#define SLAVE_TCSR 36
#define SLAVE_TCU 37
#define MASTER_CNOC_STARDUST 0
#define SLAVE_STARDUST_CENTER_CFG 1
#define SLAVE_STARDUST_EAST_CFG 2
#define SLAVE_STARDUST_MM_CFG 3
#define SLAVE_STARDUST_NORTH_CFG 4
#define SLAVE_STARDUST_SOUTH_CFG 5
#define SLAVE_STARDUST_SOUTHWEST_CFG 6
#define MASTER_A1NOC_SNOC 0
#define MASTER_APSS_NOC 1
#define MASTER_CNOC_SNOC 2
#define SLAVE_SNOC_GEM_NOC_SF 3
#endif