Received: by 2002:ab2:2994:0:b0:1ef:ca3e:3cd5 with SMTP id n20csp729187lqb; Fri, 15 Mar 2024 05:08:55 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCV9DuQtKQepYGCHhx9LdmgH752DnzGke2p20ocN1n/4zoFSIx0XLxIygkPmX59+ZWsjixRSwaqqkmRVvLm/4TWJSB6PMC5YqBw5jNe04g== X-Google-Smtp-Source: AGHT+IGvu55FPod2Ju0W6EQqToCUDPmB6rIylhke4F9EHEGbMDe+KG6mFxuWu1RcIQK83hUktAUM X-Received: by 2002:a05:6512:28c:b0:513:ccd1:563e with SMTP id j12-20020a056512028c00b00513ccd1563emr3496088lfp.8.1710504535237; Fri, 15 Mar 2024 05:08:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710504535; cv=pass; d=google.com; s=arc-20160816; b=Uw3Nn82LdLIaAqS3L1SUom7P1ST6TWL0NIWQ9oQnborm1tSAiHCfmAgKzJ/begRWgi Y8LBMoGhYybTtw0+L5d71K4UfOFazy0hshFhXaXp1ukQCqadw6VRMbG+EZ5gKRCPDiGD HLtjRbsLBtBrBocF9MDuYNt2Chmg9ynH1HD5AMpIQuZ9WisDw5P/XfNSafAAGAmo469a m7HU9cUwvPZKG/nqab0cCVwbDSuwXLDjApOoDBHNmTRn7cVt8GrM8s8VHEVm1/Cj8brC XIN4VyIBs27NA9cm/W7AVokhAoM5RE9AJ3GhEaxqvxoShYBdfA2qsEb7tK/P6+/FMnnx 1Nsw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:organization:references :in-reply-to:message-id:subject:cc:to:from:date:dkim-signature; bh=2qp2WkofBR1+deZBAjdteSVFK3g6Fc+Ze3eN9Pg5mEY=; fh=SGh7scpMOvpFHxlXaKmEOa134qxxz4ZfNtiZuL/lK84=; b=F1b7LRUcDOL69SHfhzzB0NV67yHPsOxTTvs77arKa7F3077YuN1SfJSvfyx5djA6tK +nBexWjei03d9DMzSinqJV+EBNfXvvKwN/DrZr5Ei7U/c3WKdp34tcmDvfWbT3LzdmE6 XydEAjWTaWJGxzjr1nlXDidA5rBg0nA/2FqzlDFBy5cTpdHmsGQgNmPFqRM1xHLOo/iV 5BPA4W0hpZlEuUnhIQwOWRCyQzMIolYTD/ZtFdULdCt0Vn6FTab6nDJ4pquKWnaPEXQH uw5DsWSx3inEXlBf5ypEaZ7fxVtAzTyVjUPeWO1ujwSAp/HtS0S/CdRPA7vVzhlnDK44 +fTA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=mifBnc30; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-104379-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-104379-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id a13-20020a170906684d00b00a4659b78df6si1636149ejs.700.2024.03.15.05.08.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 05:08:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-104379-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=mifBnc30; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-104379-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-104379-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 655DC1F23045 for ; Fri, 15 Mar 2024 12:08:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 772491C680; Fri, 15 Mar 2024 12:08:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="mifBnc30" Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6821C1BC2C; Fri, 15 Mar 2024 12:08:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710504523; cv=none; b=K0QplahrYwTrrDPB1nNMCpArgLPR1pUD4RevCXRDkmOjDCKvA588i+/PGpvzXWskUeXRd2TK69fSU773RYcnYeo+AqLyPhYdlcBNFIuIJODta7Ac9tVjiG5JtqkE/j+f86yuWThIDWz0PWWl5CAPIa7Rlc7s95ll7buBrXglNGI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710504523; c=relaxed/simple; bh=GxTXhfuj+NOXReycxtS30nNL98W8jwGHBG4kqX+Kl5g=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=h0Eou5GiS42ia/IrorANr/VXR5/l2/DfFK982f1kqn+yFi6I6txeK6TaevdodHYMCj8ptsDDuOCUyr2pYqHPVNeQrFHNJdcwNoBZUlhRy8601Aks5hXVjP0qm4ovh7IwVPXoqVuBlkpcabcXmLE7qFlcKjjIySQ1nHCR+Nyt8IY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=mifBnc30; arc=none smtp.client-ip=217.70.183.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id 93B371BF206; Fri, 15 Mar 2024 12:08:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1710504516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2qp2WkofBR1+deZBAjdteSVFK3g6Fc+Ze3eN9Pg5mEY=; b=mifBnc30SgqWrl2S+koCCdJnpUSxskX8leqkGEYYk0qtch/V1zkVqKd9PJQbmDYETXerla UxvitMqhWWED3pTNEf1VLt/sV7XbEOQiaxoJwP5H79gE2K8vWyMAMGHYfJeA/W3CYOmcLJ C0oz49KYeSwmODA445v1a21dtZqQE/z8TAMQSwgJ96dRGxv8eftaDHPqDTOnT2JL+iNz5R dUP+vYtewYt2geDQB7a1K8tNCqRyfWPxsFOTDCcD2HXgiBEt0IjiJHqGFPSCz/h8XMYjcs HhuZPGG7cyToQ3KoVm3xom0MNtbYwcvN+UvG0l2eBXdzFGI1azODHHerYlc0Jg== Date: Fri, 15 Mar 2024 13:08:33 +0100 From: Miquel Raynal To: Md Sadre Alam Cc: andersson@kernel.org, konrad.dybcio@linaro.org, broonie@kernel.org, robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, richard@nod.at, vigneshr@ti.com, manivannan.sadhasivam@linaro.org, neil.armstrong@linaro.org, daniel@makrotopia.org, arnd@arndb.de, chris.packham@alliedtelesis.co.nz, christophe.kerello@foss.st.com, linux-arm-msm@vger.kernel.org, linux-spi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, quic_srichara@quicinc.com, quic_varada@quicinc.com Subject: Re: [PATCH v4 3/5] spi: spi-qpic: Add qpic spi nand driver support Message-ID: <20240315130833.610edaf6@xps-13> In-Reply-To: <20240308091752.16136-4-quic_mdalam@quicinc.com> References: <20240308091752.16136-1-quic_mdalam@quicinc.com> <20240308091752.16136-4-quic_mdalam@quicinc.com> Organization: Bootlin X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-GND-Sasl: miquel.raynal@bootlin.com Hi, quic_mdalam@quicinc.com wrote on Fri, 8 Mar 2024 14:47:50 +0530: > Add qpic spi nand driver support. The spi nand > driver currently supported the below commands. >=20 > -- RESET > -- READ ID > -- SET FEATURE > -- GET FEATURE > -- READ PAGE > -- WRITE PAGE > -- ERASE PAGE >=20 > Co-developed-by: Sricharan Ramabadhran > Signed-off-by: Sricharan Ramabadhran > Co-developed-by: Varadarajan Narayanan > Signed-off-by: Varadarajan Narayanan > Signed-off-by: Md Sadre Alam I don't like the "spi nand driver" wording here. It is a spi controller, for spi-memories. Plus, I'd expect some kind of check to see whether you support the requested operation, I don't see any in the code. > --- > Change in [v4] >=20 > * No change >=20 > Change in [v3] >=20 > * Set SPI_QPIC_SNAND to n and added COMPILE_TEST in Kconfig >=20 > * Made driver name sorted in Make file >=20 > * Made comment like c++ >=20 > * Changed macro to functions, snandc_set_read_loc_last() > and snandc_set_read_loc_first() >=20 > * Added error handling in snandc_set_reg() >=20 > * Changed into normal conditional statement for > return snandc->ecc_stats.failed ? -EBADMSG : > snandc->ecc_stats.bitflips; >=20 > * Remove cast of wbuf in qpic_snand_program_execute() > function >=20 > * Made num_cw variable instead hardcoded value >=20 > * changed if..else condition of function qpic_snand_io_op() > to switch..case statement >=20 > * Added __devm_spi_alloc_controller() api instead of > devm_spi_alloc_master() >=20 > * Disabling clock in remove path >=20 > Change in [v2] >=20 > * Added initial support for SPI-NAND driver >=20 > Change in [v1] >=20 > * Added RFC patch for design review >=20 > drivers/mtd/nand/qpic_common.c | 8 + > drivers/spi/Kconfig | 8 + > drivers/spi/Makefile | 1 + > drivers/spi/spi-qpic-snand.c | 1041 ++++++++++++++++++++++++++ > include/linux/mtd/nand-qpic-common.h | 61 ++ > 5 files changed, 1119 insertions(+) > create mode 100644 drivers/spi/spi-qpic-snand.c >=20 > diff --git a/drivers/mtd/nand/qpic_common.c b/drivers/mtd/nand/qpic_commo= n.c > index 5b7c0d119d9a..67ccb3d05f20 100644 > --- a/drivers/mtd/nand/qpic_common.c > +++ b/drivers/mtd/nand/qpic_common.c > @@ -134,6 +134,14 @@ __le32 *qcom_offset_to_nandc_reg(struct nandc_regs *= regs, int offset) > return ®s->read_location_last2; > case NAND_READ_LOCATION_LAST_CW_3: > return ®s->read_location_last3; > + case NAND_FLASH_SPI_CFG: > + return ®s->spi_cfg; > + case NAND_NUM_ADDR_CYCLES: > + return ®s->num_addr_cycle; > + case NAND_BUSY_CHECK_WAIT_CNT: > + return ®s->busy_wait_cnt; > + case NAND_FLASH_FEATURES: > + return ®s->flash_feature; I am still not convinced about these. I don't understand who you have this indirection. > default: > return NULL; > } > diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig > index bc7021da2fe9..63764e943d82 100644 > --- a/drivers/spi/Kconfig > +++ b/drivers/spi/Kconfig > @@ -882,6 +882,14 @@ config SPI_QCOM_QSPI > help > QSPI(Quad SPI) driver for Qualcomm QSPI controller. > =20 > +config SPI_QPIC_SNAND > + tristate "QPIC SNAND controller" > + depends on ARCH_QCOM || COMPILE_TEST > + help > + QPIC_SNAND (QPIC SPI NAND) driver for Qualcomm QPIC controller. > + QPIC controller supports both parallel nand and serial nand. > + This config will enable serial nand driver for QPIC controller. > + > config SPI_QUP > tristate "Qualcomm SPI controller with QUP interface" > depends on ARCH_QCOM || COMPILE_TEST > diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile > index 4ff8d725ba5e..9015368f8c73 100644 > --- a/drivers/spi/Makefile > +++ b/drivers/spi/Makefile > @@ -111,6 +111,7 @@ obj-$(CONFIG_SPI_PXA2XX) +=3D spi-pxa2xx-platform.o > obj-$(CONFIG_SPI_PXA2XX_PCI) +=3D spi-pxa2xx-pci.o > obj-$(CONFIG_SPI_QCOM_GENI) +=3D spi-geni-qcom.o > obj-$(CONFIG_SPI_QCOM_QSPI) +=3D spi-qcom-qspi.o > +obj-$(CONFIG_SPI_QPIC_SNAND) +=3D spi-qpic-snand.o > obj-$(CONFIG_SPI_QUP) +=3D spi-qup.o > obj-$(CONFIG_SPI_ROCKCHIP) +=3D spi-rockchip.o > obj-$(CONFIG_SPI_ROCKCHIP_SFC) +=3D spi-rockchip-sfc.o > diff --git a/drivers/spi/spi-qpic-snand.c b/drivers/spi/spi-qpic-snand.c > new file mode 100644 > index 000000000000..df7d5d8d4db2 > --- /dev/null > +++ b/drivers/spi/spi-qpic-snand.c > @@ -0,0 +1,1041 @@ > +/* > + * SPDX-License-Identifier: GPL-2.0 > + * > + * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reser= ved. > + * > + * Authors: > + * Md Sadre Alam > + * Sricharan R > + * Varadarajan Narayanan > + */ > + > +#include > +#include > + > +/* QSPI NAND config reg bits */ > +#define LOAD_CLK_CNTR_INIT_EN BIT(28) > +#define CLK_CNTR_INIT_VAL_VEC 0x924 > +#define FEA_STATUS_DEV_ADDR 0xc0 > +#define SPI_CFG BIT(0) > +#define SPI_NUM_ADDR 0xDA4DB > +#define SPI_WAIT_CNT 0x10 > +#define QPIC_QSPI_NUM_CS 1 > +#define SPI_TRANSFER_MODE_x1 BIT(29) > +#define SPI_TRANSFER_MODE_x4 (3 << 29) > +#define SPI_WP BIT(28) > +#define SPI_HOLD BIT(27) > +#define QPIC_SET_FEATURE BIT(31) > + > +#define SPINAND_RESET 0xff > +#define SPINAND_READID 0x9f > +#define SPINAND_GET_FEATURE 0x0f > +#define SPINAND_SET_FEATURE 0x1f > +#define SPINAND_READ 0x13 > +#define SPINAND_ERASE 0xd8 > +#define SPINAND_WRITE_EN 0x06 > +#define SPINAND_PROGRAM_EXECUTE 0x10 > +#define SPINAND_PROGRAM_LOAD 0x84 > + > +struct qpic_snand_op { > + u32 cmd_reg; > + u32 addr1_reg; > + u32 addr2_reg; > +}; > + > +struct snandc_read_status { > + __le32 snandc_flash; > + __le32 snandc_buffer; > + __le32 snandc_erased_cw; > +}; > + > +static void snandc_set_reg(struct qcom_nand_controller *snandc, int offs= et, u32 val) qcom_spi_ would be a better prefix maybe? > +{ > + struct nandc_regs *regs =3D snandc->regs; > + __le32 *reg; > + > + reg =3D qcom_offset_to_nandc_reg(regs, offset); > + > + if (reg) > + *reg =3D cpu_to_le32(val); > + > + if (WARN_ON(!reg)) > + return; This whole logic really seems suboptimal.=20 > +} > + > +static void snandc_set_read_loc_first(struct qcom_nand_controller *snand= c, > + int reg, int cw_offset, int read_size, > + int is_last_read_loc) > +{ > + snandc_set_reg(snandc, reg, ((cw_offset) << READ_LOCATION_OFFSET) | > + ((read_size) << READ_LOCATION_SIZE) | ((is_last_read_loc) > + << READ_LOCATION_LAST)); FIELD_GET, FIELD_PREP ? > +} > + > +static void snandc_set_read_loc_last(struct qcom_nand_controller *snandc, > + int reg, int cw_offset, int read_size, > + int is_last_read_loc) > +{ > + snandc_set_reg(snandc, reg, ((cw_offset) << READ_LOCATION_OFFSET) | > + ((read_size) << READ_LOCATION_SIZE) | ((is_last_read_loc) > + << READ_LOCATION_LAST)); > +} > + > +static struct qcom_nand_controller *nand_to_qcom_snand(struct nand_devic= e *nand) > +{ > + struct nand_ecc_engine *eng =3D nand->ecc.engine; > + > + return container_of(eng, struct qcom_nand_controller, ecc_eng); > +} > + > +static int qcom_snand_init(struct qcom_nand_controller *snandc) > +{ > + u32 snand_cfg_val =3D 0x0; > + int ret; > + > + snand_cfg_val |=3D (LOAD_CLK_CNTR_INIT_EN | (CLK_CNTR_INIT_VAL_VEC << 1= 6) > + | (FEA_STATUS_DEV_ADDR << 8) | SPI_CFG); ^ the |=C2=A0should be on the previous line. > + > + snandc_set_reg(snandc, NAND_FLASH_SPI_CFG, 0); > + snandc_set_reg(snandc, NAND_FLASH_SPI_CFG, snand_cfg_val); > + snandc_set_reg(snandc, NAND_NUM_ADDR_CYCLES, SPI_NUM_ADDR); > + snandc_set_reg(snandc, NAND_BUSY_CHECK_WAIT_CNT, SPI_WAIT_CNT); > + > + qcom_write_reg_dma(snandc, NAND_FLASH_SPI_CFG, 1, 0); > + qcom_write_reg_dma(snandc, NAND_FLASH_SPI_CFG, 1, 0); > + > + snand_cfg_val &=3D ~LOAD_CLK_CNTR_INIT_EN; > + snandc_set_reg(snandc, NAND_FLASH_SPI_CFG, snand_cfg_val); > + > + qcom_write_reg_dma(snandc, NAND_FLASH_SPI_CFG, 1, 0); > + > + qcom_write_reg_dma(snandc, NAND_NUM_ADDR_CYCLES, 1, 0); > + qcom_write_reg_dma(snandc, NAND_BUSY_CHECK_WAIT_CNT, 1, NAND_BAM_NEXT_S= GL); > + > + ret =3D qcom_submit_descs(snandc); > + if (ret) > + dev_err(snandc->dev, "failure in sbumitting spiinit descriptor\n"); Typos... > + > + return 0; return ret ? > +} > + > +static int qcom_snand_ooblayout_ecc(struct mtd_info *mtd, int section, > + struct mtd_oob_region *oobregion) > +{ > + struct nand_device *nand =3D mtd_to_nanddev(mtd); > + struct qcom_nand_controller *snandc =3D nand_to_qcom_snand(nand); > + struct qpic_ecc *qecc =3D snandc->ecc; > + > + if (section > 1) > + return -ERANGE; > + > + if (!section) { > + oobregion->length =3D (qecc->bytes * (qecc->steps - 1)) + qecc->bbm_si= ze; > + oobregion->offset =3D 0; No BBM? > + } else { > + oobregion->length =3D qecc->ecc_bytes_hw + qecc->spare_bytes; > + oobregion->offset =3D mtd->oobsize - oobregion->length; > + } > + > + return 0; > +} > + > +static int qcom_snand_ooblayout_free(struct mtd_info *mtd, int section, > + struct mtd_oob_region *oobregion) > +{ > + struct nand_device *nand =3D mtd_to_nanddev(mtd); > + struct qcom_nand_controller *snandc =3D nand_to_qcom_snand(nand); > + struct qpic_ecc *qecc =3D snandc->ecc; > + > + if (section) > + return -ERANGE; > + > + oobregion->length =3D qecc->steps * 4; > + oobregion->offset =3D ((qecc->steps - 1) * qecc->bytes) + qecc->bbm_siz= e; > + Using the same order would be easier to compare with the above version > + return 0; > +} > + > +static const struct mtd_ooblayout_ops qcom_snand_ooblayout =3D { > + .ecc =3D qcom_snand_ooblayout_ecc, > + .free =3D qcom_snand_ooblayout_free, > +}; > + > +static int qpic_snand_ecc_init_ctx_pipelined(struct nand_device *nand) > +{ > + struct qcom_nand_controller *snandc =3D nand_to_qcom_snand(nand); > + struct nand_ecc_props *conf =3D &nand->ecc.ctx.conf; > + struct nand_ecc_props *reqs =3D &nand->ecc.requirements; > + struct nand_ecc_props *user =3D &nand->ecc.user_conf; > + struct mtd_info *mtd =3D nanddev_to_mtd(nand); > + int step_size =3D 0, strength =3D 0, steps; > + int cwperpage, bad_block_byte; > + struct qpic_ecc *ecc_cfg; > + > + cwperpage =3D mtd->writesize / NANDC_STEP_SIZE; > + snandc->num_cw =3D cwperpage; > + > + ecc_cfg =3D kzalloc(sizeof(*ecc_cfg), GFP_KERNEL); > + if (!ecc_cfg) > + return -ENOMEM; > + > + nand->ecc.ctx.priv =3D ecc_cfg; > + > + if (user->step_size && user->strength) { > + step_size =3D user->step_size; > + strength =3D user->strength; > + } else if (reqs->step_size && reqs->strength) { > + step_size =3D reqs->step_size; > + strength =3D reqs->strength; > + } > + > + if (step_size && strength) > + steps =3D mtd->writesize / step_size; > + > + ecc_cfg->ecc_bytes_hw =3D 7; > + ecc_cfg->spare_bytes =3D 4; > + ecc_cfg->bbm_size =3D 1; > + ecc_cfg->bch_enabled =3D true; > + ecc_cfg->bytes =3D ecc_cfg->ecc_bytes_hw + ecc_cfg->spare_bytes + ecc_c= fg->bbm_size; > + > + ecc_cfg->steps =3D 4; > + ecc_cfg->strength =3D 4; > + ecc_cfg->step_size =3D 512; > + > + mtd_set_ooblayout(mtd, &qcom_snand_ooblayout); > + > + ecc_cfg->cw_data =3D 516; > + ecc_cfg->cw_size =3D ecc_cfg->cw_data + ecc_cfg->bytes; > + bad_block_byte =3D mtd->writesize - ecc_cfg->cw_size * (cwperpage - 1) = + 1; > + > + ecc_cfg->cfg0 =3D (cwperpage - 1) << CW_PER_PAGE > + | ecc_cfg->cw_data << UD_SIZE_BYTES > + | 1 << DISABLE_STATUS_AFTER_WRITE > + | 3 << NUM_ADDR_CYCLES > + | ecc_cfg->ecc_bytes_hw << ECC_PARITY_SIZE_BYTES_RS > + | 0 << STATUS_BFR_READ > + | 1 << SET_RD_MODE_AFTER_STATUS > + | ecc_cfg->spare_bytes << SPARE_SIZE_BYTES; > + > + ecc_cfg->cfg1 =3D 0 << NAND_RECOVERY_CYCLES > + | 0 << CS_ACTIVE_BSY > + | bad_block_byte << BAD_BLOCK_BYTE_NUM > + | 0 << BAD_BLOCK_IN_SPARE_AREA > + | 20 << WR_RD_BSY_GAP > + | 0 << WIDE_FLASH > + | ecc_cfg->bch_enabled << ENABLE_BCH_ECC; > + > + ecc_cfg->cfg0_raw =3D (cwperpage - 1) << CW_PER_PAGE > + | ecc_cfg->cw_size << UD_SIZE_BYTES > + | 3 << NUM_ADDR_CYCLES > + | 0 << SPARE_SIZE_BYTES; > + > + ecc_cfg->cfg1_raw =3D 0 << NAND_RECOVERY_CYCLES > + | 0 << CS_ACTIVE_BSY > + | 17 << BAD_BLOCK_BYTE_NUM > + | 1 << BAD_BLOCK_IN_SPARE_AREA > + | 20 << WR_RD_BSY_GAP > + | 0 << WIDE_FLASH > + | 1 << DEV0_CFG1_ECC_DISABLE; > + > + ecc_cfg->ecc_bch_cfg =3D !ecc_cfg->bch_enabled << ECC_CFG_ECC_DISABLE > + | 0 << ECC_SW_RESET > + | ecc_cfg->cw_data << ECC_NUM_DATA_BYTES > + | 1 << ECC_FORCE_CLK_OPEN > + | 0 << ECC_MODE > + | ecc_cfg->ecc_bytes_hw << ECC_PARITY_SIZE_BYTES_BCH; > + > + ecc_cfg->ecc_buf_cfg =3D 0x203 << NUM_STEPS; > + ecc_cfg->clrflashstatus =3D FS_READY_BSY_N; > + ecc_cfg->clrreadstatus =3D 0xc0; > + > + conf->step_size =3D ecc_cfg->step_size; > + conf->strength =3D ecc_cfg->strength; > + > + if (ecc_cfg->strength < strength) > + dev_warn(snandc->dev, "Unable to fulfill ECC requirements of %u bits.\= n", strength); Not needed I guess. Somewhat redundant with the core? > + > + dev_info(snandc->dev, "ECC strength: %u bits per %u bytes\n", > + ecc_cfg->strength, ecc_cfg->step_size); Debug? > + > + return 0; > +} > + > +static void qpic_snand_ecc_cleanup_ctx_pipelined(struct nand_device *nan= d) > +{ > + struct qpic_ecc *ecc_cfg =3D nand_to_ecc_ctx(nand); > + > + kfree(ecc_cfg); > +} > + > +static int qpic_snand_ecc_prepare_io_req_pipelined(struct nand_device *n= and, > + struct nand_page_io_req *req) > +{ > + struct qcom_nand_controller *snandc =3D nand_to_qcom_snand(nand); > + struct qpic_ecc *ecc_cfg =3D nand_to_ecc_ctx(nand); > + > + snandc->ecc =3D ecc_cfg; > + snandc->raw =3D false; > + snandc->oob_read =3D false; > + > + if (req->mode =3D=3D MTD_OPS_RAW) { > + if (req->ooblen) > + snandc->oob_read =3D true; > + snandc->raw =3D true; > + } > + > + return 0; > +} > + > +static int qpic_snand_ecc_finish_io_req_pipelined(struct nand_device *na= nd, > + struct nand_page_io_req *req) > +{ > + struct qcom_nand_controller *snandc =3D nand_to_qcom_snand(nand); > + struct mtd_info *mtd =3D nanddev_to_mtd(nand); > + > + if (req->mode =3D=3D MTD_OPS_RAW || req->type !=3D NAND_PAGE_READ) > + return 0; > + > + if (snandc->ecc_stats.failed) > + mtd->ecc_stats.failed +=3D snandc->ecc_stats.failed; > + mtd->ecc_stats.corrected +=3D snandc->ecc_stats.corrected; > + > + if (snandc->ecc_stats.failed) I hope you reset this counter at some point. Did you run nandbiterrs -i ? > + return -EBADMSG; > + else > + return snandc->ecc_stats.bitflips; > +} > + > +static struct nand_ecc_engine_ops qcom_snand_ecc_engine_ops_pipelined = =3D { > + .init_ctx =3D qpic_snand_ecc_init_ctx_pipelined, > + .cleanup_ctx =3D qpic_snand_ecc_cleanup_ctx_pipelined, > + .prepare_io_req =3D qpic_snand_ecc_prepare_io_req_pipelined, > + .finish_io_req =3D qpic_snand_ecc_finish_io_req_pipelined, > +}; > + > +/* helper to configure location register values */ > +static void snandc_set_read_loc(struct qcom_nand_controller *snandc, int= cw, int reg, > + int cw_offset, int read_size, int is_last_read_loc) > +{ > + int reg_base =3D NAND_READ_LOCATION_0; > + > + if (cw =3D=3D 3) > + reg_base =3D NAND_READ_LOCATION_LAST_CW_0; > + > + reg_base +=3D reg * 4; > + > + if (cw =3D=3D 3) > + return snandc_set_read_loc_last(snandc, reg_base, cw_offset, > + read_size, is_last_read_loc); Alignments are still wrong, again. > + else > + return snandc_set_read_loc_first(snandc, reg_base, cw_offset, > + read_size, is_last_read_loc); > +} > + > +static void > +snandc_config_cw_read(struct qcom_nand_controller *snandc, bool use_ecc,= int cw) > +{ > + int reg =3D NAND_READ_LOCATION_0; > + > + if (cw =3D=3D 3) > + reg =3D NAND_READ_LOCATION_LAST_CW_0; > + > + if (snandc->props->is_bam) > + qcom_write_reg_dma(snandc, reg, 4, NAND_BAM_NEXT_SGL); > + > + qcom_write_reg_dma(snandc, NAND_FLASH_CMD, 1, NAND_BAM_NEXT_SGL); > + qcom_write_reg_dma(snandc, NAND_EXEC_CMD, 1, NAND_BAM_NEXT_SGL); > + > + qcom_read_reg_dma(snandc, NAND_FLASH_STATUS, 2, 0); > + qcom_read_reg_dma(snandc, NAND_ERASED_CW_DETECT_STATUS, 1, > + NAND_BAM_NEXT_SGL); > +} > + > +static int qpic_snand_block_erase(struct qcom_nand_controller *snandc) > +{ > + struct qpic_ecc *ecc_cfg =3D snandc->ecc; > + int ret; > + > + snandc->buf_count =3D 0; > + snandc->buf_start =3D 0; > + qcom_clear_read_regs(snandc); > + qcom_clear_bam_transaction(snandc); > + > + snandc_set_reg(snandc, NAND_FLASH_CMD, snandc->cmd); > + snandc_set_reg(snandc, NAND_ADDR0, snandc->addr1); > + snandc_set_reg(snandc, NAND_ADDR1, snandc->addr2); > + snandc_set_reg(snandc, NAND_DEV0_CFG0, ecc_cfg->cfg0_raw & ~(7 << CW_PE= R_PAGE)); > + snandc_set_reg(snandc, NAND_DEV0_CFG1, ecc_cfg->cfg1_raw); > + snandc_set_reg(snandc, NAND_EXEC_CMD, 1); > + > + qcom_write_reg_dma(snandc, NAND_FLASH_CMD, 3, NAND_BAM_NEXT_SGL); > + qcom_write_reg_dma(snandc, NAND_DEV0_CFG0, 2, NAND_BAM_NEXT_SGL); > + qcom_write_reg_dma(snandc, NAND_EXEC_CMD, 1, NAND_BAM_NEXT_SGL); > + > + ret =3D qcom_submit_descs(snandc); > + if (ret) { > + dev_err(snandc->dev, "failure to erase block\n"); > + return ret; > + } > + > + return 0; > +} > + > +static void config_snand_single_cw_page_read(struct qcom_nand_controller= *snandc, > + bool use_ecc, int cw) > +{ > + int reg; > + > + qcom_write_reg_dma(snandc, NAND_ADDR0, 2, 0); > + qcom_write_reg_dma(snandc, NAND_DEV0_CFG0, 3, 0); > + qcom_write_reg_dma(snandc, NAND_ERASED_CW_DETECT_CFG, 1, 0); > + qcom_write_reg_dma(snandc, NAND_ERASED_CW_DETECT_CFG, 1, > + NAND_ERASED_CW_SET | NAND_BAM_NEXT_SGL); > + > + reg =3D NAND_READ_LOCATION_0; > + if (cw =3D=3D 3) This is hardcoded everywhere, I am not a big fan. > + reg =3D NAND_READ_LOCATION_LAST_CW_0; > + qcom_write_reg_dma(snandc, reg, 4, NAND_BAM_NEXT_SGL); > + qcom_write_reg_dma(snandc, NAND_FLASH_CMD, 1, NAND_BAM_NEXT_SGL); > + qcom_write_reg_dma(snandc, NAND_EXEC_CMD, 1, NAND_BAM_NEXT_SGL); > + > + qcom_read_reg_dma(snandc, NAND_FLASH_STATUS, 2, 0); > + qcom_read_reg_dma(snandc, NAND_ERASED_CW_DETECT_STATUS, 1, NAND_BAM_NEX= T_SGL); > +} > + > +static int qpic_snand_read_oob(struct qcom_nand_controller *snandc, > + const struct spi_mem_op *op) > +{ > + struct qpic_ecc *ecc_cfg =3D snandc->ecc; > + int size, ret; > + int col, bbpos; > + u32 cfg0, cfg1, ecc_bch_cfg; > + u32 num_cw =3D snandc->num_cw; > + > + qcom_clear_bam_transaction(snandc); > + qcom_clear_read_regs(snandc); > + > + size =3D ecc_cfg->cw_size; > + col =3D ecc_cfg->cw_size * (num_cw - 1); > + > + /* prepare a clean read buffer */ > + memset(snandc->data_buffer, 0xff, size); > + snandc_set_reg(snandc, NAND_ADDR0, (snandc->addr1 | col)); > + snandc_set_reg(snandc, NAND_ADDR1, snandc->addr2); > + > + cfg0 =3D (ecc_cfg->cfg0_raw & ~(7U << CW_PER_PAGE)) | > + 0 << CW_PER_PAGE; > + cfg1 =3D ecc_cfg->cfg1_raw; > + ecc_bch_cfg =3D 1 << ECC_CFG_ECC_DISABLE; > + > + snandc_set_reg(snandc, NAND_FLASH_CMD, snandc->cmd); > + snandc_set_reg(snandc, NAND_DEV0_CFG0, cfg0); > + snandc_set_reg(snandc, NAND_DEV0_CFG1, cfg1); > + snandc_set_reg(snandc, NAND_DEV0_ECC_CFG, ecc_bch_cfg); > + snandc_set_reg(snandc, NAND_EXEC_CMD, 1); > + > + config_snand_single_cw_page_read(snandc, false, num_cw - 1); > + > + qcom_read_data_dma(snandc, FLASH_BUF_ACC, snandc->data_buffer, size, 0); > + > + ret =3D qcom_submit_descs(snandc); > + if (ret) > + dev_err(snandc->dev, "failed to read oob\n"); Why don't you return here? > + > + qcom_nandc_read_buffer_sync(snandc, true); > + u32 flash =3D le32_to_cpu(snandc->reg_read_buf[0]); No compiler warning here? > + > + if (flash & (FS_OP_ERR | FS_MPU_ERR)) > + return -EIO; > + > + bbpos =3D 2048 - ecc_cfg->cw_size * (num_cw - 1); Why is this size hardcoded?! That cannot work! > + memcpy(op->data.buf.in, snandc->data_buffer + bbpos, op->data.nbytes); > + > + return ret; > +} > + > +static int snandc_check_error(struct qcom_nand_controller *snandc) > +{ > + struct snandc_read_status *buf; > + int i, num_cw =3D snandc->num_cw; > + bool serial_op_err =3D false, erased; > + > + qcom_nandc_read_buffer_sync(snandc, true); > + buf =3D (struct snandc_read_status *)snandc->reg_read_buf; > + > + for (i =3D 0; i < num_cw; i++, buf++) { > + u32 flash, buffer, erased_cw; > + > + flash =3D le32_to_cpu(buf->snandc_flash); > + buffer =3D le32_to_cpu(buf->snandc_buffer); > + erased_cw =3D le32_to_cpu(buf->snandc_erased_cw); > + > + if ((flash & FS_OP_ERR) && (buffer & BS_UNCORRECTABLE_BIT)) { > + erased =3D (erased_cw & ERASED_CW) =3D=3D ERASED_CW ? > + true : false; This ternary operation is useless > + } else if (flash & (FS_OP_ERR | FS_MPU_ERR)) { > + serial_op_err =3D true; > + } > + } > + > + if (serial_op_err) > + return -EIO; > + > + return 0; > +} > + > +static int qpic_snand_read_page_cache(struct qcom_nand_controller *snand= c, > + const struct spi_mem_op *op) > +{ > + struct qpic_ecc *ecc_cfg =3D snandc->ecc; > + u8 *data_buf; > + int ret, i; > + u32 cfg0, cfg1, ecc_bch_cfg, num_cw =3D snandc->num_cw; > + > + data_buf =3D op->data.buf.in; > + > + if (snandc->oob_read) { > + return qpic_snand_read_oob(snandc, op); > + snandc->oob_read =3D false; > + } > + > + snandc->buf_count =3D 0; > + snandc->buf_start =3D 0; > + qcom_clear_read_regs(snandc); > + > + cfg0 =3D (ecc_cfg->cfg0 & ~(7U << CW_PER_PAGE)) | > + (num_cw - 1) << CW_PER_PAGE; > + cfg1 =3D ecc_cfg->cfg1; > + ecc_bch_cfg =3D ecc_cfg->ecc_bch_cfg; > + > + snandc_set_reg(snandc, NAND_ADDR0, snandc->addr1); > + snandc_set_reg(snandc, NAND_ADDR1, snandc->addr2); > + snandc_set_reg(snandc, NAND_FLASH_CMD, snandc->cmd); > + snandc_set_reg(snandc, NAND_DEV0_CFG0, cfg0); > + snandc_set_reg(snandc, NAND_DEV0_CFG1, cfg1); > + snandc_set_reg(snandc, NAND_DEV0_ECC_CFG, ecc_bch_cfg); > + snandc_set_reg(snandc, NAND_FLASH_STATUS, ecc_cfg->clrflashstatus); > + snandc_set_reg(snandc, NAND_READ_STATUS, ecc_cfg->clrreadstatus); > + snandc_set_reg(snandc, NAND_EXEC_CMD, 1); > + snandc_set_read_loc(snandc, 0, 0, 0, ecc_cfg->cw_data, 1); > + > + qcom_clear_bam_transaction(snandc); > + > + qcom_write_reg_dma(snandc, NAND_ADDR0, 2, 0); > + qcom_write_reg_dma(snandc, NAND_DEV0_CFG0, 3, 0); > + qcom_write_reg_dma(snandc, NAND_ERASED_CW_DETECT_CFG, 1, 0); > + qcom_write_reg_dma(snandc, NAND_ERASED_CW_DETECT_CFG, 1, > + NAND_ERASED_CW_SET | NAND_BAM_NEXT_SGL); > + > + for (i =3D 0; i < num_cw; i++) { > + int data_size; > + > + if (i =3D=3D (num_cw - 1)) > + data_size =3D 512 - ((num_cw - 1) << 2); > + else > + data_size =3D ecc_cfg->cw_data; > + > + if (data_buf) > + snandc_set_read_loc(snandc, i, 0, 0, data_size, 1); > + > + snandc_config_cw_read(snandc, true, i); > + > + if (data_buf) > + qcom_read_data_dma(snandc, FLASH_BUF_ACC, data_buf, > + data_size, 0); > + > + if (data_buf) > + data_buf +=3D data_size; > + } > + > + ret =3D qcom_submit_descs(snandc); > + if (ret) { > + dev_err(snandc->dev, "failure to read page/oob\n"); > + return ret; > + } > + > + return snandc_check_error(snandc); > +} > + > +static void config_snand_page_write(struct qcom_nand_controller *snandc) > +{ > + qcom_write_reg_dma(snandc, NAND_ADDR0, 2, 0); > + qcom_write_reg_dma(snandc, NAND_DEV0_CFG0, 3, 0); > + qcom_write_reg_dma(snandc, NAND_EBI2_ECC_BUF_CFG, 1, NAND_BAM_NEXT_SGL); > +} > + > +static void config_snand_cw_write(struct qcom_nand_controller *snandc) > +{ > + qcom_write_reg_dma(snandc, NAND_FLASH_CMD, 1, NAND_BAM_NEXT_SGL); > + qcom_write_reg_dma(snandc, NAND_EXEC_CMD, 1, NAND_BAM_NEXT_SGL); > +} > + > +static int qpic_snand_program_execute(struct qcom_nand_controller *snand= c, > + const struct spi_mem_op *op) > +{ > + struct qpic_ecc *ecc_cfg =3D snandc->ecc; > + u8 *data_buf; > + int i, ret; > + int num_cw =3D snandc->num_cw; > + u32 cfg0, cfg1, ecc_bch_cfg, ecc_buf_cfg; > + > + cfg0 =3D (ecc_cfg->cfg0 & ~(7U << CW_PER_PAGE)) | > + (num_cw - 1) << CW_PER_PAGE; > + cfg1 =3D ecc_cfg->cfg1; > + ecc_bch_cfg =3D ecc_cfg->ecc_bch_cfg; > + ecc_buf_cfg =3D ecc_cfg->ecc_buf_cfg; > + > + data_buf =3D snandc->wbuf; > + > + snandc->buf_count =3D 0; > + snandc->buf_start =3D 0; > + qcom_clear_read_regs(snandc); > + qcom_clear_bam_transaction(snandc); > + > + snandc_set_reg(snandc, NAND_ADDR0, snandc->addr1); > + snandc_set_reg(snandc, NAND_ADDR1, snandc->addr2); > + snandc_set_reg(snandc, NAND_FLASH_CMD, snandc->cmd); > + > + snandc_set_reg(snandc, NAND_DEV0_CFG0, cfg0); > + snandc_set_reg(snandc, NAND_DEV0_CFG1, cfg1); > + snandc_set_reg(snandc, NAND_DEV0_ECC_CFG, ecc_bch_cfg); > + > + snandc_set_reg(snandc, NAND_EBI2_ECC_BUF_CFG, ecc_buf_cfg); > + > + snandc_set_reg(snandc, NAND_EXEC_CMD, 1); > + > + config_snand_page_write(snandc); > + > + for (i =3D 0; i < num_cw; i++) { > + int data_size; > + > + if (i =3D=3D (num_cw - 1)) > + data_size =3D NANDC_STEP_SIZE - ((num_cw - 1) << 2); > + else > + data_size =3D ecc_cfg->cw_data; > + > + qcom_write_data_dma(snandc, FLASH_BUF_ACC, data_buf, data_size, > + i =3D=3D (num_cw - 1) ? NAND_BAM_NO_EOT : 0); > + > + config_snand_cw_write(snandc); > + if (data_buf) > + data_buf +=3D data_size; > + } > + > + ret =3D qcom_submit_descs(snandc); > + if (ret) { > + dev_err(snandc->dev, "failure to write page\n"); > + return ret; > + } > + > + return 0; > +} > + > +static u32 qpic_snand_cmd_mapping(struct qcom_nand_controller *snandc, u= 32 opcode) > +{ > + u32 cmd =3D 0x0; > + > + switch (opcode) { > + case SPINAND_RESET: > + cmd =3D (SPI_WP | SPI_HOLD | SPI_TRANSFER_MODE_x1 | OP_RESET_DEVICE); > + break; > + case SPINAND_READID: > + cmd =3D (SPI_WP | SPI_HOLD | SPI_TRANSFER_MODE_x1 | OP_FETCH_ID); > + break; > + case SPINAND_GET_FEATURE: > + cmd =3D (SPI_TRANSFER_MODE_x1 | SPI_WP | SPI_HOLD | ACC_FEATURE); > + break; > + case SPINAND_SET_FEATURE: > + cmd =3D (SPI_TRANSFER_MODE_x1 | SPI_WP | SPI_HOLD | ACC_FEATURE | > + QPIC_SET_FEATURE); > + break; > + case SPINAND_READ: > + if (snandc->raw) > + cmd =3D (PAGE_ACC | LAST_PAGE | SPI_TRANSFER_MODE_x1 | > + SPI_WP | SPI_HOLD | OP_PAGE_READ); > + else > + cmd =3D (PAGE_ACC | LAST_PAGE | SPI_TRANSFER_MODE_x1 | > + SPI_WP | SPI_HOLD | OP_PAGE_READ_WITH_ECC); > + break; > + case SPINAND_ERASE: > + cmd =3D OP_BLOCK_ERASE | PAGE_ACC | LAST_PAGE | SPI_WP | > + SPI_HOLD | SPI_TRANSFER_MODE_x1; > + break; > + case SPINAND_WRITE_EN: > + cmd =3D SPINAND_WRITE_EN; > + break; > + case SPINAND_PROGRAM_EXECUTE: > + cmd =3D (PAGE_ACC | LAST_PAGE | SPI_TRANSFER_MODE_x1 | > + SPI_WP | SPI_HOLD | OP_PROGRAM_PAGE); > + break; > + case SPINAND_PROGRAM_LOAD: > + cmd =3D SPINAND_PROGRAM_LOAD; > + break; > + default: > + break; No, no, no and no again. You've been sending NAND contributions for years, and you still continue to assume all the commands are defined and we will never check for supported ops. Please. > + } > + > + return cmd; > +} > + > +static int qpic_snand_write_page_cache(struct qcom_nand_controller *snan= dc, > + const struct spi_mem_op *op) > +{ > + struct qpic_snand_op s_op =3D {}; > + u32 cmd; > + > + cmd =3D qpic_snand_cmd_mapping(snandc, op->cmd.opcode); > + s_op.cmd_reg =3D cmd; > + > + if (op->cmd.opcode =3D=3D SPINAND_PROGRAM_LOAD) { > + snandc->wbuf =3D (u8 *)op->data.buf.out; > + snandc->wlen =3D op->data.nbytes; > + } > + > + return 0; > +} > + > +static int qpic_snand_send_cmdaddr(struct qcom_nand_controller *snandc, > + const struct spi_mem_op *op) > +{ > + struct qpic_snand_op s_op =3D {}; > + u32 cmd; > + int ret; > + > + cmd =3D qpic_snand_cmd_mapping(snandc, op->cmd.opcode); > + > + s_op.cmd_reg =3D cmd; > + s_op.addr1_reg =3D op->addr.val; > + s_op.addr2_reg =3D 0; > + Would a switch case be more appropriate? > + if (op->cmd.opcode =3D=3D SPINAND_WRITE_EN) > + return 0; > + > + if (op->cmd.opcode =3D=3D SPINAND_PROGRAM_EXECUTE) { > + s_op.addr1_reg =3D op->addr.val << 16; > + s_op.addr2_reg =3D op->addr.val >> 16 & 0xff; > + snandc->addr1 =3D s_op.addr1_reg; > + snandc->addr2 =3D s_op.addr2_reg; > + snandc->cmd =3D cmd; > + return qpic_snand_program_execute(snandc, op); > + } > + > + if (op->cmd.opcode =3D=3D SPINAND_READ) { > + s_op.addr1_reg =3D (op->addr.val << 16); > + s_op.addr2_reg =3D op->addr.val >> 16 & 0xff; > + snandc->addr1 =3D s_op.addr1_reg; > + snandc->addr2 =3D s_op.addr2_reg; > + snandc->cmd =3D cmd; > + return 0; > + } > + > + if (op->cmd.opcode =3D=3D SPINAND_ERASE) { > + s_op.addr2_reg =3D (op->addr.val >> 16) & 0xffff; > + s_op.addr1_reg =3D op->addr.val; > + snandc->addr1 =3D s_op.addr1_reg; > + snandc->addr1 <<=3D 16; > + snandc->addr2 =3D s_op.addr2_reg; > + snandc->cmd =3D cmd; > + qpic_snand_block_erase(snandc); > + return 0; > + } > + > + snandc->buf_count =3D 0; > + snandc->buf_start =3D 0; > + qcom_clear_read_regs(snandc); > + qcom_clear_bam_transaction(snandc); > + > + snandc_set_reg(snandc, NAND_FLASH_CMD, s_op.cmd_reg); > + snandc_set_reg(snandc, NAND_EXEC_CMD, 0x1); > + snandc_set_reg(snandc, NAND_ADDR0, s_op.addr1_reg); > + snandc_set_reg(snandc, NAND_ADDR1, s_op.addr2_reg); > + > + qcom_write_reg_dma(snandc, NAND_FLASH_CMD, 3, NAND_BAM_NEXT_SGL); > + qcom_write_reg_dma(snandc, NAND_EXEC_CMD, 1, NAND_BAM_NEXT_SGL); > + > + ret =3D qcom_submit_descs(snandc); > + if (ret) > + dev_err(snandc->dev, "failure in sbumitting cmd descriptor\n"); > + > + return ret; > +} > + > +static int qpic_snand_io_op(struct qcom_nand_controller *snandc, const s= truct spi_mem_op *op) > +{ > + int ret, val, opcode; > + bool copy =3D false, copy_ftr =3D false; > + > + ret =3D qpic_snand_send_cmdaddr(snandc, op); > + if (ret) > + return ret; > + > + snandc->buf_count =3D 0; > + snandc->buf_start =3D 0; > + qcom_clear_read_regs(snandc); > + qcom_clear_bam_transaction(snandc); > + opcode =3D op->cmd.opcode; > + > + switch (opcode) { > + case SPINAND_READID: > + snandc->buf_count =3D 4; > + qcom_read_reg_dma(snandc, NAND_READ_ID, 1, NAND_BAM_NEXT_SGL); > + copy =3D true; > + break; > + case SPINAND_GET_FEATURE: > + snandc->buf_count =3D 4; > + qcom_read_reg_dma(snandc, NAND_FLASH_FEATURES, 1, NAND_BAM_NEXT_SGL); > + copy_ftr =3D true; > + break; > + case SPINAND_SET_FEATURE: > + snandc_set_reg(snandc, NAND_FLASH_FEATURES, *(u32 *)op->data.buf.out); > + qcom_write_reg_dma(snandc, NAND_FLASH_FEATURES, 1, NAND_BAM_NEXT_SGL); > + break; > + default: > + return 0; > + } > + > + ret =3D qcom_submit_descs(snandc); > + if (ret) > + dev_err(snandc->dev, "failure in submitting descriptor for:%d\n", opco= de); > + > + if (copy) { > + qcom_nandc_read_buffer_sync(snandc, true); > + memcpy(op->data.buf.in, snandc->reg_read_buf, snandc->buf_count); > + } > + > + if (copy_ftr) { > + qcom_nandc_read_buffer_sync(snandc, true); > + val =3D le32_to_cpu(*(__le32 *)snandc->reg_read_buf); > + val >>=3D 8; > + memcpy(op->data.buf.in, &val, snandc->buf_count); > + } > + > + return ret; > +} > + > +static bool qpic_snand_is_page_op(const struct spi_mem_op *op) > +{ > + if (op->addr.buswidth !=3D 1 && op->addr.buswidth !=3D 2 && op->addr.bu= swidth !=3D 4) > + return false; > + > + if (op->data.dir =3D=3D SPI_MEM_DATA_IN) { > + if (op->addr.buswidth =3D=3D 4 && op->data.buswidth =3D=3D 4) > + return true; > + > + if (op->addr.nbytes =3D=3D 2 && op->addr.buswidth =3D=3D 1) > + return true; > + > + } else if (op->data.dir =3D=3D SPI_MEM_DATA_OUT) { > + if (op->data.buswidth =3D=3D 4) > + return true; > + if (op->addr.nbytes =3D=3D 2 && op->addr.buswidth =3D=3D 1) > + return true; > + } > + > + return false; > +} > + > +static bool qpic_snand_supports_op(struct spi_mem *mem, const struct spi= _mem_op *op) > +{ > + if (!spi_mem_default_supports_op(mem, op)) > + return false; > + > + if (op->cmd.nbytes !=3D 1 || op->cmd.buswidth !=3D 1) > + return false; > + > + if (qpic_snand_is_page_op(op)) > + return true; > + > + return ((op->addr.nbytes =3D=3D 0 || op->addr.buswidth =3D=3D 1) && !op->addr.nbytes and so on > + (op->dummy.nbytes =3D=3D 0 || op->dummy.buswidth =3D=3D 1) && > + (op->data.nbytes =3D=3D 0 || op->data.buswidth =3D=3D 1)); > +} > + > +static int qpic_snand_exec_op(struct spi_mem *mem, const struct spi_mem_= op *op) > +{ > + struct qcom_nand_controller *snandc =3D spi_controller_get_devdata(mem-= >spi->controller); > + > + dev_dbg(snandc->dev, "OP %02x ADDR %08llX@%d:%u DATA %d:%u", op->cmd.op= code, > + op->addr.val, op->addr.buswidth, op->addr.nbytes, > + op->data.buswidth, op->data.nbytes); > + > + if (qpic_snand_is_page_op(op)) { > + if (op->data.dir =3D=3D SPI_MEM_DATA_IN) > + return qpic_snand_read_page_cache(snandc, op); > + if (op->data.dir =3D=3D SPI_MEM_DATA_OUT) > + return qpic_snand_write_page_cache(snandc, op); > + } else { > + return qpic_snand_io_op(snandc, op); > + } > + > + return 0; > +} > + > +static const struct spi_controller_mem_ops qcom_spi_mem_ops =3D { > + .supports_op =3D qpic_snand_supports_op, > + .exec_op =3D qpic_snand_exec_op, > +}; > + > +static const struct spi_controller_mem_caps qcom_snand_mem_caps =3D { > + .ecc =3D true, > +}; > + > +static int qcom_snand_probe(struct platform_device *pdev) > +{ > + struct device *dev =3D &pdev->dev; > + struct spi_controller *ctlr; > + struct qcom_nand_controller *snandc; > + struct resource *res; > + const void *dev_data; > + struct qpic_ecc *ecc; > + int ret; > + > + ecc =3D devm_kzalloc(dev, sizeof(*ecc), GFP_KERNEL); > + if (!ecc) > + return -ENOMEM; > + > + ctlr =3D __devm_spi_alloc_controller(dev, sizeof(*snandc), false); I don't know if that is legitimate, why using __devm? > + if (!ctlr) > + return -ENOMEM; > + > + platform_set_drvdata(pdev, ctlr); > + > + snandc =3D spi_controller_get_devdata(ctlr); > + > + snandc->ctlr =3D ctlr; > + snandc->dev =3D dev; > + snandc->ecc =3D ecc; > + > + dev_data =3D of_device_get_match_data(dev); > + if (!dev_data) { > + dev_err(&pdev->dev, "failed to get device data\n"); > + return -ENODEV; > + } > + > + snandc->props =3D dev_data; > + snandc->dev =3D &pdev->dev; > + > + snandc->core_clk =3D devm_clk_get(dev, "core"); > + if (IS_ERR(snandc->core_clk)) > + return PTR_ERR(snandc->core_clk); > + > + snandc->aon_clk =3D devm_clk_get(dev, "aon"); > + if (IS_ERR(snandc->aon_clk)) > + return PTR_ERR(snandc->aon_clk); > + > + snandc->iomacro_clk =3D devm_clk_get(dev, "iom"); > + if (IS_ERR(snandc->iomacro_clk)) > + return PTR_ERR(snandc->iomacro_clk); > + > + snandc->base =3D devm_platform_get_and_ioremap_resource(pdev, 0, &res); > + if (IS_ERR(snandc->base)) > + return PTR_ERR(snandc->base); > + > + snandc->base_phys =3D res->start; > + snandc->base_dma =3D dma_map_resource(dev, res->start, resource_size(re= s), > + DMA_BIDIRECTIONAL, 0); > + if (dma_mapping_error(dev, snandc->base_dma)) > + return -ENXIO; > + > + ret =3D clk_prepare_enable(snandc->core_clk); > + if (ret) > + goto err_core_clk; > + > + ret =3D clk_prepare_enable(snandc->aon_clk); > + if (ret) > + goto err_aon_clk; > + > + ret =3D clk_prepare_enable(snandc->iomacro_clk); > + if (ret) > + goto err_snandc_alloc; > + > + ret =3D qcom_nandc_alloc(snandc); > + if (ret) > + goto err_snandc_alloc; > + > + ret =3D qcom_snand_init(snandc); > + if (ret) > + goto err_init; > + > + /* setup ECC engine */ > + snandc->ecc_eng.dev =3D &pdev->dev; > + snandc->ecc_eng.integration =3D NAND_ECC_ENGINE_INTEGRATION_PIPELINED; > + snandc->ecc_eng.ops =3D &qcom_snand_ecc_engine_ops_pipelined; > + snandc->ecc_eng.priv =3D snandc; > + > + ret =3D nand_ecc_register_on_host_hw_engine(&snandc->ecc_eng); > + if (ret) { > + dev_err(&pdev->dev, "failed to register ecc engine.\n"); > + goto err_init; > + } > + > + ctlr->num_chipselect =3D QPIC_QSPI_NUM_CS; > + ctlr->mem_ops =3D &qcom_spi_mem_ops; > + ctlr->mem_caps =3D &qcom_snand_mem_caps; > + ctlr->dev.of_node =3D pdev->dev.of_node; > + ctlr->mode_bits =3D SPI_TX_DUAL | SPI_RX_DUAL | > + SPI_TX_QUAD | SPI_RX_QUAD; > + > + ret =3D spi_register_controller(ctlr); > + if (ret) { > + dev_err(&pdev->dev, "spi_register_controller failed.\n"); > + goto err_init; > + } > + > + return 0; > + > +err_init: > + qcom_nandc_unalloc(snandc); > +err_snandc_alloc: > + clk_disable_unprepare(snandc->aon_clk); > +err_aon_clk: > + clk_disable_unprepare(snandc->core_clk); Don't you miss one clock ? > +err_core_clk: > + dma_unmap_resource(dev, res->start, resource_size(res), > + DMA_BIDIRECTIONAL, 0); > + return ret; > +} > + > +static int qcom_snand_remove(struct platform_device *pdev) > +{ > + struct spi_controller *ctlr =3D platform_get_drvdata(pdev); > + struct qcom_nand_controller *snandc =3D spi_controller_get_devdata(ctlr= ); > + struct resource *res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); > + > + spi_unregister_controller(ctlr); > + > + clk_disable_unprepare(snandc->aon_clk); > + clk_disable_unprepare(snandc->core_clk); > + clk_disable_unprepare(snandc->iomacro_clk); > + > + dma_unmap_resource(&pdev->dev, snandc->base_dma, resource_size(res), > + DMA_BIDIRECTIONAL, 0); > + return 0; > +} > + > +static const struct qcom_nandc_props ipq9574_snandc_props =3D { > + .dev_cmd_reg_start =3D 0x7000, > + .is_bam =3D true, Same comment about "is_bam" > +}; > + > +static const struct of_device_id qcom_snandc_of_match[] =3D { > + { > + .compatible =3D "qcom,spi-qpic-snand", > + .data =3D &ipq9574_snandc_props, > + }, > + {} > +} > +MODULE_DEVICE_TABLE(of, qcom_snandc_of_match); > + > +static struct platform_driver qcom_snand_driver =3D { > + .driver =3D { > + .name =3D "qcom_snand", > + .of_match_table =3D qcom_snandc_of_match, > + }, > + .probe =3D qcom_snand_probe, > + .remove =3D qcom_snand_remove, > +}; > +module_platform_driver(qcom_snand_driver); > + > +MODULE_DESCRIPTION("SPI driver for QPIC QSPI cores"); > +MODULE_AUTHOR("Md Sadre Alam "); > +MODULE_LICENSE("GPL"); > diff --git a/include/linux/mtd/nand-qpic-common.h b/include/linux/mtd/nan= d-qpic-common.h > index aced15866627..4673cd36ff0a 100644 > --- a/include/linux/mtd/nand-qpic-common.h > +++ b/include/linux/mtd/nand-qpic-common.h > @@ -45,6 +45,9 @@ > #define NAND_DEV_CMD1 0xa4 > #define NAND_DEV_CMD2 0xa8 > #define NAND_DEV_CMD_VLD 0xac > +#define NAND_FLASH_SPI_CFG 0xc0 > +#define NAND_NUM_ADDR_CYCLES 0xc4 > +#define NAND_BUSY_CHECK_WAIT_CNT 0xc8 If this is specific to the spi-nand implementation, then it's not common and has no reason to be shared here. Same for the other definitions of course. > #define SFLASHC_BURST_CFG 0xe0 > #define NAND_ERASED_CW_DETECT_CFG 0xe8 > #define NAND_ERASED_CW_DETECT_STATUS 0xec > @@ -61,6 +64,7 @@ > #define NAND_READ_LOCATION_LAST_CW_1 0xf44 > #define NAND_READ_LOCATION_LAST_CW_2 0xf48 > #define NAND_READ_LOCATION_LAST_CW_3 0xf4c > +#define NAND_FLASH_FEATURES 0xf64 > =20 > /* dummy register offsets, used by write_reg_dma */ > #define NAND_DEV_CMD1_RESTORE 0xdead > @@ -169,6 +173,7 @@ > #define OP_CHECK_STATUS 0xc > #define OP_FETCH_ID 0xb > #define OP_RESET_DEVICE 0xd > +#define ACC_FEATURE 0xe > =20 > /* Default Value for NAND_DEV_CMD_VLD */ > #define NAND_DEV_CMD_VLD_VAL (READ_START_VLD | WRITE_START_VLD | \ > @@ -329,11 +334,53 @@ struct nandc_regs { > __le32 read_location_last1; > __le32 read_location_last2; > __le32 read_location_last3; > + __le32 spi_cfg; > + __le32 num_addr_cycle; > + __le32 busy_wait_cnt; > + __le32 flash_feature; > =20 > __le32 erased_cw_detect_cfg_clr; > __le32 erased_cw_detect_cfg_set; > }; > =20 > +struct qcom_ecc_stats { > + u32 corrected; > + u32 bitflips; > + u32 failed; > +}; > + > +/* > + * QPIC ECC data struct > + * > + */ > +struct qpic_ecc { > + struct device *dev; > + const struct qpic_ecc_caps *caps; > + struct completion done; > + u32 sectors; > + u8 *eccdata; > + bool use_ecc; > + u32 ecc_modes; > + int ecc_bytes_hw; > + int spare_bytes; > + int bbm_size; > + int ecc_mode; > + int bytes; > + int steps; > + int step_size; > + int strength; > + int cw_size; > + int cw_data; > + u32 cfg0, cfg1; > + u32 cfg0_raw, cfg1_raw; > + u32 ecc_buf_cfg; > + u32 ecc_bch_cfg; > + u32 clrflashstatus; > + u32 clrreadstatus; > + bool bch_enabled; > +}; > + > +struct qpic_ecc; > /* > * NAND controller data struct > * > @@ -352,6 +399,7 @@ struct nandc_regs { > * initialized via DT match data > * > * @controller: base controller structure > + * @ctlr: spi controller structure > * @host_list: list containing all the chips attached to the > * controller > * > @@ -389,6 +437,7 @@ struct qcom_nand_controller { > =20 > struct clk *core_clk; > struct clk *aon_clk; > + struct clk *iomacro_clk; > =20 > struct nandc_regs *regs; > struct bam_transaction *bam_txn; > @@ -396,6 +445,7 @@ struct qcom_nand_controller { > const struct qcom_nandc_props *props; > =20 > struct nand_controller controller; > + struct spi_controller *ctlr; > struct list_head host_list; > =20 > union { > @@ -432,6 +482,17 @@ struct qcom_nand_controller { > =20 > u32 cmd1, vld; > bool exec_opwrite; > + struct qpic_ecc *ecc; > + struct qcom_ecc_stats ecc_stats; > + struct nand_ecc_engine ecc_eng; > + u8 *wbuf; > + u32 wlen; > + u32 addr1; > + u32 addr2; > + u32 cmd; > + u32 num_cw; > + bool oob_read; > + bool raw; > }; > =20 > /* Thanks, Miqu=C3=A8l