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

Merge tag 'icc-5.4-rc1' of https://git.linaro.org/people/georgi.djakov/linux into char-misc-next 



Georgi writes:

interconnect patches for 5.4

Here are the interconnect driver updates for the 5.4-rc1 merge window.

- New feature is the path tagging support that helps with grouping and
aggregating the bandwidth requests into separate buckets based on a tag.
- The first user of the path tagging is the Qualcomm sdm845 driver that
now implements support for wake/sleep sets. This allows consumer drivers
to express their bandwidth needs for the different CPU power states.
- New interconnect driver for the qcs404 platforms and a driver that
communicates bandwidth requests with remote processor over shared memory.
- Cleanups and fixes.

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

* tag 'icc-5.4-rc1' of https://git.linaro.org/people/georgi.djakov/linux:
  drivers: qcom: Add BCM vote macro to header
  interconnect: qcom: remove COMPILE_TEST from CONFIG_INTERCONNECT_QCOM_QCS404
  interconnect: qcom: Add QCS404 interconnect provider driver
  interconnect: qcom: Add interconnect RPM over SMD driver
  dt-bindings: interconnect: Add Qualcomm QCS404 DT bindings
  interconnect: qcom: Add tagging and wake/sleep support for sdm845
  interconnect: Add pre_aggregate() callback
  interconnect: Add support for path tags
parents 77fda29f 6311b652

Documentation/devicetree/bindings/interconnect/qcom,qcs404.txt

0 → 100644
+45 −0
Original line number Diff line number Diff line 
Qualcomm QCS404 Network-On-Chip interconnect driver binding

-----------------------------------------------------------



Required properties :

- compatible : shall contain only one of the following:

			"qcom,qcs404-bimc"

			"qcom,qcs404-pcnoc"

			"qcom,qcs404-snoc"

- #interconnect-cells : should contain 1



reg : specifies the physical base address and size of registers

clocks : list of phandles and specifiers to all interconnect bus clocks

clock-names : clock names should include both "bus" and "bus_a"



Example:



soc {

	...

	bimc: interconnect@400000 {

		reg = <0x00400000 0x80000>;

		compatible = "qcom,qcs404-bimc";

		#interconnect-cells = <1>;

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

		clocks = <&rpmcc RPM_SMD_BIMC_CLK>,

			<&rpmcc RPM_SMD_BIMC_A_CLK>;

	};



	pnoc: interconnect@500000 {

		reg = <0x00500000 0x15080>;

		compatible = "qcom,qcs404-pcnoc";

		#interconnect-cells = <1>;

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

		clocks = <&rpmcc RPM_SMD_PNOC_CLK>,

			<&rpmcc RPM_SMD_PNOC_A_CLK>;

	};



	snoc: interconnect@580000 {

		reg = <0x00580000 0x23080>;

		compatible = "qcom,qcs404-snoc";

		#interconnect-cells = <1>;

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

		clocks = <&rpmcc RPM_SMD_SNOC_CLK>,

			<&rpmcc RPM_SMD_SNOC_A_CLK>;

	};

};

drivers/clk/qcom/clk-rpmh.c

+3 −13
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 */



#include <linux/clk-provider.h>
@@ -12,23 +12,13 @@ 
#include <linux/platform_device.h>

#include <soc/qcom/cmd-db.h>

#include <soc/qcom/rpmh.h>

#include <soc/qcom/tcs.h>



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



#define CLK_RPMH_ARC_EN_OFFSET		0

#define CLK_RPMH_VRM_EN_OFFSET		4



#define BCM_TCS_CMD_COMMIT_MASK		0x40000000

#define BCM_TCS_CMD_VALID_SHIFT		29

#define BCM_TCS_CMD_VOTE_MASK		0x3fff

#define BCM_TCS_CMD_VOTE_SHIFT		0



#define BCM_TCS_CMD(valid, vote)				\

	(BCM_TCS_CMD_COMMIT_MASK |				\

	((valid) << BCM_TCS_CMD_VALID_SHIFT) |			\

	((vote & BCM_TCS_CMD_VOTE_MASK)				\

	<< BCM_TCS_CMD_VOTE_SHIFT))



/**

 * struct bcm_db - Auxiliary data pertaining to each Bus Clock Manager(BCM)

 * @unit: divisor used to convert Hz value to an RPMh msg
@@ -269,7 +259,7 @@ static int clk_rpmh_bcm_send_cmd(struct clk_rpmh *c, bool enable) 
	}



	cmd.addr = c->res_addr;

	cmd.data = BCM_TCS_CMD(enable, cmd_state);

	cmd.data = BCM_TCS_CMD(1, enable, 0, cmd_state);



	ret = rpmh_write_async(c->dev, RPMH_ACTIVE_ONLY_STATE, &cmd, 1);

	if (ret) {

drivers/interconnect/core.c

+26 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ static struct dentry *icc_debugfs_dir; 
 * @req_node: entry in list of requests for the particular @node

 * @node: the interconnect node to which this constraint applies

 * @dev: reference to the device that sets the constraints

 * @tag: path tag (optional)

 * @avg_bw: an integer describing the average bandwidth in kBps

 * @peak_bw: an integer describing the peak bandwidth in kBps

 */
@@ -36,6 +37,7 @@ struct icc_req { 
	struct hlist_node req_node;

	struct icc_node *node;

	struct device *dev;

	u32 tag;

	u32 avg_bw;

	u32 peak_bw;

};
@@ -203,8 +205,11 @@ static int aggregate_requests(struct icc_node *node) 
	node->avg_bw = 0;

	node->peak_bw = 0;



	if (p->pre_aggregate)

		p->pre_aggregate(node);



	hlist_for_each_entry(r, &node->req_list, req_node)

		p->aggregate(node, r->avg_bw, r->peak_bw,

		p->aggregate(node, r->tag, r->avg_bw, r->peak_bw,

			     &node->avg_bw, &node->peak_bw);



	return 0;
@@ -385,6 +390,26 @@ struct icc_path *of_icc_get(struct device *dev, const char *name) 
}

EXPORT_SYMBOL_GPL(of_icc_get);



/**

 * icc_set_tag() - set an optional tag on a path

 * @path: the path we want to tag

 * @tag: the tag value

 *

 * This function allows consumers to append a tag to the requests associated

 * with a path, so that a different aggregation could be done based on this tag.

 */

void icc_set_tag(struct icc_path *path, u32 tag)

{

	int i;



	if (!path)

		return;



	for (i = 0; i < path->num_nodes; i++)

		path->reqs[i].tag = tag;

}

EXPORT_SYMBOL_GPL(icc_set_tag);



/**

 * icc_set_bw() - set bandwidth constraints on an interconnect path

 * @path: reference to the path returned by icc_get()

drivers/interconnect/qcom/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -5,6 +5,15 @@ config INTERCONNECT_QCOM 
	help

	  Support for Qualcomm's Network-on-Chip interconnect hardware.



config INTERCONNECT_QCOM_QCS404

	tristate "Qualcomm QCS404 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 qcs404-based

	  platforms.



config INTERCONNECT_QCOM_SDM845

	tristate "Qualcomm SDM845 interconnect driver"

	depends on INTERCONNECT_QCOM
@@ -12,3 +21,6 @@ config INTERCONNECT_QCOM_SDM845 
	help

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

	  platforms.



config INTERCONNECT_QCOM_SMD_RPM

	tristate

drivers/interconnect/qcom/Makefile

+4 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



qnoc-qcs404-objs			:= qcs404.o

qnoc-sdm845-objs			:= sdm845.o

icc-smd-rpm-objs			:= smd-rpm.o



obj-$(CONFIG_INTERCONNECT_QCOM_QCS404) += qnoc-qcs404.o

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

obj-$(CONFIG_INTERCONNECT_QCOM_SMD_RPM) += icc-smd-rpm.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE