Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,8 @@ several of them using the reStructuredText markup notation.
Please read the Documentation/process/changes.rst file, as it contains the
requirements for building and running the kernel, and information about
the problems which may result by upgrading your kernel.





18 changes: 18 additions & 0 deletions drivers/bluetooth/hci_qca.c
Original file line number Diff line number Diff line change
Expand Up @@ -1653,6 +1653,24 @@ static void qca_hw_error(struct hci_dev *hdev, u8 code)
}

clear_bit(QCA_HW_ERROR_EVENT, &qca->flags);

/*
* If the SoC always enables the bt_en pin via hardware and the driver
* cannot control the bt_en pin of the SoC chip, then during SSR,
* the QCA_SSR_TRIGGERED and QCA_IBS_DISABLED bits cannot be cleared.
* This leads to a reset command timeout failure.
*
* To address this, clear QCA_SSR_TRIGGERED and QCA_IBS_DISABLED bits
* after the coredump collection is complete.
* Also, add msleep delay to wait for controller to complete SSR.
*/
if (!hci_test_quirk(hu->hdev, HCI_QUIRK_NON_PERSISTENT_SETUP)) {
clear_bit(QCA_SSR_TRIGGERED, &qca->flags);
clear_bit(QCA_IBS_DISABLED, &qca->flags);
qca->tx_ibs_state = HCI_IBS_TX_AWAKE;
qca->memdump_state = QCA_MEMDUMP_IDLE;
msleep(50);
}
}

static void qca_reset(struct hci_dev *hdev)
Expand Down