Skip to contentSkip to conversation

Bluetooth: btintel_pcie: Add ACPI dependency

PATCH In review Venkat Rao Bagalkote 3 participants 3 messages Apr 16 Bluetooth drivers

lore
Share & tools
lore

Venkat Rao Bagalkote

author
#0 lore raw

PATCH 1/1 Bluetooth: btintel_pcie: Add ACPI dependency

The btintel_pcie driver uses ACPI functions (acpi_has_method, ACPI_HANDLE, acpi_evaluate_dsm) in btintel_pcie_acpi_reset_method() but can be built without CONFIG_ACPI, leading to build failures discovered by IBM CI:

drivers/bluetooth/btintel_pcie.c:2309:14: error: implicit declaration of function 'acpi_has_method' [-Werror=implicit-function-declaration]

 2309 |         if (!acpi_has_method(handle, "_PRR")) {
      |              ^~~~~~~~~~~~~~~

Add ACPI dependency to the Kconfig entry to prevent building this driver when ACPI is disabled, since the driver requires ACPI functionality for its reset method.

Reported-by Venkat Rao Bagalkote <[email protected]>
Closes https://lore.kernel.org/all/[email protected]/ open here
Fixes 912a499a7955 ("Bluetooth: btintel_pcie: Support Product level reset")
Suggested-by Rafael J. Wysocki <[email protected]>
Signed-off-by Venkat Rao Bagalkote <[email protected]>

---
Hi Marcel and Luiz,

I'm submitting a fix for a build failure in the btintel_pcie driver when CONFIG_ACPI is not set. Christophe Leroy helped identify that commit 912a499a7955 introduced this issue.

 drivers/bluetooth/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/Kconfig +1 -1
index c5d45cf91f88..fc1b37044a9b 100644
@@ -502,7 +502,7 @@ config BT_NXPUART
 
 config BT_INTEL_PCIE
 	tristate "Intel HCI PCIe driver"
-	depends on PCI
+	depends on PCI && ACPI
 	select BT_INTEL
 	select FW_LOADER
 	help
Signature · 1 line
2.45.2
maintainer
#1 lore raw

Hi Venkat,

Quoted 35 lines · Venkat Rao Bagalkote

The btintel_pcie driver uses ACPI functions (acpi_has_method, ACPI_HANDLE, acpi_evaluate_dsm) in btintel_pcie_acpi_reset_method() but can be built without CONFIG_ACPI, leading to build failures discovered by IBM CI:

drivers/bluetooth/btintel_pcie.c:2309:14: error: implicit declaration of function 'acpi_has_method' [-Werror=implicit-function-declaration]

 2309 |         if (!acpi_has_method(handle, "_PRR")) {
      |              ^~~~~~~~~~~~~~~

Add ACPI dependency to the Kconfig entry to prevent building this driver when ACPI is disabled, since the driver requires ACPI functionality for its reset method.

Reported-by Venkat Rao Bagalkote <[email protected]>
Closes https://lore.kernel.org/all/[email protected]/ open here
Fixes 912a499a7955 ("Bluetooth: btintel_pcie: Support Product level reset")
Suggested-by Rafael J. Wysocki <[email protected]>
Signed-off-by Venkat Rao Bagalkote <[email protected]>

---
Hi Marcel and Luiz,

I'm submitting a fix for a build failure in the btintel_pcie driver when CONFIG_ACPI is not set. Christophe Leroy helped identify that commit 912a499a7955 introduced this issue.

 drivers/bluetooth/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/Kconfig +0 -0
index c5d45cf91f88..fc1b37044a9b 100644

drivers/bluetooth/Kconfig config BT_NXPUART · line 505

Quoted 5 lines
drivers/bluetooth/Kconfig +1 -1
@@ -502,7 +502,7 @@ config BT_NXPUART
 
 config BT_INTEL_PCIE
        tristate "Intel HCI PCIe driver"
-       depends on PCI
+       depends on PCI && ACPI

Good catch, I will fix it in place.

Quoted 6 lines
drivers/bluetooth/Kconfig +0 -1
        select BT_INTEL
        select FW_LOADER
        help
--

2.45.2

Signature · 1 line
Luiz Augusto von Dentz
#2 lore raw
In reply to Venkat Rao Bagalkote

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=1082108

---Test result---

Test Summary:

CheckPatch                    PASS      0.88 seconds
GitLint                       FAIL      0.29 seconds
SubjectPrefix                 PASS      0.10 seconds
BuildKernel                   PASS      26.68 seconds
CheckAllWarning               PASS      28.87 seconds
CheckSparse                   PASS      28.15 seconds
BuildKernel32                 PASS      25.74 seconds
TestRunnerSetup               PASS      572.30 seconds
TestRunner_l2cap-tester       PASS      27.89 seconds
TestRunner_iso-tester         PASS      42.05 seconds
TestRunner_bnep-tester        PASS      6.83 seconds
TestRunner_mgmt-tester        FAIL      113.32 seconds
TestRunner_rfcomm-tester      PASS      9.41 seconds
TestRunner_sco-tester         FAIL      14.24 seconds
TestRunner_ioctl-tester       PASS      10.79 seconds
TestRunner_mesh-tester        FAIL      12.21 seconds
TestRunner_smp-tester         PASS      9.06 seconds
TestRunner_userchan-tester    PASS      6.95 seconds
TestRunner_6lowpan-tester     FAIL      8.45 seconds
IncrementalBuild              PASS      27.91 seconds

Details
##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
Bluetooth: btintel_pcie: Add ACPI dependency

WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search
18: B1 Line exceeds max length (87>80): "Closes: https://lore.kernel.org/all/[email protected]/"
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 494, Passed: 489 (99.0%), Failed: 1, Not Run: 4

Failed Test Cases
Read Exp Feature - Success Failed 0.102 seconds
##############################
Test: TestRunner_sco-tester - FAIL
Desc: Run sco-tester with test-runner
Output:
WARNING: possible circular locking dependency detected
7.0.0-rc2-gbc0ec6b0810f #1 Not tainted
------------------------------------------------------
kworker/u5:2/117 is trying to acquire lock:
ffff888001946240 (sk_lock-AF_BLUETOOTH-BTPROTO_SCO){+.+.}-{0:0}, at: sco_connect_cfm+0x358/0x8d0

but task is already holding lock:
ffff8880025f7220 (&conn->lock){+.+.}-{3:3}, at: sco_connect_cfm+0x22d/0x8d0

which lock already depends on the new lock.

the existing dependency chain (in reverse order) is:

-> #1 (&conn->lock){+.+.}-{3:3}:

       lock_acquire+0xf7/0x2c0
       _raw_spin_lock+0x2a/0x40
       sco_sock_connect+0x4d7/0x1280
       __sys_connect+0x1a3/0x260
       __x64_sys_connect+0x6e/0xb0
       do_syscall_64+0xa0/0x570
       entry_SYSCALL_64_after_hwframe+0x74/0x7c

-> #0 (sk_lock-AF_BLUETOOTH-BTPROTO_SCO){+.+.}-{0:0}:

       check_prev_add+0xe9/0xc70
       __lock_acquire+0x1457/0x1df0
       lock_acquire+0xf7/0x2c0
       lock_sock_nested+0x36/0xd0
       sco_connect_cfm+0x358/0x8d0
       hci_sync_conn_complete_evt+0x3d3/0x8e0
       hci_event_packet+0x74f/0xb10
       hci_rx_work+0x398/0xd00
       process_scheduled_works+0xb16/0x1ac0
       worker_thread+0x4ff/0xba0
       kthread+0x368/0x490
       ret_from_fork+0x498/0x7e0
       ret_from_fork_asm+0x19/0x30

other info that might help us debug this:

...

BUG: sleeping function called from invalid context at net/core/sock.c:3782

in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 117, name: kworker/u5:2
preempt_count: 1, expected: 0
RCU nest depth: 0, expected: 0
INFO: lockdep is turned off.

CPU: 0 UID: 0 PID: 117 Comm: kworker/u5:2 Not tainted 7.0.0-rc2-gbc0ec6b0810f #1 PREEMPT(lazy) 
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014
Workqueue: hci0 hci_rx_work
Call Trace:
 <TASK>
 dump_stack_lvl+0x49/0x60
 __might_resched+0x2ea/0x500
 lock_sock_nested+0x47/0xd0
 ? sco_connect_cfm+0x358/0x8d0
 sco_connect_cfm+0x358/0x8d0
 ? hci_debugfs_create_conn+0x190/0x210
 ? __pfx_sco_connect_cfm+0x10/0x10
 hci_sync_conn_complete_evt+0x3d3/0x8e0
 hci_event_packet+0x74f/0xb10
 ? __pfx_hci_sync_conn_complete_evt+0x10/0x10
 ? __pfx_hci_event_packet+0x10/0x10
 ? mark_held_locks+0x49/0x80
 ? lockdep_hardirqs_on_prepare+0xd4/0x180
 ? _raw_spin_unlock_irqrestore+0x2c/0x50
 hci_rx_work+0x398/0xd00
 process_scheduled_works+0xb16/0x1ac0
 ? __pfx_process_scheduled_works+0x10/0x10
 ? lock_acquire+0xf7/0x2c0
 ? lock_is_held_type+0x9b/0x110
 ? __pfx_hci_rx_work+0x10/0x10
 worker_thread+0x4ff/0xba0
 ? _raw_spin_unlock_irqrestore+0x2c/0x50
 ? __pfx_worker_thread+0x10/0x10
 kthread+0x368/0x490
 ? _raw_spin_unlock_irq+0x23/0x40
 ? __pfx_kthread+0x10/0x10
 ret_from_fork+0x498/0x7e0
 ? __pfx_ret_from_fork+0x10/0x10
 ? __switch_to+0x9e4/0xe50
 ? __switch_to_asm+0x32/0x60

...
Total: 30, Passed: 30 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner_mesh-tester - FAIL
Desc: Run mesh-tester with test-runner Output:
Total: 10, Passed: 8 (80.0%), Failed: 2, Not Run: 0

Failed Test Cases

Mesh - Send cancel - 1                               Timed out    2.694 seconds
Mesh - Send cancel - 2                               Timed out    1.995 seconds

##############################
Test: TestRunner_6lowpan-tester - FAIL
Desc: Run 6lowpan-tester with test-runner
Output:
WARNING: possible circular locking dependency detected 7.0.0-rc2-gbc0ec6b0810f #1 Not tainted
------------------------------------------------------
kworker/0:1/11 is trying to acquire lock:
ffff8880026e0940 ((wq_completion)hci0#2){+.+.}-{0:0}, at: touch_wq_lockdep_map+0x75/0x180

but task is already holding lock:
ffffffff8a84d720 (rtnl_mutex){+.+.}-{4:4}, at: lowpan_unregister_netdev+0xd/0x30

which lock already depends on the new lock.

the existing dependency chain (in reverse order) is:

-> #4 (rtnl_mutex){+.+.}-{4:4}:

       lock_acquire+0xf7/0x2c0
       __mutex_lock+0x16b/0x1fc0
       lowpan_register_netdev+0x11/0x30
       chan_ready_cb+0x836/0xd00
       l2cap_recv_frame+0x6a06/0x8920
       l2cap_recv_acldata+0x790/0xdf0
       hci_rx_work+0x500/0xd00
       process_scheduled_works+0xb16/0x1ac0
       worker_thread+0x4ff/0xba0
       kthread+0x368/0x490
       ret_from_fork+0x498/0x7e0
       ret_from_fork_asm+0x19/0x30

-> #3 (&chan->lock#3/1){+.+.}-{4:4}:

       lock_acquire+0xf7/0x2c0
       __mutex_lock+0x16b/0x1fc0
       l2cap_chan_connect+0x74e/0x1980
       lowpan_control_write+0x523/0x660
       full_proxy_write+0x10b/0x190
       vfs_write+0x1c0/0xf60
       ksys_write+0xf1/0x1d0
       do_syscall_64+0xa0/0x570
       entry_SYSCALL_64_after_hwframe+0x74/0x7c

-> #2 (&conn->lock){+.+.}-{4:4}:
...
Total: 8, Passed: 8 (100.0%), Failed: 0, Not Run: 0

https://github.com/bluez/bluetooth-next/pull/95

---
Regards,
Linux Bluetooth