From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17CF4C10F14 for ; Fri, 12 Apr 2019 14:29:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CFD0B2084D for ; Fri, 12 Apr 2019 14:29:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727197AbfDLO3M (ORCPT ); Fri, 12 Apr 2019 10:29:12 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:6180 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726327AbfDLO3J (ORCPT ); Fri, 12 Apr 2019 10:29:09 -0400 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 04E8C820898F8CC14812; Fri, 12 Apr 2019 22:29:03 +0800 (CST) Received: from [127.0.0.1] (10.177.31.96) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.408.0; Fri, 12 Apr 2019 22:28:58 +0800 Subject: Re: [PATCH] mtd: nand: Fix build error while CONFIG_MTD_NAND_ECC_SW_BCH is set to module To: Boris Brezillon , Miquel Raynal References: <20190410130747.35692-1-yuehaibing@huawei.com> <20190410153920.68267a1a@collabora.com> <20190410155856.655122c8@collabora.com> <8b020124-4008-6081-c04c-eaefb7875878@huawei.com> <20190410162927.17ea678b@collabora.com> <41165c39-da0c-0f15-87f9-4fb588b77dcc@huawei.com> <20190410181843.489a4e33@xps13> <20190410190328.433a954f@collabora.com> CC: , , , , , , From: YueHaibing Message-ID: <79bce66d-6bb5-39f9-6f36-0667dede52fd@huawei.com> Date: Fri, 12 Apr 2019 22:28:57 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20190410190328.433a954f@collabora.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.31.96] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2019/4/11 1:03, Boris Brezillon wrote: > On Wed, 10 Apr 2019 18:18:43 +0200 > Miquel Raynal wrote: > >> Hi YueHaibing, >> >> YueHaibing wrote on Wed, 10 Apr 2019 23:03:24 >> +0800: >> >>> On 2019/4/10 22:29, Boris Brezillon wrote: >>>> On Wed, 10 Apr 2019 22:22:16 +0800 >>>> YueHaibing wrote: >>>> >>>>> On 2019/4/10 21:58, Boris Brezillon wrote: >>>>>> On Wed, 10 Apr 2019 15:39:28 +0200 >>>>>> Boris Brezillon wrote: >>>>>> >>>>>>> On Wed, 10 Apr 2019 21:07:47 +0800 >>>>>>> Yue Haibing wrote: >>>>>>> >>>>>>>> From: YueHaibing >>>>>>>> >>>>>>>> Fix gcc build error while CONFIG_MTD_NAND_ECC_SW_BCH >>>>>>>> is set to module: >>>>>>>> >>>>>>>> drivers/mtd/nand/raw/nand_base.o: In function `nand_cleanup': >>>>>>>> (.text+0xef6): undefined reference to `nand_bch_free' >>>>>>>> drivers/mtd/nand/raw/nand_base.o: In function `nand_scan_tail': >>>>>>>> nand_base.c:(.text+0xa101): undefined reference to `nand_bch_calculate_ecc' >>>>>>>> nand_base.c:(.text+0xa120): undefined reference to `nand_bch_correct_data' >>>>>>>> nand_base.c:(.text+0xa269): undefined reference to `nand_bch_init' >>>>>>>> >>>>>>>> CONFIG_MTD_NAND_ECC_SW_BCH should not be set to M, >>>>>>>> because MTD_RAW_NAND need it while linked. >>>>>>>> >>>>>>>> Reported-by: Hulk Robot >>>>>>>> Fixes: 193bd4002644 ("mtd: nand: add software BCH ECC support" >>>>>>> >>>>>>> Nope, it's not this one that introduced the regression. >>>>>>> >>>>>>> >>>>>>> >>>>>>>> Signed-off-by: YueHaibing >>>>>>>> --- >>>>>>>> drivers/mtd/nand/raw/Kconfig | 2 +- >>>>>>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>>>>>> >>>>>>>> diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig >>>>>>>> index 615d738..0500c42 100644 >>>>>>>> --- a/drivers/mtd/nand/raw/Kconfig >>>>>>>> +++ b/drivers/mtd/nand/raw/Kconfig >>>>>>>> @@ -22,7 +22,7 @@ menuconfig MTD_RAW_NAND >>>>>>>> if MTD_RAW_NAND >>>>>>>> >>>>>>>> config MTD_NAND_ECC_SW_BCH >>>>>>>> - tristate "Support software BCH ECC" >>>>>>>> + bool "Support software BCH ECC" >>>>>>>> select BCH >>>>>>>> default n >>>>>>>> help >>>>>>> >>>>>>> Should be fixed with the following diff squashed into: >>>>>>> >>>>>>> 51ef1d0b2095 ("mtd: nand: Clarify Kconfig entry for software BCH ECC algorithm") >>>>>>> >>>>>>> --->8--- >>>>>>> diff --git a/include/linux/mtd/nand_bch.h b/include/linux/mtd/nand_bch.h >>>>>>> index b8106651f807..06ce2b655c13 100644 >>>>>>> --- a/include/linux/mtd/nand_bch.h >>>>>>> +++ b/include/linux/mtd/nand_bch.h >>>>>>> @@ -15,7 +15,7 @@ struct mtd_info; >>>>>>> struct nand_chip; >>>>>>> struct nand_bch_control; >>>>>>> >>>>>>> -#if defined(CONFIG_MTD_NAND_ECC_BCH) >>>>>>> +#if defined(CONFIG_MTD_NAND_ECC_SW_BCH) >>>>>>> >>>>>>> static inline int mtd_nand_has_bch(void) { return 1; } >>>>>>> >>>>>>> @@ -39,7 +39,7 @@ struct nand_bch_control *nand_bch_init(struct mtd_info *mtd); >>>>>>> */ >>>>>>> void nand_bch_free(struct nand_bch_control *nbc); >>>>>>> >>>>>>> -#else /* !CONFIG_MTD_NAND_ECC_BCH */ >>>>>>> +#else /* !CONFIG_MTD_NAND_ECC_SW_BCH */ >>>>>>> >>>>>>> static inline int mtd_nand_has_bch(void) { return 0; } >>>>>>> >>>>>>> @@ -64,6 +64,6 @@ static inline struct nand_bch_control *nand_bch_init(struct mtd_info *mtd) >>>>>>> >>>>>>> static inline void nand_bch_free(struct nand_bch_control *nbc) {} >>>>>>> >>>>>>> -#endif /* CONFIG_MTD_NAND_ECC_BCH */ >>>>>>> +#endif /* CONFIG_MTD_NAND_ECC_SW_BCH */ >>>>>>> >>>>>>> #endif /* __MTD_NAND_BCH_H__ */ >>>>>> >>>>>> Sorry, I didn't look at the right branch, this part of the code was >>>>>> correct, but we still have a problem to express the RAW_NAND(y) -> >>>>>> SW_BCH(y) dependency. >>>>> >>>>> It seems this dependency is not always need, >>>>> >>>>> case MTD_RAW_NAND set to y works well while CONFIG_MTD_NAND_ECC_SW_BCH is not set. >>>> >>>> Yes, I know, but forcing nand_bch to a be a boolean is not the right >>>> solution either, hence my suggestion to use 'imply'. >> >> Why exactly? SW BCH is going to be converted to the generic ECC engine >> abstraction and IIRC you told me that it would not be problematic to >> turn it into a boolean? > > Yes, I told you we should turn it into a boolean and embed the code in > the nandcore.o object which can itself be linked as a module or embedded > in the kernel image (see above for a version adapted for nand.o). That's > not exactly what Yue proposed. So is there anothor fix or just to pick my v2 ? https://patchwork.ozlabs.org/patch/1083480/ > > --->8--- > diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig > index 7fcdaf6c279d..f9258d666846 100644 > --- a/drivers/mtd/devices/Kconfig > +++ b/drivers/mtd/devices/Kconfig > @@ -207,7 +207,7 @@ comment "Disk-On-Chip Device Drivers" > config MTD_DOCG3 > tristate "M-Systems Disk-On-Chip G3" > select BCH > - select BCH_CONST_PARAMS if !CONFIG_MTD_NAND_ECC_SW_BCH > + select BCH_CONST_PARAMS if !MTD_NAND_ECC_SW_BCH > select BITREVERSE > help > This provides an MTD device driver for the M-Systems DiskOnChip > diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig > index 615d738be411..0500c42f31cb 100644 > --- a/drivers/mtd/nand/raw/Kconfig > +++ b/drivers/mtd/nand/raw/Kconfig > @@ -22,7 +22,7 @@ menuconfig MTD_RAW_NAND > if MTD_RAW_NAND > > config MTD_NAND_ECC_SW_BCH > - tristate "Support software BCH ECC" > + bool "Support software BCH ECC" > select BCH > default n > help > diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile > index 8bc6faaa3bc7..d644185fa18d 100644 > --- a/drivers/mtd/nand/raw/Makefile > +++ b/drivers/mtd/nand/raw/Makefile > @@ -2,7 +2,6 @@ > > obj-$(CONFIG_MTD_RAW_NAND) += nand.o > obj-$(CONFIG_MTD_NAND_ECC_SW_HAMMING) += nand_ecc.o > -obj-$(CONFIG_MTD_NAND_ECC_SW_BCH) += nand_bch.o > obj-$(CONFIG_MTD_SM_COMMON) += sm_common.o > > obj-$(CONFIG_MTD_NAND_CAFE) += cafe_nand.o > @@ -68,3 +67,5 @@ nand-objs += nand_macronix.o > nand-objs += nand_micron.o > nand-objs += nand_samsung.o > nand-objs += nand_toshiba.o > +nand-objs-$(CONFIG_MTD_NAND_ECC_SW_BCH) += nand_bch.o > +nand-objs += $(nand-objs-y) > > > > . >