From patchwork Wed Apr 10 19:58:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 1083602 X-Patchwork-Delegate: miquel.raynal@bootlin.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="IwkumuFx"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="qNNRePeJ"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44fZjt2Fybz9s5c for ; Thu, 11 Apr 2019 05:59:14 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=jjUgE/5Qf6E8lnKR3SRHmfoWVbFv761ButXeT4ii1Ao=; b=IwkumuFxrWt7dA /0p6F5PJaqWT5cxWtalvN01rDoejY2RkCOY3ipRfmfwPZbMZLufUyv+mGUBANyYm0mq/AFZWcuRbC NzVbkioWvboCkOzN2NsGd9J5K12RAQRyjFPi1aTChSGDySPKX3QImpKFIlipHlGYitNDAAbdhzcEJ 1q2LQaQLLcdbYl8dnON4qsMXLgqxKtwalVSYT95qZmrZBJrfA67gIBic+uG5KH6hRw42kiV1t77YS 7lnI07wfot1AO4sUfgak8eDwTzjpkwIw2WwRv9eCLMWvx4eKjQmgalyTR1wWk+D5jA7HSMECIFm1q LNJt7y/cbSHzo0PZKMwg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hEJNC-0007c3-OY; Wed, 10 Apr 2019 19:59:06 +0000 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hEJNA-0007be-Om for linux-mtd@lists.infradead.org; Wed, 10 Apr 2019 19:59:06 +0000 Received: by mail-lj1-x244.google.com with SMTP id j89so3300817ljb.1 for ; Wed, 10 Apr 2019 12:59:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wcVt5VTKGlyZxp0vS8+Fu1r59HHgCfHanefStNqWyW4=; b=qNNRePeJKdY7jFnfDSk9PmpyTxY6zSzPSAtVRIWK+uHxJMacppvEn/3kXlOkTwFnk1 uz5S+S6k/szSe3cRBRXt7t8V+Jl9+asGbYFbEE2UxvSsy2DAtX8ivFvuT+BfK7OydkmQ BprZTTXTXlQLr3aIH9y11wPdFzohP2cKdOqdWWNLaYOOj/Voob1MY0TFa9bX3nPi8WPm 5ZfZGAMDo0rVka+2OC4SmA6bIzpRpR4LL9WKgiGhfxWkkrtRhMq2lg7DzmbvV73VK0is usC5IT+TGuKBi+D1/bvXF/whPmT2wDCf9DUMxxjSwXnrqVV7oEtpHwvtlKbH8HhvXgW9 3paQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wcVt5VTKGlyZxp0vS8+Fu1r59HHgCfHanefStNqWyW4=; b=beHaZwIykWq88+N+4wuXj3ROEg+e+7Xp4CaCAvTYJOFZ/cgdaDNTXn8I1MrJNopLX7 kxicNCuyavmIPKb/5LOQLsjr0dyoyg0tVLgRLYuoF6LD5hCKknDnP0Y8ZsrWB97Px9KX vKTgdNB2W3siT1bubOkGq2xtHFJsVJirtbwzWbJsM6VhSsJiFRLOgxiqNmrnB+5E5rMq +8ub6VB7IXbknbHSn9+ZYME5xSMZxeQ+F8C4ciGkci4+yZHJ7+RFQAf3UFzV2xUx8at6 A7f3tt2XYUS2ttonqkARAlIw5bBErzaXRBU/K+KMcZuC9kG2fqqHvjABIxt54CWR0Fx6 qIgA== X-Gm-Message-State: APjAAAUWLOc/cG3RVSccohLix/tLmzstiVxuEGPx57COFHzvyIwmUPux ZAe+C1PQJFlVRskub6c9J2qkNA== X-Google-Smtp-Source: APXvYqzEU+l46yVUS0tw1cyCFtByDwJvoWU6r0hypUQaIJ8ibKACU2J4bsFIzFVDIBR8LGvfED1Lcg== X-Received: by 2002:a2e:6c0f:: with SMTP id h15mr23337379ljc.155.1554926342648; Wed, 10 Apr 2019 12:59:02 -0700 (PDT) Received: from localhost (c-573670d5.07-21-73746f28.bbcust.telenor.se. [213.112.54.87]) by smtp.gmail.com with ESMTPSA id w3sm7398594lji.59.2019.04.10.12.59.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Apr 2019 12:59:01 -0700 (PDT) From: Anders Roxell To: dwmw2@infradead.org, computersforpeace@gmail.com, bbrezillon@kernel.org, marek.vasut@gmail.com, richard@nod.at Subject: [PATCH 1/2] mtd: nand: Kconfig: correct the MTD_NAND_ECC_SW_BCH select Date: Wed, 10 Apr 2019 21:58:51 +0200 Message-Id: <20190410195852.4066-1-anders.roxell@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190410_125904_834185_3BF3D2EE X-CRM114-Status: GOOD ( 11.11 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:244 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anders Roxell , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Config fragments should not have the prefix 'CONFIG_'. Rework to remove the prefix 'CONFIG_' from 'CONFIG_MTD_NAND_ECC_SW_BCH'. Fixes: 51ef1d0b2095 ("mtd: nand: Clarify Kconfig entry for software BCH ECC algorithm") Signed-off-by: Anders Roxell --- drivers/mtd/devices/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From patchwork Wed Apr 10 19:58:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 1083603 X-Patchwork-Delegate: miquel.raynal@bootlin.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="c+E9M0uw"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="QP1vEQtQ"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44fZk02bvBz9s5c for ; Thu, 11 Apr 2019 05:59:20 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=S/wx2SqoA6eE5SW1TwhIAtZNZB4ZTP8fO8HzUbnOdcw=; b=c+E9M0uwZfqcQW aerqBFsMBhAsOIBnF+RXcYeTRIRVzCh0wMmZk/HZscu/ppfCVBAJNz8+mdULV1dIeywjQXHjpJRx1 K7tl+qzAUlr4PHD6R4h2KK2oZEnmtnMK1PZ/41kZdhFZC/GE6FDJJvXfFg0GzGRtz935pf5pAqgkj Q8ULavyzpL877nJ0OvmrRuJsjdxyYDopJ83UUlqKK4fvtDjeZmsKMM5Du952bieZK69auDlI++Lu+ EfBOq9yonrvS7pL7tdegDePjACmcbNiOugrO1cVSMU07Pa177vegV5b2BYdgXXJe0wWX9YRYgzMkR uPBfA77yyMDSHTvd2Nmg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hEJNL-0007nZ-L0; Wed, 10 Apr 2019 19:59:15 +0000 Received: from mail-lj1-x241.google.com ([2a00:1450:4864:20::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hEJNE-0007ce-UP for linux-mtd@lists.infradead.org; Wed, 10 Apr 2019 19:59:13 +0000 Received: by mail-lj1-x241.google.com with SMTP id f23so3316441ljc.0 for ; Wed, 10 Apr 2019 12:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xF0+W7srIQfbgQ7tlGxBCjWOJ+vLDr6qxPO28weJN5Y=; b=QP1vEQtQhoJSrpZ76JBL1JAYV+zoZbWvYwB5G5p18VhhzHZBR2lMnGBoqbyRvNr0pq 4OoUGdDwPBl3J8a4UO97fGmytDlID6KzSlRdoVCzR3SNnR+r4tTM1lV6ujfQlIlVagXK uO0tXtmSG5ptGpp7laRSeweAc9bxB01JqHArPISzXsGzTE4q+K5w/eqPKfGwWb69zOaX gDiMvuM1FKmmxSFyuvDUJ47R9sz05HNBltF4LNg8ZXPHCwcPF901ylscKJ4LzBbV2AAe q8vM9cBtGjbBPp/OCI9smkda/UjqT+FOWvKWjwnr2WlqKbtk9PLFzuACWKnaqjXY94Kz wKww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xF0+W7srIQfbgQ7tlGxBCjWOJ+vLDr6qxPO28weJN5Y=; b=E2hxF0gK3p3d6G+KrNKB1OKYUF2rQguD6Vc2Mn/ji5RzFgEEGXarlXpS/f9Hila13L vgndPTZMsEnDB+/haJ1QRW+HLAtqP+DFdlS5RD/1P02bs0f6nHJpoHWTavb8/jUR5DaS +xdP9QMM0u8XMECkNCLBoWdYCwjrZC409Ic8sXTccY1rkFGSpARhm7XpjlQ5kCs/H67t 0EzcvKk42ZEfvJVORMLD8n3dtZlRB41RLIV8CrhBQQbMLC/XRVw55ySMUgEtOWTQx94v c2LvlHkxoIZWB7MqKED91H4sk+2+ktmaSIbHwQfOAr5A0nsMbGCtXLDrKBuwo8MvreaC 2lig== X-Gm-Message-State: APjAAAU6Y7xTPt1sEIog/xmY4XMCw93vSXM4rzUnGab9AeErqJ5bi4Qy m/0an1CyswC/iENWpRAJblkwXwcdNn/6cQ== X-Google-Smtp-Source: APXvYqxt6FgSVLw9nqPk30okfUzZKtd0kyDRdWsGL7tCt+Tr0Rj6/diNn62XiSBXkkf/SDfYKilkmg== X-Received: by 2002:a2e:968c:: with SMTP id q12mr23873796lji.36.1554926346965; Wed, 10 Apr 2019 12:59:06 -0700 (PDT) Received: from localhost (c-573670d5.07-21-73746f28.bbcust.telenor.se. [213.112.54.87]) by smtp.gmail.com with ESMTPSA id q5sm7150752lfm.16.2019.04.10.12.59.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Apr 2019 12:59:06 -0700 (PDT) From: Anders Roxell To: dwmw2@infradead.org, computersforpeace@gmail.com, bbrezillon@kernel.org, marek.vasut@gmail.com, richard@nod.at Subject: [PATCH 2/2] mtd: nand: raw: fix build dependency Date: Wed, 10 Apr 2019 21:58:52 +0200 Message-Id: <20190410195852.4066-2-anders.roxell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190410195852.4066-1-anders.roxell@linaro.org> References: <20190410195852.4066-1-anders.roxell@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190410_125909_174341_C3B69FDD X-CRM114-Status: GOOD ( 12.04 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:241 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anders Roxell , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org When enable CONFIG_MTD_NAND_ECC_SW_BCH as a module, the MTD_NAND_ECC_SW_BCH depends on MTD_NAND, but the module controlled by MTD_NAND links against the module controlled by MTD_NAND_ECC_SW_BCH. This leads to the following link failure. aarch64-linux-gnu-ld: drivers/mtd/nand/raw/nand_base.o: in function `nand_cleanup': ../drivers/mtd/nand/raw/nand_base.c:5886: undefined reference to `nand_bch_free' aarch64-linux-gnu-ld: ../drivers/mtd/nand/raw/nand_base.c:5886:(.text+0x9928): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `nand_bch_free' aarch64-linux-gnu-ld: drivers/mtd/nand/raw/nand_base.o: in function `nand_set_ecc_soft_ops': ../drivers/mtd/nand/raw/nand_base.c:5093: undefined reference to `nand_bch_calculate_ecc' aarch64-linux-gnu-ld: ../drivers/mtd/nand/raw/nand_base.c:5093:(.text+0xe914): relocation truncated to fit: R_AARCH64_ADR_PREL_PG_HI21 against undefined symbol `nand_bch_calculate_ecc' aarch64-linux-gnu-ld: ../drivers/mtd/nand/raw/nand_base.c:5093: undefined reference to `nand_bch_calculate_ecc' aarch64-linux-gnu-ld: ../drivers/mtd/nand/raw/nand_base.c:5094: undefined reference to `nand_bch_correct_data' aarch64-linux-gnu-ld: ../drivers/mtd/nand/raw/nand_base.c:5094:(.text+0xe934): relocation truncated to fit: R_AARCH64_ADR_PREL_PG_HI21 against undefined symbol `nand_bch_correct_data' aarch64-linux-gnu-ld: ../drivers/mtd/nand/raw/nand_base.c:5094: undefined reference to `nand_bch_correct_data' aarch64-linux-gnu-ld: ../drivers/mtd/nand/raw/nand_base.c:5148: undefined reference to `nand_bch_init' aarch64-linux-gnu-ld: ../drivers/mtd/nand/raw/nand_base.c:5148:(.text+0xebbc): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `nand_bch_init' Rework CONFIG_MTD_NAND_ECC_SW_BCH from tristate to bool, and then link the nand_bch.o file into nand.ko if its enabled. Fixes: 51ef1d0b2095 ("mtd: nand: Clarify Kconfig entry for software BCH ECC algorithm") Signed-off-by: Anders Roxell --- drivers/mtd/nand/raw/Kconfig | 2 +- drivers/mtd/nand/raw/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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..efaf5cd25edc 100644 --- a/drivers/mtd/nand/raw/Makefile +++ b/drivers/mtd/nand/raw/Makefile @@ -2,7 +2,7 @@ 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 +nand-$(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