lkml.org 
[lkml]   [2014]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 3.13 000/149] 3.13.7-stable review
Thomas Backlund skrev 21.3.2014 10:42:
> Guenter Roeck skrev 21.3.2014 07:37:
>> On 03/20/2014 05:02 PM, Greg Kroah-Hartman wrote:
>>> This is the start of the stable review cycle for the 3.13.7 release.
>>> There are 149 patches in this series, all will be posted as a response
>>> to this one. If anyone has any issues with these being applied, please
>>> let me know.
>>>
>>> Responses should be made by Sun Mar 23 00:03:54 UTC 2014.
>>> Anything received after that time might be too late.
>>>
>>
>> Build results:
>> total: 126 pass: 120 skipped: 4 fail: 2
>>
>> qemu tests all passed.
>>
>> There are two new build failures.
>>
>> Building powerpc:mpc85xx_defconfig ... failed
>> Building powerpc:mpc85xx_smp_defconfig ... failed
>>
>> The failure is the same in both cases.
>>
>> drivers/i2c/busses/i2c-cpm.c: In function 'cpm_i2c_setup':
>> drivers/i2c/busses/i2c-cpm.c:450:2: error: implicit declaration of
>> function 'irq_of_parse_and_map' [-Werror=implicit-function-declaration]
>> drivers/i2c/busses/i2c-cpm.c:461:2: error: implicit declaration of
>> function 'of_iomap' [-Werror=implicit-function-declaration]
>>
>> It appears you picked this up from the latest mainline, where the
>> same builds fail with the same error. The problem was introduced
>> in mainline between rc6 and rc7.
>>
>> I have no immediate idea which patch causes the problem.
>> I can bisect tomorrow if needed.
>
> Probably this one exposing additional code to be built:
>
>
> From 62c19c9d29e65086e5ae76df371ed2e6b23f00cd Mon Sep 17 00:00:00 2001
> From: Richard Weinberger <richard@nod.at>
> Date: Sun, 9 Feb 2014 19:47:40 +0100
> Subject: i2c: Remove usage of orphaned symbol OF_I2C
>
> From: Richard Weinberger <richard@nod.at>
>
> commit 62c19c9d29e65086e5ae76df371ed2e6b23f00cd upstream.
>
> The symbol is an orphan, don't depend on it anymore.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
> [wsa: enhanced commit message]
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
> Fixes: 687b81d083c0 (i2c: move OF helpers into the core)
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
> drivers/i2c/busses/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -387,7 +387,7 @@ config I2C_CBUS_GPIO
>
> config I2C_CPM
> tristate "Freescale CPM1 or CPM2 (MPC8xx/826x)"
> - depends on (CPM1 || CPM2) && OF_I2C
> + depends on CPM1 || CPM2
> help
> This supports the use of the I2C interface on Freescale
> processors with CPM1 or CPM2.
>
>


and the buildfix was posted to upstream and -stable a couple of days ago
(not in upstream linus tree yet), with subject:

[PATCH] i2c-cpm: Fix build by adding of_address.h and of_irq.h


Fixes a build break due to the undeclared use of irq_of_parse_and_map()
and of_iomap(). This build break was apparently introduced while the
driver was unbuildable due to the bug fixed by
62c19c9d29e65086e5ae76df371ed2e6b23f00cd ("i2c: Remove usage of
orphaned symbol OF_I2C"). When 62c19c was added in v3.14-rc7,
the driver was enabled again, breaking the powerpc mpc85xx_defconfig
and mpc85xx_smp_defconfig.

62c19c is marked for stable, so this should go there as well.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: stable@kernel.org
---
There are still warnings in this driver that suggest it is broken with
CONFIG_PHYS_64BIT, but that part does not appear to be a regression.

drivers/i2c/busses/i2c-cpm.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index be7f0a2..f3b89a4 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -39,7 +39,9 @@
#include <linux/i2c.h>
#include <linux/io.h>
#include <linux/dma-mapping.h>
+#include <linux/of_address.h>
#include <linux/of_device.h>
+#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <sysdev/fsl_soc.h>
#include <asm/cpm.h>
--
1.8.3.2

--
Thomas



\
 
 \ /
  Last update: 2014-03-21 10:41    [W:0.439 / U:0.116 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site