Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08743f9c authored by Alagu Sankar's avatar Alagu Sankar Committed by Greg Kroah-Hartman
Browse files

ath10k: high latency fixes for beacon buffer 



[ 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: default avatarAlagu Sankar <alagusankar@silex-india.com>
Signed-off-by: default avatarErik Stromdahl <erik.stromdahl@gmail.com>
[fabio: adapt it to use ar->bus_param.dev_type ]
Signed-off-by: default avatarFabio Estevam <festevam@denx.de>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210818232627.2040121-1-festevam@denx.de


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fadb4cd7

drivers/net/wireless/ath/ath10k/mac.c

+23 −8
Original line number Diff line number Diff line
@@ -985,8 +985,12 @@ static void ath10k_mac_vif_beacon_cleanup(struct ath10k_vif *arvif) 
	ath10k_mac_vif_beacon_free(arvif);



	if (arvif->beacon_buf) {

		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,

					  arvif->beacon_paddr);

		arvif->beacon_buf = NULL;

	}

}
@@ -5251,10 +5255,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,

		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",
@@ -5469,8 +5480,12 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, 


err:

	if (arvif->beacon_buf) {

		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,

					  arvif->beacon_paddr);

		arvif->beacon_buf = NULL;

	}