From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 58599380FEB for ; Thu, 16 Jul 2026 16:18:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784218730; cv=none; b=listgtuMvfEFv5MC/6E/Ft90iQG8aNw51jv90s88UEz4bqxwZjWEaiSxUmRzLuD+QeqwZMMY0Pg4J0KFwwbgc84FYvGCSpSpPsAHeZgQEoTodMdrh8j0T0J5TSawO8D2aymFodzcoob8FOKCsGIIfaQzFRv9+2TPjqZBVRMC+kg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784218730; c=relaxed/simple; bh=xM69rdwj/4s4KU6DoN0jDrVsnH2NCoFH3DVoSAMRnTQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=o50oY3PLtdKLmJKHXHvlGWgKCWh2r/ZOjaQjQGGqCo+dfIuj1P2kwmlMqX5B/ZScxBVgCD5uWMnEn+LtVL1owJwNNq1ii7jNGt1fCZA+VDegZERD6nQpYwDQC/cLTQ4u28DCLu/wVOjlQRqnC79e8qM0NHyuP12EsNSawZtbCoQ= 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=UxjjV5cA; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=kdhottZX; arc=none smtp.client-ip=205.220.168.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="UxjjV5cA"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="kdhottZX" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GDJtPW3988626 for ; Thu, 16 Jul 2026 16:18:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= iA2Yiw9uzbXh2h9O8pkl6U4Hyg4t6O2C/nSL7Zx+AZM=; b=UxjjV5cAYc4dm11p NTuTvZnrsFOqxPZILMOsJaFgQDrpoZYqim40h89ov7KLgMxLtsmx84PtEqDHsS4p yPkK2R00/3fnKa8bpxFqjLnYKESFx4ZsWq4LNefkhOYMm+IzYtUjTtn/N4qCA36I 4zaBEq6R5wCGQ9llAKuZwcRRsNBvvI4Wa2iTAL47aEihx2W6oV2PuGVOOeN7Nb04 kOsGcgArOHBz8nQXJ70cTp119vMJ08++1Fy8rv6gwnjDQXpMnW+/eXwG8pZotkOM Wo/HCysdfzirKxO6uvYQ+tcXFhw6AE/9jKb4hoENi7bmWn0erKneee1sIXz7JsaG NO3kjg== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4feq3pk72p-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 16:18:39 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51bec738909so58678121cf.1 for ; Thu, 16 Jul 2026 09:18:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784218718; x=1784823518; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=iA2Yiw9uzbXh2h9O8pkl6U4Hyg4t6O2C/nSL7Zx+AZM=; b=kdhottZXjKTZUFdtdCuB4QtiiTW9+OEYbzW4pK2VxER8kjttrXsJ+1pMYmcLtmj2q3 fbRu6toNf8RNWnVb2yR57ga/JcZlxRDxoLWeq5ZpVs1D24NCbT7+Ch2oFMAXRs0Z1lVW F7WD4FqjMpzjDvp8bKH5rxxeweVLGY+O6R5qvmFL1i1DV6mE38GgrxABSypEwHUKoPN5 sxrVZSSmi7gYFr6kUwB8c9bajZeojkOHAqocKp3tyXgwyPrxued4XuBtKLUkbzRnA8Jf GuOY3J59DUoouQU3/7wB9DCUZgAVGXdDzHXJ2X8S9bwPZ7HxnxXEBSIFZ/S/JQWUzuKb dcWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784218718; x=1784823518; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=iA2Yiw9uzbXh2h9O8pkl6U4Hyg4t6O2C/nSL7Zx+AZM=; b=a8Fqyvx+6iRSgsg8pgfOCzGXRiKITy240N+RUfDghbjqU1MHqkBpMB/H2LkCyQoen1 rIIg4k33SwxQ+PoM9rvNlxUd5ufw9fHmuMV4SFTQbTjZIoprAHjUK8DIVpPbICycUr4C siGLKHVrcBTlo2zJM7Je9d07gsuONtxWsWVTyFt+bf3H6P9nBAjh+jV41GO8EXAhuAmi OT4ogIUyzzqO0ixGKKSEADzm7NX/IrZdhQlN6aoqevfQB+ZmxT0u5P4LzOku044vc98Z +UNiC1IO4cl09gv3CSabPg2OGr4PRzBAt2etudvmw6emoTEOQKNM86H2rBS9XIHB+ow3 luMw== X-Forwarded-Encrypted: i=1; AHgh+RpxTLvLiVTLrP+vJD/KTYfAEySg+jlmf+88PYaeFFznZeV9q5fnJChV/jEPmQPFQ1ztB9WVMDzwlkAabyw=@vger.kernel.org X-Gm-Message-State: AOJu0YxyJatT94JayXCptp4xVOL1awswYCagAfifYMH0G/qY4bDMQabU Tmd4b5//iBeH9d7a9jfYNmhNAbvdrXrTvHId9KjcIP35pGuS+n4K6UuC6EYHKpdsI5nrTTx6Rg+ l3FykMjPCt5zNTcinYOx30jJ3Bhozy3WpbkLFxDRYaz430xgwEf+hb1XJ4FBubOclO2s= X-Gm-Gg: AfdE7cmqKtHmvEkiUfMV7vt89AKQtaq5wZrjyqXKHtG1nCp3Zs/t/DIcvMwMIXP/6As 7SeoJgfj74tyZEsnGruooq0SI4IaoSe4/lvmeLWv60vikO/8eWH8XVcCTpT5sjDGVlzxjzITy57 eW2rm2T11ObjMXL7Adkg8a6gkXrtq7Ypnatlj5jU18wvxzQBa5tvOZQQDf3YYOKsuT7uGAePivJ J6FX9FiD1KpBwiZ/mlnJ7QRNYNb4aCd8PAT+gN5/9nJ7j0O/tLmXpcYpmR75cQLoX1N0tT6VcbI qzcT7x9tle16rpnsEO5MmsEVLNQiNVCmEtb4ogxq/Y4l0hmrW4aE8aE9p2XFpWetLsntzdZ4btB 8alsmaCcuidxurj3rLu5PX052iV/cX8BRFHCFXUarvwkl/zPrlfPxHKdXgRUoFtiLK0Pvw0l9fu E/VKyKlPVeHCfl1EKoppi+Neggz53uGs1vLxXo+dIAH13kYhsgMgI= X-Received: by 2002:a05:622a:4c0a:b0:51b:efe9:27c0 with SMTP id d75a77b69052e-51e42497dbcmr119477211cf.71.1784218718045; Thu, 16 Jul 2026 09:18:38 -0700 (PDT) X-Received: by 2002:a05:622a:4c0a:b0:51b:efe9:27c0 with SMTP id d75a77b69052e-51e42497dbcmr119475821cf.71.1784218716229; Thu, 16 Jul 2026 09:18:36 -0700 (PDT) Received: from QCOM-eG0v1AUPpu.na.qualcomm.com ([2a01:e0a:830:450:751c:d61c:c91:60dd]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c168744bdddsm257262866b.48.2026.07.16.09.18.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 09:18:35 -0700 (PDT) From: Loic Poulain Date: Thu, 16 Jul 2026 18:18:24 +0200 Subject: [PATCH v4 07/11] Bluetooth: hci_qca: Embed bt_power in struct qca_serdev Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260716-monza-wireless-v4-7-9b02e6f549d7@oss.qualcomm.com> References: <20260716-monza-wireless-v4-0-9b02e6f549d7@oss.qualcomm.com> In-Reply-To: <20260716-monza-wireless-v4-0-9b02e6f549d7@oss.qualcomm.com> To: Manivannan Sadhasivam , Bartosz Golaszewski , Marcel Holtmann , Luiz Augusto von Dentz , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-bluetooth@vger.kernel.org, devicetree@vger.kernel.org, Manivannan Sadhasivam , Loic Poulain X-Mailer: b4 0.14.2 X-Proofpoint-ORIG-GUID: XotbbIyPppDurDt6ISwtWeNpvSBZORby X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDE2NyBTYWx0ZWRfX33iT+xcsUzPb 3iyRCr3MtuhZN6errOjTfNAwy2A7fP9k+nZvQJqfc8Ylf47PB9tY18WRAZPxtcJgMXJrAEhzfMP fSFLyiKffErbc5NXC/ouJmHuZUnn48I= X-Proofpoint-GUID: XotbbIyPppDurDt6ISwtWeNpvSBZORby X-Authority-Analysis: v=2.4 cv=PN8/P/qC c=1 sm=1 tr=0 ts=6a59045f cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=Z5-lucBUan0SmjtTDS4A:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDE2NyBTYWx0ZWRfX009ni2C3jgHV b9g8SMAP5SYvWp4RhkFz/lUeakuUkDLzg4iBTt1S/ZydOGhHHQPBnAq1EE0bLtAEw4mfkDpQ1cS qsqHJtE5RHca3dKCQvXjJEyst/K72gnucxK5ZuFZnAsPNa/bq5+jOrLG2nrDNiLtMrTxsDnbg7P C0A5axyFHb1R5NaEj/7zwbRyzgWZ/0mlD8WBMwqomTMi1ygrPsvtm6MeXusi02seQy571l8VMkQ KxAZBVFtLp4TIA6DivFCJ39mmahfOBQbpyfTTES0vjGeUCBzmIBqZ7BUyd9XFTOHiQpeoegDsb1 nOMgR3iPYU+P4l51GBbvMbxuCOCfNl2ejBePqoTDA8bdMSeFI6T4nsVY1PV/SU3ZnNEyt2mFfhH f/T1wfnIz7Ghwkr4/qwPET4/MWnUfiSssuH8yiOWQbr2/jXJ9EYSjYzT/tmRohfBbuySxNk5tp9 J0yB+5UHfCWtuKBVQ5A== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_05,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 malwarescore=0 lowpriorityscore=0 phishscore=0 adultscore=0 priorityscore=1501 impostorscore=0 clxscore=1015 suspectscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160167 'bt_power' is allocated dynamically only for a subset of SOC types, using a switch on the SOC type that mirrors the one that follows it. This is about to become pointless as the power sequencer path (used by M.2 modules) is independent of the SOC type and needs 'bt_power' populated for any type. Embed 'struct qca_power' directly in 'struct qca_serdev' instead of allocating it separately. This drops the extra allocation and its dedicated SOC-type switch, and removes the need for NULL checks on the pointer. No functional change intended. Signed-off-by: Loic Poulain --- drivers/bluetooth/hci_qca.c | 72 ++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 46 deletions(-) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 41e8c302abc2a820022d1783f1fad76b358ae67c..25c4387136245fca25e375951f960d7240116781 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -226,7 +226,7 @@ struct qca_serdev { struct gpio_desc *sw_ctrl; struct clk *susclk; enum qca_btsoc_type btsoc_type; - struct qca_power *bt_power; + struct qca_power bt_power; u32 init_speed; u32 oper_speed; bool bdaddr_property_broken; @@ -1776,7 +1776,7 @@ static int qca_regulator_init(struct hci_uart *hu) */ qcadev = serdev_device_get_drvdata(hu->serdev); - if (!qcadev->bt_power->vregs_on) { + if (!qcadev->bt_power.vregs_on) { serdev_device_close(hu->serdev); ret = qca_regulator_enable(qcadev); if (ret) @@ -2242,7 +2242,7 @@ static void qca_power_off(struct hci_uart *hu) return; qcadev = serdev_device_get_drvdata(hu->serdev); - power = qcadev->bt_power; + power = &qcadev->bt_power; switch (soc_type) { case QCA_WCN3988: @@ -2256,7 +2256,7 @@ static void qca_power_off(struct hci_uart *hu) break; } - if (power && power->pwrseq) { + if (power->pwrseq) { pwrseq_power_off(power->pwrseq); set_bit(QCA_BT_OFF, &qca->flags); return; @@ -2313,7 +2313,7 @@ static int qca_hci_shutdown(struct hci_dev *hdev) static int qca_regulator_enable(struct qca_serdev *qcadev) { - struct qca_power *power = qcadev->bt_power; + struct qca_power *power = &qcadev->bt_power; int ret; if (power->pwrseq) @@ -2345,7 +2345,7 @@ static void qca_regulator_disable(struct qca_serdev *qcadev) if (!qcadev) return; - power = qcadev->bt_power; + power = &qcadev->bt_power; /* Already disabled? */ if (!power->vregs_on) @@ -2417,26 +2417,6 @@ static int qca_serdev_probe(struct serdev_device *serdev) else qcadev->btsoc_type = QCA_ROME; - switch (qcadev->btsoc_type) { - case QCA_QCA6390: - case QCA_WCN3950: - case QCA_WCN3988: - case QCA_WCN3990: - case QCA_WCN3991: - case QCA_WCN3998: - case QCA_WCN6750: - case QCA_WCN6855: - case QCA_WCN7850: - qcadev->bt_power = devm_kzalloc(&serdev->dev, - sizeof(struct qca_power), - GFP_KERNEL); - if (!qcadev->bt_power) - return -ENOMEM; - break; - default: - break; - } - switch (qcadev->btsoc_type) { case QCA_WCN3950: case QCA_WCN3988: @@ -2451,10 +2431,10 @@ static int qca_serdev_probe(struct serdev_device *serdev) * the M.2 Key E connector. */ if (of_graph_is_present(dev_of_node(&serdev->ctrl->dev))) { - qcadev->bt_power->pwrseq = devm_pwrseq_get(&serdev->ctrl->dev, - "uart"); - if (IS_ERR(qcadev->bt_power->pwrseq)) - return PTR_ERR(qcadev->bt_power->pwrseq); + qcadev->bt_power.pwrseq = devm_pwrseq_get(&serdev->ctrl->dev, + "uart"); + if (IS_ERR(qcadev->bt_power.pwrseq)) + return PTR_ERR(qcadev->bt_power.pwrseq); break; } @@ -2465,8 +2445,8 @@ static int qca_serdev_probe(struct serdev_device *serdev) * let's use the power sequencer. Otherwise, let's * drive everything ourselves. */ - qcadev->bt_power->pwrseq = devm_pwrseq_get(&serdev->dev, - "bluetooth"); + qcadev->bt_power.pwrseq = devm_pwrseq_get(&serdev->dev, + "bluetooth"); /* * Some modules have BT_EN enabled via a hardware pull-up, @@ -2474,21 +2454,21 @@ static int qca_serdev_probe(struct serdev_device *serdev) * through the power sequence. In such cases, fall through * to follow the legacy flow. */ - if (IS_ERR(qcadev->bt_power->pwrseq)) - qcadev->bt_power->pwrseq = NULL; + if (IS_ERR(qcadev->bt_power.pwrseq)) + qcadev->bt_power.pwrseq = NULL; else break; } - qcadev->bt_power->dev = &serdev->dev; - err = qca_init_regulators(qcadev->bt_power, data->vregs, + qcadev->bt_power.dev = &serdev->dev; + err = qca_init_regulators(&qcadev->bt_power, data->vregs, data->num_vregs); if (err) { BT_ERR("Failed to init regulators:%d", err); return err; } - qcadev->bt_power->vregs_on = false; + qcadev->bt_power.vregs_on = false; qcadev->bt_en = devm_gpiod_get_optional(&serdev->dev, "enable", GPIOD_OUT_LOW); @@ -2522,10 +2502,10 @@ static int qca_serdev_probe(struct serdev_device *serdev) case QCA_QCA6390: if (dev_of_node(&serdev->dev)) { - qcadev->bt_power->pwrseq = devm_pwrseq_get(&serdev->dev, - "bluetooth"); - if (IS_ERR(qcadev->bt_power->pwrseq)) - return PTR_ERR(qcadev->bt_power->pwrseq); + qcadev->bt_power.pwrseq = devm_pwrseq_get(&serdev->dev, + "bluetooth"); + if (IS_ERR(qcadev->bt_power.pwrseq)) + return PTR_ERR(qcadev->bt_power.pwrseq); break; } fallthrough; @@ -2549,14 +2529,14 @@ static int qca_serdev_probe(struct serdev_device *serdev) } } - if (qcadev->bt_power->pwrseq) { - bt_en_available = pwrseq_is_controllable(qcadev->bt_power->pwrseq); + if (qcadev->bt_power.pwrseq) { + bt_en_available = pwrseq_is_controllable(qcadev->bt_power.pwrseq); if (!bt_en_available) { /* The host cannot gate the BT power individually. * Treat it as always-on and drop the pwrseq handle. */ - pwrseq_power_on(qcadev->bt_power->pwrseq); - qcadev->bt_power->pwrseq = NULL; + pwrseq_power_on(qcadev->bt_power.pwrseq); + qcadev->bt_power.pwrseq = NULL; } } @@ -2594,7 +2574,7 @@ static int qca_serdev_probe(struct serdev_device *serdev) static void qca_serdev_remove(struct serdev_device *serdev) { struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev); - struct qca_power *power = qcadev->bt_power; + struct qca_power *power = &qcadev->bt_power; switch (qcadev->btsoc_type) { case QCA_WCN3988: -- 2.34.1