From patchwork Wed Sep 25 04:43:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasanthakumar Thiagarajan X-Patchwork-Id: 11160001 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 96F8B14ED for ; Wed, 25 Sep 2019 04:47:27 +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 74A2A21A4A for ; Wed, 25 Sep 2019 04:47:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dDAprPkF"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="BKJO6Ada"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="BKJO6Ada" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 74A2A21A4A 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:References:In-Reply-To: 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: List-Owner; bh=z8JTOn2TIJ0+MWSIit4iC7+oXRsjBBRgxEj0st4It/A=; b=dDAprPkFVjTRaZ 2Pf8VAjv3YUSl+gYs4xqZ4mOJq/YilisCXl4l8rGBVMugg8SasJ86W7wpbg8JfyilX/OSq8ov1TUa 2nIKkEahfS5QjkUqZ34Ji8nNKrAu+l0T2/fFMwjM5uSjhE1AUzYCB9gwNzAX6UY9ALYUfI8ZepwEM WwL3wYCNHexnLJhqWjNyYq7Mzx7z2yRsUVRmemTy+y6x3ai8WXHVHLxJbtI0UMmVYkehsiH+P3jH0 0jwNPzxYS5mO1jCrP38EoZjUfxHz/XRG0YqxrDhK6hNa4x6QxmkfMJvUZmn3jEkFEm0dq2jnYC6Ww UZNa7oKDrEEuOkOyvJTA==; 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 1iCzD3-0003HT-0H; Wed, 25 Sep 2019 04:47:25 +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 1iCzD0-0003Fx-LB for ath11k@lists.infradead.org; Wed, 25 Sep 2019 04:47:24 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 5DBB36118E; Wed, 25 Sep 2019 04:47:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1569386842; bh=gxUb/piCyFH0yu2rEekYmDoFsAxzysTpMEb5mxQmQYs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=BKJO6AdaHaymvQKXuSxtL4Wwmnge6XI+6ldXDJVWYe7rntNTGzHPfc9RuNZDHqrfK 85YRtZGUtmAcN431RzKs1HB0mOaVcWUhNuPHD314kuxhlXQKg4xxh3rjGsD+k2Qxay qtGUtI+F0CY9QKSEEapiNEwcfept7PCKBBpf3WLw= 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 6C28E6016D for ; Wed, 25 Sep 2019 04:47:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1569386842; bh=gxUb/piCyFH0yu2rEekYmDoFsAxzysTpMEb5mxQmQYs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=BKJO6AdaHaymvQKXuSxtL4Wwmnge6XI+6ldXDJVWYe7rntNTGzHPfc9RuNZDHqrfK 85YRtZGUtmAcN431RzKs1HB0mOaVcWUhNuPHD314kuxhlXQKg4xxh3rjGsD+k2Qxay qtGUtI+F0CY9QKSEEapiNEwcfept7PCKBBpf3WLw= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6C28E6016D 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 4/5] ath11k: Avoid code duplication in set/clear of a register bit values Date: Wed, 25 Sep 2019 10:13:58 +0530 Message-Id: <1569386639-1242-4-git-send-email-vthiagar@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1569386639-1242-1-git-send-email-vthiagar@codeaurora.org> References: <1569386639-1242-1-git-send-email-vthiagar@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190924_214722_730025_21DF0D1C X-CRM114-Status: GOOD ( 10.63 ) 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 Define helpers to set/clear a particular bit in a register. Signed-off-by: Vasanthakumar Thiagarajan --- drivers/net/wireless/ath/ath11k/ahb.c | 52 +++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c index 0f26979..29157fb 100644 --- a/drivers/net/wireless/ath/ath11k/ahb.c +++ b/drivers/net/wireless/ath/ath11k/ahb.c @@ -482,49 +482,49 @@ static void ath11k_ahb_ext_grp_enable(struct ath11k_ext_irq_grp *irq_grp) enable_irq(irq_grp->ab->irq_num[irq_grp->irqs[i]]); } +static void ath11k_ahb_setbit32(struct ath11k_base *ab, u8 bit, u32 offset) +{ + u32 val; + + val = ath11k_ahb_read32(ab, offset); + ath11k_ahb_write32(ab, offset, val | BIT(bit)); +} + +static void ath11k_ahb_clearbit32(struct ath11k_base *ab, u8 bit, u32 offset) +{ + u32 val; + + val = ath11k_ahb_read32(ab, offset); + ath11k_ahb_write32(ab, offset, val & ~BIT(bit)); +} + static void ath11k_ahb_ce_irq_enable(struct ath11k_base *ab, u16 ce_id) { const struct ce_pipe_config *ce_config; - u32 val; ce_config = &target_ce_config_wlan[ce_id]; - if (__le32_to_cpu(ce_config->pipedir) & PIPEDIR_OUT) { - val = ath11k_ahb_read32(ab, CE_HOST_IE_ADDRESS); - val |= BIT(ce_id); - ath11k_ahb_write32(ab, CE_HOST_IE_ADDRESS, val); - } + if (__le32_to_cpu(ce_config->pipedir) & PIPEDIR_OUT) + ath11k_ahb_setbit32(ab, ce_id, CE_HOST_IE_ADDRESS); if (__le32_to_cpu(ce_config->pipedir) & PIPEDIR_IN) { - val = ath11k_ahb_read32(ab, CE_HOST_IE_2_ADDRESS); - val |= BIT(ce_id); - ath11k_ahb_write32(ab, CE_HOST_IE_2_ADDRESS, val); - - val = ath11k_ahb_read32(ab, CE_HOST_IE_3_ADDRESS); - val |= BIT(ce_id + CE_HOST_IE_3_SHIFT); - ath11k_ahb_write32(ab, CE_HOST_IE_3_ADDRESS, val); + ath11k_ahb_setbit32(ab, ce_id, CE_HOST_IE_2_ADDRESS); + ath11k_ahb_setbit32(ab, ce_id + CE_HOST_IE_3_SHIFT, + CE_HOST_IE_3_ADDRESS); } } static void ath11k_ahb_ce_irq_disable(struct ath11k_base *ab, u16 ce_id) { const struct ce_pipe_config *ce_config; - u32 val; ce_config = &target_ce_config_wlan[ce_id]; - if (__le32_to_cpu(ce_config->pipedir) & PIPEDIR_OUT) { - val = ath11k_ahb_read32(ab, CE_HOST_IE_ADDRESS); - val &= ~BIT(ce_id); - ath11k_ahb_write32(ab, CE_HOST_IE_ADDRESS, val); - } + if (__le32_to_cpu(ce_config->pipedir) & PIPEDIR_OUT) + ath11k_ahb_clearbit32(ab, ce_id, CE_HOST_IE_ADDRESS); if (__le32_to_cpu(ce_config->pipedir) & PIPEDIR_IN) { - val = ath11k_ahb_read32(ab, CE_HOST_IE_2_ADDRESS); - val &= ~BIT(ce_id); - ath11k_ahb_write32(ab, CE_HOST_IE_2_ADDRESS, val); - - val = ath11k_ahb_read32(ab, CE_HOST_IE_3_ADDRESS); - val &= ~BIT(ce_id + CE_HOST_IE_3_SHIFT); - ath11k_ahb_write32(ab, CE_HOST_IE_3_ADDRESS, val); + ath11k_ahb_clearbit32(ab, ce_id, CE_HOST_IE_2_ADDRESS); + ath11k_ahb_clearbit32(ab, ce_id + CE_HOST_IE_3_SHIFT, + CE_HOST_IE_3_ADDRESS); } }