Skip to contentSkip to conversation

mtd: cfi: allow building spi-intel standalone

PATCH Applied Arnd Bergmann 6 participants 10 messages Dec 20, 2022 – Jan 2, 2023

Subsystems (2)
Memory technology devices (MTD) SPI NOR
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH v2 1/1 mtd: cfi: allow building spi-intel standalone

From: Arnd Bergmann <[email protected]>

When MTD or MTD_CFI_GEOMETRY is disabled, the spi-intel driver fails to build, as it includes the shared CFI header:

include/linux/mtd/cfi.h:62:2: error: #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work. [-Werror=cpp]
62 | #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work.

linux/mtd/spi-nor.h does not actually need to include cfi.h, so remove the inclusion here to fix the warning. This uncovers a missing #include in spi-nor/core.c so add that there to prevent a different build issue.

Fixes e23e5a05d1fd ("mtd: spi-nor: intel-spi: Convert to SPI MEM")
Signed-off-by Arnd Bergmann <[email protected]>
---
 drivers/mtd/spi-nor/core.c  | 1 +
 include/linux/mtd/spi-nor.h | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/spi-nor/core.c +1 -0
index d8703d7dfd0a..d67c926bca8b 100644
@@ -10,6 +10,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/module.h>
+#include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <linux/math64.h>
include/linux/mtd/spi-nor.h +0 -1
index 25765556223a..a3f8cdca90c8 100644
@@ -7,7 +7,6 @@
 #define __LINUX_MTD_SPI_NOR_H
 
 #include <linux/bitops.h>
-#include <linux/mtd/cfi.h>
 #include <linux/mtd/mtd.h>
 #include <linux/spi/spi-mem.h>
Signature · 1 line
2.35.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 8 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When MTD or MTD_CFI_GEOMETRY is disabled, the spi-intel driver fails to build, as it includes the shared CFI header:

include/linux/mtd/cfi.h:62:2: error: #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work. [-Werror=cpp]
62 | #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work.

Quoted 7 lines

linux/mtd/spi-nor.h does not actually need to include cfi.h, so remove the inclusion here to fix the warning. This uncovers a missing #include in spi-nor/core.c so add that there to prevent a different build issue.

Fixes e23e5a05d1fd ("mtd: spi-nor: intel-spi: Convert to SPI MEM")
Signed-off-by Arnd Bergmann <[email protected]>
Reviewed-by Mika Westerberg <[email protected]>
#2 lore raw
In reply to Arnd Bergmann

Hi, Arnd,

Quoted 8 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When MTD or MTD_CFI_GEOMETRY is disabled, the spi-intel driver fails to build, as it includes the shared CFI header:

include/linux/mtd/cfi.h:62:2: error: #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work. [-Werror=cpp]
62 | #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work.

Quoted 7 lines

linux/mtd/spi-nor.h does not actually need to include cfi.h, so remove the inclusion here to fix the warning. This uncovers a missing #include in spi-nor/core.c so add that there to prevent a different build issue.

Fixes e23e5a05d1fd ("mtd: spi-nor: intel-spi: Convert to SPI MEM")
Signed-off-by Arnd Bergmann <[email protected]>

Looks good to me. I'll let the linux-0day bot run over it and apply it once -rc1 is out.

Thanks,
ta

maintainer
#3 lore raw

Hi Tudor,

[email protected] wrote on Tue, 20 Dec 2022 17:44:49 +0200:

Quoted 16 lines

Hi, Arnd,

Quoted 13 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When MTD or MTD_CFI_GEOMETRY is disabled, the spi-intel driver fails to build, as it includes the shared CFI header:

include/linux/mtd/cfi.h:62:2: error: #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work. [-Werror=cpp]
62 | #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work.

linux/mtd/spi-nor.h does not actually need to include cfi.h, so remove the inclusion here to fix the warning. This uncovers a missing #include in spi-nor/core.c so add that there to prevent a different build issue.

Quoted 5 lines
Quoted 2 lines
Fixes e23e5a05d1fd ("mtd: spi-nor: intel-spi: Convert to SPI MEM")
Signed-off-by Arnd Bergmann <[email protected]>

Looks good to me. I'll let the linux-0day bot run over it and apply it once -rc1 is out.

The issue sometimes produces build errors, shall I send it through a fixes PR instead?

Thanks,
Miquèl

#4 lore raw
Quoted 2 lines · Miquel Raynal

Hi Tudor,

Hi,

Quoted 18 lines

[email protected] wrote on Tue, 20 Dec 2022 17:44:49 +0200:

Quoted 16 lines

Hi, Arnd,

Quoted 13 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When MTD or MTD_CFI_GEOMETRY is disabled, the spi-intel driver fails to build, as it includes the shared CFI header:

include/linux/mtd/cfi.h:62:2: error: #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work. [-Werror=cpp]
62 | #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work.

linux/mtd/spi-nor.h does not actually need to include cfi.h, so remove the inclusion here to fix the warning. This uncovers a missing #include in spi-nor/core.c so add that there to prevent a different build issue.

Quoted 9 lines
Quoted 5 lines
Quoted 2 lines
Fixes e23e5a05d1fd ("mtd: spi-nor: intel-spi: Convert to SPI MEM")
Signed-off-by Arnd Bergmann <[email protected]>

Looks good to me. I'll let the linux-0day bot run over it and apply it once -rc1 is out.

The issue sometimes produces build errors, shall I send it through a fixes PR instead?

Yes, that I was thinking about.

Thanks,
ta

Reviewed-by
#5 lore raw
Quoted 29 lines · Tudor Ambarus
Quoted 2 lines · Miquel Raynal

Hi Tudor,

Hi,

Quoted 21 lines

[email protected] wrote on Tue, 20 Dec 2022 17:44:49 +0200:

Quoted 19 lines

Hi, Arnd,

Quoted 15 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When MTD or MTD_CFI_GEOMETRY is disabled, the spi-intel driver fails to build, as it includes the shared CFI header:

include/linux/mtd/cfi.h:62:2: error: #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work. [-Werror=cpp] 62 | #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work.

linux/mtd/spi-nor.h does not actually need to include cfi.h, so remove the inclusion here to fix the warning. This uncovers a missing #include in spi-nor/core.c so add that there to prevent a different build issue.

Fixes e23e5a05d1fd ("mtd: spi-nor: intel-spi: Convert to SPI MEM")
Signed-off-by Arnd Bergmann <[email protected]>
Quoted 9 lines
Quoted 6 lines
Quoted 2 lines

Looks good to me. I'll let the linux-0day bot run over it and apply it once -rc1 is out.

The issue sometimes produces build errors, shall I send it through a fixes PR instead?

Yes, that I was thinking about.

Seems that I shouldn't push to mtd/fixes, so:

Reviewed-by Tudor Ambarus <[email protected]>
maintainer
#6 lore raw

Hi Tudor,

[email protected] wrote on Mon, 26 Dec 2022 16:22:02 +0200:

Quoted 37 lines · Tudor Ambarus
Quoted 36 lines · Miquel Raynal
Quoted 2 lines

Hi Tudor,

Hi,

Quoted 27 lines

[email protected] wrote on Tue, 20 Dec 2022 17:44:49 +0200:

Quoted 16 lines

Hi, Arnd,

Quoted 13 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When MTD or MTD_CFI_GEOMETRY is disabled, the spi-intel driver fails to build, as it includes the shared CFI header:

include/linux/mtd/cfi.h:62:2: error: #warning No CONFIG_MTD_CFI_Ix >>>> selected. No NOR chip support can work. [-Werror=cpp] 62 | #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip >>>> support can work.

linux/mtd/spi-nor.h does not actually need to include cfi.h, so remove the inclusion here to fix the warning. This uncovers a missing #include in spi-nor/core.c so add that there to prevent a different build issue.

Quoted 5 lines
Quoted 2 lines
Fixes e23e5a05d1fd ("mtd: spi-nor: intel-spi: Convert to SPI MEM")
Signed-off-by Arnd Bergmann <[email protected]>

Looks good to me. I'll let the linux-0day bot run over it and apply it once -rc1 is out.

The issue sometimes produces build errors, shall I send it through a fixes PR instead?

Quoted 5 lines
Quoted 2 lines

Yes, that I was thinking about.

Seems that I shouldn't push to mtd/fixes, so:

Reviewed-by Tudor Ambarus <[email protected]>

Oh yes you can, sorry for the misunderstanding, but as I am often alone to do it, I read your "I will apply" message last time and understood "I will apply on spi-nor/next".

You can update mtd/fixes to -rc1 and push the patch, as long as we keep each other in sync ;)

Thanks!
Miquèl

Reviewed-by on v2 1/1
#7 lore raw
In reply to Arnd Bergmann
Quoted 5 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When MTD or MTD_CFI_GEOMETRY is disabled, the spi-intel driver fails to build, as it includes the shared CFI header:

Quoted 7 lines

include/linux/mtd/cfi.h:62:2: error: #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work. [-Werror=cpp]
62 | #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work.

linux/mtd/spi-nor.h does not actually need to include cfi.h, so remove the inclusion here to fix the warning. This uncovers a missing #include in spi-nor/core.c so add that there to prevent a different build issue.

Reviewed-by Tokunori Ikegami <[email protected]>
Quoted 33 lines
Fixes e23e5a05d1fd ("mtd: spi-nor: intel-spi: Convert to SPI MEM")
Signed-off-by Arnd Bergmann <[email protected]>
Reviewed-by Mika Westerberg <[email protected]>
---
  drivers/mtd/spi-nor/core.c  | 1 +
  include/linux/mtd/spi-nor.h | 1 -
  2 files changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/spi-nor/core.c +1 -0
index d8703d7dfd0a..d67c926bca8b 100644
@@ -10,6 +10,7 @@
  #include <linux/err.h>
  #include <linux/errno.h>
  #include <linux/module.h>
+#include <linux/delay.h>
  #include <linux/device.h>
  #include <linux/mutex.h>
  #include <linux/math64.h>
include/linux/mtd/spi-nor.h +0 -1
index 25765556223a..a3f8cdca90c8 100644
@@ -7,7 +7,6 @@
  #define __LINUX_MTD_SPI_NOR_H
 
  #include <linux/bitops.h>
-#include <linux/mtd/cfi.h>
  #include <linux/mtd/mtd.h>
  #include <linux/spi/spi-mem.h>
maintainer Acked-by on v2 1/1
#8 lore raw
In reply to Arnd Bergmann
Quoted 8 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When MTD or MTD_CFI_GEOMETRY is disabled, the spi-intel driver fails to build, as it includes the shared CFI header:

include/linux/mtd/cfi.h:62:2: error: #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work. [-Werror=cpp]
62 | #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work.

Quoted 7 lines

linux/mtd/spi-nor.h does not actually need to include cfi.h, so remove the inclusion here to fix the warning. This uncovers a missing #include in spi-nor/core.c so add that there to prevent a different build issue.

Fixes e23e5a05d1fd ("mtd: spi-nor: intel-spi: Convert to SPI MEM")
Signed-off-by Arnd Bergmann <[email protected]>
Acked-by Pratyush Yadav <[email protected]>
Signature · 2 lines
Regards,
Pratyush Yadav
maintainer Applied
#9 lore raw
In reply to Arnd Bergmann
Quoted 13 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When MTD or MTD_CFI_GEOMETRY is disabled, the spi-intel driver fails to build, as it includes the shared CFI header:

include/linux/mtd/cfi.h:62:2: error: #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work. [-Werror=cpp]
62 | #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work.

linux/mtd/spi-nor.h does not actually need to include cfi.h, so remove the inclusion here to fix the warning. This uncovers a missing #include in spi-nor/core.c so add that there to prevent a different build issue.

Quoted 6 lines
Fixes e23e5a05d1fd ("mtd: spi-nor: intel-spi: Convert to SPI MEM")
Signed-off-by Arnd Bergmann <[email protected]>
Reviewed-by Mika Westerberg <[email protected]>
Reviewed-by Tokunori Ikegami <[email protected]>
Acked-by Pratyush Yadav <[email protected]>
Reviewed-by Tudor Ambarus <[email protected]>

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes, thanks.

Miquel