lkml.org 
[lkml]   [2021]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.10 026/101] ath10k: high latency fixes for beacon buffer
    Date
    From: Alagu Sankar <alagusankar@silex-india.com>

    [ Upstream commit e263bdab9c0e8025fb7f41f153709a9cda51f6b6 ]

    Beacon buffer for high latency devices does not use DMA. other similar
    buffer allocation methods in the driver have already been modified for
    high latency path. Fix the beacon buffer allocation left out in the
    earlier high latency changes.

    Signed-off-by: Alagu Sankar <alagusankar@silex-india.com>
    Signed-off-by: Erik Stromdahl <erik.stromdahl@gmail.com>
    [fabio: adapt it to use ar->bus_param.dev_type ]
    Signed-off-by: Fabio Estevam <festevam@denx.de>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/20210818232627.2040121-1-festevam@denx.de
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/ath/ath10k/mac.c | 31 ++++++++++++++++++++-------
    1 file changed, 23 insertions(+), 8 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
    index 36183fdfb7f03..90dc48f66fbfe 100644
    --- a/drivers/net/wireless/ath/ath10k/mac.c
    +++ b/drivers/net/wireless/ath/ath10k/mac.c
    @@ -982,8 +982,12 @@ static void ath10k_mac_vif_beacon_cleanup(struct ath10k_vif *arvif)
    ath10k_mac_vif_beacon_free(arvif);

    if (arvif->beacon_buf) {
    - dma_free_coherent(ar->dev, IEEE80211_MAX_FRAME_LEN,
    - arvif->beacon_buf, arvif->beacon_paddr);
    + if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)
    + kfree(arvif->beacon_buf);
    + else
    + dma_free_coherent(ar->dev, IEEE80211_MAX_FRAME_LEN,
    + arvif->beacon_buf,
    + arvif->beacon_paddr);
    arvif->beacon_buf = NULL;
    }
    }
    @@ -5466,10 +5470,17 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
    if (vif->type == NL80211_IFTYPE_ADHOC ||
    vif->type == NL80211_IFTYPE_MESH_POINT ||
    vif->type == NL80211_IFTYPE_AP) {
    - arvif->beacon_buf = dma_alloc_coherent(ar->dev,
    - IEEE80211_MAX_FRAME_LEN,
    - &arvif->beacon_paddr,
    - GFP_ATOMIC);
    + if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL) {
    + arvif->beacon_buf = kmalloc(IEEE80211_MAX_FRAME_LEN,
    + GFP_KERNEL);
    + arvif->beacon_paddr = (dma_addr_t)arvif->beacon_buf;
    + } else {
    + arvif->beacon_buf =
    + dma_alloc_coherent(ar->dev,
    + IEEE80211_MAX_FRAME_LEN,
    + &arvif->beacon_paddr,
    + GFP_ATOMIC);
    + }
    if (!arvif->beacon_buf) {
    ret = -ENOMEM;
    ath10k_warn(ar, "failed to allocate beacon buffer: %d\n",
    @@ -5684,8 +5695,12 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,

    err:
    if (arvif->beacon_buf) {
    - dma_free_coherent(ar->dev, IEEE80211_MAX_FRAME_LEN,
    - arvif->beacon_buf, arvif->beacon_paddr);
    + if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)
    + kfree(arvif->beacon_buf);
    + else
    + dma_free_coherent(ar->dev, IEEE80211_MAX_FRAME_LEN,
    + arvif->beacon_buf,
    + arvif->beacon_paddr);
    arvif->beacon_buf = NULL;
    }

    --
    2.33.0
    \
     
     \ /
      Last update: 2021-11-09 02:19    [W:3.958 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site