Commit 3b8694e5 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge tag 'ath-current-20251027' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath 

Jeff Johnson says:
==================
ath.git update for v6.18-rc4

Revert an ath10k change which improved QCA6174 but completely broke
QCA988x and QCA9984.
==================

Link: https://patch.msgid.link/e7e3ab9f-f477-4e84-8a5c-609fa1834624@oss.qualcomm.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents a83155cc 2469bb6a

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

+20 −19
Original line number Diff line number Diff line
@@ -1764,34 +1764,35 @@ void ath10k_wmi_put_wmi_channel(struct ath10k *ar, struct wmi_channel *ch, 


int ath10k_wmi_wait_for_service_ready(struct ath10k *ar)

{

	unsigned long timeout = jiffies + WMI_SERVICE_READY_TIMEOUT_HZ;

	unsigned long time_left, i;



	time_left = wait_for_completion_timeout(&ar->wmi.service_ready,

						WMI_SERVICE_READY_TIMEOUT_HZ);

	if (!time_left) {

		/* Sometimes the PCI HIF doesn't receive interrupt

		 * for the service ready message even if the buffer

		 * was completed. PCIe sniffer shows that it's

		 * because the corresponding CE ring doesn't fires

	 * it. Workaround here by polling CE rings. Since

	 * the message could arrive at any time, continue

	 * polling until timeout.

		 * it. Workaround here by polling CE rings once.

		 */

	do {

		ath10k_warn(ar, "failed to receive service ready completion, polling..\n");



		for (i = 0; i < CE_COUNT; i++)

			ath10k_hif_send_complete_check(ar, i, 1);



		/* The 100 ms granularity is a tradeoff considering scheduler

		 * overhead and response latency

		 */

		time_left = wait_for_completion_timeout(&ar->wmi.service_ready,

							msecs_to_jiffies(100));

		if (time_left)

			return 0;

	} while (time_before(jiffies, timeout));



	ath10k_warn(ar, "failed to receive service ready completion\n");

							WMI_SERVICE_READY_TIMEOUT_HZ);

		if (!time_left) {

			ath10k_warn(ar, "polling timed out\n");

			return -ETIMEDOUT;

		}



		ath10k_warn(ar, "service ready completion received, continuing normally\n");

	}



	return 0;

}



int ath10k_wmi_wait_for_unified_ready(struct ath10k *ar)

{

	unsigned long time_left;