Patchwork [U-Boot,1/4] sf: Unify spi_flash write code

login
register
mail settings
Submitter Jagannadha Sutradharudu Teki
Date June 14, 2013, 8:18 p.m.
Message ID <87f697a6-f08c-4f72-906d-885df6bbdeb9@DB8EHSMHS019.ehs.local>
Download mbox | patch
Permalink /patch/251521/
State Superseded
Delegated to: Jagannadha Sutradharudu Teki
Headers show

Comments

Jagannadha Sutradharudu Teki - June 14, 2013, 8:18 p.m.
Move common flash write code into spi_flash_write_common().

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 drivers/mtd/spi/spi_flash.c          | 122 ++++++++++++++++-------------------
 drivers/mtd/spi/spi_flash_internal.h |   6 ++
 2 files changed, 60 insertions(+), 68 deletions(-)
Simon Glass - June 19, 2013, 4:31 a.m.
Hi Jagan,

On Fri, Jun 14, 2013 at 1:18 PM, Jagannadha Sutradharudu Teki <
jagannadha.sutradharudu-teki@xilinx.com> wrote:

> Move common flash write code into spi_flash_write_common().
>
> Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
> ---
>  drivers/mtd/spi/spi_flash.c          | 122
> ++++++++++++++++-------------------
>  drivers/mtd/spi/spi_flash_internal.h |   6 ++
>  2 files changed, 60 insertions(+), 68 deletions(-)
>

This looks good except that  spi_flash_write_common() is not a great name -
only one of the operations is a 'write'. Perhaps spi_flash_oper_common() or
similar?

Regards,
Simon
Jagannadha Sutradharudu Teki - June 19, 2013, 9:56 a.m.
On Wed, Jun 19, 2013 at 10:01 AM, Simon Glass <sjg@chromium.org> wrote:
> Hi Jagan,
>
> On Fri, Jun 14, 2013 at 1:18 PM, Jagannadha Sutradharudu Teki <
> jagannadha.sutradharudu-teki@xilinx.com> wrote:
>
>> Move common flash write code into spi_flash_write_common().
>>
>> Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
>> ---
>>  drivers/mtd/spi/spi_flash.c          | 122
>> ++++++++++++++++-------------------
>>  drivers/mtd/spi/spi_flash_internal.h |   6 ++
>>  2 files changed, 60 insertions(+), 68 deletions(-)
>>
>
> This looks good except that  spi_flash_write_common() is not a great name -
> only one of the operations is a 'write'. Perhaps spi_flash_oper_common() or
> similar?

I think it's ok to use spi_flash_write_common().
because, I put this name as the write sequence has all theseopers
write_enable, write and wait_ready, not by taking only write
operation.

May be I will try to put spi_flash_write_oper_common()
Any comments.??

Thanks,
Jagan.
>
> Regards,
> Simon
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>
Simon Glass - June 19, 2013, 9:07 p.m.
Hi Jagan,

On Wed, Jun 19, 2013 at 2:56 AM, Jagan Teki <jagannadh.teki@gmail.com>wrote:

> On Wed, Jun 19, 2013 at 10:01 AM, Simon Glass <sjg@chromium.org> wrote:
> > Hi Jagan,
> >
> > On Fri, Jun 14, 2013 at 1:18 PM, Jagannadha Sutradharudu Teki <
> > jagannadha.sutradharudu-teki@xilinx.com> wrote:
> >
> >> Move common flash write code into spi_flash_write_common().
> >>
> >> Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
> >> ---
> >>  drivers/mtd/spi/spi_flash.c          | 122
> >> ++++++++++++++++-------------------
> >>  drivers/mtd/spi/spi_flash_internal.h |   6 ++
> >>  2 files changed, 60 insertions(+), 68 deletions(-)
> >>
> >
> > This looks good except that  spi_flash_write_common() is not a great
> name -
> > only one of the operations is a 'write'. Perhaps spi_flash_oper_common()
> or
> > similar?
>
> I think it's ok to use spi_flash_write_common().
> because, I put this name as the write sequence has all theseopers
> write_enable, write and wait_ready, not by taking only write
> operation.
>
> OK well let's not worry about it too much.

Acked-by: Simon Glass <sjg@chromium.org>



> May be I will try to put spi_flash_write_oper_common()
> Any comments.??
>

Regards,
Simon

Patch

diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index c439601..f8fd897 100644
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -68,22 +68,53 @@  int spi_flash_cmd_write(struct spi_slave *spi, const u8 *cmd, size_t cmd_len,
 	return spi_flash_read_write(spi, cmd, cmd_len, data, NULL, data_len);
 }
 
+int spi_flash_write_common(struct spi_flash *flash, const u8 *cmd,
+	size_t cmd_len, const void *buf, size_t buf_len, unsigned long timeout)
+{
+	struct spi_slave *spi = flash->spi;
+	int ret;
+
+	ret = spi_claim_bus(flash->spi);
+	if (ret) {
+		debug("SF: Unable to claim SPI bus\n");
+		return ret;
+	}
+
+	ret = spi_flash_cmd_write_enable(flash);
+	if (ret < 0) {
+		debug("SF: enabling write failed\n");
+		return ret;
+	}
+
+	ret = spi_flash_cmd_write(spi, cmd, cmd_len, buf, buf_len);
+	if (ret < 0) {
+		debug("SF: write cmd failed\n");
+		return ret;
+	}
+
+	ret = spi_flash_cmd_wait_ready(flash, timeout);
+	if (ret < 0) {
+		debug("SF: write %s timed out\n",
+			timeout == SPI_FLASH_PROG_TIMEOUT ?
+			"program" : "page erase");
+		return ret;
+	}
+
+	spi_release_bus(spi);
+
+	return ret;
+}
+
 int spi_flash_cmd_write_multi(struct spi_flash *flash, u32 offset,
 		size_t len, const void *buf)
 {
 	unsigned long byte_addr, page_size;
 	size_t chunk_len, actual;
-	int ret;
 	u8 cmd[4];
+	int ret = -1;
 
 	page_size = flash->page_size;
 
-	ret = spi_claim_bus(flash->spi);
-	if (ret) {
-		debug("SF: unable to claim SPI bus\n");
-		return ret;
-	}
-
 	cmd[0] = CMD_PAGE_PROGRAM;
 	for (actual = 0; actual < len; actual += chunk_len) {
 #ifdef CONFIG_SPI_FLASH_BAR
@@ -108,27 +139,17 @@  int spi_flash_cmd_write_multi(struct spi_flash *flash, u32 offset,
 		debug("PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zu\n",
 		      buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
 
-		ret = spi_flash_cmd_write_enable(flash);
-		if (ret < 0) {
-			debug("SF: enabling write failed\n");
-			break;
-		}
-
-		ret = spi_flash_cmd_write(flash->spi, cmd, 4,
-					  buf + actual, chunk_len);
+		ret = spi_flash_write_common(flash, cmd, sizeof(cmd),
+					buf + actual, chunk_len,
+					SPI_FLASH_PROG_TIMEOUT);
 		if (ret < 0) {
 			debug("SF: write failed\n");
 			break;
 		}
 
-		ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
-		if (ret)
-			break;
-
 		offset += chunk_len;
 	}
 
-	spi_release_bus(flash->spi);
 	return ret;
 }
 
@@ -242,8 +263,8 @@  int spi_flash_cmd_wait_ready(struct spi_flash *flash, unsigned long timeout)
 int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len)
 {
 	u32 erase_size;
-	int ret;
 	u8 cmd[4];
+	int ret = -1;
 
 	erase_size = flash->sector_size;
 	if (offset % erase_size || len % erase_size) {
@@ -251,12 +272,6 @@  int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len)
 		return -1;
 	}
 
-	ret = spi_claim_bus(flash->spi);
-	if (ret) {
-		debug("SF: Unable to claim SPI bus\n");
-		return ret;
-	}
-
 	if (erase_size == 4096)
 		cmd[0] = CMD_ERASE_4K;
 	else
@@ -279,24 +294,17 @@  int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len)
 		debug("SF: erase %2x %2x %2x %2x (%x)\n", cmd[0], cmd[1],
 		      cmd[2], cmd[3], offset);
 
-		ret = spi_flash_cmd_write_enable(flash);
-		if (ret)
-			goto out;
-
-		ret = spi_flash_cmd_write(flash->spi, cmd, sizeof(cmd), NULL, 0);
-		if (ret)
-			goto out;
-
-		ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PAGE_ERASE_TIMEOUT);
-		if (ret)
-			goto out;
+		ret = spi_flash_write_common(flash, cmd, sizeof(cmd),
+					NULL, 0, SPI_FLASH_PAGE_ERASE_TIMEOUT);
+		if (ret < 0) {
+			debug("SF: erase failed\n");
+			break;
+		}
 
 		offset += erase_size;
 		len -= erase_size;
 	}
 
- out:
-	spi_release_bus(flash->spi);
 	return ret;
 }
 
@@ -305,22 +313,11 @@  int spi_flash_cmd_write_status(struct spi_flash *flash, u8 sr)
 	u8 cmd;
 	int ret;
 
-	ret = spi_flash_cmd_write_enable(flash);
-	if (ret < 0) {
-		debug("SF: enabling write failed\n");
-		return ret;
-	}
-
 	cmd = CMD_WRITE_STATUS;
-	ret = spi_flash_cmd_write(flash->spi, &cmd, 1, &sr, 1);
-	if (ret) {
-		debug("SF: fail to write status register\n");
-		return ret;
-	}
-
-	ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
+	ret = spi_flash_write_common(flash, &cmd, 1,
+				&sr, 1, SPI_FLASH_PROG_TIMEOUT);
 	if (ret < 0) {
-		debug("SF: write status register timed out\n");
+		debug("SF: fail to write status register\n");
 		return ret;
 	}
 
@@ -339,25 +336,14 @@  int spi_flash_cmd_bankaddr_write(struct spi_flash *flash, u8 bank_sel)
 	}
 
 	cmd = flash->bank_cmd[1];
-	ret = spi_flash_cmd_write_enable(flash);
+	ret = spi_flash_write_common(flash, &cmd, 1,
+				&bank_sel, 1, SPI_FLASH_PROG_TIMEOUT);
 	if (ret < 0) {
-		debug("SF: enabling write failed\n");
-		return ret;
-	}
-
-	ret = spi_flash_cmd_write(flash->spi, &cmd, 1, &bank_sel, 1);
-	if (ret) {
-		debug("SF: fail to write bank addr register\n");
+		debug("SF: fail to write bank register\n");
 		return ret;
 	}
 	flash->bank_curr = bank_sel;
 
-	ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
-	if (ret < 0) {
-		debug("SF: write bank addr register timed out\n");
-		return ret;
-	}
-
 	return 0;
 }
 
diff --git a/drivers/mtd/spi/spi_flash_internal.h b/drivers/mtd/spi/spi_flash_internal.h
index 8147f27..77d1da8 100644
--- a/drivers/mtd/spi/spi_flash_internal.h
+++ b/drivers/mtd/spi/spi_flash_internal.h
@@ -108,6 +108,12 @@  int spi_flash_bank_config(struct spi_flash *flash, u8 idcode0);
  */
 int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd,
 		size_t cmd_len, void *data, size_t data_len);
+/*
+ * Same as spi_flash_cmd_write() except it also claims/releases the SPI
+ * bus. Used as common part of the ->write() operation.
+ */
+int spi_flash_write_common(struct spi_flash *flash, const u8 *cmd,
+	size_t cmd_len, const void *buf, size_t buf_len, unsigned long timeout);
 
 /*
  * Send the read status command to the device and wait for the wip