From patchwork Mon Jun 12 15:03:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erik Stromdahl X-Patchwork-Id: 9781345 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 6BD9860212 for ; Mon, 12 Jun 2017 15:04:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 573112766D for ; Mon, 12 Jun 2017 15:04:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C32728635; Mon, 12 Jun 2017 15:04:18 +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=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0019F2766D for ; Mon, 12 Jun 2017 15:04:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=KjB9ifGyBhXVJIKJkjupvvLTtlSH/Z+Gw+J5haN0rhw=; b=UG0oskEbaeMfiD4nxpPU1wTUek GRVd3fjxGzKYpt1u2KNvx4BbfAm5miBNA/P2vzPMp6OONTvkC4HIyW8TP81n/A7hULBkSVRfC9X+3 N4Izl6AIK1RYwfEOBa2PazlGMd1Q0UtYpagWiTttFPkVGX6CLNHUAI8a9t/XRLnuOcJZ8I7LShWmw ak5Wn+8ac8IVO+DVJv0U6FRRFLYznLqKj9u8hD+gGLloux+T2bseY64vYdpGhsClpd3t0HjWPxCO8 4h1uv1yppxp8ESmrvMtEZr7etbhiq8nzKGRwPSAIWYd51y1FLkcfXm+RHlyPgw9AbxMxyVOCHARna LDZkTYSQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dKQt2-00081y-PV; Mon, 12 Jun 2017 15:04:12 +0000 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dKQsd-0007IE-SB for ath10k@lists.infradead.org; Mon, 12 Jun 2017 15:03:52 +0000 Received: by mail-lf0-x244.google.com with SMTP id o28so9679034lfk.1 for ; Mon, 12 Jun 2017 08:03:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OzghGcB3kc3ScDuk5+VA5I7iSWAcgwcLvFNMpjoHUag=; b=Yl8mbQQEmL6vld8XUklyZmHmtRTDjKwaMUFH3boyZNwgAN/Ee0EAm/CnLLQvtFnnaD G2vsBdjQ8ib+CdkkVu+hsdzkPX6JSGIxUt7zk+p3AjOoFyvmU4zlVQ/NW+ny8+CbGHCh AW9iLP5O0bz+g3BsVGam5u9cwS+24wNvUMgOUhmiLTh0B2GqRd05bIcgSigevhrcFqwO uYDvQE7G+EUvsVSLA7j9+UjB1qAGE0QseyBgZTvErRYkDVaq5BIFG+/dXepSHVO6zKEQ YtISnXSIGsIwbp3jR3+dunfKNphtn0cLl9ZuCV8vbSPwJ4EgXoP/dQyXnNXPmeQqvQ/a sYkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OzghGcB3kc3ScDuk5+VA5I7iSWAcgwcLvFNMpjoHUag=; b=WcjkUJvURBR/WyiAiRilKjylllV+2SaKytud15nXTXtJQ/F6jUjOSkgSo8DUKt4zte +2koy4Ei36YMh66o9wGEHtUJBSx+5UQRmKuM0ZakC5IAPP4m36BXNqgnqwxfPjRYjjje ejzS5J17SV7Mxam5g7msryC5CK/UAZaE16xZAxxhO+Q4m3aM5BwHElIiBxpJ+t5OE7lM 0cT3vmW47D3QwMVRjXxxhtV8xqfD87qbQJtCYfut/uLCqFFuHSofTiNYsVtTgUZvn8Ty I4bcjdoYL59ivUCPT5rXs5dF/Ld0XlHc10xofTfhUaVJz1b8GxoT30N1Gl3S3UM/zSOX v+GA== X-Gm-Message-State: AODbwcAGuKt1ttsxNrNC/oNpG7dUqUrgcq99ZYzqPZLR/NAaY4BS+k5Q F8xdnER9FHwxwXJq X-Received: by 10.25.39.194 with SMTP id n185mr11159101lfn.48.1497279805881; Mon, 12 Jun 2017 08:03:25 -0700 (PDT) Received: from erik-mate-1604.lan (90-227-62-61-no75.tbcn.telia.com. [90.227.62.61]) by smtp.gmail.com with ESMTPSA id n71sm2709253lje.14.2017.06.12.08.03.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Jun 2017 08:03:25 -0700 (PDT) From: Erik Stromdahl To: kvalo@qca.qualcomm.com, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org Subject: [RFC v2 07/10] ath10k: dma fixes for high latency devices Date: Mon, 12 Jun 2017 17:03:08 +0200 Message-Id: <1497279791-9598-8-git-send-email-erik.stromdahl@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497279791-9598-1-git-send-email-erik.stromdahl@gmail.com> References: <1497279791-9598-1-git-send-email-erik.stromdahl@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170612_080348_493841_EA6FC3E3 X-CRM114-Status: GOOD ( 10.70 ) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Stromdahl MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Several DMA related functions (such as the dma_map_xxx functions) are not used with high latency devices and don't need to be invoked in this case. Signed-off-by: Erik Stromdahl --- drivers/net/wireless/ath/ath10k/htc.c | 13 ++++++++----- drivers/net/wireless/ath/ath10k/htt_rx.c | 3 ++- drivers/net/wireless/ath/ath10k/htt_tx.c | 3 +++ drivers/net/wireless/ath/ath10k/txrx.c | 5 +++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c index e5c80f5..232740c 100644 --- a/drivers/net/wireless/ath/ath10k/htc.c +++ b/drivers/net/wireless/ath/ath10k/htc.c @@ -137,11 +137,14 @@ int ath10k_htc_send(struct ath10k_htc *htc, ath10k_htc_prepare_tx_skb(ep, skb); skb_cb->eid = eid; - skb_cb->paddr = dma_map_single(dev, skb->data, skb->len, DMA_TO_DEVICE); - ret = dma_mapping_error(dev, skb_cb->paddr); - if (ret) { - ret = -EIO; - goto err_credits; + if (!ar->is_high_latency) { + skb_cb->paddr = dma_map_single(dev, skb->data, skb->len, + DMA_TO_DEVICE); + ret = dma_mapping_error(dev, skb_cb->paddr); + if (ret) { + ret = -EIO; + goto err_credits; + } } sg_item.transfer_id = ep->eid; diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index 5833c08..972c21c 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c @@ -2492,7 +2492,8 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb) break; } case HTT_T2H_MSG_TYPE_TX_COMPL_IND: - ath10k_htt_rx_tx_compl_ind(htt->ar, skb); + if (!ar->is_high_latency) + ath10k_htt_rx_tx_compl_ind(htt->ar, skb); break; case HTT_T2H_MSG_TYPE_SEC_IND: { struct ath10k *ar = htt->ar; diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c index e3b820d..27bbc3e 100644 --- a/drivers/net/wireless/ath/ath10k/htt_tx.c +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c @@ -409,6 +409,9 @@ int ath10k_htt_tx_start(struct ath10k_htt *htt) if (htt->tx_mem_allocated) return 0; + if (ar->is_high_latency) + return 0; + ret = ath10k_htt_tx_alloc_buf(htt); if (ret) goto free_idr_pending_tx; diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c index d4986f6..fae143e 100644 --- a/drivers/net/wireless/ath/ath10k/txrx.c +++ b/drivers/net/wireless/ath/ath10k/txrx.c @@ -90,11 +90,12 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt, ath10k_htt_tx_free_msdu_id(htt, tx_done->msdu_id); ath10k_htt_tx_dec_pending(htt); - if (htt->num_pending_tx == 0) + if (!ar->is_high_latency && (htt->num_pending_tx == 0)) wake_up(&htt->empty_tx_wq); spin_unlock_bh(&htt->tx_lock); - dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); + if (!ar->is_high_latency) + dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); ath10k_report_offchan_tx(htt->ar, msdu);