Commit 9a61442c 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:
 "Here's a collection of primarily clk driver fixes, with a couple fixes
  to the core framework.

  We had to revert out a commit that affected boot on some devices that
  have the CLK_OPS_PARENT_ENABLE flag set. It isn't critical to have
  that fix so we'll try again next time.

  Driver side fixes include:

   - Plug an OF-node refcount bug in the TI clk driver

   - Fix the error handling in the raspberry pi firmware get_rate so
     that errors don't look like valid frequencies

   - Avoid going out of bounds in the raspberry pi driver too if the
     video firmware returns something we're not expecting"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  Revert "clk: core: Honor CLK_OPS_PARENT_ENABLE for clk gate ops"
  clk: bcm: rpi: Show clock id limit in error case
  clk: bcm: rpi: Add missing newline
  clk: bcm: rpi: Prevent out-of-bounds access
  clk: bcm: rpi: Fix error handling of raspberrypi_fw_get_rate
  clk: core: Fix runtime PM sequence in clk_core_unprepare()
  clk: core: Honor CLK_OPS_PARENT_ENABLE for clk gate ops
  clk: ti: Fix missing of_node_get() ti_find_clock_provider()
parents 77746426 abb5f3f4

drivers/clk/bcm/clk-raspberrypi.c

+11 −5
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static unsigned long raspberrypi_fw_get_rate(struct clk_hw *hw, 
	ret = raspberrypi_clock_property(rpi->firmware, data,

					 RPI_FIRMWARE_GET_CLOCK_RATE, &val);

	if (ret)

		return ret;

		return 0;



	return val;

}
@@ -220,7 +220,7 @@ static int raspberrypi_fw_set_rate(struct clk_hw *hw, unsigned long rate, 
	ret = raspberrypi_clock_property(rpi->firmware, data,

					 RPI_FIRMWARE_SET_CLOCK_RATE, &_rate);

	if (ret)

		dev_err_ratelimited(rpi->dev, "Failed to change %s frequency: %d",

		dev_err_ratelimited(rpi->dev, "Failed to change %s frequency: %d\n",

				    clk_hw_get_name(hw), ret);



	return ret;
@@ -288,7 +288,7 @@ static struct clk_hw *raspberrypi_clk_register(struct raspberrypi_clk *rpi, 
					 RPI_FIRMWARE_GET_MIN_CLOCK_RATE,

					 &min_rate);

	if (ret) {

		dev_err(rpi->dev, "Failed to get clock %d min freq: %d",

		dev_err(rpi->dev, "Failed to get clock %d min freq: %d\n",

			id, ret);

		return ERR_PTR(ret);

	}
@@ -344,8 +344,13 @@ static int raspberrypi_discover_clocks(struct raspberrypi_clk *rpi, 
	struct rpi_firmware_get_clocks_response *clks;

	int ret;



	/*

	 * The firmware doesn't guarantee that the last element of

	 * RPI_FIRMWARE_GET_CLOCKS is zeroed. So allocate an additional

	 * zero element as sentinel.

	 */

	clks = devm_kcalloc(rpi->dev,

			    RPI_FIRMWARE_NUM_CLK_ID, sizeof(*clks),

			    RPI_FIRMWARE_NUM_CLK_ID + 1, sizeof(*clks),

			    GFP_KERNEL);

	if (!clks)

		return -ENOMEM;
@@ -360,7 +365,8 @@ static int raspberrypi_discover_clocks(struct raspberrypi_clk *rpi, 
		struct raspberrypi_clk_variant *variant;



		if (clks->id > RPI_FIRMWARE_NUM_CLK_ID) {

			dev_err(rpi->dev, "Unknown clock id: %u", clks->id);

			dev_err(rpi->dev, "Unknown clock id: %u (max: %u)\n",

					   clks->id, RPI_FIRMWARE_NUM_CLK_ID);

			return -EINVAL;

		}

drivers/clk/clk.c

+1 −2
Original line number Diff line number Diff line
@@ -840,10 +840,9 @@ static void clk_core_unprepare(struct clk_core *core) 
	if (core->ops->unprepare)

		core->ops->unprepare(core->hw);



	clk_pm_runtime_put(core);



	trace_clk_unprepare_complete(core);

	clk_core_unprepare(core->parent);

	clk_pm_runtime_put(core);

}



static void clk_core_unprepare_lock(struct clk_core *core)

drivers/clk/ti/clk.c

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ static struct device_node *ti_find_clock_provider(struct device_node *from, 
			continue;



		if (!strncmp(n, tmp, strlen(tmp))) {

			of_node_get(np);

			found = true;

			break;

		}