Commit ec6cef9c authored by Marcel Holtmann's avatar Marcel Holtmann

Bluetooth: Fix SMP channel registration for unconfigured controllers

When the Bluetooth controllers requires an unconfigured state (for
example when the BD_ADDR is missing), then it is important to try
to register the SMP channels when the controller transitions to the
configured state.

This also fixes an issue with the debugfs entires that are not present
for controllers that start out as unconfigured.
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 203de21b
...@@ -931,10 +931,20 @@ static int __hci_init(struct hci_dev *hdev) ...@@ -931,10 +931,20 @@ static int __hci_init(struct hci_dev *hdev)
if (err < 0) if (err < 0)
return err; return err;
/* Only create debugfs entries during the initial setup /* This function is only called when the controller is actually in
* phase and not every time the controller gets powered on. * configured state. When the controller is marked as unconfigured,
* this initialization procedure is not run.
*
* It means that it is possible that a controller runs through its
* setup phase and then discovers missing settings. If that is the
* case, then this function will not be called. It then will only
* be called during the config phase.
*
* So only when in setup phase or config phase, create the debugfs
* entries and register the SMP channels.
*/ */
if (!test_bit(HCI_SETUP, &hdev->dev_flags)) if (!test_bit(HCI_SETUP, &hdev->dev_flags) &&
!test_bit(HCI_CONFIG, &hdev->dev_flags))
return 0; return 0;
hci_debugfs_create_common(hdev); hci_debugfs_create_common(hdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment