From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0496DF53D78 for ; Mon, 16 Mar 2026 17:14:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=sttkd7eb2H260gtaHPbEBYrM3UtDNGNgOFfj96PH8fA=; b=qcz3OzYTj6i9czq2IzuLZ3XmZF +XhPQI9aANTg0IVt5H49hn21zGnBqxVfAuyBPj85HI1mxDRyzZNTQGnMLniEq9DKajb+7JQui3oFY yBuhLcRqbyIBGFMR/dF+GTw5cG+ictcPi28fdOkR1xjh1ncaYcFbKASPQzK9n6m8d4vsPNeGpNNaw 2ZIcbN2B6XzjaSlqfBGbX3rZtckTZRLe2TIdZsnxB+Lqfj6b+3aRYow+JZ8B2j523uzrLHXfOi4lC ldfk6CmABy4XZPoV/ShWc6MjcSObZhTpBFw0htTQopMhhk2sDSCgUKKMexos+BYtRBXUH3qvLEU0D B/ZpFznQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1w2BWf-00000004WN3-2sSY; Mon, 16 Mar 2026 17:14:45 +0000 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1w2BWd-00000004WKH-0Wo4 for ath11k@lists.infradead.org; Mon, 16 Mar 2026 17:14:44 +0000 Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62GFMptj2314565 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-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cxmf28e62-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-f199.google.com with SMTP id af79cd13be357-8cd76ff19d5so139503085a.0 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=1773681281; x=1774286081; darn=lists.infradead.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=EPpyIsMLnqJM+vedN5ROuYFKQTDgvwLmfE+GKjnuGudhNPhRr5k1kXy1uWwFLBrkgY 1MMd6UEUOdk4bgHnW1czwJ8pkiR+XjT3VxsDeBnJGqkIzlNDyimRI1di0G+OKIypeO5b ycNMALas9j3yEn2g9ngpAUEF2s1D7wYvvnG7fKyxBElUq7rdtvhXBmE9LacktTQSvgak 2WmTsZhzFZmLnqZoGoWq9XGDn/4VhUHS9UvJXESud+J8owCmRKXFXoabzGo/jnpJDXYX SYB3ptTyQtU1uQeRkDiA+uQtRbaBHs1kGAD9xy1O6YzTLYReWBC/b/8FbqSqJlIuNzxV UAxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773681281; x=1774286081; 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=O36cM+iF0RD1xGDL5vZFHCwdWX8TGXrskV9zAs/n0cocWh1jBrab6DucjuLk9w23i2 RY0ZilzIKKI3MZ/G/nEl5+nhG2g/j/YJmj0iO2qk90ndsKnRZJo5x6KyI4HDdemT8Xeb xlFKoFmQhh4Av/6VQ1kkNRJ6uk+t9/Cc3WfNtKGgMkykMzcsMZSs9Cm+4diNJ1eAIcE2 g6l2JcIXcVGMJ8g04vskxQKDUiFtI4TtX29110DhAqkFvq1OL99OZkbQ+EipPHDCYMfl 08KXJBUbZJZEjlqMlBdYG1bddVzuHUN0bQm4umW0a+N1gsKbxzgCgASUjWjsKM+UYjpw XRAw== X-Forwarded-Encrypted: i=1; AJvYcCU56bMTmzjaviIOtb7Uy3c0TloikCJEzXXtMYnNiTDdjfzUYQzeQI+sxW+CAFZMbUMg+SkgC/w=@lists.infradead.org X-Gm-Message-State: AOJu0Yx+jL34IdaMWkmOZnnCWfhG57fAoG43WzuvMVSYiQt6EUpwvxVw 8TAnwTYqzcW302aEtLFTgcJOE5evFR7IN+iAlSyZZoO3LsyzuVRTIJK1MGHameJ7SQkZjejXnY+ 1JpkkKND5rk5BpCo2H7/b+VmZWDPyWJ4DpMihIXZArbM9mdlqNMFSkj+oSaI4CZ7y X-Gm-Gg: ATEYQzzmxIl4YdL2B5gBdE03DCst8t4Nfm35QfWiXhYMjtYsmb4svrb/81imVfFQvqD RDC8eJ2SF30svsSjuX1Gyg7Enp0SLwwdoKarSS559q68dnPlhg1TqfSkqJ2ViCOttb94BVha5de tM9wpXjoKjnvoqN+CiCCGgYxr3B8cjQ8RmNP3/LHc4vwjTDEx8VGLpiqx7eYAXv9mJSCHNNSUQu klzuk+pH0tdKRfg1YOfCmiC9jZo7AKbf3WrtIiSIA9zxRj1mRLWmZidXruRU7OLzsnVCPt+VEUj i2EAU2KfmTjDbq5m2cLMeAKGIIrp7AfUKTRoTvJ9GSdtwwo/6W0Joy0VBnCRVfvLcD29XH9ox53 NMhw8yx5G7r35AbKQMB+pOR8Xto8R854UfPcohQB3od00+Yd7+g== X-Received: by 2002:a05:620a:1707:b0:8cd:b2e9:b964 with SMTP id af79cd13be357-8cdb5a0c51bmr1603121185a.10.1773681281498; 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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-ORIG-GUID: bM9UWxtPrgPh7oG4RHH5BtHS3BFLaDM- X-Proofpoint-GUID: bM9UWxtPrgPh7oG4RHH5BtHS3BFLaDM- X-Authority-Analysis: v=2.4 cv=FvcIPmrq c=1 sm=1 tr=0 ts=69b83a82 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=DFXFU3FfpSgEbJi8yTMA:9 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE2MDEzMyBTYWx0ZWRfX/N+Wwddi26Mg taii2GzCZDTKT1AxyimGw+kw5DZEf12u/jyl9JyHdINYVEeHqnm9f6QEQMoorREEOkNfHInLnC5 kJGZ/1v1Rvo46fEa2C+EmnLqXIIEO0Rw9lPTYPSyLDz7vi8fxizCXnKjgteypyV7Fhu6sMcpRuP caCPI2R8nn4+aWBE6eOS/JxA6fSUTypC/SttZQzTGEQjMM3NumEDlfU8abM5kjefJZj27YsvZmf TXRWJ4rN0e7TepSnTe2scDN/01Qj3Tnkj3SEvalFOokTi+7XkkItTzGrM1ik8NrBfnszq/QhoQm 3mWR0SwYXWen/DNBKQ2AGtJuvDJ/Pr29nNzbATww5mRyQgd79s63ARdMZYWMTkZJV2ZG/2ZnrP1 yYRecYyUOhTyRJ81X14AkKgUdAk4SQAO+0SOwsfr8P63VrUdV8/Yn/tBZm8GLbmQRLNZRtk+ZUE SG3b3EBHDBvP/W/GQhw== 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 impostorscore=0 priorityscore=1501 suspectscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 spamscore=0 clxscore=1015 malwarescore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603160133 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260316_101443_317142_BB540BA5 X-CRM114-Status: GOOD ( 15.15 ) X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "ath11k" Errors-To: ath11k-bounces+ath11k=archiver.kernel.org@lists.infradead.org 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