Commit 2469bb6a authored by Baochen Qiang's avatar Baochen Qiang Committed by Jeff Johnson
Browse files

Revert "wifi: ath10k: avoid unnecessary wait for service ready message" 

This reverts commit 51a73f1b.

Although this commit benefits QCA6174, it breaks QCA988x and
QCA9984 [1][2]. Since it is not likely to root cause/fix this
issue in a short time, revert it to get those chips back.

Compile tested only.

Fixes: 51a73f1b ("wifi: ath10k: avoid unnecessary wait for service ready message")
Link: https://lore.kernel.org/ath10k/6d41bc00602c33ffbf68781f563ff2e6c6915a3e.camel@gmail.com # [1]
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220671

 # [2]
Signed-off-by: default avatarBaochen Qiang <baochen.qiang@oss.qualcomm.com>
Reviewed-by: default avatarVasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20251027-ath10k-revert-polling-first-change-v1-1-89aaf3bcbfa1@oss.qualcomm.com


Signed-off-by: default avatarJeff Johnson <jeff.johnson@oss.qualcomm.com>
parent a83155cc

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;