From patchwork Wed Sep 25 04:44:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasanthakumar Thiagarajan X-Patchwork-Id: 11160007 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 B00FB1747 for ; Wed, 25 Sep 2019 04:47:41 +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 8C4A421A4A for ; Wed, 25 Sep 2019 04:47:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UfzUAUDw"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="HBqbjceQ"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="HBqbjceQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C4A421A4A 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=UsNAGU4Y91g0Qi+JvaTCpUBMTVTVLI6+47dEMai4mOc=; b=UfzUAUDwrsa+TT NuqAqkURXnw+dLFNLLvFs8e6+GzSJCEI1440og/gLfxFwprwUaCaY+namXJaAqdXNF9Gq5BnieNXq lFCggW514YQ8oxuG0/GsN3lowc3gQBI47qcwTDL38U+ag5L3mR89pIxNTBnWOkL3i5Gxh7/WTX1Oo QzGDz4wPqD84fTUXPB1FRs4yUlVodELVwWNKlmieP8WQRb9lYhB3ZU/doFXnMH7zIjvEv/X1XugpL vUO43shvHcQga6KeCTJUjY/bfBjBUJ2R8WzUPZ2F4F8NKHU8D41NSSHbmc6sZYbzWsCnvEhZKR0Lj FZesaEXP649slV2EFMbw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iCzDI-0003NJ-5v; Wed, 25 Sep 2019 04:47:40 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iCzDE-0003MJ-ND for ath11k@lists.infradead.org; Wed, 25 Sep 2019 04:47:37 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 6736A6158B; Wed, 25 Sep 2019 04:47:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1569386856; bh=yIDN92F4wpPCij37v6Bv+NLth2Yiq8Yyqdrbv4aMkAA=; h=From:To:Subject:Date:From; b=HBqbjceQVrZLtbNe9uJ0oFviyRGJJMt+6VYxoUXuNsfHDufogQ8a8goLK4NCmZDxb T2VlF5VWilnxc9YtRJklDYA1O4Jill6XTuNRjg3wDYRZ3DfD/z1CtrZS12q/WGE73A 1b3NttqVFDXs1fPV6FOgVFjJTFEbUKTXotARsu4g= 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 vasanth-lnx.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 2A1C661572 for ; Wed, 25 Sep 2019 04:47:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1569386856; bh=yIDN92F4wpPCij37v6Bv+NLth2Yiq8Yyqdrbv4aMkAA=; h=From:To:Subject:Date:From; b=HBqbjceQVrZLtbNe9uJ0oFviyRGJJMt+6VYxoUXuNsfHDufogQ8a8goLK4NCmZDxb T2VlF5VWilnxc9YtRJklDYA1O4Jill6XTuNRjg3wDYRZ3DfD/z1CtrZS12q/WGE73A 1b3NttqVFDXs1fPV6FOgVFjJTFEbUKTXotARsu4g= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 2A1C661572 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 bringup 1/3] ath11k: Clean ups in ath11k_ce_rx_buf_enqueue_pipe() error path Date: Wed, 25 Sep 2019 10:14:16 +0530 Message-Id: <1569386658-1325-1-git-send-email-vthiagar@codeaurora.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190924_214736_772880_9B1689C0 X-CRM114-Status: UNSURE ( 9.29 ) X-CRM114-Notice: Please train this message. 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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 Unify the unlock/ring_access_end calls with error path in ath11k_ce_rx_buf_enqueue_pipe(). Update to ce_pipe->rx_buf_needed is done inside srng->lock before ath11k_hal_srng_access_end(). Also rename the goto label from err to exit. Signed-off-by: Vasanthakumar Thiagarajan --- drivers/net/wireless/ath/ath11k/ce.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/ce.c b/drivers/net/wireless/ath/ath11k/ce.c index c1b170c..205f28e 100644 --- a/drivers/net/wireless/ath/ath11k/ce.c +++ b/drivers/net/wireless/ath/ath11k/ce.c @@ -131,13 +131,13 @@ static int ath11k_ce_rx_buf_enqueue_pipe(struct ath11k_ce_pipe *pipe, if (unlikely(ath11k_hal_srng_src_num_free(ab, srng, false) < 1)) { ret = -ENOSPC; - goto err; + goto exit; } desc = ath11k_hal_srng_src_get_next_entry(ab, srng); if (!desc) { ret = -ENOSPC; - goto err; + goto exit; } ath11k_hal_ce_dst_set_desc(desc, paddr); @@ -146,15 +146,10 @@ static int ath11k_ce_rx_buf_enqueue_pipe(struct ath11k_ce_pipe *pipe, write_index = CE_RING_IDX_INCR(nentries_mask, write_index); ring->write_index = write_index; - ath11k_hal_srng_access_end(ab, srng); - - spin_unlock_bh(&srng->lock); - pipe->rx_buf_needed--; - return 0; - -err: + ret = 0; +exit: ath11k_hal_srng_access_end(ab, srng); spin_unlock_bh(&srng->lock);