3 files changed, 40 insertions, 5 deletions

diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 8c4435c53f09..6e787cc9e5b9 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -46,6 +46,8 @@ static struct clk_lookup *clk_find(const char *dev_id, const char *con_id)
         if (con_id)
                 best_possible += 1;
 
+        lockdep_assert_held(&clocks_mutex);
+
         list_for_each_entry(p, &clocks, node) {
                 match = 0;
                 if (p->dev_id) {
@@ -402,7 +404,10 @@ void devm_clk_release_clkdev(struct device *dev, const char *con_id,
         struct clk_lookup *cl;
         int rval;
 
+        mutex_lock(&clocks_mutex);
         cl = clk_find(dev_id, con_id);
+        mutex_unlock(&clocks_mutex);
+
         WARN_ON(!cl);
         rval = devres_release(dev, devm_clkdev_release,
                               devm_clk_match_clkdev, cl);
diff --git a/drivers/clk/sunxi-ng/ccu_nkmp.c b/drivers/clk/sunxi-ng/ccu_nkmp.c
index 9b49adb20d07..cbcdf664f336 100644
--- a/drivers/clk/sunxi-ng/ccu_nkmp.c
+++ b/drivers/clk/sunxi-ng/ccu_nkmp.c
@@ -167,7 +167,7 @@ static int ccu_nkmp_set_rate(struct clk_hw *hw, unsigned long rate,
                            unsigned long parent_rate)
 {
         struct ccu_nkmp *nkmp = hw_to_ccu_nkmp(hw);
-        u32 n_mask, k_mask, m_mask, p_mask;
+        u32 n_mask = 0, k_mask = 0, m_mask = 0, p_mask = 0;
         struct _ccu_nkmp _nkmp;
         unsigned long flags;
         u32 reg;
@@ -186,10 +186,24 @@ static int ccu_nkmp_set_rate(struct clk_hw *hw, unsigned long rate,
 
         ccu_nkmp_find_best(parent_rate, rate, &_nkmp);
 
-        n_mask = GENMASK(nkmp->n.width + nkmp->n.shift - 1, nkmp->n.shift);
-        k_mask = GENMASK(nkmp->k.width + nkmp->k.shift - 1, nkmp->k.shift);
-        m_mask = GENMASK(nkmp->m.width + nkmp->m.shift - 1, nkmp->m.shift);
-        p_mask = GENMASK(nkmp->p.width + nkmp->p.shift - 1, nkmp->p.shift);
+        /*
+         * If width is 0, GENMASK() macro may not generate expected mask (0)
+         * as it falls under undefined behaviour by C standard due to shifts
+         * which are equal or greater than width of left operand. This can
+         * be easily avoided by explicitly checking if width is 0.
+         */
+        if (nkmp->n.width)
+                n_mask = GENMASK(nkmp->n.width + nkmp->n.shift - 1,
+                                 nkmp->n.shift);
+        if (nkmp->k.width)
+                k_mask = GENMASK(nkmp->k.width + nkmp->k.shift - 1,
+                                 nkmp->k.shift);
+        if (nkmp->m.width)
+                m_mask = GENMASK(nkmp->m.width + nkmp->m.shift - 1,
+                                 nkmp->m.shift);
+        if (nkmp->p.width)
+                p_mask = GENMASK(nkmp->p.width + nkmp->p.shift - 1,
+                                 nkmp->p.shift);
 
         spin_lock_irqsave(nkmp->common.lock, flags);
 
diff --git a/include/linux/clk.h b/include/linux/clk.h
index d8bc1a856b39..f689fc58d7be 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -811,6 +811,22 @@ static inline bool clk_has_parent(struct clk *clk, struct clk *parent)
         return true;
 }
 
+static inline int clk_set_rate_range(struct clk *clk, unsigned long min,
+                                     unsigned long max)
+{
+        return 0;
+}
+
+static inline int clk_set_min_rate(struct clk *clk, unsigned long rate)
+{
+        return 0;
+}
+
+static inline int clk_set_max_rate(struct clk *clk, unsigned long rate)
+{
+        return 0;
+}
+
 static inline int clk_set_parent(struct clk *clk, struct clk *parent)
 {
         return 0;