Skip to contentSkip to conversation

ns16650: Make sure we have CONFIG_CLK set before using infrastructure

PATCH New Tom Rini 2 participants 4 messages Sep 23, 2016

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 ns16650: Make sure we have CONFIG_CLK set before using infrastructure

We cannot call on the CONFIG_CLK based clk_get_rate function unless CONFIG_CLK is set.

---
 drivers/serial/ns16550.c |  7 +++++--
 include/clk.h            | 25 ++++++++++++-------------
 2 files changed, 17 insertions(+), 15 deletions(-)
drivers/serial/ns16550.c +5 -2
index 3f6ea4d27591..765499dab646 100644
@@ -13,6 +13,7 @@
 #include <serial.h>
 #include <watchdog.h>
 #include <linux/types.h>
+#include <linux/compiler.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -353,8 +354,8 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
 {
 	struct ns16550_platdata *plat = dev->platdata;
 	fdt_addr_t addr;
-	struct clk clk;
-	int err;
+	__maybe_unused struct clk clk;
+	__maybe_unused int err;
 
 	/* try Processor Local Bus device first */
 	addr = dev_get_addr(dev);
@@ -401,6 +402,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
 	plat->reg_shift = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
 					 "reg-shift", 0);
 
+#ifdef CONFIG_CLK
 	err = clk_get_by_index(dev, 0, &clk);
 	if (!err) {
 		err = clk_get_rate(&clk);
@@ -410,6 +412,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
 		debug("ns16550 failed to get clock\n");
 		return err;
 	}
+#endif
 
 	if (!plat->clock)
 		plat->clock = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
include/clk.h +12 -13
index 94c003714700..7273127bb4fb 100644
@@ -98,19 +98,6 @@ int clk_get_by_index(struct udevice *dev, int index, struct clk *clk);
  * @return 0 if OK, or a negative error code.
  */
 int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk);
-#else
-static inline int clk_get_by_index(struct udevice *dev, int index,
-				   struct clk *clk)
-{
-	return -ENOSYS;
-}
-
-static inline int clk_get_by_name(struct udevice *dev, const char *name,
-			   struct clk *clk)
-{
-	return -ENOSYS;
-}
-#endif
 
 /**
  * clk_request - Request a clock by provider-specific ID.
@@ -175,5 +162,17 @@ int clk_enable(struct clk *clk);
 int clk_disable(struct clk *clk);
 
 int soc_clk_dump(void);
+#else
+static inline int clk_get_by_index(struct udevice *dev, int index,
+				   struct clk *clk)
+{
+	return -ENOSYS;
+}
 
+static inline int clk_get_by_name(struct udevice *dev, const char *name,
+			   struct clk *clk)
+{
+	return -ENOSYS;
+}
+#endif
 #endif
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 ns16650: Make sure we have CONFIG_CLK set before using infrastructure

Quoted 4 lines · Tom Rini

We cannot call on the CONFIG_CLK based clk_get_rate function unless CONFIG_CLK is set.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160922/e2837c34/attachment.sig>
#2 lore raw

PATCH 1/1 ns16650: Make sure we have CONFIG_CLK set before using infrastructure

In reply to Tom Rini

Hi Tom,

2016-09-23 10:11 GMT+09:00 Tom Rini <[email protected]>:

Quoted 41 lines

We cannot call on the CONFIG_CLK based clk_get_rate function unless CONFIG_CLK is set.

---
 drivers/serial/ns16550.c |  7 +++++--
 include/clk.h            | 25 ++++++++++++-------------
 2 files changed, 17 insertions(+), 15 deletions(-)
drivers/serial/ns16550.c +4 -2
index 3f6ea4d27591..765499dab646 100644
@@ -13,6 +13,7 @@
 #include <serial.h>
 #include <watchdog.h>
 #include <linux/types.h>
+#include <linux/compiler.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -353,8 +354,8 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
 {
        struct ns16550_platdata *plat = dev->platdata;
        fdt_addr_t addr;
-       struct clk clk;
-       int err;
+       __maybe_unused struct clk clk;
+       __maybe_unused int err;
 
        /* try Processor Local Bus device first */
        addr = dev_get_addr(dev);
@@ -401,6 +402,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
        plat->reg_shift = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
                                         "reg-shift", 0);
 
+#ifdef CONFIG_CLK
        err = clk_get_by_index(dev, 0, &clk);
        if (!err) {
                err = clk_get_rate(&clk);

drivers/serial/ns16550.c int ns16550_serial_ofdata_to_platdata(struct udevice *dev) · line 418

Quoted 7 lines
drivers/serial/ns16550.c +1 -0
@@ -410,6 +412,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
                debug("ns16550 failed to get clock\n");
                return err;
        }
+#endif
 
        if (!plat->clock)
                plat->clock = fdtdec_get_int(gd->fdt_blob, dev->of_offset,

Why did you need this patch?

If CONFIG_CLK is not set, clk_get_by_index() just returns -ENOSYS.

So, the compiler optimization will drop
the whole of if () ... else if ().

     err = clk_get_by_index(dev, 0, &clk);
     if (!err) {
             err = clk_get_rate(&clk);
             if (!IS_ERR_VALUE(err))
                     plat->clock = err;
     } else if (err != -ENODEV && err != -ENOSYS) {
             debug("ns16550 failed to get clock\n");
             return err;
     }

Why are you belt-and-braces guarding it with #ifdef CONFIG_CLK?

Quoted 32 lines
include/clk.h +4 -13
index 94c003714700..7273127bb4fb 100644
@@ -98,19 +98,6 @@ int clk_get_by_index(struct udevice *dev, int index, struct clk *clk);
  * @return 0 if OK, or a negative error code.
  */
 int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk);
-#else
-static inline int clk_get_by_index(struct udevice *dev, int index,
-                                  struct clk *clk)
-{
-       return -ENOSYS;
-}
-
-static inline int clk_get_by_name(struct udevice *dev, const char *name,
-                          struct clk *clk)
-{
-       return -ENOSYS;
-}
-#endif
 
 /**
  * clk_request - Request a clock by provider-specific ID.
@@ -175,5 +162,17 @@ int clk_enable(struct clk *clk);
 int clk_disable(struct clk *clk);
 
 int soc_clk_dump(void);
+#else
+static inline int clk_get_by_index(struct udevice *dev, int index,
+                                  struct clk *clk)
+{

include/clk.h int clk_enable(struct clk *clk); · line 178

Quoted 10 lines
include/clk.h +8 -0
+       return -ENOSYS;
+}
 
+static inline int clk_get_by_name(struct udevice *dev, const char *name,
+                          struct clk *clk)
+{
+       return -ENOSYS;
+}
+#endif
 #endif

This just made the situation worse; it will cause implicit declaration of clk_enable(), clk_set_rate(), etc unless we patch clk consumers around with #ifdef CONFIG_CLK.

Signature · 2 lines
Best Regards
Masahiro Yamada
author
#3 lore raw

PATCH 1/1 ns16650: Make sure we have CONFIG_CLK set before using infrastructure

Quoted 50 lines · Masahiro Yamada

Hi Tom,

2016-09-23 10:11 GMT+09:00 Tom Rini <[email protected]>:

Quoted 46 lines

We cannot call on the CONFIG_CLK based clk_get_rate function unless CONFIG_CLK is set.

---
 drivers/serial/ns16550.c |  7 +++++--
 include/clk.h            | 25 ++++++++++++-------------
 2 files changed, 17 insertions(+), 15 deletions(-)
drivers/serial/ns16550.c +5 -2
index 3f6ea4d27591..765499dab646 100644
@@ -13,6 +13,7 @@
 #include <serial.h>
 #include <watchdog.h>
 #include <linux/types.h>
+#include <linux/compiler.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -353,8 +354,8 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
 {
        struct ns16550_platdata *plat = dev->platdata;
        fdt_addr_t addr;
-       struct clk clk;
-       int err;
+       __maybe_unused struct clk clk;
+       __maybe_unused int err;
 
        /* try Processor Local Bus device first */
        addr = dev_get_addr(dev);
@@ -401,6 +402,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
        plat->reg_shift = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
                                         "reg-shift", 0);
 
+#ifdef CONFIG_CLK
        err = clk_get_by_index(dev, 0, &clk);
        if (!err) {
                err = clk_get_rate(&clk);
@@ -410,6 +412,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
                debug("ns16550 failed to get clock\n");
                return err;
        }
+#endif
 
Quoted 6 lines

drivers/serial/ns16550.c int ns16550_serial_ofdata_to_platdata(struct udevice *dev) · line 418

Quoted 2 lines
drivers/serial/ns16550.c +0 -0
        if (!plat->clock)
                plat->clock = fdtdec_get_int(gd->fdt_blob, dev->of_offset,

Why did you need this patch?

Because we have non-CONFIG_CLK clk_get_rate() functions, so we get function prototype mismatches.

Quoted 35 lines
Quoted 35 lines
include/clk.h +6 -13
index 94c003714700..7273127bb4fb 100644
@@ -98,19 +98,6 @@ int clk_get_by_index(struct udevice *dev, int index, struct clk *clk);
  * @return 0 if OK, or a negative error code.
  */
 int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk);
-#else
-static inline int clk_get_by_index(struct udevice *dev, int index,
-                                  struct clk *clk)
-{
-       return -ENOSYS;
-}
-
-static inline int clk_get_by_name(struct udevice *dev, const char *name,
-                          struct clk *clk)
-{
-       return -ENOSYS;
-}
-#endif
 
 /**
  * clk_request - Request a clock by provider-specific ID.
@@ -175,5 +162,17 @@ int clk_enable(struct clk *clk);
 int clk_disable(struct clk *clk);
 
 int soc_clk_dump(void);
+#else
+static inline int clk_get_by_index(struct udevice *dev, int index,
+                                  struct clk *clk)
+{
+       return -ENOSYS;
+}
 
Quoted 12 lines

include/clk.h int clk_enable(struct clk *clk); · line 178

Quoted 7 lines
include/clk.h +6 -0
+static inline int clk_get_by_name(struct udevice *dev, const char *name,
+                          struct clk *clk)
+{
+       return -ENOSYS;
+}
+#endif
 #endif

This just made the situation worse; it will cause implicit declaration of clk_enable(), clk_set_rate(), etc unless we patch clk consumers around with #ifdef CONFIG_CLK.

There's none today, and I think it makes it more obvious when we have a clock "framework" that's not using CONFIG_CLK and needs to be moved over.

Without this k2*evm fails to build.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160923/26abc0a0/attachment.sig>