From patchwork Tue Oct 29 04:26:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasanthakumar Thiagarajan X-Patchwork-Id: 11216961 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 57F1B1390 for ; Tue, 29 Oct 2019 04:26:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 29C1D2086A for ; Tue, 29 Oct 2019 04:26:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BV/KA2nm"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="k0b3FFbp"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="ltiZh4Vt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 29C1D2086A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org 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:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id: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=Q4pqRdsv2gk4VnL/9fK6S+7UrPi6U8YLa2HTUHR6xq8=; b=BV/KA2nmrYemk0 449zJ/wLg2nlobawjXzhqUT6fqG6mcxHmv/cPtcYhZmrgXvTMG47m8gqSWsr6RNUseMpOuxr3016K Vf8apW+JL+i2CvfbHZHTjcX4dDiouK/v4XYElAKEFjuehTzewqbjr5Q28jrpvZj8vf9FCOqQHP2r5 0NWPKBZWJLSLfdePXSVW0EJc3Y+eE4JNzmEzZJxKu01Dh/O76lZ7OO05jbEQsEO1lv2O+PbVLe/+e /S1xcBrI2mjzQylN9ZUdH87Ux/slAjgyU3iBwo7/DpZainZQ+PCfrRToe4Cp9q4ea7MeDBz1Vqmvr xVzOrVwlf62+r+/nFJig==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iPJ5V-0004vS-8c; Tue, 29 Oct 2019 04:26:33 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iPJ5T-0004uq-3m for ath11k@lists.infradead.org; Tue, 29 Oct 2019 04:26:32 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 1077F60D77; Tue, 29 Oct 2019 04:26:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1572323188; bh=gsWV/Yro9o+7vJlq5Hsb7B2o9o0S/gcYjbr9RSCMH/I=; h=From:To:Subject:Date:From; b=k0b3FFbpapW+DkeX+bowtf0uIKAp96ivZkcdXo4WJGO8aO4CS3Ss4lwYyHDH0KLzI lQcxCFX2a6uo5l8YLqEhFPHGfprC3qUzXIc4yGwqivV1r7IlMaOh4JwnT4Zs9xMgIY kvHzfpZ0FvUTKU97BAQL9qDKYHCg4DlXn7M73BpY= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID,DKIM_SIGNED,SPF_NONE autolearn=no autolearn_force=no version=3.4.0 Received: from CHECSTEX0180100-LIN.qca.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: vthiagar@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id EA77460B6E for ; Tue, 29 Oct 2019 04:26:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1572323187; bh=gsWV/Yro9o+7vJlq5Hsb7B2o9o0S/gcYjbr9RSCMH/I=; h=From:To:Subject:Date:From; b=ltiZh4VtG+bakOcPrVm35glJa0mhzsnqvpyIVWkDvQPF7Y4J+3WDw11r7mg0LtCam MOjASkK3yB5cdvDYM/QjWLU/Hy9PWXqhPLMUBZieE4tEFIeA/N1gxMvub6aDHXUM0/ 7P6ftPemZQQvBO0E3O9JBjCAOYNGlwQKD3EVmWSE= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org EA77460B6E 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=vthiagar@codeaurora.org From: Vasanthakumar Thiagarajan To: ath11k@lists.infradead.org Subject: [PATCH] ath11k: Fix target crash due to WBM_IDLE_LINK ring desc shortage Date: Tue, 29 Oct 2019 09:56:02 +0530 Message-Id: <1572323162-13410-1-git-send-email-vthiagar@codeaurora.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191028_212631_179935_A97FE18A X-CRM114-Status: GOOD ( 11.82 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.145.29.96 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org Make sure the number of WBM_IDLE_LINK ring descriptors is power of 2. This increases the number of descriptors to 32k from the current ~18k to fix the target assert because of the shortage in the descriptors in WBM_IDLE_LINK ring. Remove unnecessary power of 2 calculation in ath11k_dp_link_desc_setup() as it is not required after this change. Signed-off-by: Vasanthakumar Thiagarajan --- drivers/net/wireless/ath/ath11k/dp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/dp.c b/drivers/net/wireless/ath/ath11k/dp.c index ff510e8..72c21cf 100644 --- a/drivers/net/wireless/ath/ath11k/dp.c +++ b/drivers/net/wireless/ath/ath11k/dp.c @@ -478,6 +478,9 @@ static int ath11k_wbm_idle_ring_setup(struct ath11k_base *ab, u32 *n_link_desc) *n_link_desc = n_mpdu_link_desc + n_mpdu_queue_desc + n_tx_msdu_link_desc + n_rx_msdu_link_desc; + if (*n_link_desc & (*n_link_desc - 1)) + *n_link_desc = 1 << fls(*n_link_desc); + ret = ath11k_dp_srng_setup(ab, &dp->wbm_idle_ring, HAL_WBM_IDLE_LINK, 0, 0, *n_link_desc); if (ret) { @@ -499,9 +502,6 @@ int ath11k_dp_link_desc_setup(struct ath11k_base *ab, u32 *desc; int i, ret; - if (n_link_desc & (n_link_desc - 1)) - n_link_desc = 1 << fls(n_link_desc); - tot_mem_sz = n_link_desc * HAL_LINK_DESC_SIZE; tot_mem_sz += HAL_LINK_DESC_ALIGN;