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 4B463F53D80 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=eIrvwN7SamzaOMBknOqz1V3ZYy CZ1tOANojtsMIfjYAU+y5zKhjvG73QD5Q2T0L8cpupFlXHRDVlwrNAhLTRBDeP2b4bzoZXLewjGwE XNfpcoFzWR6l4jGwwe5UNPMZIhHN8li2gmq4OZodaJaCNckekRTuX5aZRSwO1jvWcTlEAa4BPq6cg vhxFMxV3TR/84lN+ZBwVO4Sh45b03q39xiwvhreTBdmgu7ujTQfgwGIHTn0VbCWJANms15jwjjRPg bqhR7ddiI56EfxK/cMhX9MrzED7yMqHZh3E7S8Tm6nunoy+nrJJXu4gpDJLWvy7qx4CKyiGUBwnnn Wmue4RiA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1w2BWf-00000004WNT-49rq; Mon, 16 Mar 2026 17:14:45 +0000 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1w2BWd-00000004WKN-0i3e for ath12k@lists.infradead.org; Mon, 16 Mar 2026 17:14:44 +0000 Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62GE87dl2375172 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-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cxkby0q93-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-f197.google.com with SMTP id af79cd13be357-8cd8b37d4b2so186739085a.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=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=N5CFFXUSXHluwTduQlUl+Fyi0o2e6mBTA9OZuJu1n9Lhj5ZSUpw0yjpyPeJebIQqN3 tJAqPWsY+q0k4/BiGawwYfvpiUquJXXfnuZnGY3Du4afGRGVfDn9+LXXwRshotSVZr6f I64HmSUmaEIYBILUnDIqHcgQAoFmZtb5BBuFhOogneBuOUDplVmrxX8dLMx+N9DyXt3D v8/dNmlDusnFAUgvPDZDVFqG5yC6GHnPJ8D0aoze+usiFai74u72cJmHnQ2aZyGqudbC jMrYXf8L2AaAAetIoo++J9DBv3v+RjBINfR2M+jjeXHrzHIR5bW0OgJfN9BiOMutz3zH 1sDA== X-Forwarded-Encrypted: i=1; AJvYcCUskZ3O0BhkzrsHLMIQ/lAxb9WkjCCKSwgNUEtFqy835dE3LMBxXWW22SlDOLs9CR3kGdt2Ayg=@lists.infradead.org X-Gm-Message-State: AOJu0Yxk3JHU66sf/2fLGeW9NybGODYBYpAzvwyoPwnrh1hu/Xilqsfa 8YRTA4qkdf03Rv8B+d4cjH0Jy4BoONWXjKAD3f0iZE9eHgpCBnlKckm8UcBmc2yfmp2B+f8klsv x8ysXLgdicdIIR9Uq+K672sfOlkLV/EiBqnkQ8yCQEpvBZfP+mjdDHOvol/otMOhz X-Gm-Gg: ATEYQzxl54cPrvhd2GkJTBDUoYrdwfIOlOf4BszMF4UFCFSV5zA9lc3Ig4EOlasQi4k y32bYpV7N0Pt/IPMA0j6FwgQ7caxpDxZ7XwclDFwKEJE3IjLHpYlkwrzXqCpiYQ10smdFiBLvE+ VmJp3Kz2bQKo/v2Mf6hILq5vwRbK3a44ULTrAVniMpENHvxPqypUXHpvy6oa/NsQy3Sob81b/3D Sr3H3mdbGDDap5LUTIYmXZDjq2aznhEAgKHFLeczdS5zM24RkxRrmAv2ttm/Sk+FHRuR9U9RrQF 9rNZCIPTH3EdzprpWuUosPIrGFzAImMPCLK+2LSAHZjcmuEKqvID90wfLXqpfe96oWiMz4norli MI86duhzOiKSnWlminbi9dTI6OJ4HpOHIUjOcjXyeInq2zY/FJw== X-Received: by 2002:a05:620a:1707:b0:8cd:b2e9:b964 with SMTP id af79cd13be357-8cdb5a0c51bmr1603121585a.10.1773681281503; 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-GUID: LC90tH5Gbah8zYSvDLCVnqhItY8-itjs X-Proofpoint-ORIG-GUID: LC90tH5Gbah8zYSvDLCVnqhItY8-itjs X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE2MDEzMyBTYWx0ZWRfXwnvO6B2DwH30 Tt//9VqUxcYP02ROiVdja5iSScz2oOABMJwUvelfGyjm0/MVHRxK0LV+cusT0kn/L7jfUz+ziQr 9gT06Ijr/o2GeXTmFFJ3k8cb9TF8ZIxkzZXz8HpAKhliqOmUJ+elbjybkyc38khs94z5D+PVMGX jzkj69uxtRU3pA/tsn3DJ62nb6DYkn5SgJyYu9lwGOorVuB4Bsf8i/+T6RUsIwQil65/k39qWQw uxyrGty+151W3mnX1PeDaL405Y61XsONSnT195UiEJ1u0rrUQmGRsTdGJxoYsZxoDSSdTUaMgNG JSdcp6WNybrzOd6BcnAo4NdRRLF5BgmTmZEWbV5/uXzI/qbhD/qiDnGeBL264r6K0/OwZWQzlqI +4/fBaYbsYTS3AVKjk0RsduShbttUpCbN31/I1p1kIFEcFN1D6mPlhuGiGFe8KQI9bWkGE/eKtR I1VCim05aPtW5SvE4wg== X-Authority-Analysis: v=2.4 cv=ZpLg6t7G c=1 sm=1 tr=0 ts=69b83a82 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=DFXFU3FfpSgEbJi8yTMA:9 a=IoWCM6iH3mJn3m4BftBB:22 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 lowpriorityscore=0 suspectscore=0 bulkscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 impostorscore=0 adultscore=0 phishscore=0 spamscore=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_218946_9B49FDEB X-CRM114-Status: GOOD ( 14.89 ) X-BeenThere: ath12k@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "ath12k" Errors-To: ath12k-bounces+ath12k=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