From patchwork Fri May 24 13:18:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Birje X-Patchwork-Id: 246141 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id BCC192C016A for ; Fri, 24 May 2013 23:12:07 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B31394A037; Fri, 24 May 2013 15:12:03 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TyWVAbNDnSV2; Fri, 24 May 2013 15:12:03 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 953EE4A03B; Fri, 24 May 2013 15:12:01 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EE6134A03A for ; Fri, 24 May 2013 15:11:55 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IkT+cBCVWcxC for ; Fri, 24 May 2013 15:11:51 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 BL_NJABL=SKIP(-1.5) (only DNSBL check requested) Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by theia.denx.de (Postfix) with ESMTP id 935C34A027 for ; Fri, 24 May 2013 15:11:48 +0200 (CEST) Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MNB00HT90NMUG40@mailout1.samsung.com> for u-boot@lists.denx.de; Fri, 24 May 2013 22:11:46 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.124]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id E5.67.08825.2176F915; Fri, 24 May 2013 22:11:46 +0900 (KST) X-AuditID: cbfee68e-b7f276d000002279-74-519f67121726 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id CA.03.21068.2176F915; Fri, 24 May 2013 22:11:46 +0900 (KST) Received: from rajeshwari-linux.sisodomain.com ([107.108.215.115]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MNB008JZ0L9SE20@mmp1.samsung.com>; Fri, 24 May 2013 22:11:46 +0900 (KST) From: Rajeshwari Shinde To: u-boot@lists.denx.de Date: Fri, 24 May 2013 18:48:26 +0530 Message-id: <1369401506-865-3-git-send-email-rajeshwari.s@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1369401506-865-1-git-send-email-rajeshwari.s@samsung.com> References: <1369401506-865-1-git-send-email-rajeshwari.s@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRmVeSWpSXmKPExsWyRsSkRlcofX6gwd9WCYuOIy2MFlMOf2Gx +LZlG6PF8tcb2S3e7u1kd2D1mN1wkcVjwaZSjzvX9rB5nL2zg9Gjb8sqxgDWKC6blNSczLLU In27BK6MM6u2sRTc1qyYeOw+cwPjLoUuRk4OCQETiZ+nlzFD2GISF+6tZ+ti5OIQEljKKNH3 9QkbTNGDj19ZIBKLGCW+TVnFDOFMZJJoO7aEBaSKTcBIYuvJaYwgtoiAhMSv/qtgNrNAlMT3 7kvsILawgJ3Ej5YuVhCbRUBVYuOHq2AbeAXcJF6eOQx1hoLEsalfwWo4Bdwlrm5cDFYjBFTz 4MBXRoiabnaJ3XdtIeYISHybfAjoBg6guKzEpgNQYyQlDq64wTKBUXgBI8MqRtHUguSC4qT0 IiO94sTc4tK8dL3k/NxNjMCQPv3vWd8OxpsHrA8xJgONm8gsJZqcD4yJvJJ4Q2MzIwtTE1Nj I3NLM9KElcR51VqsA4UE0hNLUrNTUwtSi+KLSnNSiw8xMnFwSjUwzjgaUKyx8+A77arqCXET ospaN4jPTZdd9rOh6P15wehOh5zDk55PYXX4lP552xfpCYblyR9e93Idn5rHzfumc/LdN/L3 vrHt0xML8Hy/4C1Lj7vXkh9ri5f+dys8PzdebaLrMuGXCx00eouX8f1t8q3Vm8LW9YIj6vIb hyM5DOz96obhq5u+KLEUZyQaajEXFScCAJzrHRJ/AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFIsWRmVeSWpSXmKPExsVy+t9jAV2h9PmBBjcu8Fl0HGlhtJhy+AuL xbct2xgtlr/eyG7xdm8nuwOrx+yGiyweCzaVety5tofN4+ydHYwefVtWMQawRjUw2mSkJqak Fimk5iXnp2TmpdsqeQfHO8ebmhkY6hpaWpgrKeQl5qbaKrn4BOi6ZeYAbVdSKEvMKQUKBSQW Fyvp22GaEBripmsB0xih6xsSBNdjZIAGEtYwZpxZtY2l4LZmxcRj95kbGHcpdDFyckgImEg8 +PiVBcIWk7hwbz1bFyMXh5DAIkaJb1NWMUM4E5kk2o4tAatiEzCS2HpyGiOILSIgIfGr/yqY zSwQJfG9+xI7iC0sYCfxo6WLFcRmEVCV2PjhKhuIzSvgJvHyzGFmiG0KEsemfgWr4RRwl7i6 cTFYjRBQzYMDXxknMPIuYGRYxSiaWpBcUJyUnmukV5yYW1yal66XnJ+7iREcM8+kdzCuarA4 xCjAwajEwztDZ16gEGtiWXFl7iFGCQ5mJRHedSHzA4V4UxIrq1KL8uOLSnNSiw8xJgNdNZFZ SjQ5HxjPeSXxhsYm5qbGppYmFiZmlqQJK4nzHmy1DhQSSE8sSc1OTS1ILYLZwsTBKdXAWCbf whGqNvf55K2XewKM7W/ciVDVcp32MOHBN+e7/5tenZdTnZWnXBW9bsXPdvbumytCYk3fRD08 x/Wzal+donvvztKvl3WNP3F3mCQvq5aeolMxKXlfmqz11oVSDves2M8EyedcLMl+Ojd8ehpz atBy/g/vNL8c+u0UuMNsmnWX94HPKtellFiKMxINtZiLihMBi2g41N0CAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: u-boot-review@google.com, patches@linaro.org Subject: [U-Boot] [PATCH 2/2 V3] EXYNOS: SPI: Support SPI_PREAMBLE mode X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Support interfaces with a preamble before each received message. We handle this when the client has requested a SPI_XFER_END, meaning that we must close of the transaction. In this case we read until we see the preamble (or a timeout occurs), skipping all data before and including the preamble. The client will receive only data bytes after the preamble. Signed-off-by: Simon Glass Signed-off-by: Rajeshwari Shinde --- Changes in v2: - Remove preamable_count variable which is not really needed - Fix checkpatch warning (multiple assignments) Changes in V3: - Modified the if logic in spi_rx_tx function - Added blank lines as suggested by Minkyu Kang. - Removed in_bytes check in while loop. - Added a error check. drivers/spi/exynos_spi.c | 69 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 59 insertions(+), 10 deletions(-) diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c index 607e1cd..99895af 100644 --- a/drivers/spi/exynos_spi.c +++ b/drivers/spi/exynos_spi.c @@ -51,6 +51,7 @@ struct exynos_spi_slave { unsigned int mode; enum periph_id periph_id; /* Peripheral ID for this device */ unsigned int fifo_size; + int skip_preamble; }; static struct spi_bus *spi_get_bus(unsigned dev_index) @@ -105,6 +106,8 @@ struct spi_slave *spi_setup_slave(unsigned int busnum, unsigned int cs, else spi_slave->fifo_size = 256; + spi_slave->skip_preamble = 0; + spi_slave->freq = bus->frequency; if (max_hz) spi_slave->freq = min(max_hz, spi_slave->freq); @@ -217,17 +220,23 @@ static void spi_request_bytes(struct exynos_spi *regs, int count) writel(count | SPI_PACKET_CNT_EN, ®s->pkt_cnt); } -static void spi_rx_tx(struct exynos_spi_slave *spi_slave, int todo, - void **dinp, void const **doutp) +static int spi_rx_tx(struct exynos_spi_slave *spi_slave, int todo, + void **dinp, void const **doutp, unsigned long flags) { struct exynos_spi *regs = spi_slave->regs; uchar *rxp = *dinp; const uchar *txp = *doutp; int rx_lvl, tx_lvl; uint out_bytes, in_bytes; + int toread; + unsigned start = get_timer(0); + int stopping; out_bytes = in_bytes = todo; + stopping = spi_slave->skip_preamble && (flags & SPI_XFER_END) && + !(spi_slave->mode & SPI_SLAVE); + /* * If there's something to send, do a software reset and set a * transaction size. @@ -238,6 +247,8 @@ static void spi_rx_tx(struct exynos_spi_slave *spi_slave, int todo, * Bytes are transmitted/received in pairs. Wait to receive all the * data because then transmission will be done as well. */ + toread = in_bytes; + while (in_bytes) { int temp; @@ -248,15 +259,43 @@ static void spi_rx_tx(struct exynos_spi_slave *spi_slave, int todo, writel(temp, ®s->tx_data); out_bytes--; } - if (rx_lvl > 0 && in_bytes) { + if (rx_lvl > 0) { temp = readl(®s->rx_data); - if (rxp) - *rxp++ = temp; - in_bytes--; + if (spi_slave->skip_preamble) { + if (temp == SPI_PREAMBLE_END_BYTE) { + spi_slave->skip_preamble = 0; + stopping = 0; + } + } else { + if (rxp || stopping) + *rxp++ = temp; + in_bytes--; + } + toread--; + } else if (in_bytes) { + /* + * We have run out of input data, but haven't read + * enough bytes after the preamble yet. Read some more, + * and make sure that we transmit dummy bytes too, to + * keep things going. + */ + assert(!out_bytes); + out_bytes = in_bytes; + toread = in_bytes; + txp = NULL; + spi_request_bytes(regs, toread); + } + if (spi_slave->skip_preamble && get_timer(start) > 100) { + printf("SPI timeout: in_bytes=%d, out_bytes=%d, ", + in_bytes, out_bytes); + return -1; } } + *dinp = rxp; *doutp = txp; + + return 0; } /** @@ -276,6 +315,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, struct exynos_spi_slave *spi_slave = to_exynos_spi(slave); int upto, todo; int bytelen; + int ret = 0; /* spi core configured to do 8 bit transfers */ if (bitlen % 8) { @@ -289,16 +329,24 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, /* Exynos SPI limits each transfer to 65535 bytes */ bytelen = bitlen / 8; - for (upto = 0; upto < bytelen; upto += todo) { + for (upto = 0; !ret && upto < bytelen; upto += todo) { todo = min(bytelen - upto, (1 << 16) - 1); - spi_rx_tx(spi_slave, todo, &din, &dout); + ret = spi_rx_tx(spi_slave, todo, &din, &dout, flags); + if (ret) + break; } /* Stop the transaction, if necessary. */ - if ((flags & SPI_XFER_END)) + if ((flags & SPI_XFER_END) && !(spi_slave->mode & SPI_SLAVE)) { spi_cs_deactivate(slave); + if (spi_slave->skip_preamble) { + assert(!spi_slave->skip_preamble); + debug("Failed to complete premable transaction\n"); + ret = -1; + } + } - return 0; + return ret; } /** @@ -325,6 +373,7 @@ void spi_cs_activate(struct spi_slave *slave) clrbits_le32(&spi_slave->regs->cs_reg, SPI_SLAVE_SIG_INACT); debug("Activate CS, bus %d\n", spi_slave->slave.bus); + spi_slave->skip_preamble = spi_slave->mode & SPI_PREAMBLE; } /**