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(-)
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index d8703d7dfd0a..d67c926bca8b 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -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>
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
index 25765556223a..a3f8cdca90c8 100644
--- a/include/linux/mtd/spi-nor.h
+++ b/include/linux/mtd/spi-nor.h
@@ -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>
--
2.35.1
On Tue, Dec 20, 2022 at 03:13:34PM +0100, Arnd Bergmann wrote:
> 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]>
Reviewed-by: Mika Westerberg <[email protected]>
Hi Tudor,
[email protected] wrote on Tue, 20 Dec 2022 17:44:49 +0200:
> Hi, Arnd,
>
> On 20.12.2022 16:13, Arnd Bergmann wrote:
> > 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]>
>
> 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
Hi, Arnd,
On 20.12.2022 16:13, Arnd Bergmann wrote:
> 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]>
Looks good to me. I'll let the linux-0day bot run over it and apply it
once -rc1 is out.
Thanks,
ta
On 20.12.2022 17:57, Miquel Raynal wrote:
> Hi Tudor,
>
Hi,
> [email protected] wrote on Tue, 20 Dec 2022 17:44:49 +0200:
>
>> Hi, Arnd,
>>
>> On 20.12.2022 16:13, Arnd Bergmann wrote:
>>> 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]>
>>
>> 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
On 2022/12/20 23:13, Arnd Bergmann wrote:
> 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.
Reviewed-by: Tokunori Ikegami <[email protected]>
>
> 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(-)
>
> diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
> index d8703d7dfd0a..d67c926bca8b 100644
> --- a/drivers/mtd/spi-nor/core.c
> +++ b/drivers/mtd/spi-nor/core.c
> @@ -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>
> diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
> index 25765556223a..a3f8cdca90c8 100644
> --- a/include/linux/mtd/spi-nor.h
> +++ b/include/linux/mtd/spi-nor.h
> @@ -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>
>
On 20/12/22 03:13PM, Arnd Bergmann wrote:
> 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]>
Acked-by: Pratyush Yadav <[email protected]>
--
Regards,
Pratyush Yadav
On 21.12.2022 08:49, Tudor Ambarus wrote:
>
>
> On 20.12.2022 17:57, Miquel Raynal wrote:
>> Hi Tudor,
>>
>
> Hi,
>
>> [email protected] wrote on Tue, 20 Dec 2022 17:44:49 +0200:
>>
>>> Hi, Arnd,
>>>
>>> On 20.12.2022 16:13, Arnd Bergmann wrote:
>>>> 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]>
>>>
>>> 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]>
Hi Tudor,
[email protected] wrote on Mon, 26 Dec 2022 16:22:02 +0200:
> On 21.12.2022 08:49, Tudor Ambarus wrote:
> >
> >
> > On 20.12.2022 17:57, Miquel Raynal wrote:
> >> Hi Tudor,
> >>
> >
> > Hi,
> >
> >> [email protected] wrote on Tue, 20 Dec 2022 17:44:49 +0200:
> >>
> >>> Hi, Arnd,
> >>>
> >>> On 20.12.2022 16:13, Arnd Bergmann wrote:
> >>>> 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]>
> >>>
> >>> 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]>
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
On Tue, 2022-12-20 at 14:13:34 UTC, Arnd Bergmann wrote:
> 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]>
> 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