From patchwork Thu Jun 20 19:15:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muna Sinada X-Patchwork-Id: 11007805 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 6F9A713AF for ; Thu, 20 Jun 2019 19:15:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F6802832B for ; Thu, 20 Jun 2019 19:15:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 536CB28734; Thu, 20 Jun 2019 19:15:52 +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 ADE912832B for ; Thu, 20 Jun 2019 19:15:51 +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: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:In-Reply-To: References:List-Owner; bh=AxMmHKRXK7VC3COmA6Ux3lA4yqlTcrWaRW7+JTdxCKg=; b=Dsf 7lg2sldLJL051N1/eT/OwyIv0lyuqZgym5H1VAgcyDMVYxwAt2T530/iJRFZxEnC6GQC8t8bnTMhi 1T3N7aVeIha4hSBwlUGAyLpj9mzIgSEy80CJD9QRJ8JTs3VcTA+dnhGrlq3Lv83MR9f53HWQ5Kyru zOeBdaskQ9LjTgAQxJrby5ItZ+4YQOlgCyexCusQ85MItdftUACKy98VqeNPzLeQPVCJCgp9Hh337 hahpV8LAunJSpj6ddPTad4R9OaU9qpz6i5G5ogZl5JuuyODIClFSUMa9XWGLnQ9oW8lYMDURN4S0E 1kw+PDPLy/jf+1eh/a73RiDh0qS/S6w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1he2XG-0001s0-UI; Thu, 20 Jun 2019 19:15:50 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1he2XE-0001rf-2k for ath11k@lists.infradead.org; Thu, 20 Jun 2019 19:15:49 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 808C46055D; Thu, 20 Jun 2019 19:15:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561058147; bh=4asilOiXvkMPgm0bvEMsb9uthptgukTmJ2gbk7gi68k=; h=From:To:Cc:Subject:Date:From; b=UFSObdXydGGBpcnFvsF7dcSzIU9TjhGwVMb5RRT9TADioJ2ceVDNT0eoxbFGVBYHv Q1YL5eBk5928eYecxR/UIdkNS8hZ5aGU2C2Z5sTxEb1XtLN51EfYpMItlg4hTZleVT qMnoTptok+vk2t54fu0qNSx6eBkF920FZmZVEyLk= Received: from msinada-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: msinada@codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id B59766028D; Thu, 20 Jun 2019 19:15:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561058146; bh=4asilOiXvkMPgm0bvEMsb9uthptgukTmJ2gbk7gi68k=; h=From:To:Cc:Subject:Date:From; b=HH+bQS4K1lygRujEOYxQFqK8uHXAKT2HVBE/BqQbY5vMzJkZUK3Utli1sHvZ+vyrv XWa9pG4+iQw19gv8h8vRnz4zaH/DyT1lv1iOGzjnYYT9LjSPKxC9UGmBi7tTNTzK2L mhfRi2xYrwoUPpmtZnfooz68jrbcWgOs5ynIUfe0= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org B59766028D 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=msinada@codeaurora.org From: Muna Sinada To: ath11k@lists.infradead.org Subject: [PATCH 1/4] ath11k: change struct name from buffer_addr to ath11k_buffer_addr Date: Thu, 20 Jun 2019 12:15:26 -0700 Message-Id: <1561058129-25625-1-git-send-email-msinada@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-20190620_121548_151856_4714AA9E X-CRM114-Status: GOOD ( 11.56 ) 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: , Cc: Muna Sinada MIME-Version: 1.0 Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Changed definition and all mentions of buffer_addr to ath11k_buffer_addr Signed-off-by: Muna Sinada --- drivers/net/wireless/ath/ath11k/dp.c | 4 ++-- drivers/net/wireless/ath/ath11k/dp_rx.c | 10 +++++----- drivers/net/wireless/ath/ath11k/hal.c | 4 ++-- drivers/net/wireless/ath/ath11k/hal_desc.h | 22 +++++++++++----------- drivers/net/wireless/ath/ath11k/hal_rx.c | 10 +++++----- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/dp.c b/drivers/net/wireless/ath/ath11k/dp.c index 0aec840fc360..1a5bf2d4eba7 100644 --- a/drivers/net/wireless/ath/ath11k/dp.c +++ b/drivers/net/wireless/ath/ath11k/dp.c @@ -372,7 +372,7 @@ static int ath11k_dp_scatter_idle_link_desc_setup(struct ath11k_base *ab, paddr = link_desc_banks[i].paddr; while (n_entries) { ath11k_hal_set_link_desc_addr( - (struct buffer_addr *)scatter_buf, i, + (struct ath11k_buffer_addr *)scatter_buf, i, paddr); n_entries--; paddr += HAL_LINK_DESC_SIZE; @@ -576,7 +576,7 @@ int ath11k_dp_link_desc_setup(struct ath11k_base *ab, while (n_entries && (desc = ath11k_hal_srng_src_get_next_entry(ab, srng))) { ath11k_hal_set_link_desc_addr( - (struct buffer_addr *)desc, i, + (struct ath11k_buffer_addr *)desc, i, paddr); n_entries--; paddr += HAL_LINK_DESC_SIZE; diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c index 59d2605c0ce2..41f6d4115e06 100644 --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c @@ -3292,10 +3292,10 @@ int ath11k_dp_rx_monitor_link_desc_return(struct ath11k *ar, src_srng_desc = ath11k_hal_srng_src_get_next_entry(ar->ab, hal_srng); if (src_srng_desc) { - struct buffer_addr *src_desc = - (struct buffer_addr *)src_srng_desc; + struct ath11k_buffer_addr *src_desc = + (struct ath11k_buffer_addr *)src_srng_desc; - *src_desc = *((struct buffer_addr *)p_last_buf_addr_info); + *src_desc = *((struct ath11k_buffer_addr *)p_last_buf_addr_info); } else { ath11k_dbg(ar->ab, ATH11K_DBG_DATA, "Monitor Link Desc Ring %d Full", mac_id); @@ -3313,10 +3313,10 @@ void ath11k_dp_rx_mon_next_link_desc_get(void *rx_msdu_link_desc, { struct hal_rx_msdu_link *msdu_link = (struct hal_rx_msdu_link *)rx_msdu_link_desc; - struct buffer_addr *buf_addr_info; + struct ath11k_buffer_addr *buf_addr_info; u8 rbm = 0; - buf_addr_info = (struct buffer_addr *)&msdu_link->buf_addr_info; + buf_addr_info = (struct ath11k_buffer_addr *)&msdu_link->buf_addr_info; ath11k_hal_rx_buf_addr_info_get(buf_addr_info, paddr, sw_cookie, &rbm); diff --git a/drivers/net/wireless/ath/ath11k/hal.c b/drivers/net/wireless/ath/ath11k/hal.c index 655398e3cad4..b3ef72325dc7 100644 --- a/drivers/net/wireless/ath/ath11k/hal.c +++ b/drivers/net/wireless/ath/ath11k/hal.c @@ -691,7 +691,7 @@ u32 ath11k_hal_ce_dst_status_get_length(void *buf) void ath11k_hal_set_link_desc_addr(void *buf, u32 cookie, dma_addr_t paddr) { - struct buffer_addr *desc = (struct buffer_addr *)buf; + struct ath11k_buffer_addr *desc = (struct ath11k_buffer_addr *)buf; desc->info0 = FIELD_PREP(BUFFER_ADDR_INFO0_ADDR, (paddr & HAL_ADDR_LSB_REG_MASK)); @@ -903,7 +903,7 @@ void ath11k_hal_setup_link_idle_list(struct ath11k_base *ab, u32 nsbufs, u32 tot_link_desc, u32 end_offset) { - struct buffer_addr *link_addr; + struct ath11k_buffer_addr *link_addr; int i; u32 reg_scatter_buf_sz = HAL_WBM_IDLE_SCATTER_BUF_SIZE / 64; diff --git a/drivers/net/wireless/ath/ath11k/hal_desc.h b/drivers/net/wireless/ath/ath11k/hal_desc.h index 99ab6f6845cc..32b8ccbd06f0 100644 --- a/drivers/net/wireless/ath/ath11k/hal_desc.h +++ b/drivers/net/wireless/ath/ath11k/hal_desc.h @@ -11,12 +11,12 @@ #define BUFFER_ADDR_INFO1_RET_BUF_MGR GENMASK(10, 8) #define BUFFER_ADDR_INFO1_SW_COOKIE GENMASK(31, 11) -struct buffer_addr { +struct ath11k_buffer_addr { u32 info0; u32 info1; } __packed; -/* buffer_addr +/* ath11k_buffer_addr * * info0 * Address (lower 32 bits) of the msdu buffer or msdu extension @@ -684,7 +684,7 @@ enum hal_reo_dest_ring_error_code { #define HAL_REO_DEST_RING_INFO2_LOOPING_COUNT GENMASK(31, 28) struct hal_reo_dest_ring { - struct buffer_addr buf_addr_info; + struct ath11k_buffer_addr buf_addr_info; struct rx_mpdu_desc rx_mpdu_info; struct rx_msdu_desc rx_msdu_info; u32 queue_addr_lo; @@ -787,7 +787,7 @@ enum hal_reo_entr_rxdma_ecode { #define HAL_REO_ENTR_RING_INFO1_RXDMA_ERROR_CODE GENMASK(6, 2) struct hal_reo_entrance_ring { - struct buffer_addr buf_addr_info; + struct ath11k_buffer_addr buf_addr_info; struct rx_mpdu_desc rx_mpdu_info; u32 queue_addr_lo; u32 info0; /* %HAL_REO_ENTR_RING_INFO0_ */ @@ -999,7 +999,7 @@ enum hal_wbm_htt_tx_comp_status { }; struct hal_tcl_data_cmd { - struct buffer_addr buf_addr_info; + struct ath11k_buffer_addr buf_addr_info; u32 info0; u32 info1; u32 info2; @@ -1540,7 +1540,7 @@ struct hal_tx_rate_stats { } __packed; struct hal_wbm_link_desc { - struct buffer_addr buf_addr_info; + struct ath11k_buffer_addr buf_addr_info; } __packed; /* hal_wbm_link_desc @@ -1643,7 +1643,7 @@ enum hal_wbm_rel_bm_act { #define HAL_WBM_REL_HTT_TX_COMP_INFO0_EXP_FRAME BIT(17) struct hal_wbm_release_ring { - struct buffer_addr buf_addr_info; + struct ath11k_buffer_addr buf_addr_info; u32 info0; u32 info1; u32 info2; @@ -1833,7 +1833,7 @@ enum hal_wbm_tqm_rel_reason { }; struct hal_wbm_buffer_ring { - struct buffer_addr buf_addr_info; + struct ath11k_buffer_addr buf_addr_info; }; enum hal_desc_owner { @@ -1874,11 +1874,11 @@ struct hal_desc_header { } __packed; struct hal_rx_mpdu_link_ptr { - struct buffer_addr addr_info; + struct ath11k_buffer_addr addr_info; } __packed; struct hal_rx_msdu_details { - struct buffer_addr buf_addr_info; + struct ath11k_buffer_addr buf_addr_info; struct rx_msdu_desc rx_msdu_info; } __packed; @@ -1887,7 +1887,7 @@ struct hal_rx_msdu_details { struct hal_rx_msdu_link { struct hal_desc_header desc_hdr; - struct buffer_addr buf_addr_info; + struct ath11k_buffer_addr buf_addr_info; u32 info0; u32 pn[4]; struct hal_rx_msdu_details msdu_link[6]; diff --git a/drivers/net/wireless/ath/ath11k/hal_rx.c b/drivers/net/wireless/ath/ath11k/hal_rx.c index c37340fc0cad..329ecc6566f8 100644 --- a/drivers/net/wireless/ath/ath11k/hal_rx.c +++ b/drivers/net/wireless/ath/ath11k/hal_rx.c @@ -269,7 +269,7 @@ int ath11k_hal_reo_cmd_send(struct ath11k_base *ab, struct hal_srng *srng, void ath11k_hal_rx_buf_addr_info_set(void *desc, dma_addr_t paddr, u32 cookie, u8 manager) { - struct buffer_addr *binfo = (struct buffer_addr *)desc; + struct ath11k_buffer_addr *binfo = (struct ath11k_buffer_addr *)desc; u32 paddr_lo, paddr_hi; paddr_lo = lower_32_bits(paddr); @@ -283,7 +283,7 @@ void ath11k_hal_rx_buf_addr_info_set(void *desc, dma_addr_t paddr, void ath11k_hal_rx_buf_addr_info_get(void *desc, dma_addr_t *paddr, u32 *cookie, u8 *rbm) { - struct buffer_addr *binfo = (struct buffer_addr *)desc; + struct ath11k_buffer_addr *binfo = (struct ath11k_buffer_addr *)desc; *paddr = (((u64)FIELD_GET(BUFFER_ADDR_INFO1_ADDR, binfo->info1)) << 32) | @@ -453,7 +453,7 @@ int ath11k_hal_wbm_desc_parse_err(struct ath11k_base *ab, void *desc, void ath11k_hal_rx_reo_ent_paddr_get(struct ath11k_base *ab, void *desc, dma_addr_t *paddr, u32 *desc_bank) { - struct buffer_addr *buff_addr = desc; + struct ath11k_buffer_addr *buff_addr = desc; *paddr = ((u64)(FIELD_GET(BUFFER_ADDR_INFO1_ADDR, buff_addr->info1)) << 32) | FIELD_GET(BUFFER_ADDR_INFO0_ADDR, buff_addr->info0); @@ -1200,7 +1200,7 @@ void ath11k_hal_rx_reo_ent_buf_paddr_get(void *rx_desc, dma_addr_t *paddr, { struct hal_reo_entrance_ring *reo_ent_ring = (struct hal_reo_entrance_ring *)rx_desc; - struct buffer_addr *buf_addr_info; + struct ath11k_buffer_addr *buf_addr_info; struct rx_mpdu_desc *rx_mpdu_desc_info_details; rx_mpdu_desc_info_details = @@ -1209,7 +1209,7 @@ void ath11k_hal_rx_reo_ent_buf_paddr_get(void *rx_desc, dma_addr_t *paddr, *msdu_cnt = FIELD_GET(RX_MPDU_DESC_INFO0_MSDU_COUNT, rx_mpdu_desc_info_details->info0); - buf_addr_info = (struct buffer_addr *)&reo_ent_ring->buf_addr_info; + buf_addr_info = (struct ath11k_buffer_addr *)&reo_ent_ring->buf_addr_info; *paddr = (((u64)FIELD_GET(BUFFER_ADDR_INFO1_ADDR, buf_addr_info->info1)) << 32) |