From patchwork Fri Oct 12 08:48:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Brezillon X-Patchwork-Id: 982934 X-Patchwork-Delegate: tudor.ambarus@gmail.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=none (p=none dis=none) header.from=bootlin.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jE9VqizF"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="v93ZnZXy"; 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 42Wj085hnBz9s3Z for ; Fri, 12 Oct 2018 20:17:12 +1100 (AEDT) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=HRfgTBRB9ok0wFvuTBTNmSuKvZ1OTKYEbl1pzrpUP40=; b=jE9VqizFsLeKAJmK9i/OiKcSBz cug94/ix+VfTuitk8xylP4usF+aESUqMDw1rXIjG8BoQuLnYVOnB534aFSVTDsuoHoIJVINCNdjH/ 6AC6fEmV2L0vYDMWMYFEgVsbeaSQSva4hAPjlVLI5k1SsYaFOYEJPLqFcoIamv1+nNT/k5VbE8y+2 EnqC//3MBDzkwbSA3P67PTY6f7024DiHg1Ay07vIS02EhKzuzitotddGP0E/cr7h364xtDyutIKSH 2oOqWj5nA3wZhQh9mNXSeKrV+6d99K69P3sF/QT6X9x1l9ea9NFJDO3fypFNMqsKdhS1ilRxxe82q 6OKESdDQ==; 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 1gAtZ5-0002PL-63; Fri, 12 Oct 2018 09:16:59 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gAtNk-0003DT-WA for linux-mtd@bombadil.infradead.org; Fri, 12 Oct 2018 09:05:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=1ijd1a0LDJTCSb3nID3FkfGfiW39JH3yMZSbctNoMAw=; b=v93ZnZXyDL+QBcRdFVVhauY65 ru1b4w1WINYtrwTgeo9sM4JtO03fF40NlB6OUHaUlNIDEsdSrkVD6Cgzipvhpxn/BAfKac27srAfe 70uTs3Jzu2vQLvIUiuBD5z7sdwPGXoPkJKHiFOmO2eXyQH115cn3KRJZTL6O/gmZsKJXF6hb2MDX8 hfIEbFy+fwSeu8upptFua0/kPQWSuWedbMP4kQfE+a8ezSN3rAm4WfPLYy+hIwwcOGEvwkl+Swfok dQi+6an+xyj8fxTALQ+EcF+XYIVVj05h56qJQ1fortdBor2KaK/jANrq4TM3S3jM3xCe7UMvRyK00 hLWQ1Tcbw==; Received: from mail.bootlin.com ([62.4.15.54]) by casper.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gAt8V-0004Hr-VD for linux-mtd@lists.infradead.org; Fri, 12 Oct 2018 08:49:35 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 63E1420703; Fri, 12 Oct 2018 10:48:58 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.bootlin.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost.localdomain (AAubervilliers-681-1-7-245.w90-88.abo.wanadoo.fr [90.88.129.245]) by mail.bootlin.com (Postfix) with ESMTPSA id 60A3120DDD; Fri, 12 Oct 2018 10:48:32 +0200 (CEST) From: Boris Brezillon To: David Woodhouse , Brian Norris , Boris Brezillon , Marek Vasut , Richard Weinberger , linux-mtd@lists.infradead.org, Yogesh Gaur , Vignesh R , Cyrille Pitchen Subject: [PATCH RFC 15/18] mtd: spi-nor: Add DTR support to the spi-mem logic Date: Fri, 12 Oct 2018 10:48:22 +0200 Message-Id: <20181012084825.23697-16-boris.brezillon@bootlin.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20181012084825.23697-1-boris.brezillon@bootlin.com> References: <20181012084825.23697-1-boris.brezillon@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181012_094932_129025_A3A5AD1A X-CRM114-Status: GOOD ( 16.20 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on casper.infradead.org summary: Content analysis details: (-0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 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: Julien Su , Mark Brown , Mason Yang , linux-spi@vger.kernel.org, zhengxunli@mxic.com.tw MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Make sure op->xxx.dtr fields are properly filled and unmask DTR modes in spi_nor_spimem_adjust_hwcaps() so that DTR support detection is done through spi_mem_supports_op(). Signed-off-by: Boris Brezillon --- drivers/mtd/spi-nor/spi-nor.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 98dab7f6938e..9ff957dc351c 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -280,12 +280,18 @@ static ssize_t spi_nor_spimem_read_data(struct spi_nor *nor, loff_t ofs, /* get transfer protocols. */ op.cmd.buswidth = spi_nor_get_protocol_inst_nbits(nor->read_proto); + op.cmd.dtr = spi_nor_protocol_inst_is_dtr(nor->read_proto); op.addr.buswidth = spi_nor_get_protocol_addr_nbits(nor->read_proto); + op.addr.dtr = spi_nor_protocol_addr_is_dtr(nor->read_proto); op.dummy.buswidth = op.addr.buswidth; + op.dummy.dtr = op.addr.dtr; op.data.buswidth = spi_nor_get_protocol_data_nbits(nor->read_proto); + op.data.dtr = spi_nor_protocol_data_is_dtr(nor->read_proto); /* convert the dummy cycles to the number of bytes */ op.dummy.nbytes = (nor->read_dummy * op.dummy.buswidth) / 8; + if (op.dummy.dtr) + op.dummy.nbytes *= 2; if (nor->read_proto & SNOR_PROTO_INST_2BYTE) op.cmd.nbytes = 2; @@ -345,8 +351,11 @@ static ssize_t spi_nor_spimem_write_data(struct spi_nor *nor, loff_t ofs, /* get transfer protocols. */ op.cmd.buswidth = spi_nor_get_protocol_inst_nbits(nor->write_proto); + op.cmd.dtr = spi_nor_protocol_inst_is_dtr(nor->write_proto); op.addr.buswidth = spi_nor_get_protocol_addr_nbits(nor->write_proto); + op.addr.dtr = spi_nor_protocol_addr_is_dtr(nor->write_proto); op.data.buswidth = spi_nor_get_protocol_data_nbits(nor->write_proto); + op.data.dtr = spi_nor_protocol_data_is_dtr(nor->write_proto); if (nor->write_proto & SNOR_PROTO_INST_2BYTE) op.cmd.nbytes = 2; @@ -3043,11 +3052,17 @@ static int spi_nor_spimem_check_readop(struct spi_nor *nor, SPI_MEM_OP_DATA_IN(0, NULL, 1)); op.cmd.buswidth = spi_nor_get_protocol_inst_nbits(read->proto); + op.cmd.dtr = spi_nor_protocol_inst_is_dtr(read->proto); op.addr.buswidth = spi_nor_get_protocol_addr_nbits(read->proto); + op.addr.dtr = spi_nor_protocol_addr_is_dtr(read->proto); op.data.buswidth = spi_nor_get_protocol_data_nbits(read->proto); + op.data.dtr = spi_nor_protocol_addr_is_dtr(read->proto); op.dummy.buswidth = op.addr.buswidth; + op.dummy.dtr = op.addr.dtr; op.dummy.nbytes = (read->num_mode_clocks + read->num_wait_states) * op.dummy.buswidth / 8; + if (op.dummy.dtr) + op.dummy.nbytes *= 2; if (read->proto & SNOR_PROTO_INST_2BYTE) op.cmd.nbytes = 2; @@ -3077,8 +3092,11 @@ static int spi_nor_spimem_check_progop(struct spi_nor *nor, SPI_MEM_OP_DATA_OUT(0, NULL, 1)); op.cmd.buswidth = spi_nor_get_protocol_inst_nbits(pp->proto); + op.cmd.dtr = spi_nor_protocol_inst_is_dtr(pp->proto); op.addr.buswidth = spi_nor_get_protocol_addr_nbits(pp->proto); + op.addr.dtr = spi_nor_protocol_addr_is_dtr(pp->proto); op.data.buswidth = spi_nor_get_protocol_data_nbits(pp->proto); + op.data.dtr = spi_nor_protocol_addr_is_dtr(pp->proto); if (pp->proto & SNOR_PROTO_INST_2BYTE) op.cmd.nbytes = 2; @@ -3106,9 +3124,6 @@ spi_nor_spimem_adjust_hwcaps(struct spi_nor *nor, { unsigned int cap; - /* DTR modes are not supported yet, mask them all. */ - *hwcaps &= ~SNOR_HWCAPS_DTR; - /* Start with read commands. */ for (cap = 0; cap < 32; cap++) { int idx;