From patchwork Wed Apr 5 07:07:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 9663113 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8DCE2602B8 for ; Wed, 5 Apr 2017 07:11:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D37528527 for ; Wed, 5 Apr 2017 07:11:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7127328533; Wed, 5 Apr 2017 07:11:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26D2C28527 for ; Wed, 5 Apr 2017 07:11:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753796AbdDEHLe (ORCPT ); Wed, 5 Apr 2017 03:11:34 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:55375 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753780AbdDEHLd (ORCPT ); Wed, 5 Apr 2017 03:11:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1491376293; x=1522912293; h=subject:from:to:cc:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=r5hOjAERkfq0Jptbakbg8LnzcLbn80rZWvvCwA+PkYc=; b=vh3yMadhXKgAGNLjAI0VspLWBE5hxuJrA68FDB+Hgkm2koKtiMQpgAkv BQQfFe5khiZAo6n/6ViayBO68UiqkhSHXYcNmcvp7VJqckALEA3TLxWeX reafteisHCiSQIu4ofpdG0XEQ4K1zJgc/mNXmuiF1/1jLrtmcX3uDSXQ1 Q=; X-IronPort-AV: E=Sophos;i="5.36,277,1486454400"; d="scan'208";a="276077675" Received: from unknown (HELO Ironmsg04-R.qualcomm.com) ([10.53.140.108]) by wolverine01.qualcomm.com with ESMTP; 05 Apr 2017 00:07:33 -0700 X-IronPort-AV: E=McAfee;i="5800,7501,8488"; a="1392291485" X-MGA-submission: =?us-ascii?q?MDFWo4SejHgbXXpWBGqBfJQh+3xR/lgsksBfZw?= =?us-ascii?q?8D0QePXqYugaO5wzx8YRYZkhEtur43mqwitbAp43i+laY/cP/jr0XxJr?= =?us-ascii?q?Uba66mOTWUBM3rh8x1dvmQFsRdIP/DAWqx+yckv98Wh0zaZHHly4Rihl?= =?us-ascii?q?0D?= Received: from nasanexm02h.na.qualcomm.com ([10.85.0.89]) by Ironmsg04-R.qualcomm.com with ESMTP/TLS/RC4-SHA; 05 Apr 2017 00:07:33 -0700 Received: from euamsexm01a.eu.qualcomm.com (10.251.127.40) by nasanexm02h.na.qualcomm.com (10.85.0.89) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Wed, 5 Apr 2017 00:07:32 -0700 Received: from potku.adurom.net (10.80.80.8) by euamsexm01a.eu.qualcomm.com (10.251.127.40) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Wed, 5 Apr 2017 09:07:27 +0200 Subject: [PATCH 5/7] ath10k: add ath10k_sdio_readsb() From: Kalle Valo To: CC: Date: Wed, 5 Apr 2017 10:07:22 +0300 Message-ID: <149137604232.4898.8026652026499451988.stgit@potku.adurom.net> In-Reply-To: <149137591893.4898.2318291094351440261.stgit@potku.adurom.net> References: <149137591893.4898.2318291094351440261.stgit@potku.adurom.net> User-Agent: StGit/0.17.1-17-ge4e0 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01C.na.qualcomm.com (10.85.0.83) To euamsexm01a.eu.qualcomm.com (10.251.127.40) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Kalle Valo --- drivers/net/wireless/ath/ath10k/sdio.c | 34 +++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c index beb1749672f0..301355228cfa 100644 --- a/drivers/net/wireless/ath/ath10k/sdio.c +++ b/drivers/net/wireless/ath/ath10k/sdio.c @@ -396,6 +396,33 @@ static int ath10k_sdio_write(struct ath10k *ar, u32 addr, const void *buf, size_ return ret; } +static int ath10k_sdio_readsb(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); + + len = round_down(len, ar_sdio->mbox_info.block_size); + + ret = sdio_readsb(func, buf, addr, len); + if (ret) { + ath10k_warn(ar, "failed to read from fixed (sb) address 0x%x: %d\n", + addr, ret); + goto out; + } + + ath10k_dbg(ar, ATH10K_DBG_SDIO, "sdio readsb addr 0x%x buf 0x%p len %zu\n", + addr, buf, len); + ath10k_dbg_dump(ar, ATH10K_DBG_SDIO_DUMP, NULL, "sdio readsb ", buf, len); + +out: + sdio_release_host(func); + + return ret; +} + /* HIF mbox functions */ static int ath10k_sdio_mbox_rx_process_packet(struct ath10k *ar, @@ -645,11 +672,8 @@ static int ath10k_sdio_mbox_rx_packet(struct ath10k *ar, struct sk_buff *skb = pkt->skb; int ret; - ret = ath10k_sdio_read_write_sync(ar, - ar_sdio->mbox_info.htc_addr, - skb->data, pkt->alloc_len, - HIF_RD_SYNC_BLOCK_FIX); - + ret = ath10k_sdio_readsb(ar, ar_sdio->mbox_info.htc_addr, + skb->data, pkt->alloc_len); pkt->status = ret; if (!ret) skb_put(skb, pkt->act_len);