6 files changed, 47 insertions, 4 deletions

diff --git a/Documentation/devicetree/bindings/clock/clock-bindings.txt b/Documentation/devicetree/bindings/clock/clock-bindings.txt
index 2ec489eebe72..b646bbcf7f92 100644
--- a/Documentation/devicetree/bindings/clock/clock-bindings.txt
+++ b/Documentation/devicetree/bindings/clock/clock-bindings.txt
@@ -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>;
+   };
diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index d667eee4e6d0..b3def0358177 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -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>;
diff --git a/drivers/clk/mmp/clk.c b/drivers/clk/mmp/clk.c
index ad8d483a35cd..ca7d37e2c7be 100644
--- a/drivers/clk/mmp/clk.c
+++ b/drivers/clk/mmp/clk.c
@@ -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;
         }
diff --git a/drivers/clk/mvebu/cp110-system-controller.c b/drivers/clk/mvebu/cp110-system-controller.c
index 9781b1bf5998..9235a331b588 100644
--- a/drivers/clk/mvebu/cp110-system-controller.c
+++ b/drivers/clk/mvebu/cp110-system-controller.c
@@ -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];
         }
diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c
index db9b2471ac40..0a48ed56833b 100644
--- a/drivers/clk/qcom/common.c
+++ b/drivers/clk/qcom/common.c
@@ -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;
diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c
index 9d7d297f0ea8..f65cc0ff76ab 100644
--- a/drivers/clk/zynqmp/clkc.c
+++ b/drivers/clk/zynqmp/clkc.c
@@ -128,7 +128,7 @@ static const struct zynqmp_eemi_ops *eemi_ops;
  */
 static inline int zynqmp_is_valid_clock(u32 clk_id)
 {
-        if (clk_id > clock_max_idx)
+        if (clk_id >= clock_max_idx)
                 return -ENODEV;
 
         return clock[clk_id].valid;
@@ -279,6 +279,9 @@ struct clk_hw *zynqmp_clk_register_fixed_factor(const char *name, u32 clk_id,
         qdata.arg1 = clk_id;
 
         ret = eemi_ops->query_data(qdata, ret_payload);
+        if (ret)
+                return ERR_PTR(ret);
+
         mult = ret_payload[1];
         div = ret_payload[2];