ARM: imx: Fix the removal of CONFIG_SPI option

PATCH Superseded Fabio Estevam 4 participants 7 messages Nov 4, 2014

Subsystems (3)

Arm (32-bit) Media (V4L/DVB) Arm i.MX and Layerscape

lore

Share & tools

lore

Fabio Estevam

author reviewer

2014-11-04 10:28 UTC #0 lore raw

PATCH v2 1/1 ARM: imx: Fix the removal of CONFIG_SPI option

From: Fabio Estevam <[email protected]>

Since 64546e9fe3a5b8c ("ARM: imx_v6_v7_defconfig updates") and commit 0650f855d2e4b0b9 ("ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM") CONFIG_SPI selection was dropped by savedefconfig for imx_v4_v5_defconfig and imx_v6_v7_defconfig.

In order to keep the same behaviour as previous kernel versions and avoid regressions, let's add CONFIG_SPI option back.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Add commit id's that caused the issue.

Shawn,

If possible, please apply this as a bug fix for 3.18.

 arch/arm/configs/imx_v4_v5_defconfig | 1 +
 arch/arm/configs/imx_v6_v7_defconfig | 1 +
 2 files changed, 2 insertions(+)

arch/arm/configs/imx_v4_v5_defconfig +1 -0

index e688741..e6b0007 100644
@@ -97,6 +97,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_IMX=y
+CONFIG_SPI=y
 CONFIG_SPI_IMX=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_GPIO_SYSFS=y

arch/arm/configs/imx_v6_v7_defconfig +1 -0

index 8fca6e2..6790f1b 100644
@@ -158,6 +158,7 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_ALGOPCF=m
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_IMX=y
+CONFIG_SPI=y
 CONFIG_SPI_IMX=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_MC9S08DZ60=y

Signature · 1 line

1.9.1

Shawn Guo

Applied

2014-11-04 11:07 UTC #1 lore raw

PATCH v2 1/1 ARM: imx: Fix the removal of CONFIG_SPI option

Quoted 11 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>
Since 64546e9fe3a5b8c ("ARM: imx_v6_v7_defconfig updates") and commit 0650f855d2e4b0b9 ("ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM") CONFIG_SPI selection was dropped by savedefconfig for imx_v4_v5_defconfig and imx_v6_v7_defconfig.
In order to keep the same behaviour as previous kernel versions and avoid regressions, let's add CONFIG_SPI option back.
Signed-off-by Fabio Estevam <[email protected]>

Applied, thanks.

Fabio Estevam

author reviewer

2014-11-04 15:05 UTC #2 lore raw

PATCH v2 1/1 ARM: imx: Fix the removal of CONFIG_SPI option

Shawn,

Quoted 8 lines · Shawn Guo

Quoted 7 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Since 64546e9fe3a5b8c ("ARM: imx_v6_v7_defconfig updates") and commit 0650f855d2e4b0b9 ("ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM") CONFIG_SPI selection was dropped by savedefconfig for imx_v4_v5_defconfig and imx_v6_v7_defconfig.

Quoted 6 lines

Quoted 4 lines
In order to keep the same behaviour as previous kernel versions and avoid regressions, let's add CONFIG_SPI option back.
Signed-off-by Fabio Estevam <[email protected]>
Applied, thanks.

I have just sent a v3, with an explanation as to why savedefconfig dropped CONFIG_SPI=y.

Thanks to Uwe for his analysis!

Uwe Kleine-König

2014-11-04 15:26 UTC #3 lore raw

PATCH v2 1/1 ARM: imx: Fix the removal of CONFIG_SPI option

In reply to Fabio Estevam

[Note, this is a resend of a mail I accidently only sent to Fabio before.]

Hello,

Quoted 7 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>
Since 64546e9fe3a5b8c ("ARM: imx_v6_v7_defconfig updates") and commit 0650f855d2e4b0b9 ("ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM") CONFIG_SPI selection was dropped by savedefconfig for imx_v4_v5_defconfig and imx_v6_v7_defconfig.

Quoted 7 lines

In order to keep the same behaviour as previous kernel versions and avoid regressions, let's add CONFIG_SPI option back.
Signed-off-by Fabio Estevam <[email protected]>
---
Changes since v1:
- Add commit id's that caused the issue.

on top of 64546e9fe3a5b8c doing

make imx_v6_v7_defconfig

resulted in CONFIG_SPI=y. That's because MEDIA_SUBDRV_AUTOSELECT selects SPI and has default y.

So the commit that really broke imx_v6_v7_defconfig is 7d24c514e8e0 ([media] Kconfig: do not select SPI bus on sub-driver auto-select). On a side note I wonder how that commit sneaked into v3.17-rc6.

I think people need to be more aware of the results of Kconfig changes
...

Best regards
Uwe

Signature · 2 lines

Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

Antti Palosaari

2014-11-04 15:55 UTC #4 lore raw

PATCH v2 1/1 ARM: imx: Fix the removal of CONFIG_SPI option

Moikka!

Quoted 24 lines · Uwe Kleine-K?nig

[Note, this is a resend of a mail I accidently only sent to Fabio before.]
Hello,
Quoted 7 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Since 64546e9fe3a5b8c ("ARM: imx_v6_v7_defconfig updates") and commit 0650f855d2e4b0b9 ("ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM") CONFIG_SPI selection was dropped by savedefconfig for imx_v4_v5_defconfig and imx_v6_v7_defconfig.
Quoted 7 lines
In order to keep the same behaviour as previous kernel versions and avoid regressions, let's add CONFIG_SPI option back.
Signed-off-by Fabio Estevam <[email protected]>
---
Changes since v1:
- Add commit id's that caused the issue.
on top of 64546e9fe3a5b8c doing
make imx_v6_v7_defconfig

Quoted 8 lines

resulted in CONFIG_SPI=y. That's because MEDIA_SUBDRV_AUTOSELECT selects SPI and has default y.
So the commit that really broke imx_v6_v7_defconfig is 7d24c514e8e0 ([media] Kconfig: do not select SPI bus on sub-driver auto-select). On a side note I wonder how that commit sneaked into v3.17-rc6.
I think people need to be more aware of the results of Kconfig changes

I added that SPI select patch for 3.17-rc1 and it was removed right after I got bug report it should not be there. But there was of course some delay and removal patch went to 3.17-rc6.

But all in all, it was all happening during 3.17 period and I wonder how it could affect you?

Here are related discussions:

[GIT PULL for 3.17-rc1] media updates for next
https://lkml.org/lkml/2014/8/5/646

Autoselecting SPI for MEDIA_SUBDRV_AUTOSELECT?
https://lkml.org/lkml/2014/8/22/325

[PATCH] Kconfig: do not select SPI bus on sub-driver auto-select
https://lkml.org/lkml/2014/8/22/452

[GIT PULL 3.17] FIX: remove SPI select from Kconfig
http://permalink.gmane.org/gmane.linux.drivers.video-input-infrastructure/81346

[GIT PULL for v3.17-rc6] media fixes
https://lkml.org/lkml/2014/9/21/44

regards
Antti

Signature · 1 line

http://palosaari.fi/

Uwe Kleine-König

2014-11-04 19:18 UTC #5 lore raw

PATCH v2 1/1 ARM: imx: Fix the removal of CONFIG_SPI option

Hello,

Quoted 32 lines · Antti Palosaari

Quoted 31 lines · Uwe Kleine-K?nig
[Note, this is a resend of a mail I accidently only sent to Fabio before.]
Hello,
Quoted 7 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Since 64546e9fe3a5b8c ("ARM: imx_v6_v7_defconfig updates") and commit 0650f855d2e4b0b9 ("ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM") CONFIG_SPI selection was dropped by savedefconfig for imx_v4_v5_defconfig and imx_v6_v7_defconfig.
Quoted 7 lines
In order to keep the same behaviour as previous kernel versions and avoid regressions, let's add CONFIG_SPI option back.
Signed-off-by Fabio Estevam <[email protected]>
---
Changes since v1:
- Add commit id's that caused the issue.
on top of 64546e9fe3a5b8c doing
make imx_v6_v7_defconfig
resulted in CONFIG_SPI=y. That's because MEDIA_SUBDRV_AUTOSELECT selects SPI and has default y.
So the commit that really broke imx_v6_v7_defconfig is 7d24c514e8e0 ([media] Kconfig: do not select SPI bus on sub-driver auto-select). On a side note I wonder how that commit sneaked into v3.17-rc6.

Quoted 5 lines

Quoted 1 line
I think people need to be more aware of the results of Kconfig changes
I added that SPI select patch for 3.17-rc1 and it was removed right after I got bug report it should not be there. But there was of course some delay and removal patch went to 3.17-rc6.

Still I think that -rc6 is quite late for such a patch. But obviously I'm not the relevant maintainer here and YMMV.

Quoted 2 lines

But all in all, it was all happening during 3.17 period and I wonder how it could affect you?

Commit 64546e9fe3a5 was based on v3.17-rc3 and so had the "select SPI". That's why savedefconfig removed CONFIG_SPI=y from the minimized config.

Dropping the select for -rc6 resulted in imx_v6_v7_defconfig not including CONFIG_SPI any more.

I checked all commits listed by:

	git log --oneline linus/master ^e4462ffc1602 -SCONFIG_SPI

and the two imx defconfigs are the only ones being affected by this issue.

Best regards
Uwe

Signature · 2 lines

Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

Antti Palosaari

2014-11-04 19:26 UTC #6 lore raw

PATCH v2 1/1 ARM: imx: Fix the removal of CONFIG_SPI option

Moikka,

Quoted 35 lines · Uwe Kleine-K?nig

Hello,
Quoted 32 lines · Antti Palosaari
Quoted 31 lines · Uwe Kleine-K?nig
[Note, this is a resend of a mail I accidently only sent to Fabio before.]
Hello,
Quoted 7 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Since 64546e9fe3a5b8c ("ARM: imx_v6_v7_defconfig updates") and commit 0650f855d2e4b0b9 ("ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM") CONFIG_SPI selection was dropped by savedefconfig for imx_v4_v5_defconfig and imx_v6_v7_defconfig.
Quoted 7 lines
In order to keep the same behaviour as previous kernel versions and avoid regressions, let's add CONFIG_SPI option back.
Signed-off-by Fabio Estevam <[email protected]>
---
Changes since v1:
- Add commit id's that caused the issue.
on top of 64546e9fe3a5b8c doing
make imx_v6_v7_defconfig
resulted in CONFIG_SPI=y. That's because MEDIA_SUBDRV_AUTOSELECT selects SPI and has default y.
So the commit that really broke imx_v6_v7_defconfig is 7d24c514e8e0 ([media] Kconfig: do not select SPI bus on sub-driver auto-select). On a side note I wonder how that commit sneaked into v3.17-rc6.

Quoted 7 lines

Quoted 5 lines
Quoted 1 line
I think people need to be more aware of the results of Kconfig changes
I added that SPI select patch for 3.17-rc1 and it was removed right after I got bug report it should not be there. But there was of course some delay and removal patch went to 3.17-rc6.
Still I think that -rc6 is quite late for such a patch. But obviously I'm not the relevant maintainer here and YMMV.

Yes, it is late. I send PULL request last day of rc1, but media fixes are not send for every rc, instead for rc1 and 1-2 times after that, usually very near end of merge window.

Quoted 11 lines

Quoted 3 lines
But all in all, it was all happening during 3.17 period and I wonder how it could affect you?
Commit 64546e9fe3a5 was based on v3.17-rc3 and so had the "select SPI". That's why savedefconfig removed CONFIG_SPI=y from the minimized config.
Dropping the select for -rc6 resulted in imx_v6_v7_defconfig not including CONFIG_SPI any more.
I checked all commits listed by:

Quoted 8 lines

	git log --oneline linus/master ^e4462ffc1602 -SCONFIG_SPI
and the two imx defconfigs are the only ones being affected by this issue.
Best regards
Uwe

regards
Antti

Signature · 1 line

http://palosaari.fi/