linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: build failure after merge of the clk tree
@ 2015-02-26  2:14 Stephen Rothwell
  2015-02-26  9:09 ` Krzysztof Kozlowski
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2015-02-26  2:14 UTC (permalink / raw)
  To: Mike Turquette; +Cc: linux-next, linux-kernel, Krzysztof Kozlowski

[-- Attachment #1: Type: text/plain, Size: 684 bytes --]

Hi Mike,

After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/clk/clk.c: In function 'clk_disable_unused_subtree':
drivers/clk/clk.c:514:3: error: label 'out' used but not defined
   goto out;
   ^

Caused by commit a2146f032294 ("clk: Use lockdep asserts to find
missing hold of prepare_lock").  Commit c440525cb967 ("clk: Remove
unneeded NULL checks") removed that label along with the NULL check
that a2146f032294 reintroduces (was this a bad rebase?).  Please do
simple build tests.

I have used the clk tree from next-20150225 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2015-02-26  2:14 linux-next: build failure after merge of the clk tree Stephen Rothwell
@ 2015-02-26  9:09 ` Krzysztof Kozlowski
  2015-02-27  0:01   ` Mike Turquette
  0 siblings, 1 reply; 44+ messages in thread
From: Krzysztof Kozlowski @ 2015-02-26  9:09 UTC (permalink / raw)
  To: Mike Turquette; +Cc: linux-next, linux-kernel, Stephen Rothwell

On czw, 2015-02-26 at 13:14 +1100, Stephen Rothwell wrote:
> Hi Mike,
> 
> After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/clk/clk.c: In function 'clk_disable_unused_subtree':
> drivers/clk/clk.c:514:3: error: label 'out' used but not defined
>    goto out;
>    ^
> 
> Caused by commit a2146f032294 ("clk: Use lockdep asserts to find
> missing hold of prepare_lock").  Commit c440525cb967 ("clk: Remove
> unneeded NULL checks") removed that label along with the NULL check
> that a2146f032294 reintroduces (was this a bad rebase?).  Please do
> simple build tests.
> 
> I have used the clk tree from next-20150225 for today.

Mike,

It seems that my patch did not applied cleanly and the merge introduced
such artifacts. My patch adds only lockdep_asserts and does not
influence the program flow. I can rebase and resend the patch if you
wish.

Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2015-02-26  9:09 ` Krzysztof Kozlowski
@ 2015-02-27  0:01   ` Mike Turquette
  2015-02-27  0:06     ` Stephen Rothwell
  0 siblings, 1 reply; 44+ messages in thread
From: Mike Turquette @ 2015-02-27  0:01 UTC (permalink / raw)
  To: Krzysztof Kozlowski; +Cc: linux-next, linux-kernel, Stephen Rothwell

On Thu, Feb 26, 2015 at 1:09 AM, Krzysztof Kozlowski
<k.kozlowski@samsung.com> wrote:
> On czw, 2015-02-26 at 13:14 +1100, Stephen Rothwell wrote:
>> Hi Mike,
>>
>> After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
>> failed like this:
>>
>> drivers/clk/clk.c: In function 'clk_disable_unused_subtree':
>> drivers/clk/clk.c:514:3: error: label 'out' used but not defined
>>    goto out;
>>    ^
>>
>> Caused by commit a2146f032294 ("clk: Use lockdep asserts to find
>> missing hold of prepare_lock").  Commit c440525cb967 ("clk: Remove
>> unneeded NULL checks") removed that label along with the NULL check
>> that a2146f032294 reintroduces (was this a bad rebase?).  Please do
>> simple build tests.
>>
>> I have used the clk tree from next-20150225 for today.
>
> Mike,
>
> It seems that my patch did not applied cleanly and the merge introduced
> such artifacts. My patch adds only lockdep_asserts and does not
> influence the program flow. I can rebase and resend the patch if you
> wish.

It's OK. I fixed it up locally the same day that I applied it but
didn't push the change out to my mirror in time to catch -next. It
will be fixed the next time Stephen pulls the clk tree.

Regards,
Mike

>
> Best regards,
> Krzysztof
>

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2015-02-27  0:01   ` Mike Turquette
@ 2015-02-27  0:06     ` Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2015-02-27  0:06 UTC (permalink / raw)
  To: Mike Turquette; +Cc: Krzysztof Kozlowski, linux-next, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 405 bytes --]

Hi Mike,

On Thu, 26 Feb 2015 16:01:24 -0800 Mike Turquette <mturquette@linaro.org> wrote:
>
> It's OK. I fixed it up locally the same day that I applied it but
> didn't push the change out to my mirror in time to catch -next. It
> will be fixed the next time Stephen pulls the clk tree.

Which I have just done.  Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2024-01-03 23:04 Stephen Rothwell
@ 2024-01-04  0:59 ` Stephen Boyd
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Boyd @ 2024-01-04  0:59 UTC (permalink / raw)
  To: Mike Turquette, Stephen Rothwell
  Cc: Daniel Golle, Sam Shih, Stephen Boyd, Linux Kernel Mailing List,
	Linux Next Mailing List

Quoting Stephen Rothwell (2024-01-03 15:04:28)
> Hi all,
> 
> After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> ERROR: modpost: missing MODULE_LICENSE() in drivers/clk/mediatek/clk-mt7988-infracfg.o
> 
> Caused by commit
> 
>   7589129341ad ("clk: mediatek: add drivers for MT7988 SoC")
> 
> I have used the clk tree from next-20240103 for today.
> 

Thanks. I've fixed it up.

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2024-01-03 23:04 Stephen Rothwell
  2024-01-04  0:59 ` Stephen Boyd
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2024-01-03 23:04 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd
  Cc: Daniel Golle, Sam Shih, Stephen Boyd, Linux Kernel Mailing List,
	Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 372 bytes --]

Hi all,

After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: modpost: missing MODULE_LICENSE() in drivers/clk/mediatek/clk-mt7988-infracfg.o

Caused by commit

  7589129341ad ("clk: mediatek: add drivers for MT7988 SoC")

I have used the clk tree from next-20240103 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2023-04-02 23:59 Stephen Rothwell
@ 2023-04-05  0:28 ` Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2023-04-05  0:28 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd
  Cc: Garmin.Chang, Linux Kernel Mailing List, Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 1589 bytes --]

Hi all,

On Mon, 3 Apr 2023 09:59:39 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> In file included from include/linux/device/driver.h:21,
>                  from include/linux/device.h:32,
>                  from include/linux/platform_device.h:13,
>                  from drivers/clk/mediatek/clk-mt8188-wpe.c:9:
> drivers/clk/mediatek/clk-mt8188-wpe.c:91:31: error: 'clk_mt8188_vpp1_id_table' undeclared here (not in a function)
>    91 | MODULE_DEVICE_TABLE(platform, clk_mt8188_vpp1_id_table);
>       |                               ^~~~~~~~~~~~~~~~~~~~~~~~
> include/linux/module.h:243:15: note: in definition of macro 'MODULE_DEVICE_TABLE'
>   243 | extern typeof(name) __mod_##type##__##name##_device_table               \
>       |               ^~~~
> include/linux/module.h:243:21: error: '__mod_platform__clk_mt8188_vpp1_id_table_device_table' aliased to undefined symbol 'clk_mt8188_vpp1_id_table'
>   243 | extern typeof(name) __mod_##type##__##name##_device_table               \
>       |                     ^~~~~~
> drivers/clk/mediatek/clk-mt8188-wpe.c:91:1: note: in expansion of macro 'MODULE_DEVICE_TABLE'
>    91 | MODULE_DEVICE_TABLE(platform, clk_mt8188_vpp1_id_table);
>       | ^~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   f42b9e9a43e3 ("clk: mediatek: Add MT8188 wpesys clock support")
> 
> I have used the clk tree from next-20230331 for today.

I am still getting this failure.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2023-04-02 23:59 Stephen Rothwell
  2023-04-05  0:28 ` Stephen Rothwell
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2023-04-02 23:59 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd
  Cc: Garmin.Chang, Linux Kernel Mailing List, Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]

Hi all,

After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

In file included from include/linux/device/driver.h:21,
                 from include/linux/device.h:32,
                 from include/linux/platform_device.h:13,
                 from drivers/clk/mediatek/clk-mt8188-wpe.c:9:
drivers/clk/mediatek/clk-mt8188-wpe.c:91:31: error: 'clk_mt8188_vpp1_id_table' undeclared here (not in a function)
   91 | MODULE_DEVICE_TABLE(platform, clk_mt8188_vpp1_id_table);
      |                               ^~~~~~~~~~~~~~~~~~~~~~~~
include/linux/module.h:243:15: note: in definition of macro 'MODULE_DEVICE_TABLE'
  243 | extern typeof(name) __mod_##type##__##name##_device_table               \
      |               ^~~~
include/linux/module.h:243:21: error: '__mod_platform__clk_mt8188_vpp1_id_table_device_table' aliased to undefined symbol 'clk_mt8188_vpp1_id_table'
  243 | extern typeof(name) __mod_##type##__##name##_device_table               \
      |                     ^~~~~~
drivers/clk/mediatek/clk-mt8188-wpe.c:91:1: note: in expansion of macro 'MODULE_DEVICE_TABLE'
   91 | MODULE_DEVICE_TABLE(platform, clk_mt8188_vpp1_id_table);
      | ^~~~~~~~~~~~~~~~~~~

Caused by commit

  f42b9e9a43e3 ("clk: mediatek: Add MT8188 wpesys clock support")

I have used the clk tree from next-20230331 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2020-05-11  0:55 Stephen Rothwell
  2020-05-13  3:20 ` Stephen Boyd
@ 2020-05-13  3:28 ` Stephen Boyd
  1 sibling, 0 replies; 44+ messages in thread
From: Stephen Boyd @ 2020-05-13  3:28 UTC (permalink / raw)
  To: Mike Turquette, Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

Quoting Stephen Rothwell (2020-05-10 17:55:56)
> Hi all,
> 
> After merging the clk tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> arch/arm/mach-mmp/time.c:37:10: fatal error: clock.h: No such file or directory
>    37 | #include "clock.h"
>       |          ^~~~~~~~~
> 
> Caused by commit
> 
>   e4d1fdf89751 ("ARM: mmp: Remove legacy clk code")
> 
> I have disabled CONFIG_ARCH_MPP for today.  (For some reason, this
> build error did not show up until several more trees had been merged
> ...)
> 

Ok yeah I removed that clock.h file and then forgot to find any users of
the header file.

---8<----
diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c
index b642e900727a..1e9389245d0e 100644
--- a/arch/arm/mach-mmp/pxa168.c
+++ b/arch/arm/mach-mmp/pxa168.c
@@ -19,7 +19,6 @@
 #include <asm/system_misc.h>
 
 #include "addr-map.h"
-#include "clock.h"
 #include "common.h"
 #include <linux/soc/mmp/cputype.h>
 #include "devices.h"
diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
index 049a65f47b42..41b2e8abc9e6 100644
--- a/arch/arm/mach-mmp/time.c
+++ b/arch/arm/mach-mmp/time.c
@@ -34,7 +34,6 @@
 #include "regs-apbc.h"
 #include "irqs.h"
 #include <linux/soc/mmp/cputype.h>
-#include "clock.h"
 
 #define TIMERS_VIRT_BASE	TIMERS1_VIRT_BASE

^ permalink raw reply related	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2020-05-11  0:55 Stephen Rothwell
@ 2020-05-13  3:20 ` Stephen Boyd
  2020-05-13  3:28 ` Stephen Boyd
  1 sibling, 0 replies; 44+ messages in thread
From: Stephen Boyd @ 2020-05-13  3:20 UTC (permalink / raw)
  To: Mike Turquette, Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

Quoting Stephen Rothwell (2020-05-10 17:55:56)
> Hi all,
> 
> After merging the clk tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> arch/arm/mach-mmp/time.c:37:10: fatal error: clock.h: No such file or directory
>    37 | #include "clock.h"
>       |          ^~~~~~~~~
> 
> Caused by commit
> 
>   e4d1fdf89751 ("ARM: mmp: Remove legacy clk code")
> 
> I have disabled CONFIG_ARCH_MPP for today.  (For some reason, this
> build error did not show up until several more trees had been merged

Thanks. I see this error so it must be something on my end.

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2020-05-11  0:55 Stephen Rothwell
  2020-05-13  3:20 ` Stephen Boyd
  2020-05-13  3:28 ` Stephen Boyd
  0 siblings, 2 replies; 44+ messages in thread
From: Stephen Rothwell @ 2020-05-11  0:55 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 503 bytes --]

Hi all,

After merging the clk tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arch/arm/mach-mmp/time.c:37:10: fatal error: clock.h: No such file or directory
   37 | #include "clock.h"
      |          ^~~~~~~~~

Caused by commit

  e4d1fdf89751 ("ARM: mmp: Remove legacy clk code")

I have disabled CONFIG_ARCH_MPP for today.  (For some reason, this
build error did not show up until several more trees had been merged
...)

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2020-01-07 21:47 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2020-01-07 21:47 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 460 bytes --]

Hi all,

After merging the clk tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

ERROR: "__clk_hw_register_divider" [drivers/iio/adc/aspeed_adc.ko] undefined!
ERROR: "__clk_hw_register_divider" [drivers/gpu/drm/msm/msm.ko] undefined!

Caused by commit

  a43d909b71d3 ("clk: divider: Add support for specifying parents via DT/pointers")

I used the clk tree from next-20200107 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2019-07-02  2:03   ` Stephen Rothwell
  2019-07-05  1:24     ` Stephen Rothwell
@ 2019-07-12 17:53     ` Stephen Boyd
  1 sibling, 0 replies; 44+ messages in thread
From: Stephen Boyd @ 2019-07-12 17:53 UTC (permalink / raw)
  To: Mike Turquette, Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

Quoting Stephen Rothwell (2019-07-01 19:03:50)
> Hi all,
> 
> On Tue, 2 Jul 2019 11:14:55 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Tue, 2 Jul 2019 10:01:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > 
> > > We need something like this (untested):  
> > 
> > simple testing shows build errors ... we need something better.
> 
> This at least passes my (few) build tests (this will be in linux-next
> today):
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 2 Jul 2019 11:53:07 +1000
> Subject: [PATCH] clk: consoldiate the __clk_get_hw() declarations
> 
> Without this we were getting errors like:
> 
> In file included from drivers/clk/clkdev.c:22:0:
> drivers/clk/clk.h:36:23: error: static declaration of '__clk_get_hw' follows non-static declaration
> include/linux/clk-provider.h:808:16: note: previous declaration of '__clk_get_hw' was here
> 
> Fixes: 59fcdce425b7 ("clk: Remove ifdef for COMMON_CLK in clk-provider.h")
> fixes: 73e0e496afda ("clkdev: Always allocate a struct clk and call __clk_get() w/ CCF")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks for fixing this. I didn't run all the configs it seems.

I'll pull this into the clk pile now.


^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2019-07-02  2:03   ` Stephen Rothwell
@ 2019-07-05  1:24     ` Stephen Rothwell
  2019-07-12 17:53     ` Stephen Boyd
  1 sibling, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2019-07-05  1:24 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 5167 bytes --]

Hi all,

On Tue, 2 Jul 2019 12:03:50 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> This at least passes my (few) build tests (this will be in linux-next
> today):
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 2 Jul 2019 11:53:07 +1000
> Subject: [PATCH] clk: consoldiate the __clk_get_hw() declarations
> 
> Without this we were getting errors like:
> 
> In file included from drivers/clk/clkdev.c:22:0:
> drivers/clk/clk.h:36:23: error: static declaration of '__clk_get_hw' follows non-static declaration
> include/linux/clk-provider.h:808:16: note: previous declaration of '__clk_get_hw' was here
> 
> Fixes: 59fcdce425b7 ("clk: Remove ifdef for COMMON_CLK in clk-provider.h")
> fixes: 73e0e496afda ("clkdev: Always allocate a struct clk and call __clk_get() w/ CCF")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/clk/clk.h             | 4 ----
>  drivers/clk/imx/clk-imx6q.c   | 1 +
>  drivers/clk/imx/clk-imx6sll.c | 1 +
>  drivers/clk/imx/clk-imx6sx.c  | 1 +
>  drivers/clk/imx/clk-imx6ul.c  | 1 +
>  drivers/clk/imx/clk-imx7d.c   | 1 +
>  drivers/clk/imx/clk.c         | 1 +
>  include/linux/clk-provider.h  | 7 +++++++
>  8 files changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/clk/clk.h b/drivers/clk/clk.h
> index d8400d623b34..2d801900cad5 100644
> --- a/drivers/clk/clk.h
> +++ b/drivers/clk/clk.h
> @@ -33,10 +33,6 @@ clk_hw_create_clk(struct device *dev, struct clk_hw *hw, const char *dev_id,
>  {
>  	return (struct clk *)hw;
>  }
> -static struct clk_hw *__clk_get_hw(struct clk *clk)
> -{
> -	return (struct clk_hw *)clk;
> -}
>  static inline void __clk_put(struct clk *clk) { }
>  
>  #endif
> diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
> index 4e61f5189a1f..466561fb8925 100644
> --- a/drivers/clk/imx/clk-imx6q.c
> +++ b/drivers/clk/imx/clk-imx6q.c
> @@ -14,6 +14,7 @@
>  #include <linux/types.h>
>  #include <linux/clk.h>
>  #include <linux/clkdev.h>
> +#include <linux/clk-provider.h>
>  #include <linux/err.h>
>  #include <linux/io.h>
>  #include <linux/of.h>
> diff --git a/drivers/clk/imx/clk-imx6sll.c b/drivers/clk/imx/clk-imx6sll.c
> index 342dcc58ac16..5f3e92c09a5e 100644
> --- a/drivers/clk/imx/clk-imx6sll.c
> +++ b/drivers/clk/imx/clk-imx6sll.c
> @@ -7,6 +7,7 @@
>  #include <dt-bindings/clock/imx6sll-clock.h>
>  #include <linux/clk.h>
>  #include <linux/clkdev.h>
> +#include <linux/clk-provider.h>
>  #include <linux/err.h>
>  #include <linux/init.h>
>  #include <linux/io.h>
> diff --git a/drivers/clk/imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c
> index fb58479eaa68..2ada63e6ba16 100644
> --- a/drivers/clk/imx/clk-imx6sx.c
> +++ b/drivers/clk/imx/clk-imx6sx.c
> @@ -12,6 +12,7 @@
>  #include <dt-bindings/clock/imx6sx-clock.h>
>  #include <linux/clk.h>
>  #include <linux/clkdev.h>
> +#include <linux/clk-provider.h>
>  #include <linux/err.h>
>  #include <linux/init.h>
>  #include <linux/io.h>
> diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c
> index 95ca895c8776..d860a244363a 100644
> --- a/drivers/clk/imx/clk-imx6ul.c
> +++ b/drivers/clk/imx/clk-imx6ul.c
> @@ -12,6 +12,7 @@
>  #include <dt-bindings/clock/imx6ul-clock.h>
>  #include <linux/clk.h>
>  #include <linux/clkdev.h>
> +#include <linux/clk-provider.h>
>  #include <linux/err.h>
>  #include <linux/init.h>
>  #include <linux/io.h>
> diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c
> index c6d86700a080..c1efb061d237 100644
> --- a/drivers/clk/imx/clk-imx7d.c
> +++ b/drivers/clk/imx/clk-imx7d.c
> @@ -12,6 +12,7 @@
>  #include <dt-bindings/clock/imx7d-clock.h>
>  #include <linux/clk.h>
>  #include <linux/clkdev.h>
> +#include <linux/clk-provider.h>
>  #include <linux/err.h>
>  #include <linux/init.h>
>  #include <linux/io.h>
> diff --git a/drivers/clk/imx/clk.c b/drivers/clk/imx/clk.c
> index 76457b2bd7f0..f628071f6605 100644
> --- a/drivers/clk/imx/clk.c
> +++ b/drivers/clk/imx/clk.c
> @@ -1,5 +1,6 @@
>  // SPDX-License-Identifier: GPL-2.0
>  #include <linux/clk.h>
> +#include <linux/clk-provider.h>
>  #include <linux/err.h>
>  #include <linux/io.h>
>  #include <linux/of.h>
> diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
> index 0fbf3ccad849..2ae7604783dd 100644
> --- a/include/linux/clk-provider.h
> +++ b/include/linux/clk-provider.h
> @@ -805,7 +805,14 @@ void devm_clk_hw_unregister(struct device *dev, struct clk_hw *hw);
>  /* helper functions */
>  const char *__clk_get_name(const struct clk *clk);
>  const char *clk_hw_get_name(const struct clk_hw *hw);
> +#ifdef CONFIG_COMMON_CLK
>  struct clk_hw *__clk_get_hw(struct clk *clk);
> +#else
> +static inline struct clk_hw *__clk_get_hw(struct clk *clk)
> +{
> +	return (struct clk_hw *)clk;
> +}
> +#endif
>  unsigned int clk_hw_get_num_parents(const struct clk_hw *hw);
>  struct clk_hw *clk_hw_get_parent(const struct clk_hw *hw);
>  struct clk_hw *clk_hw_get_parent_by_index(const struct clk_hw *hw,

I am still applying this ...

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2019-07-02  1:14 ` Stephen Rothwell
@ 2019-07-02  2:03   ` Stephen Rothwell
  2019-07-05  1:24     ` Stephen Rothwell
  2019-07-12 17:53     ` Stephen Boyd
  0 siblings, 2 replies; 44+ messages in thread
From: Stephen Rothwell @ 2019-07-02  2:03 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 5094 bytes --]

Hi all,

On Tue, 2 Jul 2019 11:14:55 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 2 Jul 2019 10:01:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > We need something like this (untested):  
> 
> simple testing shows build errors ... we need something better.

This at least passes my (few) build tests (this will be in linux-next
today):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Jul 2019 11:53:07 +1000
Subject: [PATCH] clk: consoldiate the __clk_get_hw() declarations

Without this we were getting errors like:

In file included from drivers/clk/clkdev.c:22:0:
drivers/clk/clk.h:36:23: error: static declaration of '__clk_get_hw' follows non-static declaration
include/linux/clk-provider.h:808:16: note: previous declaration of '__clk_get_hw' was here

Fixes: 59fcdce425b7 ("clk: Remove ifdef for COMMON_CLK in clk-provider.h")
fixes: 73e0e496afda ("clkdev: Always allocate a struct clk and call __clk_get() w/ CCF")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/clk/clk.h             | 4 ----
 drivers/clk/imx/clk-imx6q.c   | 1 +
 drivers/clk/imx/clk-imx6sll.c | 1 +
 drivers/clk/imx/clk-imx6sx.c  | 1 +
 drivers/clk/imx/clk-imx6ul.c  | 1 +
 drivers/clk/imx/clk-imx7d.c   | 1 +
 drivers/clk/imx/clk.c         | 1 +
 include/linux/clk-provider.h  | 7 +++++++
 8 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/clk/clk.h b/drivers/clk/clk.h
index d8400d623b34..2d801900cad5 100644
--- a/drivers/clk/clk.h
+++ b/drivers/clk/clk.h
@@ -33,10 +33,6 @@ clk_hw_create_clk(struct device *dev, struct clk_hw *hw, const char *dev_id,
 {
 	return (struct clk *)hw;
 }
-static struct clk_hw *__clk_get_hw(struct clk *clk)
-{
-	return (struct clk_hw *)clk;
-}
 static inline void __clk_put(struct clk *clk) { }
 
 #endif
diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
index 4e61f5189a1f..466561fb8925 100644
--- a/drivers/clk/imx/clk-imx6q.c
+++ b/drivers/clk/imx/clk-imx6q.c
@@ -14,6 +14,7 @@
 #include <linux/types.h>
 #include <linux/clk.h>
 #include <linux/clkdev.h>
+#include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/of.h>
diff --git a/drivers/clk/imx/clk-imx6sll.c b/drivers/clk/imx/clk-imx6sll.c
index 342dcc58ac16..5f3e92c09a5e 100644
--- a/drivers/clk/imx/clk-imx6sll.c
+++ b/drivers/clk/imx/clk-imx6sll.c
@@ -7,6 +7,7 @@
 #include <dt-bindings/clock/imx6sll-clock.h>
 #include <linux/clk.h>
 #include <linux/clkdev.h>
+#include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
diff --git a/drivers/clk/imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c
index fb58479eaa68..2ada63e6ba16 100644
--- a/drivers/clk/imx/clk-imx6sx.c
+++ b/drivers/clk/imx/clk-imx6sx.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/imx6sx-clock.h>
 #include <linux/clk.h>
 #include <linux/clkdev.h>
+#include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c
index 95ca895c8776..d860a244363a 100644
--- a/drivers/clk/imx/clk-imx6ul.c
+++ b/drivers/clk/imx/clk-imx6ul.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/imx6ul-clock.h>
 #include <linux/clk.h>
 #include <linux/clkdev.h>
+#include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c
index c6d86700a080..c1efb061d237 100644
--- a/drivers/clk/imx/clk-imx7d.c
+++ b/drivers/clk/imx/clk-imx7d.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/imx7d-clock.h>
 #include <linux/clk.h>
 #include <linux/clkdev.h>
+#include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
diff --git a/drivers/clk/imx/clk.c b/drivers/clk/imx/clk.c
index 76457b2bd7f0..f628071f6605 100644
--- a/drivers/clk/imx/clk.c
+++ b/drivers/clk/imx/clk.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <linux/clk.h>
+#include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/of.h>
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 0fbf3ccad849..2ae7604783dd 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -805,7 +805,14 @@ void devm_clk_hw_unregister(struct device *dev, struct clk_hw *hw);
 /* helper functions */
 const char *__clk_get_name(const struct clk *clk);
 const char *clk_hw_get_name(const struct clk_hw *hw);
+#ifdef CONFIG_COMMON_CLK
 struct clk_hw *__clk_get_hw(struct clk *clk);
+#else
+static inline struct clk_hw *__clk_get_hw(struct clk *clk)
+{
+	return (struct clk_hw *)clk;
+}
+#endif
 unsigned int clk_hw_get_num_parents(const struct clk_hw *hw);
 struct clk_hw *clk_hw_get_parent(const struct clk_hw *hw);
 struct clk_hw *clk_hw_get_parent_by_index(const struct clk_hw *hw,
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply related	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2019-07-02  0:01 Stephen Rothwell
@ 2019-07-02  1:14 ` Stephen Rothwell
  2019-07-02  2:03   ` Stephen Rothwell
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2019-07-02  1:14 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

Hi all,

On Tue, 2 Jul 2019 10:01:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> We need something like this (untested):

simple testing shows build errors ... we need something better.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2019-07-02  0:01 Stephen Rothwell
  2019-07-02  1:14 ` Stephen Rothwell
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2019-07-02  0:01 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 2632 bytes --]

Hi all,

After merging the clk tree, today's linux-next build (arm omap1_defconfig
and many others) failed like this:

In file included from drivers/clk/clkdev.c:22:0:
drivers/clk/clk.h:36:23: error: static declaration of '__clk_get_hw' follows non-static declaration
include/linux/clk-provider.h:808:16: note: previous declaration of '__clk_get_hw' was here

Caused by commit

  59fcdce425b7 ("clk: Remove ifdef for COMMON_CLK in clk-provider.h")

This commit exposed the CONFIG_COMMON_CLK version of the __clk_get_hw()
declaration to non CONFIG_COMMON_CLK code (where there is a static
declaration of  __clk_get_hw() (which is BTW missing an "inline")
in drivers/clk/clk.h.

We need something like this (untested):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Jul 2019 09:58:18 +1000
Subject: [PATCH] clk: for up for "clk: Remove ifdef for COMMON_CLK in
 clk-provider.h"

We were getting errors like:

In file included from drivers/clk/clkdev.c:22:0:
drivers/clk/clk.h:36:23: error: static declaration of '__clk_get_hw' follows non
-static declaration
include/linux/clk-provider.h:808:16: note: previous declaration of '__clk_get_hw
' was here

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/clk/clk.h            | 2 +-
 include/linux/clk-provider.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/clk.h b/drivers/clk/clk.h
index d8400d623b34..143acac2ec81 100644
--- a/drivers/clk/clk.h
+++ b/drivers/clk/clk.h
@@ -33,7 +33,7 @@ clk_hw_create_clk(struct device *dev, struct clk_hw *hw, const char *dev_id,
 {
 	return (struct clk *)hw;
 }
-static struct clk_hw *__clk_get_hw(struct clk *clk)
+static inline struct clk_hw *__clk_get_hw(struct clk *clk)
 {
 	return (struct clk_hw *)clk;
 }
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 0fbf3ccad849..35c8b1c315b4 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -805,7 +805,10 @@ void devm_clk_hw_unregister(struct device *dev, struct clk_hw *hw);
 /* helper functions */
 const char *__clk_get_name(const struct clk *clk);
 const char *clk_hw_get_name(const struct clk_hw *hw);
+#ifdef CONFIG_COMON_CLK
+/* There is a !CONFIG_COMMON_CLK static inline for this in drivers/clk/clk.h */
 struct clk_hw *__clk_get_hw(struct clk *clk);
+#endif
 unsigned int clk_hw_get_num_parents(const struct clk_hw *hw);
 struct clk_hw *clk_hw_get_parent(const struct clk_hw *hw);
 struct clk_hw *clk_hw_get_parent_by_index(const struct clk_hw *hw,
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply related	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2019-05-02 23:25 Stephen Rothwell
@ 2019-05-03 15:55 ` Stephen Boyd
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Boyd @ 2019-05-03 15:55 UTC (permalink / raw)
  To: Mike Turquette, Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

Quoting Stephen Rothwell (2019-05-02 16:25:11)
> Hi all,
> 
> After merging the clk tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> arch/arm/mach-omap2/omap_hwmod.c: In function '_get_clkdm':
> arch/arm/mach-omap2/omap_hwmod.c:669:35: error: 'CLK_IS_BASIC' undeclared (first use in this function); did you mean 'CLOCKS_MASK'?
>    if (__clk_get_flags(oh->_clk) & CLK_IS_BASIC)
>                                    ^~~~~~~~~~~~
>                                    CLOCKS_MASK
> arch/arm/mach-omap2/omap_hwmod.c:669:35: note: each undeclared identifier is reported only once for each function it appears in
> 
> Caused by commit
> 
>   7c36ec8a90a8 ("clk: Remove CLK_IS_BASIC clk flag")
> 
> I have used the clk tree from next-20190502 for today.  (The above commit
> does not revert cleanly.)
> 

Sorry, I got confused and merged the wrong branch over. Should be fixed
up now.

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2019-05-02 23:25 Stephen Rothwell
  2019-05-03 15:55 ` Stephen Boyd
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2019-05-02 23:25 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 799 bytes --]

Hi all,

After merging the clk tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arch/arm/mach-omap2/omap_hwmod.c: In function '_get_clkdm':
arch/arm/mach-omap2/omap_hwmod.c:669:35: error: 'CLK_IS_BASIC' undeclared (first use in this function); did you mean 'CLOCKS_MASK'?
   if (__clk_get_flags(oh->_clk) & CLK_IS_BASIC)
                                   ^~~~~~~~~~~~
                                   CLOCKS_MASK
arch/arm/mach-omap2/omap_hwmod.c:669:35: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit

  7c36ec8a90a8 ("clk: Remove CLK_IS_BASIC clk flag")

I have used the clk tree from next-20190502 for today.  (The above commit
does not revert cleanly.)



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2018-11-29 22:03 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2018-11-29 22:03 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Lucas Stach,
	Abel Vesa

[-- Attachment #1: Type: text/plain, Size: 448 bytes --]

Hi all,

After merging the clk tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arm-linux-gnueabi-ld: drivers/clk/imx/clk-frac-pll.o: in function `clk_pll_round_rate':
clk-frac-pll.c:(.text+0x50): undefined reference to `__aeabi_uldivmod'

Caused by commit

  9fd680d0fafd ("clk: imx: add fractional PLL output clock")

I have used the clk tree from next-20181129 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2018-01-01 21:51 Stephen Rothwell
@ 2018-01-02 19:58 ` Stephen Boyd
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Boyd @ 2018-01-02 19:58 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Mike Turquette, Linux-Next Mailing List,
	Linux Kernel Mailing List, Georgi Djakov

On 01/02, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> ERROR: "clk_regmap_mux_div_ops" [drivers/clk/qcom/apcs-msm8916.ko] undefined!
> ERROR: "__mux_div_set_src_div" [drivers/clk/qcom/apcs-msm8916.ko] undefined!
> 
> Caused by commit
> 
>   8a77f61118a2 ("clk: qcom: Add APCS clock controller support")
> 
> I have used the clk tree from next-20171222 for today.
> 

Thanks for the report. I've fixed it up and I'm going to roll
more build coverage into my scripts now.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2018-01-01 21:51 Stephen Rothwell
  2018-01-02 19:58 ` Stephen Boyd
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2018-01-01 21:51 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Georgi Djakov

Hi all,

After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: "clk_regmap_mux_div_ops" [drivers/clk/qcom/apcs-msm8916.ko] undefined!
ERROR: "__mux_div_set_src_div" [drivers/clk/qcom/apcs-msm8916.ko] undefined!

Caused by commit

  8a77f61118a2 ("clk: qcom: Add APCS clock controller support")

I have used the clk tree from next-20171222 for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2017-12-10 23:16 Stephen Rothwell
@ 2017-12-14  0:57 ` Stephen Boyd
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Boyd @ 2017-12-14  0:57 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Mike Turquette, Linux-Next Mailing List,
	Linux Kernel Mailing List, Abhishek Sahu, Rajendra Nayak,
	Taniya Das

On 12/11, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> ERROR: "clk_alpha_pll_regs" [drivers/clk/qcom/mmcc-msm8996.ko] undefined!
> ERROR: "clk_alpha_pll_regs" [drivers/clk/qcom/gcc-msm8996.ko] undefined!
> ERROR: "clk_alpha_pll_regs" [drivers/clk/qcom/gcc-msm8994.ko] undefined!
> ERROR: "clk_alpha_pll_regs" [drivers/clk/qcom/gcc-ipq8074.ko] undefined!
> ERROR: "clk_hw_is_enabled" [drivers/clk/qcom/clk-qcom.ko] undefined!
> 
> Caused by commits
> 
>   d1506b749e92 ("clk: qcom: support for alpha pll properties")
>   e66a4d6d0081 ("clk: qcom: support for dynamic updating the PLL")
>   301803e6013b ("clk: qcom: support Huayra type Alpha PLL")
> 
> I have used the clk tree from next-20171208 for today.
> 

Thanks. I believe this is fixed up now.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2017-12-10 23:16 Stephen Rothwell
  2017-12-14  0:57 ` Stephen Boyd
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2017-12-10 23:16 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Abhishek Sahu, Rajendra Nayak, Taniya Das

Hi all,

After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: "clk_alpha_pll_regs" [drivers/clk/qcom/mmcc-msm8996.ko] undefined!
ERROR: "clk_alpha_pll_regs" [drivers/clk/qcom/gcc-msm8996.ko] undefined!
ERROR: "clk_alpha_pll_regs" [drivers/clk/qcom/gcc-msm8994.ko] undefined!
ERROR: "clk_alpha_pll_regs" [drivers/clk/qcom/gcc-ipq8074.ko] undefined!
ERROR: "clk_hw_is_enabled" [drivers/clk/qcom/clk-qcom.ko] undefined!

Caused by commits

  d1506b749e92 ("clk: qcom: support for alpha pll properties")
  e66a4d6d0081 ("clk: qcom: support for dynamic updating the PLL")
  301803e6013b ("clk: qcom: support Huayra type Alpha PLL")

I have used the clk tree from next-20171208 for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2017-06-05  0:14 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2017-06-05  0:14 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

Hi all,

After merging the clk tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/clk/at91/clk-generated.c: In function 'at91_clk_register_generated':
drivers/clk/at91/clk-generated.c:273:20: error: invalid storage class for function 'of_sama5d2_clk_generated_setup'
 static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
                    ^
drivers/clk/at91/clk-generated.c:273:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
 static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
 ^
In file included from include/linux/clk-provider.h:15:0,
                 from drivers/clk/at91/clk-generated.c:14:
include/linux/of.h:1132:16: error: initializer element is not constant
        .data = (fn == (fn_type)NULL) ? fn : fn  }
                ^
include/linux/of.h:1146:3: note: in expansion of macro '_OF_DECLARE'
   _OF_DECLARE(table, name, compat, fn, of_init_fn_1)
   ^
include/linux/clk-provider.h:791:42: note: in expansion of macro 'OF_DECLARE_1'
 #define CLK_OF_DECLARE(name, compat, fn) OF_DECLARE_1(clk, name, compat, fn)
                                          ^
drivers/clk/at91/clk-generated.c:321:1: note: in expansion of macro 'CLK_OF_DECLARE'
 CLK_OF_DECLARE(of_sama5d2_clk_generated_setup, "atmel,sama5d2-clk-generated",
 ^
include/linux/of.h:1132:16: note: (near initialization for '__of_table_of_sama5d2_clk_generated_setup.data')
        .data = (fn == (fn_type)NULL) ? fn : fn  }
                ^
include/linux/of.h:1146:3: note: in expansion of macro '_OF_DECLARE'
   _OF_DECLARE(table, name, compat, fn, of_init_fn_1)
   ^
include/linux/clk-provider.h:791:42: note: in expansion of macro 'OF_DECLARE_1'
 #define CLK_OF_DECLARE(name, compat, fn) OF_DECLARE_1(clk, name, compat, fn)
                                          ^
drivers/clk/at91/clk-generated.c:321:1: note: in expansion of macro 'CLK_OF_DECLARE'
 CLK_OF_DECLARE(of_sama5d2_clk_generated_setup, "atmel,sama5d2-clk-generated",
 ^
include/linux/of.h:1129:22: error: expected declaration or statement at end of input
  static const struct of_device_id __of_table_##name  \
                      ^
include/linux/of.h:1146:3: note: in expansion of macro '_OF_DECLARE'
   _OF_DECLARE(table, name, compat, fn, of_init_fn_1)
   ^
include/linux/clk-provider.h:791:42: note: in expansion of macro 'OF_DECLARE_1'
 #define CLK_OF_DECLARE(name, compat, fn) OF_DECLARE_1(clk, name, compat, fn)
                                          ^
drivers/clk/at91/clk-generated.c:321:1: note: in expansion of macro 'CLK_OF_DECLARE'
 CLK_OF_DECLARE(of_sama5d2_clk_generated_setup, "atmel,sama5d2-clk-generated",
 ^

Caused by commit

  8e56133e5c7b ("clk: at91: fix clk-generated parenting")

A closing brace was lost ...

I have used the clk tree from next-20170602 for today.
-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2015-07-27  4:11 Stephen Rothwell
  2015-08-03 10:08 ` Tony Lindgren
@ 2015-08-13 11:04 ` Olof Johansson
  1 sibling, 0 replies; 44+ messages in thread
From: Olof Johansson @ 2015-08-13 11:04 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Mike Turquette, Stephen Boyd, Tony Lindgren, linux-next,
	linux-kernel, Tero Kristo

On Mon, Jul 27, 2015 at 02:11:17PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the clk tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/clk/ti/clk-814x.c:11:25: error: array type has incomplete element type
>  static struct ti_dt_clk dm814_clks[] = {
>                          ^
> drivers/clk/ti/clk-814x.c:12:2: error: implicit declaration of function 'DT_CLK' [-Werror=implicit-function-declaration]
>   DT_CLK(NULL, "devosc_ck", "devosc_ck"),
>   ^
> drivers/clk/ti/clk-814x.c:21:2: error: field name not in record or union initializer
>   { .node_name = NULL },
>   ^
> drivers/clk/ti/clk-814x.c:21:2: error: (near initialization for 'dm814_clks')
> drivers/clk/ti/clk-814x.c: In function 'dm814x_dt_clk_init':
> drivers/clk/ti/clk-814x.c:26:2: error: implicit declaration of function 'ti_dt_clocks_register' [-Werror=implicit-function-declaration]
>   ti_dt_clocks_register(dm814_clks);
>   ^
> drivers/clk/ti/clk-814x.c:28:2: error: implicit declaration of function 'omap2_clk_enable_init_clocks' [-Werror=implicit-function-declaration]
>   omap2_clk_enable_init_clocks(NULL, 0);
>   ^
> drivers/clk/ti/clk-814x.c: At top level:
> drivers/clk/ti/clk-814x.c:11:25: warning: 'dm814_clks' defined but not used [-Wunused-variable]
>  static struct ti_dt_clk dm814_clks[] = {
>                          ^
> 
> Caused by commit
> 
>   9cf705de06a2 ("ARM: OMAP2+: Add support for initializing dm814x clocks")
> 
> from the omap tree interacting with commit
> 
>   a3314e9cf69c ("clk: ti: move some public definitions to private header")
> 
> from the clk tree.
> 
> I have applied the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 27 Jul 2015 14:07:23 +1000
> Subject: [PATCH] clk: ti: fix for definition movement
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/clk/ti/clk-814x.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/clk/ti/clk-814x.c b/drivers/clk/ti/clk-814x.c
> index d490d427cc20..e172920798ea 100644
> --- a/drivers/clk/ti/clk-814x.c
> +++ b/drivers/clk/ti/clk-814x.c
> @@ -8,6 +8,8 @@
>  #include <linux/clk-provider.h>
>  #include <linux/clk/ti.h>
>  
> +#include "clock.h"
> +
>  static struct ti_dt_clk dm814_clks[] = {
>  	DT_CLK(NULL, "devosc_ck", "devosc_ck"),
>  	DT_CLK(NULL, "mpu_ck", "mpu_ck"),

Thanks, I've now applied this to the same branch where 9cf705de06a2 was merged.


-Olof

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2015-08-12  7:45 ` Geert Uytterhoeven
@ 2015-08-12  8:23   ` Stephen Boyd
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Boyd @ 2015-08-12  8:23 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Stephen Rothwell, Mike Turquette, Linux-Next, linux-kernel,
	Linux PM list, Rajendra Nayak

On 08/12, Geert Uytterhoeven wrote:
> On Wed, Aug 12, 2015 at 9:19 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> >
> > ERROR: "pm_genpd_init" [drivers/clk/qcom/clk-qcom.ko] undefined!
> >
> > Caused by commit
> >
> >   0c4172846b0b ("clk: qcom: Add support for GDSCs")
> >
> > I have used the clk tree from next-20150810 for today.
> 
> Missing EXPORT_SYMBOL_GPL(pm_genpd_init)?
> 
> However, having modular PM Domain drivers may cause unpleasant surprises...
> 

Curious what sort of surprises those would be? I suppose
something like power domains being removed from the system would
need some more work to start failing the suspend/resume of
devices in the power domains or possibly unbind the drivers that
are using the power domains provided. And we probably need to
sprinkle some try_module_get()/module_put() too so that the
module isn't easily removed if it's in use by some other drivers.

I hope it's not something that we think is impossible to do
though because we've been able to support the clk driver as
entirely modular on qcom platforms and I'd like to keep it that
way. BTW, it seems that we export __of_genpd_add_provider() so
there's at least some precedence for modular genpd code, albeit a
small one.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2015-08-12  7:19 Stephen Rothwell
  2015-08-12  7:45 ` Geert Uytterhoeven
@ 2015-08-12  8:03 ` Stephen Boyd
  1 sibling, 0 replies; 44+ messages in thread
From: Stephen Boyd @ 2015-08-12  8:03 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Mike Turquette, linux-next, linux-kernel, Rajendra Nayak

On 08/12, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> ERROR: "pm_genpd_init" [drivers/clk/qcom/clk-qcom.ko] undefined!
> 
> Caused by commit
> 
>   0c4172846b0b ("clk: qcom: Add support for GDSCs")
> 
> I have used the clk tree from next-20150810 for today.

Thanks. I've removed these patches from the clk tree until this
is resolved.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2015-08-12  7:19 Stephen Rothwell
@ 2015-08-12  7:45 ` Geert Uytterhoeven
  2015-08-12  8:23   ` Stephen Boyd
  2015-08-12  8:03 ` Stephen Boyd
  1 sibling, 1 reply; 44+ messages in thread
From: Geert Uytterhoeven @ 2015-08-12  7:45 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Mike Turquette, Stephen Boyd, Linux-Next, linux-kernel, Linux PM list

On Wed, Aug 12, 2015 at 9:19 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> ERROR: "pm_genpd_init" [drivers/clk/qcom/clk-qcom.ko] undefined!
>
> Caused by commit
>
>   0c4172846b0b ("clk: qcom: Add support for GDSCs")
>
> I have used the clk tree from next-20150810 for today.

Missing EXPORT_SYMBOL_GPL(pm_genpd_init)?

However, having modular PM Domain drivers may cause unpleasant surprises...

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2015-08-12  7:19 Stephen Rothwell
  2015-08-12  7:45 ` Geert Uytterhoeven
  2015-08-12  8:03 ` Stephen Boyd
  0 siblings, 2 replies; 44+ messages in thread
From: Stephen Rothwell @ 2015-08-12  7:19 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd; +Cc: linux-next, linux-kernel

Hi all,

After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: "pm_genpd_init" [drivers/clk/qcom/clk-qcom.ko] undefined!

Caused by commit

  0c4172846b0b ("clk: qcom: Add support for GDSCs")

I have used the clk tree from next-20150810 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2015-08-03 10:08 ` Tony Lindgren
@ 2015-08-07 23:56   ` Stephen Boyd
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Boyd @ 2015-08-07 23:56 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: Stephen Rothwell, Mike Turquette, linux-next, linux-kernel, Tero Kristo

On 08/03, Tony Lindgren wrote:
> 
> Sorry for the delay in replying, I was offline for a few days. Thanks
> for fixing it up. I assume no need to apply this fix into arm-soc
> for-next but please let me know if you prefer that.
> 

Can we apply it into arm-soc. I'm worried we're going to forget
about it, and having the include there in arm-soc (where
a3314e9cf69c isn't present) doesn't hurt anything from what I can
tell.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2015-07-27  4:11 Stephen Rothwell
@ 2015-08-03 10:08 ` Tony Lindgren
  2015-08-07 23:56   ` Stephen Boyd
  2015-08-13 11:04 ` Olof Johansson
  1 sibling, 1 reply; 44+ messages in thread
From: Tony Lindgren @ 2015-08-03 10:08 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Mike Turquette, Stephen Boyd, linux-next, linux-kernel, Tero Kristo

* Stephen Rothwell <sfr@canb.auug.org.au> [150726 21:14]:
> Hi all,
> 
> After merging the clk tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/clk/ti/clk-814x.c:11:25: error: array type has incomplete element type
>  static struct ti_dt_clk dm814_clks[] = {
>                          ^
> drivers/clk/ti/clk-814x.c:12:2: error: implicit declaration of function 'DT_CLK' [-Werror=implicit-function-declaration]
>   DT_CLK(NULL, "devosc_ck", "devosc_ck"),
>   ^
> drivers/clk/ti/clk-814x.c:21:2: error: field name not in record or union initializer
>   { .node_name = NULL },
>   ^
> drivers/clk/ti/clk-814x.c:21:2: error: (near initialization for 'dm814_clks')
> drivers/clk/ti/clk-814x.c: In function 'dm814x_dt_clk_init':
> drivers/clk/ti/clk-814x.c:26:2: error: implicit declaration of function 'ti_dt_clocks_register' [-Werror=implicit-function-declaration]
>   ti_dt_clocks_register(dm814_clks);
>   ^
> drivers/clk/ti/clk-814x.c:28:2: error: implicit declaration of function 'omap2_clk_enable_init_clocks' [-Werror=implicit-function-declaration]
>   omap2_clk_enable_init_clocks(NULL, 0);
>   ^
> drivers/clk/ti/clk-814x.c: At top level:
> drivers/clk/ti/clk-814x.c:11:25: warning: 'dm814_clks' defined but not used [-Wunused-variable]
>  static struct ti_dt_clk dm814_clks[] = {
>                          ^
> 
> Caused by commit
> 
>   9cf705de06a2 ("ARM: OMAP2+: Add support for initializing dm814x clocks")
> 
> from the omap tree interacting with commit
> 
>   a3314e9cf69c ("clk: ti: move some public definitions to private header")
> 
> from the clk tree.
> 
> I have applied the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 27 Jul 2015 14:07:23 +1000
> Subject: [PATCH] clk: ti: fix for definition movement
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/clk/ti/clk-814x.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/clk/ti/clk-814x.c b/drivers/clk/ti/clk-814x.c
> index d490d427cc20..e172920798ea 100644
> --- a/drivers/clk/ti/clk-814x.c
> +++ b/drivers/clk/ti/clk-814x.c
> @@ -8,6 +8,8 @@
>  #include <linux/clk-provider.h>
>  #include <linux/clk/ti.h>
>  
> +#include "clock.h"
> +
>  static struct ti_dt_clk dm814_clks[] = {
>  	DT_CLK(NULL, "devosc_ck", "devosc_ck"),
>  	DT_CLK(NULL, "mpu_ck", "mpu_ck"),

Sorry for the delay in replying, I was offline for a few days. Thanks
for fixing it up. I assume no need to apply this fix into arm-soc
for-next but please let me know if you prefer that.

Regards,

Tony

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2015-07-27  4:11 Stephen Rothwell
  2015-08-03 10:08 ` Tony Lindgren
  2015-08-13 11:04 ` Olof Johansson
  0 siblings, 2 replies; 44+ messages in thread
From: Stephen Rothwell @ 2015-07-27  4:11 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd, Tony Lindgren
  Cc: linux-next, linux-kernel, Tero Kristo

Hi all,

After merging the clk tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/clk/ti/clk-814x.c:11:25: error: array type has incomplete element type
 static struct ti_dt_clk dm814_clks[] = {
                         ^
drivers/clk/ti/clk-814x.c:12:2: error: implicit declaration of function 'DT_CLK' [-Werror=implicit-function-declaration]
  DT_CLK(NULL, "devosc_ck", "devosc_ck"),
  ^
drivers/clk/ti/clk-814x.c:21:2: error: field name not in record or union initializer
  { .node_name = NULL },
  ^
drivers/clk/ti/clk-814x.c:21:2: error: (near initialization for 'dm814_clks')
drivers/clk/ti/clk-814x.c: In function 'dm814x_dt_clk_init':
drivers/clk/ti/clk-814x.c:26:2: error: implicit declaration of function 'ti_dt_clocks_register' [-Werror=implicit-function-declaration]
  ti_dt_clocks_register(dm814_clks);
  ^
drivers/clk/ti/clk-814x.c:28:2: error: implicit declaration of function 'omap2_clk_enable_init_clocks' [-Werror=implicit-function-declaration]
  omap2_clk_enable_init_clocks(NULL, 0);
  ^
drivers/clk/ti/clk-814x.c: At top level:
drivers/clk/ti/clk-814x.c:11:25: warning: 'dm814_clks' defined but not used [-Wunused-variable]
 static struct ti_dt_clk dm814_clks[] = {
                         ^

Caused by commit

  9cf705de06a2 ("ARM: OMAP2+: Add support for initializing dm814x clocks")

from the omap tree interacting with commit

  a3314e9cf69c ("clk: ti: move some public definitions to private header")

from the clk tree.

I have applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 27 Jul 2015 14:07:23 +1000
Subject: [PATCH] clk: ti: fix for definition movement

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/clk/ti/clk-814x.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/clk/ti/clk-814x.c b/drivers/clk/ti/clk-814x.c
index d490d427cc20..e172920798ea 100644
--- a/drivers/clk/ti/clk-814x.c
+++ b/drivers/clk/ti/clk-814x.c
@@ -8,6 +8,8 @@
 #include <linux/clk-provider.h>
 #include <linux/clk/ti.h>
 
+#include "clock.h"
+
 static struct ti_dt_clk dm814_clks[] = {
 	DT_CLK(NULL, "devosc_ck", "devosc_ck"),
 	DT_CLK(NULL, "mpu_ck", "mpu_ck"),
-- 
2.4.6

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

^ permalink raw reply related	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2015-03-04  9:56   ` Geert Uytterhoeven
@ 2015-03-05  0:15     ` Mike Turquette
  0 siblings, 0 replies; 44+ messages in thread
From: Mike Turquette @ 2015-03-05  0:15 UTC (permalink / raw)
  To: Geert Uytterhoeven, Stephen Boyd
  Cc: Stephen Rothwell, Linux-Next, linux-kernel

Quoting Geert Uytterhoeven (2015-03-04 01:56:42)
> On Fri, Feb 27, 2015 at 6:42 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> > The problem is the patch was written before struct clk_core moved into
> > the clk.c file and then applied after it moved. So before the move the
> > order of includes would cause the struct definition to be before the
> > place where the tracepoint macros were expanded. The fix is to move the
> > tracepoint include after the struct clk_core definition:
> >
> > -----8<----
> >
> > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
> > index 9aee501b8284..392477033990 100644
> > --- a/drivers/clk/clk.c
> > +++ b/drivers/clk/clk.c
> > @@ -22,9 +22,6 @@
> >  #include <linux/init.h>
> >  #include <linux/sched.h>
> >
> > -#define CREATE_TRACE_POINTS
> > -#include <trace/events/clk.h>
> > -
> >  #include "clk.h"
> >
> >  static DEFINE_SPINLOCK(enable_lock);
> > @@ -80,6 +77,9 @@ struct clk_core {
> >         struct kref             ref;
> >  };
> >
> > +#define CREATE_TRACE_POINTS
> > +#include <trace/events/clk.h>
> > +
> >  struct clk {
> >         struct clk_core *core;
> >         const char *dev_id;
> 
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Thanks, I've rolled this into the offending commit.

Regards,
Mike

> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2015-02-27 17:42 ` Stephen Boyd
@ 2015-03-04  9:56   ` Geert Uytterhoeven
  2015-03-05  0:15     ` Mike Turquette
  0 siblings, 1 reply; 44+ messages in thread
From: Geert Uytterhoeven @ 2015-03-04  9:56 UTC (permalink / raw)
  To: Stephen Boyd; +Cc: Stephen Rothwell, Mike Turquette, Linux-Next, linux-kernel

On Fri, Feb 27, 2015 at 6:42 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> The problem is the patch was written before struct clk_core moved into
> the clk.c file and then applied after it moved. So before the move the
> order of includes would cause the struct definition to be before the
> place where the tracepoint macros were expanded. The fix is to move the
> tracepoint include after the struct clk_core definition:
>
> -----8<----
>
> diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
> index 9aee501b8284..392477033990 100644
> --- a/drivers/clk/clk.c
> +++ b/drivers/clk/clk.c
> @@ -22,9 +22,6 @@
>  #include <linux/init.h>
>  #include <linux/sched.h>
>
> -#define CREATE_TRACE_POINTS
> -#include <trace/events/clk.h>
> -
>  #include "clk.h"
>
>  static DEFINE_SPINLOCK(enable_lock);
> @@ -80,6 +77,9 @@ struct clk_core {
>         struct kref             ref;
>  };
>
> +#define CREATE_TRACE_POINTS
> +#include <trace/events/clk.h>
> +
>  struct clk {
>         struct clk_core *core;
>         const char *dev_id;

Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2015-02-27  3:08 Stephen Rothwell
@ 2015-02-27 17:42 ` Stephen Boyd
  2015-03-04  9:56   ` Geert Uytterhoeven
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Boyd @ 2015-02-27 17:42 UTC (permalink / raw)
  To: Stephen Rothwell, Mike Turquette; +Cc: linux-next, linux-kernel

On 02/26/15 19:08, Stephen Rothwell wrote:
> Hi Mike,
>
> After merging the clk tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from include/trace/define_trace.h:90:0,
>                  from include/trace/events/clk.h:198,
>                  from drivers/clk/clk.c:26:
> include/trace/events/clk.h: In function 'ftrace_get_offsets_clk':
> include/trace/events/clk.h:30:40: error: dereferencing pointer to incomplete type
>    __string(        name,           core->name       )
>                                         ^
> include/trace/ftrace.h:465:2: note: in definition of macro 'DECLARE_EVENT_CLASS'
>   tstruct;       \
>   ^
> include/trace/events/clk.h:29:2: note: in expansion of macro 'TP_STRUCT__entry'
>   TP_STRUCT__entry(
>   ^
> include/trace/ftrace.h:430:29: note: in expansion of macro '__dynamic_array'
>  #define __string(item, src) __dynamic_array(char, item,   \
>                              ^
> include/trace/events/clk.h:30:3: note: in expansion of macro '__string'
>    __string(        name,           core->name       )
>    ^
>
> and many more ...
>
> Caused by commit 0742a46667e3 ("clk: Add tracepoints for hardware
> operations").
>
> I have used the version of the clk tree from next-20150225 for today
> (since yesterday's tree had a different build problem).

The problem is the patch was written before struct clk_core moved into
the clk.c file and then applied after it moved. So before the move the
order of includes would cause the struct definition to be before the
place where the tracepoint macros were expanded. The fix is to move the
tracepoint include after the struct clk_core definition:

-----8<----

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 9aee501b8284..392477033990 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -22,9 +22,6 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 
-#define CREATE_TRACE_POINTS
-#include <trace/events/clk.h>
-
 #include "clk.h"
 
 static DEFINE_SPINLOCK(enable_lock);
@@ -80,6 +77,9 @@ struct clk_core {
 	struct kref		ref;
 };
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/clk.h>
+
 struct clk {
 	struct clk_core	*core;
 	const char *dev_id;

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

^ permalink raw reply related	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2015-02-27  3:08 Stephen Rothwell
  2015-02-27 17:42 ` Stephen Boyd
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2015-02-27  3:08 UTC (permalink / raw)
  To: Mike Turquette; +Cc: linux-next, linux-kernel, Stephen Boyd

[-- Attachment #1: Type: text/plain, Size: 1343 bytes --]

Hi Mike,

After merging the clk tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from include/trace/define_trace.h:90:0,
                 from include/trace/events/clk.h:198,
                 from drivers/clk/clk.c:26:
include/trace/events/clk.h: In function 'ftrace_get_offsets_clk':
include/trace/events/clk.h:30:40: error: dereferencing pointer to incomplete type
   __string(        name,           core->name       )
                                        ^
include/trace/ftrace.h:465:2: note: in definition of macro 'DECLARE_EVENT_CLASS'
  tstruct;       \
  ^
include/trace/events/clk.h:29:2: note: in expansion of macro 'TP_STRUCT__entry'
  TP_STRUCT__entry(
  ^
include/trace/ftrace.h:430:29: note: in expansion of macro '__dynamic_array'
 #define __string(item, src) __dynamic_array(char, item,   \
                             ^
include/trace/events/clk.h:30:3: note: in expansion of macro '__string'
   __string(        name,           core->name       )
   ^

and many more ...

Caused by commit 0742a46667e3 ("clk: Add tracepoints for hardware
operations").

I have used the version of the clk tree from next-20150225 for today
(since yesterday's tree had a different build problem).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
       [not found] ` <20141216072034.29014.12434@quantum>
@ 2014-12-17  3:47   ` Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2014-12-17  3:47 UTC (permalink / raw)
  To: Mike Turquette; +Cc: linux-next, linux-kernel, Stephen Boyd

[-- Attachment #1: Type: text/plain, Size: 2345 bytes --]

Hi Mike,

On Mon, 15 Dec 2014 23:20:34 -0800 Mike Turquette <mturquette@linaro.org> wrote:
>
> Quoting Stephen Rothwell (2014-12-15 19:45:36)
> > Hi Mike,
> > 
> > After merging the clk tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > In file included from arch/x86/include/asm/bug.h:35:0,
> >                  from include/linux/bug.h:4,
> >                  from include/linux/cpumask.h:12,
> >                  from arch/x86/include/asm/cpumask.h:4,
> >                  from arch/x86/include/asm/msr.h:10,
> >                  from arch/x86/include/asm/processor.h:20,
> >                  from arch/x86/include/asm/atomic.h:6,
> >                  from include/linux/atomic.h:4,
> >                  from include/linux/debug_locks.h:5,
> >                  from include/linux/lockdep.h:23,
> >                  from include/linux/spinlock_types.h:18,
> >                  from include/linux/mutex.h:15,
> >                  from include/linux/notifier.h:13,
> >                  from include/linux/clk.h:17,
> >                  from include/linux/clk-provider.h:14,
> >                  from include/linux/clk-private.h:14,
> >                  from drivers/clk/clk.c:12:
> > drivers/clk/clk.c: In function 'clk_debug_create_one':
> > include/linux/lockdep.h:339:51: error: invalid type argument of '->' (have 'struct mutex')
> >  #define lockdep_is_held(lock) lock_is_held(&(lock)->dep_map)
> >                                                    ^
> > include/asm-generic/bug.h:86:25: note: in definition of macro 'WARN_ON'
> >   int __ret_warn_on = !!(condition);    \
> >                          ^
> > include/linux/lockdep.h:362:27: note: in expansion of macro 'lockdep_is_held'
> >    WARN_ON(debug_locks && !lockdep_is_held(l)); \
> >                            ^
> > drivers/clk/clk.c:248:2: note: in expansion of macro 'lockdep_assert_held'
> >   lockdep_assert_held(clk_debug_lock);
> >   ^
> > 
> > Caused by commit 9a2027b99994 ("clk: Really fix deadlock with
> > mmap_sem").  I wonder how this ever built?
> 
> This was fixed up earlier today. Next run through should be fine.

This is still broken ... and the diff from yesterday's version of the
clk tree was empty :-(
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2014-12-16  3:45 Stephen Rothwell
       [not found] ` <20141216072034.29014.12434@quantum>
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2014-12-16  3:45 UTC (permalink / raw)
  To: Mike Turquette; +Cc: linux-next, linux-kernel, Stephen Boyd

[-- Attachment #1: Type: text/plain, Size: 1934 bytes --]

Hi Mike,

After merging the clk tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from arch/x86/include/asm/bug.h:35:0,
                 from include/linux/bug.h:4,
                 from include/linux/cpumask.h:12,
                 from arch/x86/include/asm/cpumask.h:4,
                 from arch/x86/include/asm/msr.h:10,
                 from arch/x86/include/asm/processor.h:20,
                 from arch/x86/include/asm/atomic.h:6,
                 from include/linux/atomic.h:4,
                 from include/linux/debug_locks.h:5,
                 from include/linux/lockdep.h:23,
                 from include/linux/spinlock_types.h:18,
                 from include/linux/mutex.h:15,
                 from include/linux/notifier.h:13,
                 from include/linux/clk.h:17,
                 from include/linux/clk-provider.h:14,
                 from include/linux/clk-private.h:14,
                 from drivers/clk/clk.c:12:
drivers/clk/clk.c: In function 'clk_debug_create_one':
include/linux/lockdep.h:339:51: error: invalid type argument of '->' (have 'struct mutex')
 #define lockdep_is_held(lock) lock_is_held(&(lock)->dep_map)
                                                   ^
include/asm-generic/bug.h:86:25: note: in definition of macro 'WARN_ON'
  int __ret_warn_on = !!(condition);    \
                         ^
include/linux/lockdep.h:362:27: note: in expansion of macro 'lockdep_is_held'
   WARN_ON(debug_locks && !lockdep_is_held(l)); \
                           ^
drivers/clk/clk.c:248:2: note: in expansion of macro 'lockdep_assert_held'
  lockdep_assert_held(clk_debug_lock);
  ^

Caused by commit 9a2027b99994 ("clk: Really fix deadlock with
mmap_sem").  I wonder how this ever built?

I have used the clk tree from next-20141215 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2014-01-29  3:32 Stephen Rothwell
@ 2014-01-29 10:02 ` Sebastian Hesselbarth
  0 siblings, 0 replies; 44+ messages in thread
From: Sebastian Hesselbarth @ 2014-01-29 10:02 UTC (permalink / raw)
  To: Stephen Rothwell, Mike Turquette; +Cc: linux-next, linux-kernel, Linus

On 01/29/2014 04:32 AM, Stephen Rothwell wrote:
> After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/clk/clk-si5351.c: In function 'si5351_i2c_probe':
> drivers/clk/clk-si5351.c:1314:2: error: too many arguments to function 'si5351_dt_parse'
>    ret = si5351_dt_parse(client, variant);
>    ^
> drivers/clk/clk-si5351.c:1296:12: note: declared here
>   static int si5351_dt_parse(struct i2c_client *client)
>              ^
>
> Caused by commit 9d43dc7f403d ("clk: si5351: remove variant from
> platform_data").
>
> I have used the clk tree from next-20140128 for today.  (Yes, I know that
> Linus already took this - I guess I won't have to worry about it
> tomorrow.)

I wasn't aware that Mike did not sent his PR for v3.14 yet and that
Linus will pick it up that quickly. The patch had been lying around
for a while but was obviously not well compile tested.

Anyway, my patch, my fault: Thanks for fixing it up and sorry for the
inconvenience.

Sebastian

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2014-01-29  3:32 Stephen Rothwell
  2014-01-29 10:02 ` Sebastian Hesselbarth
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2014-01-29  3:32 UTC (permalink / raw)
  To: Mike Turquette; +Cc: linux-next, linux-kernel, Sebastian Hesselbarth, Linus

[-- Attachment #1: Type: text/plain, Size: 747 bytes --]

Hi Mike,

After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/clk/clk-si5351.c: In function 'si5351_i2c_probe':
drivers/clk/clk-si5351.c:1314:2: error: too many arguments to function 'si5351_dt_parse'
  ret = si5351_dt_parse(client, variant);
  ^
drivers/clk/clk-si5351.c:1296:12: note: declared here
 static int si5351_dt_parse(struct i2c_client *client)
            ^

Caused by commit 9d43dc7f403d ("clk: si5351: remove variant from
platform_data").

I have used the clk tree from next-20140128 for today.  (Yes, I know that
Linus already took this - I guess I won't have to worry about it
tomorrow.)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2013-04-15  7:03 ` Sebastian Hesselbarth
@ 2013-04-16  0:42   ` Mike Turquette
  0 siblings, 0 replies; 44+ messages in thread
From: Mike Turquette @ 2013-04-16  0:42 UTC (permalink / raw)
  To: Sebastian Hesselbarth, Stephen Rothwell; +Cc: linux-next, linux-kernel

Quoting Sebastian Hesselbarth (2013-04-15 00:03:23)
> On 04/15/2013 07:04 AM, Stephen Rothwell wrote:
> > After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> >
> > ERROR: "of_clk_add_provider" [drivers/clk/clk-si5351.ko] undefined!
> > ERROR: "of_clk_src_onecell_get" [drivers/clk/clk-si5351.ko] undefined!
> 
> Stephen,
> 
> I must have missed the both above when allowing clk-si5351 to be built
> for !OF. I sent a patch to make clk-si5351 depend on CONFIG_OF until
> we sort it out.
> 
> > ERROR: "__clk_get_flags" [drivers/clk/clk-si5351.ko] undefined!
> 
> I sent a patch to export the above function but Mike must have missed
> it. I resent it on list.
> 

Sorry about missing that export.

I've taken both of your fixes into clk-next.

Regards,
Mike

> Sebastian
> 
> > Caused by commit 9abd5f0555df ("clk: add si5351 i2c common clock
> > driver").  It probbaly need to depend on CONFIG_OF.
> >
> > I have used the clk tree from next-20130412 for today.

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: build failure after merge of the clk tree
  2013-04-15  5:04 Stephen Rothwell
@ 2013-04-15  7:03 ` Sebastian Hesselbarth
  2013-04-16  0:42   ` Mike Turquette
  0 siblings, 1 reply; 44+ messages in thread
From: Sebastian Hesselbarth @ 2013-04-15  7:03 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Mike Turquette, linux-next, linux-kernel

On 04/15/2013 07:04 AM, Stephen Rothwell wrote:
> After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> ERROR: "of_clk_add_provider" [drivers/clk/clk-si5351.ko] undefined!
> ERROR: "of_clk_src_onecell_get" [drivers/clk/clk-si5351.ko] undefined!

Stephen,

I must have missed the both above when allowing clk-si5351 to be built
for !OF. I sent a patch to make clk-si5351 depend on CONFIG_OF until
we sort it out.

> ERROR: "__clk_get_flags" [drivers/clk/clk-si5351.ko] undefined!

I sent a patch to export the above function but Mike must have missed
it. I resent it on list.

Sebastian

> Caused by commit 9abd5f0555df ("clk: add si5351 i2c common clock
> driver").  It probbaly need to depend on CONFIG_OF.
>
> I have used the clk tree from next-20130412 for today.

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: build failure after merge of the clk tree
@ 2013-04-15  5:04 Stephen Rothwell
  2013-04-15  7:03 ` Sebastian Hesselbarth
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2013-04-15  5:04 UTC (permalink / raw)
  To: Mike Turquette; +Cc: linux-next, linux-kernel, Sebastian Hesselbarth

[-- Attachment #1: Type: text/plain, Size: 566 bytes --]

Hi Mike,

After merging the clk tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: "of_clk_add_provider" [drivers/clk/clk-si5351.ko] undefined!
ERROR: "of_clk_src_onecell_get" [drivers/clk/clk-si5351.ko] undefined!
ERROR: "__clk_get_flags" [drivers/clk/clk-si5351.ko] undefined!

Caused by commit 9abd5f0555df ("clk: add si5351 i2c common clock
driver").  It probbaly need to depend on CONFIG_OF.

I have used the clk tree from next-20130412 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

end of thread, other threads:[~2024-01-04  0:59 UTC | newest]

Thread overview: 44+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-26  2:14 linux-next: build failure after merge of the clk tree Stephen Rothwell
2015-02-26  9:09 ` Krzysztof Kozlowski
2015-02-27  0:01   ` Mike Turquette
2015-02-27  0:06     ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2024-01-03 23:04 Stephen Rothwell
2024-01-04  0:59 ` Stephen Boyd
2023-04-02 23:59 Stephen Rothwell
2023-04-05  0:28 ` Stephen Rothwell
2020-05-11  0:55 Stephen Rothwell
2020-05-13  3:20 ` Stephen Boyd
2020-05-13  3:28 ` Stephen Boyd
2020-01-07 21:47 Stephen Rothwell
2019-07-02  0:01 Stephen Rothwell
2019-07-02  1:14 ` Stephen Rothwell
2019-07-02  2:03   ` Stephen Rothwell
2019-07-05  1:24     ` Stephen Rothwell
2019-07-12 17:53     ` Stephen Boyd
2019-05-02 23:25 Stephen Rothwell
2019-05-03 15:55 ` Stephen Boyd
2018-11-29 22:03 Stephen Rothwell
2018-01-01 21:51 Stephen Rothwell
2018-01-02 19:58 ` Stephen Boyd
2017-12-10 23:16 Stephen Rothwell
2017-12-14  0:57 ` Stephen Boyd
2017-06-05  0:14 Stephen Rothwell
2015-08-12  7:19 Stephen Rothwell
2015-08-12  7:45 ` Geert Uytterhoeven
2015-08-12  8:23   ` Stephen Boyd
2015-08-12  8:03 ` Stephen Boyd
2015-07-27  4:11 Stephen Rothwell
2015-08-03 10:08 ` Tony Lindgren
2015-08-07 23:56   ` Stephen Boyd
2015-08-13 11:04 ` Olof Johansson
2015-02-27  3:08 Stephen Rothwell
2015-02-27 17:42 ` Stephen Boyd
2015-03-04  9:56   ` Geert Uytterhoeven
2015-03-05  0:15     ` Mike Turquette
2014-12-16  3:45 Stephen Rothwell
     [not found] ` <20141216072034.29014.12434@quantum>
2014-12-17  3:47   ` Stephen Rothwell
2014-01-29  3:32 Stephen Rothwell
2014-01-29 10:02 ` Sebastian Hesselbarth
2013-04-15  5:04 Stephen Rothwell
2013-04-15  7:03 ` Sebastian Hesselbarth
2013-04-16  0:42   ` Mike Turquette

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).