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 7E024481FCC for ; Mon, 5 Oct 2026 12:21:55 +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=1791202917; cv=none; b=pTqynzINuwnnOe7ki/oODIyoQql7yVXjPkEfumd5g+NhccaZXpYjWoMjPicSFrXDCL1XNLfVzcygQ8xhRZhEZ8lN4nJ7hNxQ5xqMojWPppM6hIncOrKDwAzr2FfBe+bKQ1P3rRSM4gRCf8cG1EQ5fBdXckBcdlh46MW1DNA0tZw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791202917; c=relaxed/simple; bh=ENUkgfTLoGSU62yU+ODXLM++GYZz3DSTZhKUOe4vKLE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=E1hTx85z0kAqLzY3N1C19vRoHn+M2ZChLjLM/urFoVSfMBH2a1afuJQqcTwrVnDh5NEpuCQxs+7mpT2XBEBg/fhuQncc8u1LfDSTyYZMKx1291xN5a9Qhr+Azn7keIC6wPLqmXP0xMgP20uzXbhGQKu+VK4IfjUrVTKA2EPLS0g= 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=BVKtV+iL; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=BDGZkcoh; 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="BVKtV+iL"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="BDGZkcoh" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 695CFSHU1068617 for ; Mon, 5 Oct 2026 12:21:53 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= j1J11ckuq5L3HohBW9mX7gxzlO47Pb4MpwXhFW82VGg=; b=BVKtV+iL1cIP0eQ+ AgJnSG8XDKV2nH6OOYJc5jPhETEL8hLynze5+v6DFil4aO/fsyxBOBWwLp8eJw0E d9lumsnpxQJaGiL6mQ7/in2TyEiLI+xOi3BV14xwXtn1QOvGDJWKZydTo0PaM4gK UGCMBnFbNaXR6/Vy1fVm8lkWSD1ymaWK46R3jIfMtXwCAZK70/z5yrRhvOTQjbfx AqCrrl387NTzFJOoPuDYOTBGNPXWkZafmQ8XuDEjJ+lCjSzRza0jsZ5D9BoBJT3M 142ZBcFRBfc0eoHYFMCC2hbi6zwtf0Yb5Ia4tpWJRSxABrj8hlXp6NHy6V5WzNnT Fa7QHQ== Received: from mail-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4h2u08nnrf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 05 Oct 2026 12:21:53 +0000 (GMT) Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-98087b0c5deso1159785241.2 for ; Mon, 05 Oct 2026 05:21:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1791202912; x=1791807712; 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=j1J11ckuq5L3HohBW9mX7gxzlO47Pb4MpwXhFW82VGg=; b=BDGZkcohbVQ3Hg/gu0xStVOtmyUPQiF2yKjXRPY47mVEG3O7yhoxKot4URiAzSPJap 3ada5FWqXkoJHCrxkMb5Q+DG8N4FLHeXPcFCF8FYduCYYv4Im0Jm8G5XonGn/VEdS+Kx 0kVtU8rCoLLc7ziRde5VndAweDYWJ7yvjsgC6bsmJN/m3xS2ZpoxoDr8U0ckdRq8Afwv EVaE6FnppozvKvvgTzjgSzba08j0q1bNiIeFRd4BOgwOQRIZzG71dKxY6qC52CL5Q1rR HOMriFYtuhO4VsR+ug3wFSR9uiajRLPIEjlrZmWtBBcMNFxeY6Ti6EFHicFwjHLJxHnH uw/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791202912; x=1791807712; 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=j1J11ckuq5L3HohBW9mX7gxzlO47Pb4MpwXhFW82VGg=; b=ZYiQIm+PxsLoE6z1dV9CRwAyP5/v6H/DrG5Alq93PJXXowFeINUl/vRO+61eZbtzoF Z61HmDZNUx4aSjiFRlArUxCGJgpWHfeWWekOC8k0S15Lr0hSJddfOmdP5D0erPp1fK8f peE7bWGO+1TkhDUT/c91Lmkn9gNKxehCxAtWjw2ckE1u7NQtVAB0CWDYCBI0XbVA0iMm CxRX9wyPGKKBFHxMvgzq6ERTPoLIY3Y9OLzX07IslSCr7aaE8VveYnWbSMWjI47YdQcG Cxy3PTn7s7nNg1iidVXHqQP/Aw0FpqB7JeEobAxxJe5aBZQZ0jBeGUgC2oM3vjrIBLx4 iaDQ== X-Forwarded-Encrypted: i=1; AKwUvBxLed9wuspQ7M8DvAfvOWZbSsle9wxPnFxRqDWIYCQIVbSN3AwGkMp0+RKeRddIMKgP1fnFFiRzv40H@vger.kernel.org X-Gm-Message-State: AFq9FYJeERnfLIVH9t3ZYIE2i3BQPcGM0KRgqXfSq/Tuf7UQdPv3K3Ix qDTyKEOxfHhS1dF5V1CpSmaqh+zO1gxF7ApemLX3gN6wS0962S2JZo08Wfuj7nKnkzbxMdsW/9N rzM7D+E6eYpzcJ0VspE2bHlDRYZ9a/75Bq29fgXqBqGX5Ln0vArGMRnCrhmBqVO++ X-Gm-Gg: AYBFou0c3MEz2hKggaAUoT7Cykj9Hw1DCaVqVt5j/VK0Ee+Z9UpMqsIwjUgia08wsuJ fXDaoOPZrMItbgZ7fCgnFphmvQ2Adj3XmiaPu9LQrSBOG4uqW8WOBbTcd5l2Q5VOJnv39Y0+UGH zIbGVoGhrsBVsxXuJSXEMPvDt7QVe6vM+top7aiNVs8cGQhMHKf5veRzxxTfResg+mHi26nl3Do CbUKKCgwKisAeJxopIVmjGZzkdQ35oEN75uK/7NzRBwwEWS5CHGk2eeTe9YlHGJNUG/IWmVdnhe 7oR2YM58TTEZBUPQrRPF/9FeOQDu7MZ54WrozjwBg3Vm/MYCYAFZPFmLmMmHDF6Ue0KGrMAL0SN cvM75kzkJmEtM8BIuBfAGgmgjnugmjxvJPiWzq0duvEQ9Zt/ERVER29CRB/x7C0IfkTS+vKyIiQ 1V3F/P2mYWE4U+tiTQDU86ditnRCIA7Mmyjnj0QROiz8++jl3iDdTkMlc1nVKYDIa6bWBAWA== X-Received: by 2002:a05:6102:d89:b0:7a6:b18e:6d24 with SMTP id ada2fe7eead31-7c0f4b9b65dmr2855193137.23.1791202912464; Mon, 05 Oct 2026 05:21:52 -0700 (PDT) X-Received: by 2002:a05:6102:d89:b0:7a6:b18e:6d24 with SMTP id ada2fe7eead31-7c0f4b9b65dmr2855183137.23.1791202911964; Mon, 05 Oct 2026 05:21:51 -0700 (PDT) Received: from QCOM-eG0v1AUPpu.na.qualcomm.com (90-182-211-1.rcp.o2.cz. [90.182.211.1]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4a027698f13sm324157425e9.1.2026.10.05.05.21.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2026 05:21:51 -0700 (PDT) From: Loic Poulain Date: Mon, 05 Oct 2026 14:21:34 +0200 Subject: [PATCH v7 4/8] Bluetooth: hci_qca: Embed bt_power in struct qca_serdev Precedence: bulk X-Mailing-List: devicetree@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: <20261005-monza-wireless-v7-4-5a6de7662dcb@oss.qualcomm.com> References: <20261005-monza-wireless-v7-0-5a6de7662dcb@oss.qualcomm.com> In-Reply-To: <20261005-monza-wireless-v7-0-5a6de7662dcb@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 , Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Proofpoint-ORIG-GUID: pMrFlnzHxu6PgnzUQtOJ0AnkQhuS4IDz X-Proofpoint-GUID: pMrFlnzHxu6PgnzUQtOJ0AnkQhuS4IDz X-Authority-Analysis: v=2.4 cv=JqlkP84C c=1 sm=1 tr=0 ts=6ac39661 cx=c_pps a=R6oCqFB+Yf/t2GF8e0/dFg==:117 a=zRh97aRZNhiOMYVz81Er1w==:17 a=IkcTkHD0fZMA:10 a=660iZSQnnn4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=9HiflFjrvY0K7w4qUiwA:9 a=QEXdDO2ut3YA:10 a=TD8TdBvy0hsOASGTdmB-:22 X-Proofpoint-Spam-Info: AW1haW4tMjYxMDA1MDA0OCBTYWx0ZWRfX1uYt30FsVCkT Q4uDJzqK88baEKBYaYUYcstGf1d+ujDnYeaK44hm4ds03t1PmQC5PXU/qEWBdSTiEp+1XllitcZ GIIgag0GvAvkGQqZJiVNAh97d76hdbc= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMDA1MDA0OCBTYWx0ZWRfX/Pu08Ocnu1lG aIMMbZ/YzN8qShNYV0Sg3LBo7IqOLDagP21KebTmbsrr0WqyVN7mKo4RrIgeGPHv/ctr7Tb1C76 sEwXLlPoSsAM32fh4jJSbEkjSqr4v0NBwn9vSwjB43WmkpZVTDgEFQfnzm4DYthMs0hWk3LMDe9 UO1I1eMljSmirNE4vY6AjPnI/Qk5dVKRFknxGX0PLRfxv9eCvf7butQRMYQKeD+POXQQETt7Q6e 9mqmlEZyh4E/0MUycrnScRWMI8gMSGhl3olhdGRPI42CTDi4OOKTQlFfNnDMPTFUJbumaNv7jBz pTjOAByUZqXv5AvUWvptkWVMVMAlj3nuis1rrUpg1Ffn4+QMz8bDyLUvfh0SFLK2eTuajfWCVCg GzM9TLY7RBqzdReJL1WXH2N0HatdfeDQorouqxCLx8Sc+8F2NfFbGQcpl974XrUpt906r7eYwr8 mmfOVNuWljyy2fg+E8w== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-10-05_03,2026-10-05_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 malwarescore=0 phishscore=0 suspectscore=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 adultscore=0 clxscore=1015 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2610050048 '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. Reviewed-by: Bartosz Golaszewski 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 20d8c5e890a8903a07c3e7e37d037c44d383e8df..1d27ff98034ba99d0783e48db5c605f3b31117ea 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -225,7 +225,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; @@ -1779,7 +1779,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) @@ -2245,7 +2245,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: @@ -2265,7 +2265,7 @@ static void qca_power_off(struct hci_uart *hu) break; } - if (power && power->pwrseq) { + if (power->pwrseq) { pwrseq_disable(power->pwrseq); set_bit(QCA_BT_OFF, &qca->flags); return; @@ -2322,7 +2322,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) @@ -2354,7 +2354,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) @@ -2426,26 +2426,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: @@ -2460,10 +2440,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; } @@ -2474,8 +2454,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, @@ -2483,21 +2463,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); @@ -2531,10 +2511,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; @@ -2558,16 +2538,16 @@ 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. * The descriptor itself is still released by devres, * so dropping the handle here is not a leak. */ - pwrseq_power_on(qcadev->bt_power->pwrseq); - qcadev->bt_power->pwrseq = NULL; + pwrseq_enable(qcadev->bt_power.pwrseq); + qcadev->bt_power.pwrseq = NULL; } } @@ -2605,7 +2585,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