Commit 9e856a74 authored by Georgi Djakov's avatar Georgi Djakov
Browse files

Merge branch 'icc-sdm660' into icc-next 

This patch series adds the SDM660 interconnect provider driver in
order to stop some timeouts and achieve some decent performance by
avoiding to be NoC limited.
It's also providing some power consumption improvement, but I have
only measured that as less heat, which is quite important when
working on thermally constrained devices like smartphones.

Please note that this driver's yaml binding is referring to a MMCC
clock, so this series does depend on the SDM660 MMCC driver that I
have sent separately.
The multimedia clock is required only for the Multimedia NoC (mnoc).

This patch series has been tested against the following devices:
 - Sony Xperia XA2 Ultra (SDM630 Nile Discovery)
 - Sony Xperia 10        (SDM630 Ganges Kirin)
 - Sony Xperia 10 Plus   (SDM636 Ganges Mermaid)

* icc-sdm660
  dt-bindings: interconnect: Add bindings for Qualcomm SDM660 NoC
  interconnect: qcom: Add SDM660 interconnect provider driver
  interconnect: qcom: sdm660: Fix kerneldoc warning

Link: https://lore.kernel.org/r/20201017133718.31327-1-kholk11@gmail.com


Signed-off-by: default avatarGeorgi Djakov <georgi.djakov@linaro.org>
parents 173ef5f8 7014dfee

Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml

0 → 100644
+147 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/interconnect/qcom,sdm660.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Qualcomm SDM660 Network-On-Chip interconnect



maintainers:

  - AngeloGioacchino Del Regno <kholk11@gmail.com>



description: |

  The Qualcomm SDM660 interconnect providers support adjusting the

  bandwidth requirements between the various NoC fabrics.



properties:

  reg:

    maxItems: 1



  compatible:

    enum:

      - qcom,sdm660-a2noc

      - qcom,sdm660-bimc

      - qcom,sdm660-cnoc

      - qcom,sdm660-gnoc

      - qcom,sdm660-mnoc

      - qcom,sdm660-snoc



  '#interconnect-cells':

    const: 1



  clocks:

    minItems: 1

    maxItems: 3



  clock-names:

    minItems: 1

    maxItems: 3



required:

  - compatible

  - reg

  - '#interconnect-cells'

  - clock-names

  - clocks



additionalProperties: false



allOf:

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sdm660-mnoc

    then:

      properties:

        clocks:

          items:

            - description: Bus Clock.

            - description: Bus A Clock.

            - description: CPU-NoC High-performance Bus Clock.

        clock-names:

          items:

            - const: bus

            - const: bus_a

            - const: iface



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sdm660-a2noc

              - qcom,sdm660-bimc

              - qcom,sdm660-cnoc

              - qcom,sdm660-gnoc

              - qcom,sdm660-snoc

    then:

      properties:

        clocks:

          items:

            - description: Bus Clock.

            - description: Bus A Clock.

        clock-names:

          items:

            - const: bus

            - const: bus_a



examples:

  - |

      #include <dt-bindings/clock/qcom,rpmcc.h>

      #include <dt-bindings/clock/qcom,mmcc-sdm660.h>



      bimc: interconnect@1008000 {

              compatible = "qcom,sdm660-bimc";

              reg = <0x01008000 0x78000>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a";

              clocks = <&rpmcc RPM_SMD_BIMC_CLK>,

                       <&rpmcc RPM_SMD_BIMC_A_CLK>;

      };



      cnoc: interconnect@1500000 {

              compatible = "qcom,sdm660-cnoc";

              reg = <0x01500000 0x10000>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a";

              clocks = <&rpmcc RPM_SMD_CNOC_CLK>,

                       <&rpmcc RPM_SMD_CNOC_A_CLK>;

      };



      snoc: interconnect@1626000 {

              compatible = "qcom,sdm660-snoc";

              reg = <0x01626000 0x7090>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a";

              clocks = <&rpmcc RPM_SMD_SNOC_CLK>,

                       <&rpmcc RPM_SMD_SNOC_A_CLK>;

      };



      a2noc: interconnect@1704000 {

              compatible = "qcom,sdm660-a2noc";

              reg = <0x01704000 0xc100>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a";

              clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>,

                       <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>;

      };



      mnoc: interconnect@1745000 {

              compatible = "qcom,sdm660-mnoc";

              reg = <0x01745000 0xa010>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a", "iface";

              clocks = <&rpmcc RPM_SMD_MMSSNOC_AXI_CLK>,

                       <&rpmcc RPM_SMD_MMSSNOC_AXI_CLK_A>,

                       <&mmcc AHB_CLK_SRC>;

      };



      gnoc: interconnect@17900000 {

              compatible = "qcom,sdm660-gnoc";

              reg = <0x17900000 0xe000>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a";

              clocks = <&xo_board>, <&xo_board>;

      };

drivers/interconnect/qcom/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -74,6 +74,15 @@ config INTERCONNECT_QCOM_SC7180 
	  This is a driver for the Qualcomm Network-on-Chip on sc7180-based

	  platforms.



config INTERCONNECT_QCOM_SDM660

	tristate "Qualcomm SDM660 interconnect driver"

	depends on INTERCONNECT_QCOM

	depends on QCOM_SMD_RPM

	select INTERCONNECT_QCOM_SMD_RPM

	help

	  This is a driver for the Qualcomm Network-on-Chip on sdm660-based

	  platforms.



config INTERCONNECT_QCOM_SDM845

	tristate "Qualcomm SDM845 interconnect driver"

	depends on INTERCONNECT_QCOM_RPMH_POSSIBLE

drivers/interconnect/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ icc-osm-l3-objs := osm-l3.o 
qnoc-qcs404-objs			:= qcs404.o

icc-rpmh-obj				:= icc-rpmh.o

qnoc-sc7180-objs			:= sc7180.o

qnoc-sdm660-objs			:= sdm660.o

qnoc-sdm845-objs			:= sdm845.o

qnoc-sdx55-objs				:= sdx55.o

qnoc-sm8150-objs			:= sm8150.o
@@ -22,6 +23,7 @@ obj-$(CONFIG_INTERCONNECT_QCOM_OSM_L3) += icc-osm-l3.o 
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_SDM660) += qnoc-sdm660.o

obj-$(CONFIG_INTERCONNECT_QCOM_SDM845) += qnoc-sdm845.o

obj-$(CONFIG_INTERCONNECT_QCOM_SDX55) += qnoc-sdx55.o

obj-$(CONFIG_INTERCONNECT_QCOM_SM8150) += qnoc-sm8150.o

drivers/interconnect/qcom/sdm660.c

0 → 100644
+923 −0

File added.

Preview size limit exceeded, changes collapsed.

include/dt-bindings/interconnect/qcom,sdm660.h

0 → 100644
+116 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* SDM660 interconnect IDs */



#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_SDM660_H

#define __DT_BINDINGS_INTERCONNECT_QCOM_SDM660_H



/* A2NOC */

#define MASTER_IPA			0

#define MASTER_CNOC_A2NOC		1

#define MASTER_SDCC_1			2

#define MASTER_SDCC_2			3

#define MASTER_BLSP_1			4

#define MASTER_BLSP_2			5

#define MASTER_UFS			6

#define MASTER_USB_HS			7

#define MASTER_USB3			8

#define MASTER_CRYPTO_C0		9

#define SLAVE_A2NOC_SNOC		10



/* BIMC */

#define MASTER_GNOC_BIMC		0

#define MASTER_OXILI			1

#define MASTER_MNOC_BIMC		2

#define MASTER_SNOC_BIMC		3

#define MASTER_PIMEM			4

#define SLAVE_EBI			5

#define SLAVE_HMSS_L3			6

#define SLAVE_BIMC_SNOC			7



/* CNOC */

#define MASTER_SNOC_CNOC		0

#define MASTER_QDSS_DAP			1

#define SLAVE_CNOC_A2NOC		2

#define SLAVE_MPM			3

#define SLAVE_PMIC_ARB			4

#define SLAVE_TLMM_NORTH		5

#define SLAVE_TCSR			6

#define SLAVE_PIMEM_CFG			7

#define SLAVE_IMEM_CFG			8

#define SLAVE_MESSAGE_RAM		9

#define SLAVE_GLM			10

#define SLAVE_BIMC_CFG			11

#define SLAVE_PRNG			12

#define SLAVE_SPDM			13

#define SLAVE_QDSS_CFG			14

#define SLAVE_CNOC_MNOC_CFG		15

#define SLAVE_SNOC_CFG			16

#define SLAVE_QM_CFG			17

#define SLAVE_CLK_CTL			18

#define SLAVE_MSS_CFG			19

#define SLAVE_TLMM_SOUTH		20

#define SLAVE_UFS_CFG			21

#define SLAVE_A2NOC_CFG			22

#define SLAVE_A2NOC_SMMU_CFG		23

#define SLAVE_GPUSS_CFG			24

#define SLAVE_AHB2PHY			25

#define SLAVE_BLSP_1			26

#define SLAVE_SDCC_1			27

#define SLAVE_SDCC_2			28

#define SLAVE_TLMM_CENTER		29

#define SLAVE_BLSP_2			30

#define SLAVE_PDM			31

#define SLAVE_CNOC_MNOC_MMSS_CFG	32

#define SLAVE_USB_HS			33

#define SLAVE_USB3_0			34

#define SLAVE_SRVC_CNOC			35



/* GNOC */

#define MASTER_APSS_PROC		0

#define SLAVE_GNOC_BIMC			1

#define SLAVE_GNOC_SNOC			2



/* MNOC */

#define MASTER_CPP			0

#define MASTER_JPEG			1

#define MASTER_MDP_P0			2

#define MASTER_MDP_P1			3

#define MASTER_VENUS			4

#define MASTER_VFE			5

#define SLAVE_MNOC_BIMC			6

#define MASTER_CNOC_MNOC_MMSS_CFG	7

#define MASTER_CNOC_MNOC_CFG		8

#define SLAVE_CAMERA_CFG		9

#define SLAVE_CAMERA_THROTTLE_CFG	10

#define SLAVE_MISC_CFG			11

#define SLAVE_VENUS_THROTTLE_CFG	12

#define SLAVE_VENUS_CFG			13

#define SLAVE_MMSS_CLK_XPU_CFG		14

#define SLAVE_MMSS_CLK_CFG		15

#define SLAVE_MNOC_MPU_CFG		16

#define SLAVE_DISPLAY_CFG		17

#define SLAVE_CSI_PHY_CFG		18

#define SLAVE_DISPLAY_THROTTLE_CFG	19

#define SLAVE_SMMU_CFG			20

#define SLAVE_SRVC_MNOC			21



/* SNOC */

#define MASTER_QDSS_ETR			0

#define MASTER_QDSS_BAM			1

#define MASTER_SNOC_CFG			2

#define MASTER_BIMC_SNOC		3

#define MASTER_A2NOC_SNOC		4

#define MASTER_GNOC_SNOC		5

#define SLAVE_HMSS			6

#define SLAVE_LPASS			7

#define SLAVE_WLAN			8

#define SLAVE_CDSP			9

#define SLAVE_IPA			10

#define SLAVE_SNOC_BIMC			11

#define SLAVE_SNOC_CNOC			12

#define SLAVE_IMEM			13

#define SLAVE_PIMEM			14

#define SLAVE_QDSS_STM			15

#define SLAVE_SRVC_SNOC			16



#endif