thunderbolt: Use generic tb_nvm_[read|write]_data() for Thunderbolt 2/3 devices

Now that we have generic functionality available in nvm.c make the DMA
port code call it instead of duplicating the functionality.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/thunderbolt/dma_port.c b/drivers/thunderbolt/dma_port.c
index 5631319..9f20c7b 100644 (file)
--- a/drivers/thunderbolt/dma_port.c
+++ b/drivers/thunderbolt/dma_port.c
@@ -299,15 +299,13 @@ static int dma_port_request(struct tb_dma_port *dma, u32 in,
        return status_to_errno(out);
 }
 
-static int dma_port_flash_read_block(struct tb_dma_port *dma, u32 address,
-                                    void *buf, u32 size)
+static int dma_port_flash_read_block(void *data, unsigned int dwaddress,
+                                    void *buf, size_t dwords)
 {
+       struct tb_dma_port *dma = data;
        struct tb_switch *sw = dma->sw;
-       u32 in, dwaddress, dwords;
        int ret;
-
-       dwaddress = address / 4;
-       dwords = size / 4;
+       u32 in;
 
        in = MAIL_IN_CMD_FLASH_READ << MAIL_IN_CMD_SHIFT;
        if (dwords < MAIL_DATA_DWORDS)
@@ -323,14 +321,13 @@ static int dma_port_flash_read_block(struct tb_dma_port *dma, u32 address,
                             dma->base + MAIL_DATA, dwords, DMA_PORT_TIMEOUT);
 }
 
-static int dma_port_flash_write_block(struct tb_dma_port *dma, u32 address,
-                                     const void *buf, u32 size)
+static int dma_port_flash_write_block(void *data, unsigned int dwaddress,
+                                     const void *buf, size_t dwords)
 {
+       struct tb_dma_port *dma = data;
        struct tb_switch *sw = dma->sw;
-       u32 in, dwaddress, dwords;
        int ret;
-
-       dwords = size / 4;
+       u32 in;
 
        /* Write the block to MAIL_DATA registers */
        ret = dma_port_write(sw->tb->ctl, buf, tb_route(sw), dma->port,
@@ -341,12 +338,8 @@ static int dma_port_flash_write_block(struct tb_dma_port *dma, u32 address,
        in = MAIL_IN_CMD_FLASH_WRITE << MAIL_IN_CMD_SHIFT;
 
        /* CSS header write is always done to the same magic address */
-       if (address >= DMA_PORT_CSS_ADDRESS) {
-               dwaddress = DMA_PORT_CSS_ADDRESS;
+       if (dwaddress >= DMA_PORT_CSS_ADDRESS)
                in |= MAIL_IN_CSS;
-       } else {
-               dwaddress = address / 4;
-       }
 
        in |= ((dwords - 1) << MAIL_IN_DWORDS_SHIFT) & MAIL_IN_DWORDS_MASK;
        in |= (dwaddress << MAIL_IN_ADDRESS_SHIFT) & MAIL_IN_ADDRESS_MASK;
@@ -365,36 +358,8 @@ static int dma_port_flash_write_block(struct tb_dma_port *dma, u32 address,
 int dma_port_flash_read(struct tb_dma_port *dma, unsigned int address,
                        void *buf, size_t size)
 {
-       unsigned int retries = DMA_PORT_RETRIES;
-
-       do {
-               unsigned int offset;
-               size_t nbytes;
-               int ret;
-
-               offset = address & 3;
-               nbytes = min_t(size_t, size + offset, MAIL_DATA_DWORDS * 4);
-
-               ret = dma_port_flash_read_block(dma, address, dma->buf,
-                                               ALIGN(nbytes, 4));
-               if (ret) {
-                       if (ret == -ETIMEDOUT) {
-                               if (retries--)
-                                       continue;
-                               ret = -EIO;
-                       }
-                       return ret;
-               }
-
-               nbytes -= offset;
-               memcpy(buf, dma->buf + offset, nbytes);
-
-               size -= nbytes;
-               address += nbytes;
-               buf += nbytes;
-       } while (size > 0);
-
-       return 0;
+       return tb_nvm_read_data(address, buf, size, DMA_PORT_RETRIES,
+                               dma_port_flash_read_block, dma);
 }
 
 /**
@@ -411,40 +376,11 @@ int dma_port_flash_read(struct tb_dma_port *dma, unsigned int address,
 int dma_port_flash_write(struct tb_dma_port *dma, unsigned int address,
                         const void *buf, size_t size)
 {
-       unsigned int retries = DMA_PORT_RETRIES;
-       unsigned int offset;
-
-       if (address >= DMA_PORT_CSS_ADDRESS) {
-               offset = 0;
-               if (size > DMA_PORT_CSS_MAX_SIZE)
-                       return -E2BIG;
-       } else {
-               offset = address & 3;
-               address = address & ~3;
-       }
-
-       do {
-               u32 nbytes = min_t(u32, size, MAIL_DATA_DWORDS * 4);
-               int ret;
+       if (address >= DMA_PORT_CSS_ADDRESS && size > DMA_PORT_CSS_MAX_SIZE)
+               return -E2BIG;
 
-               memcpy(dma->buf + offset, buf, nbytes);
-
-               ret = dma_port_flash_write_block(dma, address, buf, nbytes);
-               if (ret) {
-                       if (ret == -ETIMEDOUT) {
-                               if (retries--)
-                                       continue;
-                               ret = -EIO;
-                       }
-                       return ret;
-               }
-
-               size -= nbytes;
-               address += nbytes;
-               buf += nbytes;
-       } while (size > 0);
-
-       return 0;
+       return tb_nvm_write_data(address, buf, size, DMA_PORT_RETRIES,
+                                dma_port_flash_write_block, dma);
 }
 
 /**