Commit 92852219 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'icc-6.5-rc1' of... 

Merge tag 'icc-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc

 into char-misc-next

Georgi writes:

interconnect changes for 6.5

This pull request contains the interconnect changes for the 6.5-rc1 merge
window which is a mix of core and driver changes with the following highlights:

- Support for configuring QoS on the Qualcomm's RPM-based platforms, that
  required special handling of some interface (non-scaling) clocks.
- Support for clock-based interconnect providers for cases when clock
  corresponds to bus bandwidth. This is used to enable CPU cluster bandwidth
  scaling on MSM8996 platforms. One patch is touching a file in the clock
  subsystem that has been acked by the maintainer.

Core changes:
	interconnect: add clk-based icc provider support
	interconnect: icc-clk: fix modular build
	interconnect: drop unused icc_get() interface

Driver changes:
	interconnect: qcom: rpm: Rename icc desc clocks to bus_blocks
	interconnect: qcom: rpm: Rename icc provider num_clocks to num_bus_clocks
	interconnect: qcom: rpm: Drop unused parameters
	interconnect: qcom: rpm: Set QoS registers only once
	interconnect: qcom: rpm: Handle interface clocks
	interconnect: qcom: icc-rpm: Enforce 2 or 0 bus clocks
	interconnect: qcom: rpm: Don't use clk_get_optional for bus clocks anymore
	interconnect: qcom: msm8996: Promote to core_initcall
	interconnect: qcom: rpm: allocate enough data in probe()
	dt-bindings: interconnect/msm8996-cbf: add defines to be used by CBF
	clk: qcom: cbf-msm8996: scale CBF clock according to the CPUfreq
	dt-bindings: interconnect: fsl,imx8m-noc: drop unneeded quotes

Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>

* tag 'icc-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  dt-bindings: interconnect: fsl,imx8m-noc: drop unneeded quotes
  interconnect: icc-clk: fix modular build
  clk: qcom: cbf-msm8996: scale CBF clock according to the CPUfreq
  interconnect: drop unused icc_get() interface
  interconnect: qcom: rpm: allocate enough data in probe()
  interconnect: qcom: msm8996: Promote to core_initcall
  interconnect: qcom: rpm: Don't use clk_get_optional for bus clocks anymore
  interconnect: qcom: icc-rpm: Enforce 2 or 0 bus clocks
  interconnect: qcom: rpm: Handle interface clocks
  interconnect: add clk-based icc provider support
  dt-bindings: interconnect/msm8996-cbf: add defines to be used by CBF
  interconnect: qcom: rpm: Set QoS registers only once
  interconnect: qcom: rpm: Drop unused parameters
  interconnect: qcom: rpm: Rename icc provider num_clocks to num_bus_clocks
  interconnect: qcom: rpm: Rename icc desc clocks to bus_blocks
parents a5052c85 1400725e

Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ properties: 
    type: object



  fsl,ddrc:

    $ref: "/schemas/types.yaml#/definitions/phandle"

    $ref: /schemas/types.yaml#/definitions/phandle

    description:

      Phandle to DDR Controller.

drivers/clk/qcom/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ config QCOM_CLK_APCS_MSM8916 
config QCOM_CLK_APCC_MSM8996

	tristate "MSM8996 CPU Clock Controller"

	select QCOM_KRYO_L2_ACCESSORS

	select INTERCONNECT_CLK if INTERCONNECT

	depends on ARM64

	help

	  Support for the CPU clock controller on msm8996 devices.

drivers/clk/qcom/clk-cbf-8996.c

+59 −1
Original line number Diff line number Diff line
@@ -5,11 +5,15 @@ 
#include <linux/bitfield.h>

#include <linux/clk.h>

#include <linux/clk-provider.h>

#include <linux/interconnect-clk.h>

#include <linux/interconnect-provider.h>

#include <linux/of.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>



#include <dt-bindings/interconnect/qcom,msm8996-cbf.h>



#include "clk-alpha-pll.h"

#include "clk-regmap.h"
@@ -223,6 +227,49 @@ static const struct regmap_config cbf_msm8996_regmap_config = { 
	.val_format_endian	= REGMAP_ENDIAN_LITTLE,

};



#ifdef CONFIG_INTERCONNECT



/* Random ID that doesn't clash with main qnoc and OSM */

#define CBF_MASTER_NODE 2000



static int qcom_msm8996_cbf_icc_register(struct platform_device *pdev, struct clk_hw *cbf_hw)

{

	struct device *dev = &pdev->dev;

	struct clk *clk = devm_clk_hw_get_clk(dev, cbf_hw, "cbf");

	const struct icc_clk_data data[] = {

		{ .clk = clk, .name = "cbf", },

	};

	struct icc_provider *provider;



	provider = icc_clk_register(dev, CBF_MASTER_NODE, ARRAY_SIZE(data), data);

	if (IS_ERR(provider))

		return PTR_ERR(provider);



	platform_set_drvdata(pdev, provider);



	return 0;

}



static int qcom_msm8996_cbf_icc_remove(struct platform_device *pdev)

{

	struct icc_provider *provider = platform_get_drvdata(pdev);



	icc_clk_unregister(provider);



	return 0;

}

#define qcom_msm8996_cbf_icc_sync_state icc_sync_state

#else

static int qcom_msm8996_cbf_icc_register(struct platform_device *pdev,  struct clk_hw *cbf_hw)

{

	dev_warn(&pdev->dev, "CONFIG_INTERCONNECT is disabled, CBF clock is fixed\n");



	return 0;

}

#define qcom_msm8996_cbf_icc_remove(pdev) (0)

#define qcom_msm8996_cbf_icc_sync_state NULL

#endif



static int qcom_msm8996_cbf_probe(struct platform_device *pdev)

{

	void __iomem *base;
@@ -281,7 +328,16 @@ static int qcom_msm8996_cbf_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, &cbf_mux.clkr.hw);

	ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, &cbf_mux.clkr.hw);

	if (ret)

		return ret;



	return qcom_msm8996_cbf_icc_register(pdev, &cbf_mux.clkr.hw);

}



static int qcom_msm8996_cbf_remove(struct platform_device *pdev)

{

	return qcom_msm8996_cbf_icc_remove(pdev);

}



static const struct of_device_id qcom_msm8996_cbf_match_table[] = {
@@ -292,9 +348,11 @@ MODULE_DEVICE_TABLE(of, qcom_msm8996_cbf_match_table); 


static struct platform_driver qcom_msm8996_cbf_driver = {

	.probe = qcom_msm8996_cbf_probe,

	.remove = qcom_msm8996_cbf_remove,

	.driver = {

		.name = "qcom-msm8996-cbf",

		.of_match_table = qcom_msm8996_cbf_match_table,

		.sync_state = qcom_msm8996_cbf_icc_sync_state,

	},

};

drivers/interconnect/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -15,4 +15,10 @@ source "drivers/interconnect/imx/Kconfig" 
source "drivers/interconnect/qcom/Kconfig"

source "drivers/interconnect/samsung/Kconfig"



config INTERCONNECT_CLK

	tristate

	depends on COMMON_CLK

	help

	  Support for wrapping clocks into the interconnect nodes.



endif

drivers/interconnect/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -7,3 +7,5 @@ obj-$(CONFIG_INTERCONNECT) += icc-core.o 
obj-$(CONFIG_INTERCONNECT_IMX)		+= imx/

obj-$(CONFIG_INTERCONNECT_QCOM)		+= qcom/

obj-$(CONFIG_INTERCONNECT_SAMSUNG)	+= samsung/



obj-$(CONFIG_INTERCONNECT_CLK)		+= icc-clk.o