]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
staging: wfx: load the firmware faster
authorJérôme Pouiller <jerome.pouiller@silabs.com>
Wed, 1 Jul 2020 15:06:59 +0000 (17:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Jul 2020 08:33:07 +0000 (10:33 +0200)
During the loading of the firmware, the WFX_DCA_GET register provide the
number available bytes in the receiving buffer. It is not necessary to
access to the WFX_DCA_GET after sent of each firmware fragment.

This patch allows to send the firmware:
  - in 64ms instead of 130ms using SDIO bus
  - in 78ms instead of 115ms using SPI bus

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200701150707.222985-6-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wfx/fwio.c

index 72bb3d2a96138f669a07931a2ffa09e5c47288d5..d9a886f3e64be338158dc76c991a7cec50f5e0b9 100644 (file)
@@ -188,15 +188,14 @@ static int upload_firmware(struct wfx_dev *wdev, const u8 *data, size_t len)
        while (offs < len) {
                start = ktime_get();
                for (;;) {
-                       ret = sram_reg_read(wdev, WFX_DCA_GET, &bytes_done);
-                       if (ret < 0)
-                               return ret;
                        now = ktime_get();
-                       if (offs +
-                           DNLD_BLOCK_SIZE - bytes_done < DNLD_FIFO_SIZE)
+                       if (offs + DNLD_BLOCK_SIZE - bytes_done < DNLD_FIFO_SIZE)
                                break;
                        if (ktime_after(now, ktime_add_ms(start, DCA_TIMEOUT)))
                                return -ETIMEDOUT;
+                       ret = sram_reg_read(wdev, WFX_DCA_GET, &bytes_done);
+                       if (ret < 0)
+                               return ret;
                }
                if (ktime_compare(now, start))
                        dev_dbg(wdev->dev, "answer after %lldus\n",