Skip to contentSkip to conversation

dmaengine: edma: fix build without CONFIG_OF

PATCH Applied Arnd Bergmann 3 participants 6 messages Nov 3, 2015 – Nov 16, 2015 dmaengine

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dmaengine: edma: fix build without CONFIG_OF

During the edma rework, a build error was introduced for the case that CONFIG_OF is disabled:

drivers/built-in.o: In function `edma_tc_set_pm_state':
:(.text+0x43bf0): undefined reference to `of_find_device_by_node'

As the edma_tc_set_pm_state() function does nothing in case we are running without OF, this adds an IS_ENABLED() check that turns the function into an empty stub then and avoids the link error.

Fixes ca304fa9bb76 ("ARM/dmaengine: edma: Public API to use private struct pointer")

---
Found on ARM randconfig builds with today's linux-next

drivers/dma/edma.c +1 -1
index 31722d436a42..16713a93da10 100644
@@ -1560,7 +1560,7 @@ static void edma_tc_set_pm_state(struct edma_tc *tc, bool enable)
 	struct platform_device *tc_pdev;
 	int ret;
 
-	if (!tc)
+	if (!IS_ENABLED(CONFIG_OF) || !tc)
 		return;
 
 	tc_pdev = of_find_device_by_node(tc->node);
#1 lore raw
Quoted 6 lines · Arnd Bergmann

During the edma rework, a build error was introduced for the case that CONFIG_OF is disabled:

drivers/built-in.o: In function `edma_tc_set_pm_state':
:(.text+0x43bf0): undefined reference to `of_find_device_by_node'

Quoted 7 lines

As the edma_tc_set_pm_state() function does nothing in case we are running without OF, this adds an IS_ENABLED() check that turns the function into an empty stub then and avoids the link error.

Fixes ca304fa9bb76 ("ARM/dmaengine: edma: Public API to use private struct pointer")

The actual commit this patch is fixing is:
1be5336bc7ba dmaengine: edma: New device tree binding

Quoted 2 lines

---
Found on ARM randconfig builds with today's linux-next

I have sanity built the kernel with omap2plus_defconfig and davinci_all_defconfig since eDMA is used by these platforms and did not faced with this issue, as obviously these defconfigs will result OF to be enabled.

drivers/dma/edma.c static void edma_tc_set_pm_state(struct edma_tc *tc, bool enable) · line 1564

Quoted 11 lines
drivers/dma/edma.c +1 -1
index 31722d436a42..16713a93da10 100644
@@ -1560,7 +1560,7 @@ static void edma_tc_set_pm_state(struct edma_tc *tc, bool enable)
 	struct platform_device *tc_pdev;
 	int ret;
 
-	if (!tc)
+	if (!IS_ENABLED(CONFIG_OF) || !tc)
 		return;

Should we instead put the function inside of:
#if IS_ENABLED(CONFIG_OF)
static void edma_tc_set_pm_state(struct edma_tc *tc, bool enable) {
...
}
#else
static inline void edma_tc_set_pm_state(struct edma_tc *tc, bool enable) {
}
#endif /* IS_ENABLED(CONFIG_OF) */

Quoted 3 lines
drivers/dma/edma.c +0 -0
 	tc_pdev = of_find_device_by_node(tc->node);
 
Signature · 1 line
P?ter
#2 lore raw
Quoted 12 lines · On Wednesday 04 November 2015 09:42:35 Peter Ujfalusi wrote:
Quoted 11 lines · Arnd Bergmann

During the edma rework, a build error was introduced for the case that CONFIG_OF is disabled:

drivers/built-in.o: In function `edma_tc_set_pm_state':
:(.text+0x43bf0): undefined reference to `of_find_device_by_node'

As the edma_tc_set_pm_state() function does nothing in case we are running without OF, this adds an IS_ENABLED() check that turns the function into an empty stub then and avoids the link error.

Quoted 5 lines
Quoted 2 lines
Fixes ca304fa9bb76 ("ARM/dmaengine: edma: Public API to use private struct pointer")

The actual commit this patch is fixing is:
1be5336bc7ba dmaengine: edma: New device tree binding

That's what I first thought, but it seems to just move around the call to of_find_device_by_node that was first introduced in the commit I mentioned. Did you build-test it successfully with ca304fa9bb76 and CONFIG_OF enabled? I have to admit that I was just guessing from the contents and did not bisect this fully.

Quoted 6 lines
Quoted 2 lines

---
Found on ARM randconfig builds with today's linux-next

I have sanity built the kernel with omap2plus_defconfig and davinci_all_defconfig since eDMA is used by these platforms and did not faced with this issue, as obviously these defconfigs will result OF to be enabled.

Right. The defconfigs were all fine, and this is hard to hit even in the randconfig builds.

Quoted 8 lines
Quoted 8 lines
drivers/dma/edma.c +0 -0
index 31722d436a42..16713a93da10 100644
@@ -1560,7 +1560,7 @@ static void edma_tc_set_pm_state(struct edma_tc *tc, bool enable)
      struct platform_device *tc_pdev;
      int ret;
 
Quoted 15 lines

drivers/dma/edma.c static void edma_tc_set_pm_state(struct edma_tc *tc, bool enable) · line 1564

Quoted 3 lines
drivers/dma/edma.c +1 -1
-     if (!tc)
+     if (!IS_ENABLED(CONFIG_OF) || !tc)
              return;

Should we instead put the function inside of:
#if IS_ENABLED(CONFIG_OF)
static void edma_tc_set_pm_state(struct edma_tc *tc, bool enable) {
...
}
#else
static inline void edma_tc_set_pm_state(struct edma_tc *tc, bool enable) {
}
#endif /* IS_ENABLED(CONFIG_OF) */

I think that would be less readable, and gives no compile-time coverage to the contents of the edma_tc_set_pm_state function.

The effect is the same, so I'd rather stay with my version.

Arnd

#3 lore raw
Quoted 19 lines · Arnd Bergmann
Quoted 12 lines · On Wednesday 04 November 2015 09:42:35 Peter Ujfalusi wrote:
Quoted 11 lines · Arnd Bergmann

During the edma rework, a build error was introduced for the case that CONFIG_OF is disabled:

drivers/built-in.o: In function `edma_tc_set_pm_state':
:(.text+0x43bf0): undefined reference to `of_find_device_by_node'

As the edma_tc_set_pm_state() function does nothing in case we are running without OF, this adds an IS_ENABLED() check that turns the function into an empty stub then and avoids the link error.

Quoted 5 lines
Quoted 2 lines
Fixes ca304fa9bb76 ("ARM/dmaengine: edma: Public API to use private struct pointer")

The actual commit this patch is fixing is:
1be5336bc7ba dmaengine: edma: New device tree binding

Quoted 6 lines

That's what I first thought, but it seems to just move around the call to of_find_device_by_node that was first introduced in the commit I mentioned. Did you build-test it successfully with ca304fa9bb76 and CONFIG_OF enabled? I have to admit that I was just guessing from the contents and did not bisect this fully.

Ah, I see. That of_find_device_by_node() was used by the function used to build the unused channel list for the legacy old code. The whole unused channel list has been removed by the new DT binding patch since it was bogus to start with and there is no need for it anymore.

Quoted 10 lines
Quoted 7 lines
Quoted 3 lines

---
Found on ARM randconfig builds with today's linux-next

I have sanity built the kernel with omap2plus_defconfig and davinci_all_defconfig since eDMA is used by these platforms and did not faced with this issue, as obviously these defconfigs will result OF to be enabled.

Right. The defconfigs were all fine, and this is hard to hit even in the randconfig builds.

I just did a sanity clean _defconfig builds and they both built fine (even w/o this patch), phew.

Quoted 24 lines
Quoted 8 lines
Quoted 8 lines
drivers/dma/edma.c +0 -0
index 31722d436a42..16713a93da10 100644
@@ -1560,7 +1560,7 @@ static void edma_tc_set_pm_state(struct edma_tc *tc, bool enable)
      struct platform_device *tc_pdev;
      int ret;
 
Quoted 15 lines

drivers/dma/edma.c static void edma_tc_set_pm_state(struct edma_tc *tc, bool enable) · line 1564

Quoted 3 lines
drivers/dma/edma.c +1 -1
-     if (!tc)
+     if (!IS_ENABLED(CONFIG_OF) || !tc)
              return;

Should we instead put the function inside of:
#if IS_ENABLED(CONFIG_OF)
static void edma_tc_set_pm_state(struct edma_tc *tc, bool enable) {
...
}
#else
static inline void edma_tc_set_pm_state(struct edma_tc *tc, bool enable) {
}
#endif /* IS_ENABLED(CONFIG_OF) */

Quoted 2 lines

I think that would be less readable, and gives no compile-time coverage to the contents of the edma_tc_set_pm_state function.

Hrm, if the compiler knows that there is no need to compile the code after the:
if (!IS_ENABLED(CONFIG_OF) || !tc)
when OF is disabled, then it does not give more compile coverage then have empty inline function in case of !OF.
Not sure about it, but if we disable all optimization in gcc, then we might get the same missing symbol?

Quoted 1 line

The effect is the same, so I'd rather stay with my version.

I'm fine with both. It is up to Vinod to decide which one he prefers (I prefer the #if #else #endif version).

Anyways:

#4 lore raw
Quoted 8 lines · On Wednesday 04 November 2015 11:05:54 Peter Ujfalusi wrote:
Quoted 3 lines

I think that would be less readable, and gives no compile-time coverage to the contents of the edma_tc_set_pm_state function.

Hrm, if the compiler knows that there is no need to compile the code after the:
if (!IS_ENABLED(CONFIG_OF) || !tc)
when OF is disabled, then it does not give more compile coverage then have empty inline function in case of !OF.

No, the way it works (simplified but close enough here) is that gcc parses all the source code first and throws warnings or errors for everything that looks wrong to it, and only later throws out all code that it knows is never used before emitting the object code.

The difference to the #ifdef is that the preprocessor here throws out all disabled code before it gets parsed, so we don't get warnings for it.

Quoted 2 lines

Not sure about it, but if we disable all optimization in gcc, then we might get the same missing symbol?

It's impossible to build the kernel with inlining disabled, because we rely on the same kind of optimization in lots of places.

Quoted 7 lines
Quoted 1 line

The effect is the same, so I'd rather stay with my version.

I'm fine with both. It is up to Vinod to decide which one he prefers (I prefer the #if #else #endif version).

Anyways:

Thanks!

Arnd

Applied
#5 lore raw
In reply to Arnd Bergmann
Quoted 10 lines · Arnd Bergmann

During the edma rework, a build error was introduced for the case that CONFIG_OF is disabled:

drivers/built-in.o: In function `edma_tc_set_pm_state':
:(.text+0x43bf0): undefined reference to `of_find_device_by_node'

As the edma_tc_set_pm_state() function does nothing in case we are running without OF, this adds an IS_ENABLED() check that turns the function into an empty stub then and avoids the link error.

Applied, thanks

Signature · 1 line
~Vinod