From patchwork Mon Apr 29 14:06:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Gonzalez X-Patchwork-Id: 13647058 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 937EB78B4E for ; Mon, 29 Apr 2024 14:08:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714399705; cv=none; b=djvROqm7iKWtICq0tdoTHog9Y8rOV11cCu73AERjLwzB1uCcDyK1FsSrFD0Ti0xkkQigqj7WIJBp7ea5YDHeB6l+bGDarIGbay4wroeHlJ/yRvN1RiZ3yqtHvFXiru3ovWgwfVX+Pdro7kCILQyj5XvU0wiPIxPRnDBcU6wWZCQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714399705; c=relaxed/simple; bh=K3H3oU3CMwUoPM9Gm8tJdK0RIHTbJw44PRW6pLlAOTw=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=YgPRu3PlUwfys07WWqdEUVteEG5W7alZvhLwBLdvZflZvqBo1lEJ7mdw56pJQZHtHkOd7Vj3iOOk8MfzrU6uTcoS9vjhUXqA/fCbXl0+a6BUDdxgtl/38wVGI5BxM9ztXumU45oDF/ZiZXo39fRoAQntxvHZmZk+5WHK4WzmlOs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freebox.fr; spf=pass smtp.mailfrom=freebox.fr; dkim=pass (2048-bit key) header.d=freebox-fr.20230601.gappssmtp.com header.i=@freebox-fr.20230601.gappssmtp.com header.b=OvLFr4EU; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freebox.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=freebox.fr Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=freebox-fr.20230601.gappssmtp.com header.i=@freebox-fr.20230601.gappssmtp.com header.b="OvLFr4EU" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-347c197a464so3373744f8f.2 for ; Mon, 29 Apr 2024 07:08:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebox-fr.20230601.gappssmtp.com; s=20230601; t=1714399702; x=1715004502; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=slJpYmgS90L/h5w1hii7W5uz2RIsMI5ZLFBw+Kaucdg=; b=OvLFr4EUtleHY247ykcqxLVpRcpJVzjhYQeqsuOITwTctqcUXdn0qFI5waamN/qyQ1 P404Fzz+rn2KXCAcpRVL0BrV2zsQZO7q+bN+COiJJRx0t4aJBY/2PMqI3XuwCS2vxpWs 0mKi1wNwwB+PExKAa+qSwlSRYwXloSGioo6JUIHP9kIaaOeiGRoag5dJrQUyrPyEP8D+ fWpL90FfVo1rmon1QYBkulR2kMqpZ09/4/Ont9cgN9xI9HNwbpZY5H2j/xObyI4k8N4g mhmu3hKmwrELtgjpe7F66wn9++lHwBEx5Tq5lQrC6yaADbUMs6jOWXKAG1UkNOYgjs78 8QQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714399702; x=1715004502; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=slJpYmgS90L/h5w1hii7W5uz2RIsMI5ZLFBw+Kaucdg=; b=hDzfIgamEbhlvEjcaIk9wt8sGhJMaUHsumw9l+v0e6Yn7JPhURh7CuTGuqT+HUcIZ4 KNaPy34k39CIHm1MZHOyBsAd0ClgHjbYirYOfzkdyY0pxJ+r4aqmEl5SkVLC4PPk2IJe 37xMbbewn3sbxVyJIXB55pXf9DwEdsuO5tGeXRdrsra85umoWKRkpcLcrCPtBJdVX6+A SvixgHkL+DAQ3L0/jWRNRj5uUyVs+onUbeGLYEE+HK+QF/mK31kUSNwtfMjjREnLzPOO cwSb0Zu3z4/grW0TL9jTWFyM1BSvgkAvtwO2CF3KFr30XH4P2nKqKMIV3i7YUBIp4jsy ypug== X-Forwarded-Encrypted: i=1; AJvYcCWAP7xt/3s07FwywEwriZB+qOaLv0KX31+9QLiyMop9yIdM16jN4sKcSAMLy5pG/zS0aoR4bzeTxlVFxGMiOCB3DRTUBL3uIItOBd1dBQ== X-Gm-Message-State: AOJu0Yy2yPWnvSz3A8LujVEudNdvFvDPCV7TZezSmDJkds9CM2RKviXW bZZJv5z1gB2St3TmdXgHWz/1TwPgEvdV07SWIzGggWwJlbLbOCPcOj3/giznLBU= X-Google-Smtp-Source: AGHT+IE0U6L3fujZHlk20H5CVqIRzvRH48z34sBirtpJ3xZOuT9o+7jDn4hp8aLzGpTqiK2yS6z6Yg== X-Received: by 2002:a5d:43cf:0:b0:34c:ea34:7191 with SMTP id v15-20020a5d43cf000000b0034cea347191mr2786066wrr.21.1714399701848; Mon, 29 Apr 2024 07:08:21 -0700 (PDT) Received: from [192.168.108.81] (freebox.vlq16.iliad.fr. [213.36.7.13]) by smtp.gmail.com with ESMTPSA id h1-20020a5d6881000000b0034615862c64sm29585477wru.110.2024.04.29.07.08.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 29 Apr 2024 07:08:21 -0700 (PDT) Message-ID: <23540303-5816-45d5-a1af-5f09d645a73b@freebox.fr> Date: Mon, 29 Apr 2024 16:06:29 +0200 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v3 2/3] wifi: ath10k: do not always wait for MSA_READY indicator From: Marc Gonzalez To: Kalle Valo , Jeff Johnson , ath10k Cc: wireless , DT , MSM , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Pierre-Hugues Husson , Arnaud Vrac , Bjorn Andersson , Konrad Dybcio , Jami Kettunen , Jeffrey Hugo , Dmitry Baryshkov , Alexey Minnekhanov References: Content-Language: en-US In-Reply-To: The ath10k driver waits for an "MSA_READY" indicator to complete initialization. If the indicator is not received, then the device remains unusable. Several msm8998-based devices are affected by this issue. Oddly, it seems safe to NOT wait for the indicator, and proceed immediately when QMI_EVENT_SERVER_ARRIVE. fw_version 0x100204b2 fw_build_timestamp 2019-09-04 03:01 fw_build_id QC_IMAGE_VERSION_STRING=WLAN.HL.1.0-01202-QCAHLSWMTPLZ-1.221523.2 Jeff Johnson wrote: The feedback I received was "it might be ok to change all ath10k qmi to skip waiting for msa_ready", and it was pointed out that ath11k (and ath12k) do not wait for it. However with so many deployed devices, "might be ok" isn't a strong argument for changing the default behavior. Signed-off-by: Pierre-Hugues Husson Signed-off-by: Marc Gonzalez Reviewed-by: Bjorn Andersson Acked-by: Jeff Johnson --- drivers/net/wireless/ath/ath10k/qmi.c | 11 +++++++++++ drivers/net/wireless/ath/ath10k/qmi.h | 1 + 2 files changed, 12 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c index 38e939f572a9e..f1f33af0170a0 100644 --- a/drivers/net/wireless/ath/ath10k/qmi.c +++ b/drivers/net/wireless/ath/ath10k/qmi.c @@ -1040,6 +1040,10 @@ static void ath10k_qmi_driver_event_work(struct work_struct *work) switch (event->type) { case ATH10K_QMI_EVENT_SERVER_ARRIVE: ath10k_qmi_event_server_arrive(qmi); + if (qmi->no_msa_ready_indicator) { + ath10k_info(ar, "qmi not waiting for msa_ready indicator"); + ath10k_qmi_event_msa_ready(qmi); + } break; case ATH10K_QMI_EVENT_SERVER_EXIT: ath10k_qmi_event_server_exit(qmi); @@ -1048,6 +1052,10 @@ static void ath10k_qmi_driver_event_work(struct work_struct *work) ath10k_qmi_event_fw_ready_ind(qmi); break; case ATH10K_QMI_EVENT_MSA_READY_IND: + if (qmi->no_msa_ready_indicator) { + ath10k_warn(ar, "qmi unexpected msa_ready indicator"); + break; + } ath10k_qmi_event_msa_ready(qmi); break; default: @@ -1077,6 +1085,9 @@ int ath10k_qmi_init(struct ath10k *ar, u32 msa_size) if (of_property_read_bool(dev->of_node, "qcom,msa-fixed-perm")) qmi->msa_fixed_perm = true; + if (of_property_read_bool(dev->of_node, "qcom,no-msa-ready-indicator")) + qmi->no_msa_ready_indicator = true; + ret = qmi_handle_init(&qmi->qmi_hdl, WLFW_BDF_DOWNLOAD_REQ_MSG_V01_MAX_MSG_LEN, &ath10k_qmi_ops, qmi_msg_handler); diff --git a/drivers/net/wireless/ath/ath10k/qmi.h b/drivers/net/wireless/ath/ath10k/qmi.h index 89464239fe96a..0816eb4e4a18a 100644 --- a/drivers/net/wireless/ath/ath10k/qmi.h +++ b/drivers/net/wireless/ath/ath10k/qmi.h @@ -107,6 +107,7 @@ struct ath10k_qmi { char fw_build_timestamp[MAX_TIMESTAMP_LEN + 1]; struct ath10k_qmi_cal_data cal_data[MAX_NUM_CAL_V01]; bool msa_fixed_perm; + bool no_msa_ready_indicator; enum ath10k_qmi_state state; };