Message ID | 20210927141045.1597593-1-arnd@kernel.org |
---|---|
State | New |
Headers | show |
Series | [RFC] mtd: fixup CFI on ixp4xx | expand |
Hi Arnd, arnd@kernel.org wrote on Mon, 27 Sep 2021 16:10:37 +0200: > From: Arnd Bergmann <arnd@arndb.de> > > drivers/mtd/maps/ixp4xx.c requires MTD_CFI_BE_BYTE_SWAP to be set > in order to compile. > > drivers/mtd/maps/ixp4xx.c:57:4: error: #error CONFIG_MTD_CFI_BE_BYTE_SWAP required > > This patch avoids the #error output by enforcing the policy in > Kconfig. Not sure if this is the right approach, but it helps doing > randconfig builds. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > Any other ideas for how to address it? I am fine with the approach. Should I wait for someone else's Ack? Thanks, Miquèl > --- > drivers/mtd/chips/Kconfig | 2 ++ > drivers/mtd/maps/Kconfig | 2 +- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig > index aef14990e5f7..19726ebd973d 100644 > --- a/drivers/mtd/chips/Kconfig > +++ b/drivers/mtd/chips/Kconfig > @@ -55,12 +55,14 @@ choice > LITTLE_ENDIAN_BYTE, if the bytes are reversed. > > config MTD_CFI_NOSWAP > + depends on !ARCH_IXP4XX || CPU_BIG_ENDIAN > bool "NO" > > config MTD_CFI_BE_BYTE_SWAP > bool "BIG_ENDIAN_BYTE" > > config MTD_CFI_LE_BYTE_SWAP > + depends on !ARCH_IXP4XX > bool "LITTLE_ENDIAN_BYTE" > > endchoice > diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig > index aaa164b977fe..4945caa88345 100644 > --- a/drivers/mtd/maps/Kconfig > +++ b/drivers/mtd/maps/Kconfig > @@ -302,7 +302,7 @@ config MTD_DC21285 > > config MTD_IXP4XX > tristate "CFI Flash device mapped on Intel IXP4xx based systems" > - depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX > + depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX && MTD_CFI_ADV_OPTIONS > help > This enables MTD access to flash devices on platforms based > on Intel's IXP4xx family of network processors such as the
On Mon, Sep 27, 2021 at 6:33 PM Miquel Raynal <miquel.raynal@bootlin.com> wrote: > > Hi Arnd, > > arnd@kernel.org wrote on Mon, 27 Sep 2021 16:10:37 +0200: > > > From: Arnd Bergmann <arnd@arndb.de> > > > > drivers/mtd/maps/ixp4xx.c requires MTD_CFI_BE_BYTE_SWAP to be set > > in order to compile. > > > > drivers/mtd/maps/ixp4xx.c:57:4: error: #error CONFIG_MTD_CFI_BE_BYTE_SWAP required > > > > This patch avoids the #error output by enforcing the policy in > > Kconfig. Not sure if this is the right approach, but it helps doing > > randconfig builds. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > Any other ideas for how to address it? > > I am fine with the approach. Should I wait for someone else's Ack? Maybe wait a few days to see if there are objections or any better ideas then. I'd certainly be happy to never run into this problem again. Arnd ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
On Mon, Sep 27, 2021 at 4:10 PM Arnd Bergmann <arnd@kernel.org> wrote: > From: Arnd Bergmann <arnd@arndb.de> > > drivers/mtd/maps/ixp4xx.c requires MTD_CFI_BE_BYTE_SWAP to be set > in order to compile. > > drivers/mtd/maps/ixp4xx.c:57:4: error: #error CONFIG_MTD_CFI_BE_BYTE_SWAP required > > This patch avoids the #error output by enforcing the policy in > Kconfig. Not sure if this is the right approach, but it helps doing > randconfig builds. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Linus Walleij <linus.walleij@linaro.org> > Any other ideas for how to address it? We will "soon" have IXP4xx transitioned to device tree and then physmap-ixp4xx.c is used instead, and this entire driver can be deleted. I will get there, we just need to remember to mop of cruft like this at the end of it. Yours, Linus Walleij ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
On Tue, Sep 28, 2021 at 1:28 AM Linus Walleij <linus.walleij@linaro.org> wrote: > On Mon, Sep 27, 2021 at 4:10 PM Arnd Bergmann <arnd@kernel.org> wrote: > > Any other ideas for how to address it? > > We will "soon" have IXP4xx transitioned to device tree and then > physmap-ixp4xx.c is used instead, and this entire driver can be > deleted. I will get there, we just need to remember to mop of cruft > like this at the end of it. Ah, perfect. In that case I'm not worried about my patch doing anything wrong at all, and we can just backport that to stable kernels after it's merged, while future kernels will won't even need it. Arnd ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
On Mon, 2021-09-27 at 14:10:37 UTC, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > drivers/mtd/maps/ixp4xx.c requires MTD_CFI_BE_BYTE_SWAP to be set > in order to compile. > > drivers/mtd/maps/ixp4xx.c:57:4: error: #error CONFIG_MTD_CFI_BE_BYTE_SWAP required > > This patch avoids the #error output by enforcing the policy in > Kconfig. Not sure if this is the right approach, but it helps doing > randconfig builds. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Acked-by: Linus Walleij <linus.walleij@linaro.org> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks. Miquel ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig index aef14990e5f7..19726ebd973d 100644 --- a/drivers/mtd/chips/Kconfig +++ b/drivers/mtd/chips/Kconfig @@ -55,12 +55,14 @@ choice LITTLE_ENDIAN_BYTE, if the bytes are reversed. config MTD_CFI_NOSWAP + depends on !ARCH_IXP4XX || CPU_BIG_ENDIAN bool "NO" config MTD_CFI_BE_BYTE_SWAP bool "BIG_ENDIAN_BYTE" config MTD_CFI_LE_BYTE_SWAP + depends on !ARCH_IXP4XX bool "LITTLE_ENDIAN_BYTE" endchoice diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index aaa164b977fe..4945caa88345 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -302,7 +302,7 @@ config MTD_DC21285 config MTD_IXP4XX tristate "CFI Flash device mapped on Intel IXP4xx based systems" - depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX + depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX && MTD_CFI_ADV_OPTIONS help This enables MTD access to flash devices on platforms based on Intel's IXP4xx family of network processors such as the