From patchwork Tue May 14 04:28:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 10941983 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-2.web.codeaurora.org (Postfix) with ESMTP id 41B89924 for ; Tue, 14 May 2019 04:28:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 309B0285D6 for ; Tue, 14 May 2019 04:28:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21FD6285DB; Tue, 14 May 2019 04:28:41 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 9F6D9285D6 for ; Tue, 14 May 2019 04:28:40 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=9dPYJqZX09wFyZ+Jby6v9f5SxpqN6oBmIaFoB/rApg8=; b=Li/P5l2VrJDk/I rry5Uu5Trqs6Kp5k70am1iVZjdaL4b3P6wqv7s3WzOrj4C92h5gL3vi2PbVX+OWccbLMdZYAtAKHD 7n/uhu3i0ixDSF1BywON2ScdTSOGFDnX4JI2ZzVGhgShNtx7ecjMBkGoPzHRKcD6RakDhc5DCZCPi EtUzjTWcGml8e7+D8PTwjdjNppIfQyaXztUxQk/SarIpe7lSun8jc3BPyOtl9+Szy8tOujWm5/DcS V/X7t+EyxLIEshm0qwVMJzKPw86EvpjSBfJcVs2vxOaX+1B73RYjB0x5Rq2EB4BHVl0Vi1MqMb7XM J6uXxZ3p/kGOVD9FQmaw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hQP3O-0002cG-VW; Tue, 14 May 2019 04:28:38 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hQP3L-0002Wc-Mo for ath11k@lists.infradead.org; Tue, 14 May 2019 04:28:37 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id CE19760769; Tue, 14 May 2019 04:28:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1557808114; bh=JAI5QR8/SONcfw68ffb4b1tjZLGTYNmeJEkyRJctC7c=; h=From:To:Subject:Date:From; b=TEhclAaf21JsxyPGWPxRZIDd8/UjQvG9hucGc7UjUpdfvflSEkKaY0VnlLOq1YnfU sznOECzwhQHHa9LzWbSh6/m5ItWvtL+rxbv57+Jrh/V89ALDtPHFjXhvEeBq1QsLyt FC2ihPsyugv9d1bnrrakb3rM4580EA8Y0EmcYshg= Received: from potku.adurom.net (88-114-240-156.elisa-laajakaista.fi [88.114.240.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: kvalo@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id E2BDF6028D for ; Tue, 14 May 2019 04:28:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1557808114; bh=JAI5QR8/SONcfw68ffb4b1tjZLGTYNmeJEkyRJctC7c=; h=From:To:Subject:Date:From; b=TEhclAaf21JsxyPGWPxRZIDd8/UjQvG9hucGc7UjUpdfvflSEkKaY0VnlLOq1YnfU sznOECzwhQHHa9LzWbSh6/m5ItWvtL+rxbv57+Jrh/V89ALDtPHFjXhvEeBq1QsLyt FC2ihPsyugv9d1bnrrakb3rM4580EA8Y0EmcYshg= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org E2BDF6028D Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=kvalo@codeaurora.org From: Kalle Valo To: ath11k@lists.infradead.org Subject: Merging v5.1 Date: Tue, 14 May 2019 07:28:31 +0300 Message-ID: <87k1etfymo.fsf@kamboji.qca.qualcomm.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190513_212835_788889_E3D6D206 X-CRM114-Status: GOOD ( 11.35 ) X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Hi, I'm planning today to merge v5.1 into ath11k-bringup. There's one API change DMA allocations, patch below how I'm planning to fix that. If there are any issues with this merge please let me know ASAP. Kalle diff --git a/drivers/net/wireless/ath/ath11k/ce.c b/drivers/net/wireless/ath/ath11k/ce.c index e66e5308def3..fa2c7d13b2f5 100644 --- a/drivers/net/wireless/ath/ath11k/ce.c +++ b/drivers/net/wireless/ath/ath11k/ce.c @@ -420,9 +420,9 @@ ath11k_ce_alloc_ring(struct ath11k_base *sc, int nentries, int desc_sz) * coherent DMA are unsupported */ ce_ring->base_addr_owner_space_unaligned = - dma_zalloc_coherent(sc->dev, - nentries * desc_sz + CE_DESC_RING_ALIGN, - &base_addr, GFP_KERNEL); + dma_alloc_coherent(sc->dev, + nentries * desc_sz + CE_DESC_RING_ALIGN, + &base_addr, GFP_KERNEL); if (!ce_ring->base_addr_owner_space_unaligned) { kfree(ce_ring); return ERR_PTR(-ENOMEM); diff --git a/drivers/net/wireless/ath/ath11k/dp.c b/drivers/net/wireless/ath/ath11k/dp.c index 2fddbef1b172..5d30fc231ab0 100644 --- a/drivers/net/wireless/ath/ath11k/dp.c +++ b/drivers/net/wireless/ath/ath11k/dp.c @@ -103,9 +103,9 @@ int ath11k_dp_srng_setup(struct ath11k_base *ab, struct dp_srng *ring, num_entries = max_entries; ring->size = (num_entries * entry_sz) + HAL_RING_BASE_ALIGN - 1; - ring->vaddr_unaligned = dma_zalloc_coherent(ab->dev, ring->size, - &ring->paddr_unaligned, - GFP_KERNEL); + ring->vaddr_unaligned = dma_alloc_coherent(ab->dev, ring->size, + &ring->paddr_unaligned, + GFP_KERNEL); if (!ring->vaddr_unaligned) return -ENOMEM; @@ -353,10 +353,9 @@ static int ath11k_dp_scatter_idle_link_desc_setup(struct ath11k_base *ab, return -EINVAL; for (i = 0; i < num_scatter_buf; i++) { - slist[i].vaddr = dma_zalloc_coherent( - ab->dev, - HAL_WBM_IDLE_SCATTER_BUF_SIZE_MAX, - &slist[i].paddr, GFP_KERNEL); + slist[i].vaddr = dma_alloc_coherent(ab->dev, + HAL_WBM_IDLE_SCATTER_BUF_SIZE_MAX, + &slist[i].paddr, GFP_KERNEL); if (!slist[i].vaddr) { ret = -ENOMEM; goto err; @@ -436,10 +435,9 @@ static int ath11k_dp_link_desc_bank_alloc(struct ath11k_base *ab, if (i == (n_link_desc_bank - 1) && last_bank_sz) desc_sz = last_bank_sz; - desc_bank[i].vaddr_unaligned = dma_zalloc_coherent( - ab->dev, desc_sz, - &desc_bank[i].paddr_unaligned, - GFP_KERNEL); + desc_bank[i].vaddr_unaligned = dma_alloc_coherent(ab->dev, desc_sz, + &desc_bank[i].paddr_unaligned, + GFP_KERNEL); if (!desc_bank[i].vaddr_unaligned) { ret = -ENOMEM; goto err;