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 4D0323CE083 for ; Mon, 20 Jul 2026 08:04:23 +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=1784534666; cv=none; b=lp37/Gy3FPJfxy5/99UMg95iSw6s/5LJoQOlqtheozS6nVKH4Pb3pLTnBhTm6981FJctp4P2kRVlebnIlMeVTqpelRCXyN4OFGDr3bv4e9+9g3p/0/Vl5uzZVO/8Xmn/mFftIvY2tnascPKuM11x0IasEBa/Jou0vgTw9x83neY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784534666; c=relaxed/simple; bh=bnTEeD/UVWG+A8qIsKS5oxfA8TAvilyqIIn+RIIDBIo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nNBYwVc55yrEgOfXQR7e0TqXWUM2hpePXlBNKMkEW+VDw8GtdzwJ5BQrtE/uejdspmYSJEHat5zqc/wv14+eYAq5rRONqYlJsTNVwKhVcUr/Gjpwzu8ohONvnKXe11Ph8cKLP1BSl8sWsNabS51Y+wSk3/9MyPO7gpJwV+BxLeA= 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=NfXDaUaN; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=L34mWyqs; 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="NfXDaUaN"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="L34mWyqs" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66K6RXql1665645 for ; Mon, 20 Jul 2026 08:04:22 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= pMLNj+8YpE+ddjFeUDPdXAz+LLoQFrp5xWINARMGems=; b=NfXDaUaNdKUEhoY0 lnb88ULUhmZaJnNbyOwdDE5UzJ8W2wuFSowyaB2hqJOEnmaVokWErGinYszlqHU4 M0xvahGmm+pIjxP5SZ7AHhGTjgjJ/LhkIU/LjLc3V1YZdlIVQtZPsZUm3+6jUy79 lixPhQJ8OtIHuGxmRur/3ElPVvMjZWTUhhjvqMuqselYABDzwuU8Tr5PvQ2YA1kM dodwhZip4qcsf6guvDJQKOo7vtJ4mxGIYIfmjkWb1pBP1uOXWLe0ZDOMbP0lZwQE +HEoKsGUmHSVoW8h2/zRg4qWOvUB5DfuqjPf70GKeppcES5x3KlkkN+QX3mTWZ9m JJRGtQ== Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fgd04v2tt-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 20 Jul 2026 08:04:21 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-51c26012cd0so174986071cf.0 for ; Mon, 20 Jul 2026 01:04:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784534661; x=1785139461; 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=pMLNj+8YpE+ddjFeUDPdXAz+LLoQFrp5xWINARMGems=; b=L34mWyqsDSHCVQs9L7puuu7BsqV+Ozj9aF8BZEIQBa1MviqG/dPsUnE2j6cJruULqg 2NmwOY9h0hug81EPRn2OxCLO19J/PRxio00GvOZwvGYykk5oKdQLf5hqwLpZHL1/Sq75 8afdsLf0MVYwoOfuCZGc3Jp6DXiD/ZZkqN/xM2j1CmiYkP+7RWTTBNu9gi2nAHG0j3Up 6wlMGLm1Z5wkhXye5zN799GPFcYLVEYRxbqVDFuqQjIZk4Cw3dTqO/JWANOkNtDp4+vl DAqOJAi2cyhimCnq4TWJX6qGEIGZrFlTOTKglPYf12O0t0EjTNpbjrNZGUacS2w/nWG7 MHsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784534661; x=1785139461; 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=pMLNj+8YpE+ddjFeUDPdXAz+LLoQFrp5xWINARMGems=; b=srCL9ft1HSKLgvJZZG/h+ug1i4ar1HO2Qlh/jU0OrFY+ncl2qlAQ58qjFxqMQhO2J1 9Khgswwv0F3WPx01bhoJa6nieiDTtCuxiyC6NNSlz05mVKi6KvjyK4JbKKYBfCVWYPqW CD82/xUr6tjfv5nm4xpWZmMRirWD4KRfwZMP0Yqz2aiQjvrosmoFrYgUVTpHSXw27K3k oCpcHpAMSQW++FuHbio3m4bWIuqxkPQyKse0MLdyWBewqw8HdGLYXhTvPA9qx9KBk7vt xt0mYlTWFkXPlIXAz9Zhl0gB6ukZREyPqjeI5IXKwxFGcMMND6rH5xSG10dWjorOsUw9 rLhw== X-Forwarded-Encrypted: i=1; AHgh+RoGE5SNjnpSwQz+albMhDyNq1RxTbT6M93/+Mm3pL3yygIEidKM2ZxmCLFnrwccAeOh9LQQH8MIt0aKJug=@vger.kernel.org X-Gm-Message-State: AOJu0Yw448+ijFlUvBKUkZiiS0DftCQrWbll9IQlVLIn97B5yOAPNX8o KfqII7XXA78pmYG50qx//KPPCIipQ9KdhnAYnQCuPuNFKOzEVwHVZJ8VCqgCT1NeHmxioO+gqLX dPuHFsyBLdkMatcAg3ezsxAGhD4WWtvFQaSQrjDkqrbuyx9svVVcpp31B0a9dHUXsRPw= X-Gm-Gg: AfdE7ck5pR3Mt+my7uKCrNq74lqdaQKC+ZnDwNT6gr+s7TwT4KHmaah+Ztn8CBCrrWV 7bnbXn/GRZPoPZKCipCj6xDcovFajtHZ2OGm7GBiBNOKyw6BNJzMIOXFttFZ6AQgz21IzZJGZxa cfF1K9ENHQJ/1P03mmLiYdqPLEOucjHeAlvT5Wihswxt3urBRIfqjyrLBzYrnLbAnjK+UrfkGzd CwLV7N4IGS9xe+uVhacDUxEQSwesYvp664rifGjn8vxEwN0jbEFHcNx3bPtoB3pDKXAY5OPPZyg Me9aCMzy48+muEnJBPnxymeDax3KG/tqqqedoae1jQkAghasHakjziAHX+vLDlnK8+4pU013OIS 2hNhOqvaP3tqvjRZXsris282w1e3ekyrL1/2dkprr2HOYeVbpOZYXfZ+o6iMzdKB6uPkjDvBcfV Q3itXexX1JQlygC9DB3hsyhkCvBnnzg3t3D8F1yBjUcuC6lhTnsUM= X-Received: by 2002:ac8:7d10:0:b0:51a:8c97:938c with SMTP id d75a77b69052e-5213e182f07mr124772331cf.67.1784534661102; Mon, 20 Jul 2026 01:04:21 -0700 (PDT) X-Received: by 2002:ac8:7d10:0:b0:51a:8c97:938c with SMTP id d75a77b69052e-5213e182f07mr124772011cf.67.1784534660628; Mon, 20 Jul 2026 01:04:20 -0700 (PDT) Received: from QCOM-eG0v1AUPpu.na.qualcomm.com ([2a01:e0a:830:450:751c:d61c:c91:60dd]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-69e7000c3e2sm4256542a12.30.2026.07.20.01.04.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 01:04:19 -0700 (PDT) From: Loic Poulain Date: Mon, 20 Jul 2026 10:04:09 +0200 Subject: [PATCH v5 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: <20260720-monza-wireless-v5-7-69ec6743543c@oss.qualcomm.com> References: <20260720-monza-wireless-v5-0-69ec6743543c@oss.qualcomm.com> In-Reply-To: <20260720-monza-wireless-v5-0-69ec6743543c@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-Authority-Analysis: v=2.4 cv=POs/P/qC c=1 sm=1 tr=0 ts=6a5dd685 cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=Z5-lucBUan0SmjtTDS4A:9 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIwMDA4OCBTYWx0ZWRfX6Yec8lyZ4zRY G28Tlgimlob0EjnpjKaa4VHgWaGloOu11OY0n2ZkWbKuMN9lzm3RIgtEjbhBUbRdNjFa+WPfHrE KcKokp4f02MQmKsPmayeBU8fxAjQzt6JWb55M/GoKL9C0IPtbbF2d1tvW1qsn8/nEwpOPBMXfSW RX0+47LYf50VeAf05Lc27vr79zYhEGX656xKwRjwg8hRb1I+YK8N9QxSGcibVizlflgP65IusFJ 5UQ/JxXzk9VN1hT/rKISk+lMeHB18oM5uhvteBSq9X8LB3Jr+uilte9dPJNsgNUP/5O7iKESMZg ItmB0gnPllPGpntiQKq9rP7VMLVosXAjUh3MtS1/S4/lnO1e/BnXzWbfoGur8Tf5t5Wks8PUkmn vZN72CQ9Q0kjBdrUiXqNDJXscxlcmB4O9xus1PvZ/FvC/5X+/koRo5pqcwRhhVOgq6SV2aopkfy xiovV+ietunjv02hKHg== X-Proofpoint-ORIG-GUID: k2sL3MZCdiCdrAcCy1PWSwIB2t30fjsj X-Proofpoint-GUID: k2sL3MZCdiCdrAcCy1PWSwIB2t30fjsj X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIwMDA4OCBTYWx0ZWRfX1n+AOgtTZp16 n8ajWusNEWCXwQwDenhpw4sspaRQdpXIPmbxx7wZyDDrFBvLXp2y1RzTjeXh9nHN5fwmtN5t2Yp huLrc+BgfAMmbV/hsGnidRAKOvOj/y8= 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-20_01,2026-07-17_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 adultscore=0 clxscore=1015 suspectscore=0 priorityscore=1501 malwarescore=0 impostorscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607200088 '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 81fa41915363ce577ad7c6f25fe1b0a69536d462..7e4cb03d3db0722e5f9fa2e7a5a9a0894bf4f18c 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,16 +2529,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_power_on(qcadev->bt_power.pwrseq); + qcadev->bt_power.pwrseq = NULL; } } @@ -2596,7 +2576,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