From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F33C3B7B83 for ; Mon, 16 Mar 2026 17:14:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681285; cv=none; b=SiR6+602GGTI1jYR9xkq1QylYjYRoKBekzSbcRjV1CprMHIbl0yD7SHRB7kkGzaoXG+ysL1+4RXNH1CxZpLybVuVcS1josrk9q/DclEzpEqFqjxT7V8zsAzUdy0o6F73OgxW+dvBGmwUCPe7DPSUKbumxdzODGT3qGpYmSFdfX4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681285; c=relaxed/simple; bh=RitF4X0ydyAtTX/CCYADqtg2SWdZZo+quUkjHBSz16s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hGZdDq8pqabU1B926WpSWqEhjwQq4Q987Ual1cpWaIPfi02RB3P2Pp9Ct13df3/PFmOYWqOlkavaMtyghmhUgfd2I2ktHl602piSEBZ4ra2ynqUh02BnSM+Eg9SWdXHt90UO0CYtBzrLCDffeF+JX7mA5BJ1PINgvH0QV39M2/w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=fJ6kkfYD; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=csOpmZAg; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="fJ6kkfYD"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="csOpmZAg" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62GF2cNR1533923 for ; Mon, 16 Mar 2026 17:14:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=sttkd7eb2H2 60gtaHPbEBYrM3UtDNGNgOFfj96PH8fA=; b=fJ6kkfYDn3KQ6shXEvD5Q3uqQR4 8GNTg+aD9oSpshc1SUYkQ1DdIXsR0N/fcaeGfyoHV4xKEVFI7iiZXrR4hAPMskMz 7tHgnRvZ9XXREaK5hpUww3cvqQYCIHWXt1CwDZ9F49eR7RMMwg9rYH2lvcW97zcL 8HLQOmz75+EwnlkddogWCLGESPZIg8LjcTytuh8Wx0G1rQXbfdw8GAlCP7ZMCGjc 1huqPLODNZdQdl4PMl8XW1afJqXFOVxIaFnaWoVN/4CJTqLXEQJS0ZYSYX6nBx5a 6gqVa41jBh2roHre2gqdPlwNyqjeSYWQGddaUwADGLQfVlL2GccNKfDqzCw== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cxm5k0gxt-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 16 Mar 2026 17:14:42 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8cd8b37d4b2so186742785a.3 for ; Mon, 16 Mar 2026 10:14:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773681282; x=1774286082; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sttkd7eb2H260gtaHPbEBYrM3UtDNGNgOFfj96PH8fA=; b=csOpmZAgH7zrObh3zfdQIfbW80qqVNvgblnQhp7atGFEtEIaRybIfQPawKyqla5eoq X/jq2SDWDytlQYi2i4PbwtIJyMCUFnbEFnbEhlZFH4PH3XL/KEEPT5WYiU9Aee/c33Yy XBNJqhajb+A7R7WETCBd4vVpEbTYR+jhK5oMC2Kb4K84Qf4RmeHeOWqrv0SRr766WWIH MmfsxxoUdPYjFrN+7MtHvSgA9YSjCZSFZnnpILbNMRS4/9zui+rFfyYUr+F7HB4Fts/u 2EGWfJaFNuPVslLVFUQ0RE0+Fd8p7LFe8L/ArRWoa2duCFxPXgWlIfQokX8F79TK9y4m 9lIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773681282; x=1774286082; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=sttkd7eb2H260gtaHPbEBYrM3UtDNGNgOFfj96PH8fA=; b=Gk35CV1jAakm2F28e0Jg8KGtnAgGFrXhcuRPF4M+ATP3NQNa0kBce5RZi0VnSPfawP aJtS30EwSq+h1aWASmndCPgkT6AJe5uK5XZ6d7D+QCw5Da+/3jjIMp2r9S64/5xqSgd4 g+MomsxJHf62/LJM6vGsW36WOrHtoKmuo4obyzXx8whJdoeMABKjsXD6lAztdjWTjNBt pU1n/p72+SvLMw48UUEbwXVk5JJU4ZTwjG9vhplK/UO9ttqcgBzAvpY1be+Rfi+YHcrK 2ypHkj1n39bojmksGJdqx6RWyw6Nrd3lj77qTBJZHoamCPMv0LhWmwadY96RnPeJK/yv Xz/w== X-Forwarded-Encrypted: i=1; AJvYcCV4G8DAR7L59K+cJDUwleIRhtWTR0EQvOXbEfg7RWD03GDCrkTkgqPzk7ApCu/nXIPFDNMkJDEERZUowFPBgg==@vger.kernel.org X-Gm-Message-State: AOJu0YxqitC+xhCV15aaOzKI9xSStmFu6S+a/yPv+dXnconoDZ/RiL7d YWd+YdLQf6xcVyVSFI1I6rrkcKeK0zBWbWGwuppHEVdZV1Faa97ta6fJfnDkA0HgsSayqOzeEPu Q837h+XVxl2kFdfZO/SbhwLDDSEbwXaHvdN8aD0/KIjPl2KH4gQkcz3SX625UM2Mn7nKCKw== X-Gm-Gg: ATEYQzwKORhg/t7st++blIwpqiUaVFBhtKHn4r05qctJeZtQuCZOQj9DxWOVks1BTJL +211nCsB+/wGpFslUL49nizIbYE56m60g+EXndIK85YULhujLOphL6S/C97LtSvrXwp5EBonlQt kI9w1klxIea9S9Cb8tKhFdYTFT/UkHJXWhow0j8yG/q0DmEsuhfR5mCUzyXISb1guSdykC/maSe USS9rtF5s8vz1jzoyzRvp0vMVHUNDIW9s3taojui3g/p4nFR8X24YfAxC//uUZz4OJ4IKEva2Z0 ZfC6MZemJXDFn5z2lT+fH1fM15BWpzvu1ZfsU2oWeqprlljdfLChqzcsrnhGd0RRH7shIPxT2G1 GqwOIyD2ELE9YAAOWOpr1LpNshfQ/lITPjwAoByvkTf220yhVjg== X-Received: by 2002:a05:620a:1707:b0:8cd:b2e9:b964 with SMTP id af79cd13be357-8cdb5a0c51bmr1603122285a.10.1773681281517; Mon, 16 Mar 2026 10:14:41 -0700 (PDT) X-Received: by 2002:a05:620a:1707:b0:8cd:b2e9:b964 with SMTP id af79cd13be357-8cdb5a0c51bmr1603116085a.10.1773681280946; Mon, 16 Mar 2026 10:14:40 -0700 (PDT) Received: from mai.box.freepro.com ([2a05:6e02:1041:c10:5dfc:3995:22ce:d286]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439fe20b544sm43860993f8f.20.2026.03.16.10.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 10:14:40 -0700 (PDT) From: Daniel Lezcano To: konradybcio@kernel.org, andersson@kernel.org Cc: linux-kernel@vger.kernel.org, Alex Elder , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jeff Johnson , Mathieu Poirier , Srinivas Kandagatla , Jaroslav Kysela , Takashi Iwai , Kees Cook , Greg Kroah-Hartman , Arnd Bergmann , Mark Brown , Wesley Cheng , netdev@vger.kernel.org, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, ath11k@lists.infradead.org, ath12k@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-sound@vger.kernel.org, Dmitry Baryshkov Subject: [PATCH v2 2/4] wifi: ath: Use the unified QMI service ID instead of defining it locally Date: Mon, 16 Mar 2026 18:14:12 +0100 Message-ID: <20260316171419.2619620-3-daniel.lezcano@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260316171419.2619620-1-daniel.lezcano@oss.qualcomm.com> References: <20260316171419.2619620-1-daniel.lezcano@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authority-Analysis: v=2.4 cv=fJ00HJae c=1 sm=1 tr=0 ts=69b83a82 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=DFXFU3FfpSgEbJi8yTMA:9 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE2MDEzMyBTYWx0ZWRfX3vXW6wO1201B DoDfdQQV2xkjKm4rH1Lc0nb9IuEV6NNxNxevhRyy2IaE2mFnmGiIHSpgT9AEz+w7vs9YusPHDce NY0cFzruKLZjeZnKhBio/x2NL/IYgS0iIYiz7yy9UtI1ASzFCsgiAa1O1Ko0iJuh5glpWMM8PSY dvjgKNwffgHPGNbke4emtqXKtIASLgv49TMIbMXx0GspS1UCYh9tpBNaXGet623IAA6V+Ul+VA5 4AW/1WKYJnBQ2L8+6ddQUKL+O231Rf7W52pewryeMLuN97gI0LEQH1HgXGeX0CsopGeIRPVBfGG wQDsh2mSp1osjr9f4lQjHnc7uLzg7j9kcYY5xHVTAoQnEDVXd9xcbjFpLypQTZdLmS8C5KQlSYF 6egf0zJRQvT6vEkr4bSFLn2gYR39cb0gWvTAunhN+kU5Mg/n4P+WsIqmYYbXNTIlwcFDG3NGCmb 415H1NgKiV93fse5V7w== X-Proofpoint-GUID: QMspotlopsGb2t903BH1aggkIHMkbGuG X-Proofpoint-ORIG-GUID: QMspotlopsGb2t903BH1aggkIHMkbGuG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-16_04,2026-03-16_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 malwarescore=0 suspectscore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603160133 Instead of defining a local macro with a custom name for the QMI service identifier, use the one provided in qmi.h and remove the locally defined macro. Reviewed-by: Dmitry Baryshkov Signed-off-by: Daniel Lezcano --- drivers/net/wireless/ath/ath10k/qmi.c | 2 +- drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h | 1 - drivers/net/wireless/ath/ath11k/qmi.c | 2 +- drivers/net/wireless/ath/ath11k/qmi.h | 1 - drivers/net/wireless/ath/ath12k/qmi.c | 2 +- drivers/net/wireless/ath/ath12k/qmi.h | 1 - 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c index eebd78e7ff6b..4fdd0af415d5 100644 --- a/drivers/net/wireless/ath/ath10k/qmi.c +++ b/drivers/net/wireless/ath/ath10k/qmi.c @@ -1105,7 +1105,7 @@ int ath10k_qmi_init(struct ath10k *ar, u32 msa_size) spin_lock_init(&qmi->event_lock); INIT_WORK(&qmi->event_work, ath10k_qmi_driver_event_work); - ret = qmi_add_lookup(&qmi->qmi_hdl, WLFW_SERVICE_ID_V01, + ret = qmi_add_lookup(&qmi->qmi_hdl, QMI_SERVICE_ID_WLFW, WLFW_SERVICE_VERS_V01, 0); if (ret) goto err_qmi_lookup; diff --git a/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h b/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h index 9f311f3bc9e7..88d58f78989d 100644 --- a/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h +++ b/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h @@ -7,7 +7,6 @@ #ifndef WCN3990_QMI_SVC_V01_H #define WCN3990_QMI_SVC_V01_H -#define WLFW_SERVICE_ID_V01 0x45 #define WLFW_SERVICE_VERS_V01 0x01 #define QMI_WLFW_BDF_DOWNLOAD_REQ_V01 0x0025 diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c index feebbc30f3df..1397756d6251 100644 --- a/drivers/net/wireless/ath/ath11k/qmi.c +++ b/drivers/net/wireless/ath/ath11k/qmi.c @@ -3337,7 +3337,7 @@ int ath11k_qmi_init_service(struct ath11k_base *ab) spin_lock_init(&ab->qmi.event_lock); INIT_WORK(&ab->qmi.event_work, ath11k_qmi_driver_event_work); - ret = qmi_add_lookup(&ab->qmi.handle, ATH11K_QMI_WLFW_SERVICE_ID_V01, + ret = qmi_add_lookup(&ab->qmi.handle, QMI_SERVICE_ID_WLFW, ATH11K_QMI_WLFW_SERVICE_VERS_V01, ab->qmi.service_ins_id); if (ret < 0) { diff --git a/drivers/net/wireless/ath/ath11k/qmi.h b/drivers/net/wireless/ath/ath11k/qmi.h index 7968ab122b65..eae416db8b52 100644 --- a/drivers/net/wireless/ath/ath11k/qmi.h +++ b/drivers/net/wireless/ath/ath11k/qmi.h @@ -15,7 +15,6 @@ #define ATH11K_QMI_MAX_BDF_FILE_NAME_SIZE 64 #define ATH11K_QMI_CALDB_ADDRESS 0x4BA00000 #define ATH11K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01 128 -#define ATH11K_QMI_WLFW_SERVICE_ID_V01 0x45 #define ATH11K_QMI_WLFW_SERVICE_VERS_V01 0x01 #define ATH11K_QMI_WLFW_SERVICE_INS_ID_V01 0x02 #define ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCA6390 0x01 diff --git a/drivers/net/wireless/ath/ath12k/qmi.c b/drivers/net/wireless/ath/ath12k/qmi.c index c11b84b56f8f..f31cba7af722 100644 --- a/drivers/net/wireless/ath/ath12k/qmi.c +++ b/drivers/net/wireless/ath/ath12k/qmi.c @@ -4061,7 +4061,7 @@ int ath12k_qmi_init_service(struct ath12k_base *ab) spin_lock_init(&ab->qmi.event_lock); INIT_WORK(&ab->qmi.event_work, ath12k_qmi_driver_event_work); - ret = qmi_add_lookup(&ab->qmi.handle, ATH12K_QMI_WLFW_SERVICE_ID_V01, + ret = qmi_add_lookup(&ab->qmi.handle, QMI_SERVICE_ID_WLFW, ATH12K_QMI_WLFW_SERVICE_VERS_V01, ab->qmi.service_ins_id); if (ret < 0) { diff --git a/drivers/net/wireless/ath/ath12k/qmi.h b/drivers/net/wireless/ath/ath12k/qmi.h index b5a4a01391cb..2a63e214eb42 100644 --- a/drivers/net/wireless/ath/ath12k/qmi.h +++ b/drivers/net/wireless/ath/ath12k/qmi.h @@ -15,7 +15,6 @@ #define ATH12K_QMI_MAX_BDF_FILE_NAME_SIZE 64 #define ATH12K_QMI_CALDB_ADDRESS 0x4BA00000 #define ATH12K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01 128 -#define ATH12K_QMI_WLFW_SERVICE_ID_V01 0x45 #define ATH12K_QMI_WLFW_SERVICE_VERS_V01 0x01 #define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01 0x02 #define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_WCN7850 0x1 -- 2.43.0