public inbox for linux-bluetooth@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] Bluetooth: qca: set power_ctrl_enabled on NULL returned by gpiod_get_optional()
@ 2024-04-24 12:29 Bartosz Golaszewski
  2024-04-24 12:35 ` quic_zijuhu
                   ` (5 more replies)
  0 siblings, 6 replies; 28+ messages in thread
From: Bartosz Golaszewski @ 2024-04-24 12:29 UTC (permalink / raw)
  To: Marcel Holtmann, Luiz Augusto von Dentz, Krzysztof Kozlowski
  Cc: linux-bluetooth, linux-kernel, Bartosz Golaszewski, Wren Turkal,
	Zijun Hu

From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

Any return value from gpiod_get_optional() other than a pointer to a
GPIO descriptor or a NULL-pointer is an error and the driver should
abort probing. That being said: commit 56d074d26c58 ("Bluetooth: hci_qca:
don't use IS_ERR_OR_NULL() with gpiod_get_optional()") no longer sets
power_ctrl_enabled on NULL-pointer returned by
devm_gpiod_get_optional(). Restore this behavior but bail-out on errors.
While at it: also bail-out on error returned when trying to get the
"swctrl" GPIO.

Reported-by: Wren Turkal <wt@penguintechs.org>
Reported-by: Zijun Hu <quic_zijuhu@quicinc.com>
Closes: https://lore.kernel.org/linux-bluetooth/1713449192-25926-2-git-send-email-quic_zijuhu@quicinc.com/
Fixes: 56d074d26c58 ("Bluetooth: hci_qca: don't use IS_ERR_OR_NULL() with gpiod_get_optional()")
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
v1 -> v2:
- also restore the previous behavior for QCA6390 and other models that
  fall under the default: label in the affected switch case
- bail-out on errors when getting the swctrl GPIO too

 drivers/bluetooth/hci_qca.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 92fa20f5ac7d..0e98ad2c0c9d 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -2327,16 +2327,21 @@ static int qca_serdev_probe(struct serdev_device *serdev)
 		    (data->soc_type == QCA_WCN6750 ||
 		     data->soc_type == QCA_WCN6855)) {
 			dev_err(&serdev->dev, "failed to acquire BT_EN gpio\n");
-			power_ctrl_enabled = false;
+			return PTR_ERR(qcadev->bt_en);
 		}
 
+		if (!qcadev->bt_en)
+			power_ctrl_enabled = false;
+
 		qcadev->sw_ctrl = devm_gpiod_get_optional(&serdev->dev, "swctrl",
 					       GPIOD_IN);
 		if (IS_ERR(qcadev->sw_ctrl) &&
 		    (data->soc_type == QCA_WCN6750 ||
 		     data->soc_type == QCA_WCN6855 ||
-		     data->soc_type == QCA_WCN7850))
-			dev_warn(&serdev->dev, "failed to acquire SW_CTRL gpio\n");
+		     data->soc_type == QCA_WCN7850)) {
+			dev_err(&serdev->dev, "failed to acquire SW_CTRL gpio\n");
+			return PTR_ERR(qcadev->sw_ctrl);
+		}
 
 		qcadev->susclk = devm_clk_get_optional(&serdev->dev, NULL);
 		if (IS_ERR(qcadev->susclk)) {
@@ -2355,10 +2360,13 @@ static int qca_serdev_probe(struct serdev_device *serdev)
 		qcadev->bt_en = devm_gpiod_get_optional(&serdev->dev, "enable",
 					       GPIOD_OUT_LOW);
 		if (IS_ERR(qcadev->bt_en)) {
-			dev_warn(&serdev->dev, "failed to acquire enable gpio\n");
-			power_ctrl_enabled = false;
+			dev_err(&serdev->dev, "failed to acquire enable gpio\n");
+			return PTR_ERR(qcadev->bt_en);
 		}
 
+		if (!qcadev->bt_en)
+			power_ctrl_enabled = false;
+
 		qcadev->susclk = devm_clk_get_optional(&serdev->dev, NULL);
 		if (IS_ERR(qcadev->susclk)) {
 			dev_warn(&serdev->dev, "failed to acquire clk\n");
-- 
2.40.1


^ permalink raw reply related	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2024-04-26 17:23 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-24 12:29 [PATCH v2] Bluetooth: qca: set power_ctrl_enabled on NULL returned by gpiod_get_optional() Bartosz Golaszewski
2024-04-24 12:35 ` quic_zijuhu
2024-04-24 12:59 ` quic_zijuhu
2024-04-24 13:15   ` Wren Turkal
2024-04-24 13:10 ` Wren Turkal
2024-04-24 13:18   ` Bartosz Golaszewski
2024-04-24 13:22     ` quic_zijuhu
2024-04-24 13:31       ` Wren Turkal
2024-04-24 13:36         ` quic_zijuhu
2024-04-24 13:40           ` Wren Turkal
2024-04-24 13:39         ` Bartosz Golaszewski
2024-04-24 13:16 ` [v2] " bluez.test.bot
2024-04-24 14:46 ` [PATCH v2] " Krzysztof Kozlowski
2024-04-24 14:52   ` Bartosz Golaszewski
2024-04-24 15:05     ` Krzysztof Kozlowski
2024-04-24 15:24     ` quic_zijuhu
2024-04-24 15:29       ` quic_zijuhu
2024-04-24 15:31         ` Bartosz Golaszewski
2024-04-24 15:35           ` quic_zijuhu
2024-04-24 15:41             ` Luiz Augusto von Dentz
2024-04-24 15:47               ` quic_zijuhu
2024-04-24 15:57                 ` quic_zijuhu
2024-04-24 15:30       ` Bartosz Golaszewski
2024-04-24 15:31       ` Krzysztof Kozlowski
2024-04-24 15:40 ` patchwork-bot+bluetooth
2024-04-26 14:37   ` Bartosz Golaszewski
2024-04-26 15:09     ` Luiz Augusto von Dentz
2024-04-26 17:23       ` Bartosz Golaszewski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox