From patchwork Fri Jul 6 07:51:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Sahu X-Patchwork-Id: 10510985 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5B4B060532 for ; Fri, 6 Jul 2018 07:53:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CA2528458 for ; Fri, 6 Jul 2018 07:53:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 41241284C9; Fri, 6 Jul 2018 07:53:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF98B28458 for ; Fri, 6 Jul 2018 07:53:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753515AbeGFHxH (ORCPT ); Fri, 6 Jul 2018 03:53:07 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:34002 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753362AbeGFHwQ (ORCPT ); Fri, 6 Jul 2018 03:52:16 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id AB0E260B7D; Fri, 6 Jul 2018 07:52:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1530863535; bh=w5H2e0pBPABQrAVbQkSHQ12xHME0j5Xr9WI+mupqGM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y5vySp0gUqb3YX2z4EM+n8VbralgGJUUcaS8rkCgepvcaKEuSMH11QZ0IQP6J0uIT BDid4qbV0HSCvhV72PdbLRNTSa38H9mfKmf/WmOK0QxnvERitSBIPlgfG6Usoie3rL TY/m1U8hj/g/HFxZWMK8XTqG2d7OitEhoIew2+Yo= Received: from absahu-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: absahu@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id ADB5D60B26; Fri, 6 Jul 2018 07:52:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1530863534; bh=w5H2e0pBPABQrAVbQkSHQ12xHME0j5Xr9WI+mupqGM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H92PoadK0znD1dJnk/IEbkGwi6FhL77AKuFY8wCcS/bmealI5iyBehgwBXu+dbeuM SR8hkzyX1XWUOyGew70bx4AdGAcCkEVeUiYFNVCtIingBIQLJ4scWXBs2QYSEl45RK 6nlvTp84slQDYfcnHpTijnMYO/Y3dagcuNBbhuh8= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org ADB5D60B26 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=absahu@codeaurora.org From: Abhishek Sahu To: Boris Brezillon , Miquel Raynal Cc: David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, Andy Gross , Abhishek Sahu Subject: [PATCH 2/5] mtd: rawnand: qcom: remove driver specific block_markbad function Date: Fri, 6 Jul 2018 13:21:56 +0530 Message-Id: <1530863519-5564-3-git-send-email-absahu@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1530863519-5564-1-git-send-email-absahu@codeaurora.org> References: <1530863519-5564-1-git-send-email-absahu@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The NAND base layer calls write_oob() by setting bytes at chip->badblockpos with value non 0xFF for updating bad block status. The QCOM NAND controller skips the bad block bytes while doing normal write with ECC enabled. When initial support for this driver was added, the driver specific function was added temporarily for block_markbad() with assumption to change for raw read in NAND base layer. Moving to raw read for block_markbad() seems to take more time so this patch removes driver specific block_markbad() function by using following HACK in write_oob() function. Check for BBM bytes in OOB and accordingly do raw write for updating BBM bytes in NAND flash or normal write for updating available OOB bytes. Signed-off-by: Abhishek Sahu --- drivers/mtd/nand/raw/qcom_nandc.c | 103 +++++++++++++++----------------------- 1 file changed, 40 insertions(+), 63 deletions(-) diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c index ea253ac..df12cf3 100644 --- a/drivers/mtd/nand/raw/qcom_nandc.c +++ b/drivers/mtd/nand/raw/qcom_nandc.c @@ -2138,28 +2138,57 @@ static int qcom_nandc_write_oob(struct mtd_info *mtd, struct nand_chip *chip, struct qcom_nand_host *host = to_qcom_nand_host(chip); struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip); struct nand_ecc_ctrl *ecc = &chip->ecc; - u8 *oob = chip->oob_poi; - int data_size, oob_size; + u8 *oob = chip->oob_poi, bbm_byte; + int data_size, oob_size, bbm_offset, write_size; int ret; - host->use_ecc = true; clear_bam_transaction(nandc); - /* calculate the data and oob size for the last codeword/step */ - data_size = ecc->size - ((ecc->steps - 1) << 2); - oob_size = mtd->oobavail; + /* + * The NAND base layer calls ecc->write_oob() by setting bytes at + * chip->badblockpos (chip->badblockpos will be 0 for QCOM NAND + * controller layout) in OOB buffer with value other that 0xFF + * for updating bad block status. QCOM NAND controller skips + * BBM bytes while writing with ECC, so following HACK has been + * added in this function for using generic block_markbad() function. + * + * Check for BBM bytes in OOB and accordingly do raw write for + * updating BBM bytes in NAND flash or normal write with ECC for + * updating available OOB bytes. + */ + bbm_byte = oob[0]; + if (chip->options & NAND_BUSWIDTH_16) + bbm_byte &= oob[1]; - memset(nandc->data_buffer, 0xff, host->cw_data); - /* override new oob content to last codeword */ - mtd_ooblayout_get_databytes(mtd, nandc->data_buffer + data_size, oob, - 0, mtd->oobavail); + /* Write BBM bytes by doing raw write. */ + if (bbm_byte != 0xff) { + host->use_ecc = false; + memset(nandc->data_buffer, 0xff, host->cw_size); + /* Determine the BBM bytes position and update the same */ + bbm_offset = mtd->writesize - host->cw_size * (ecc->steps - 1); + memcpy(nandc->data_buffer + bbm_offset, oob, host->bbm_size); + write_size = host->cw_size; + /* Write OOB bytes by doing normal write with ECC */ + } else { + host->use_ecc = true; + /* calculate the data and oob size for the last codeword/step */ + data_size = ecc->size - ((ecc->steps - 1) << 2); + oob_size = mtd->oobavail; + + memset(nandc->data_buffer, 0xff, host->cw_data); + /* override new oob content to last codeword */ + mtd_ooblayout_get_databytes(mtd, nandc->data_buffer + data_size, + oob, 0, mtd->oobavail); + + write_size = data_size + oob_size; + } set_address(host, host->cw_size * (ecc->steps - 1), page); update_rw_regs(host, 1, false); config_nand_page_write(nandc); write_data_dma(nandc, FLASH_BUF_ACC, - nandc->data_buffer, data_size + oob_size, 0); + nandc->data_buffer, write_size, 0); config_nand_cw_write(nandc); ret = submit_descs(nandc); @@ -2174,48 +2203,6 @@ static int qcom_nandc_write_oob(struct mtd_info *mtd, struct nand_chip *chip, return nand_prog_page_end_op(chip); } -static int qcom_nandc_block_markbad(struct mtd_info *mtd, loff_t ofs) -{ - struct nand_chip *chip = mtd_to_nand(mtd); - struct qcom_nand_host *host = to_qcom_nand_host(chip); - struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip); - struct nand_ecc_ctrl *ecc = &chip->ecc; - int page, ret; - - clear_read_regs(nandc); - clear_bam_transaction(nandc); - - /* - * to mark the BBM as bad, we flash the entire last codeword with 0s. - * we don't care about the rest of the content in the codeword since - * we aren't going to use this block again - */ - memset(nandc->data_buffer, 0x00, host->cw_size); - - page = (int)(ofs >> chip->page_shift) & chip->pagemask; - - /* prepare write */ - host->use_ecc = false; - set_address(host, host->cw_size * (ecc->steps - 1), page); - update_rw_regs(host, 1, false); - - config_nand_page_write(nandc); - write_data_dma(nandc, FLASH_BUF_ACC, - nandc->data_buffer, host->cw_size, 0); - config_nand_cw_write(nandc); - - ret = submit_descs(nandc); - - free_descs(nandc); - - if (ret) { - dev_err(nandc->dev, "failure to update BBM\n"); - return -EIO; - } - - return nand_prog_page_end_op(chip); -} - /* * the three functions below implement chip->read_byte(), chip->read_buf() * and chip->write_buf() respectively. these aren't used for @@ -2757,16 +2744,6 @@ static int qcom_nand_host_init(struct qcom_nand_controller *nandc, chip->set_features = nand_get_set_features_notsupp; chip->get_features = nand_get_set_features_notsupp; - /* - * the bad block marker is writable only when we write the last codeword - * of a page with ECC disabled. currently, the nand_base and nand_bbt - * helpers don't allow us to write BB from a nand chip with ECC - * disabled (MTD_OPS_PLACE_OOB is set by default). use the block_markbad - * helpers until we permanently switch to using - * MTD_OPS_RAW for all drivers (with the help of badblockbits) - */ - chip->block_markbad = qcom_nandc_block_markbad; - chip->controller = &nandc->controller; chip->options |= NAND_NO_SUBPAGE_WRITE | NAND_USE_BOUNCE_BUFFER | NAND_SKIP_BBTSCAN;