[PATCH 3/7] ath10k: add ath10k_sdio_read()

[Kalle Valo]

Signed-off-by: Kalle Valo <kv...@qca.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/sdio.c |   40 +++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/sdio.c 
b/drivers/net/wireless/ath/ath10k/sdio.c
index 56728d44dd12..bbd8317de861 100644
--- a/drivers/net/wireless/ath/ath10k/sdio.c
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
@@ -343,6 +343,31 @@ static int ath10k_sdio_read32(struct ath10k *ar, u32 addr, 
u32 *val)
        return ret;
 }
 
+static int ath10k_sdio_read(struct ath10k *ar, u32 addr, void *buf, size_t len)
+{
+       struct ath10k_sdio *ar_sdio = ath10k_sdio_priv(ar);
+       struct sdio_func *func = ar_sdio->func;
+       int ret;
+
+       sdio_claim_host(func);
+
+       ret = sdio_memcpy_fromio(func, buf, addr, len);
+       if (ret) {
+               ath10k_warn(ar, "failed to read from address 0x%x: %d\n",
+                           addr, ret);
+               goto out;
+       }
+
+       ath10k_dbg(ar, ATH10K_DBG_SDIO, "sdio read addr 0x%x buf 0x%p len 
%zu\n",
+                  addr, buf, len);
+       ath10k_dbg_dump(ar, ATH10K_DBG_SDIO_DUMP, NULL, "sdio read ", buf, len);
+
+out:
+       sdio_release_host(func);
+
+       return ret;
+}
+
 /* HIF mbox functions */
 
 static int ath10k_sdio_mbox_rx_process_packet(struct ath10k *ar,
@@ -859,11 +884,8 @@ static int ath10k_sdio_mbox_read_int_status(struct ath10k 
*ar,
         * will yield us the value of different int status
         * registers and the lookahead registers.
         */
-       ret = ath10k_sdio_read_write_sync(ar,
-                                         MBOX_HOST_INT_STATUS_ADDRESS,
-                                         (u8 *)irq_proc_reg,
-                                         sizeof(*irq_proc_reg),
-                                         HIF_RD_SYNC_BYTE_INC);
+       ret = ath10k_sdio_read(ar, MBOX_HOST_INT_STATUS_ADDRESS,
+                              irq_proc_reg, sizeof(*irq_proc_reg));
        if (ret)
                goto out;
 
@@ -1175,9 +1197,7 @@ static int ath10k_sdio_bmi_exchange_msg(struct ath10k *ar,
 
        /* We always read from the start of the mbox address */
        addr = ar_sdio->mbox_info.htc_addr;
-       ret = ath10k_sdio_read_write_sync(ar, addr, ar_sdio->bmi_buf,
-                                         *resp_len,
-                                         HIF_RD_SYNC_BYTE_INC);
+       ret = ath10k_sdio_read(ar, addr, ar_sdio->bmi_buf, *resp_len);
        if (ret) {
                ath10k_warn(ar,
                            "unable to read the bmi data from the device: %d\n",
@@ -1538,9 +1558,7 @@ static int ath10k_sdio_hif_diag_read(struct ath10k *ar, 
u32 address, void *buf,
        }
 
        /* read the data */
-       ret = ath10k_sdio_read_write_sync(ar, MBOX_WINDOW_DATA_ADDRESS,
-                                         (u8 *)buf, buf_len,
-                                         HIF_RD_SYNC_BYTE_INC);
+       ret = ath10k_sdio_read(ar, MBOX_WINDOW_DATA_ADDRESS, buf, buf_len);
        if (ret) {
                ath10k_warn(ar, "failed to read from mbox window data addrress: 
%d\n",
                            ret);