Commit 570c9139 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux 

Pull clk fixes from Stephen Boyd:
 "A few clk driver fixes this time:

   - Introduce protected-clock DT binding to fix breakage on qcom
     sdm845-mtp boards where the qspi clks introduced this merge window
     cause the firmware on those boards to take down the system if we
     try to read the clk registers

   - Fix a couple off-by-one errors found by Dan Carpenter

   - Handle failure in zynq fixed factor clk driver to avoid using
     uninitialized data"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: zynqmp: Off by one in zynqmp_is_valid_clock()
  clk: mmp: Off by one in mmp_clk_add()
  clk: mvebu: Off by one bugs in cp110_of_clk_get()
  arm64: dts: qcom: sdm845-mtp: Mark protected gcc clocks
  clk: qcom: Support 'protected-clocks' property
  dt-bindings: clk: Introduce 'protected-clocks' property
  clk: zynqmp: handle fixed factor param query error
parents f896adc4 9a43be9c

Documentation/devicetree/bindings/clock/clock-bindings.txt

+16 −0
Original line number Diff line number Diff line
@@ -168,3 +168,19 @@ a shared clock is forbidden. 


Configuration of common clocks, which affect multiple consumer devices can

be similarly specified in the clock provider node.



==Protected clocks==



Some platforms or firmwares may not fully expose all the clocks to the OS, such

as in situations where those clks are used by drivers running in ARM secure

execution levels. Such a configuration can be specified in device tree with the

protected-clocks property in the form of a clock specifier list. This property should

only be specified in the node that is providing the clocks being protected:



   clock-controller@a000f000 {

        compatible = "vendor,clk95;

        reg = <0xa000f000 0x1000>

        #clocks-cells = <1>;

        ...

        protected-clocks = <UART3_CLK>, <SPI5_CLK>;

   };

arch/arm64/boot/dts/qcom/sdm845-mtp.dts

+6 −0
Original line number Diff line number Diff line
@@ -343,6 +343,12 @@ 
	};

};



&gcc {

	protected-clocks = <GCC_QSPI_CORE_CLK>,

			   <GCC_QSPI_CORE_CLK_SRC>,

			   <GCC_QSPI_CNOC_PERIPH_AHB_CLK>;

};



&i2c10 {

	status = "okay";

	clock-frequency = <400000>;

drivers/clk/mmp/clk.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ void mmp_clk_add(struct mmp_clk_unit *unit, unsigned int id, 
		pr_err("CLK %d has invalid pointer %p\n", id, clk);

		return;

	}

	if (id > unit->nr_clks) {

	if (id >= unit->nr_clks) {

		pr_err("CLK %d is invalid\n", id);

		return;

	}

drivers/clk/mvebu/cp110-system-controller.c

+2 −2
Original line number Diff line number Diff line
@@ -200,11 +200,11 @@ static struct clk_hw *cp110_of_clk_get(struct of_phandle_args *clkspec, 
	unsigned int idx = clkspec->args[1];



	if (type == CP110_CLK_TYPE_CORE) {

		if (idx > CP110_MAX_CORE_CLOCKS)

		if (idx >= CP110_MAX_CORE_CLOCKS)

			return ERR_PTR(-EINVAL);

		return clk_data->hws[idx];

	} else if (type == CP110_CLK_TYPE_GATABLE) {

		if (idx > CP110_MAX_GATABLE_CLOCKS)

		if (idx >= CP110_MAX_GATABLE_CLOCKS)

			return ERR_PTR(-EINVAL);

		return clk_data->hws[CP110_MAX_CORE_CLOCKS + idx];

	}

drivers/clk/qcom/common.c

+18 −0
Original line number Diff line number Diff line
@@ -191,6 +191,22 @@ int qcom_cc_register_sleep_clk(struct device *dev) 
}

EXPORT_SYMBOL_GPL(qcom_cc_register_sleep_clk);



/* Drop 'protected-clocks' from the list of clocks to register */

static void qcom_cc_drop_protected(struct device *dev, struct qcom_cc *cc)

{

	struct device_node *np = dev->of_node;

	struct property *prop;

	const __be32 *p;

	u32 i;



	of_property_for_each_u32(np, "protected-clocks", prop, p, i) {

		if (i >= cc->num_rclks)

			continue;



		cc->rclks[i] = NULL;

	}

}



static struct clk_hw *qcom_cc_clk_hw_get(struct of_phandle_args *clkspec,

					 void *data)

{
@@ -251,6 +267,8 @@ int qcom_cc_really_probe(struct platform_device *pdev, 
	cc->rclks = rclks;

	cc->num_rclks = num_clks;



	qcom_cc_drop_protected(dev, cc);



	for (i = 0; i < num_clks; i++) {

		if (!rclks[i])

			continue;

CRA Git | Maintained and supported by SUSTech CRA and CCSE