| Message ID | 20250314101613.3682010-1-chandrashekar.devegowda@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v1] Bluetooth: btintel_pcie: Support function level reset | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | success | Success |
| tedd_an/SubjectPrefix | success | Gitlint PASS |
| tedd_an/BuildKernel | success | BuildKernel PASS |
| tedd_an/CheckAllWarning | success | CheckAllWarning PASS |
| tedd_an/CheckSparse | warning | CheckSparse WARNING drivers/bluetooth/btintel.c:47:14: warning: symbol 'btintel_guid_dsm' was not declared. Should it be static? |
| tedd_an/BuildKernel32 | success | BuildKernel32 PASS |
| tedd_an/TestRunnerSetup | success | TestRunnerSetup PASS |
| tedd_an/TestRunner_l2cap-tester | success | TestRunner PASS |
| tedd_an/TestRunner_iso-tester | success | TestRunner PASS |
| tedd_an/TestRunner_bnep-tester | success | TestRunner PASS |
| tedd_an/TestRunner_mgmt-tester | fail | TestRunner_mgmt-tester: Total: 490, Passed: 485 (99.0%), Failed: 1, Not Run: 4 |
| tedd_an/TestRunner_rfcomm-tester | success | TestRunner PASS |
| tedd_an/TestRunner_sco-tester | success | TestRunner PASS |
| tedd_an/TestRunner_ioctl-tester | success | TestRunner PASS |
| tedd_an/TestRunner_mesh-tester | success | TestRunner PASS |
| tedd_an/TestRunner_smp-tester | success | TestRunner PASS |
| tedd_an/TestRunner_userchan-tester | success | TestRunner PASS |
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=943796 ---Test result--- Test Summary: CheckPatch PENDING 0.37 seconds GitLint PENDING 0.25 seconds SubjectPrefix PASS 0.30 seconds BuildKernel PASS 24.42 seconds CheckAllWarning PASS 26.73 seconds CheckSparse WARNING 29.94 seconds BuildKernel32 PASS 23.78 seconds TestRunnerSetup PASS 430.37 seconds TestRunner_l2cap-tester PASS 20.93 seconds TestRunner_iso-tester PASS 31.00 seconds TestRunner_bnep-tester PASS 4.73 seconds TestRunner_mgmt-tester FAIL 121.37 seconds TestRunner_rfcomm-tester PASS 7.90 seconds TestRunner_sco-tester PASS 12.24 seconds TestRunner_ioctl-tester PASS 8.31 seconds TestRunner_mesh-tester PASS 6.15 seconds TestRunner_smp-tester PASS 7.40 seconds TestRunner_userchan-tester PASS 4.98 seconds IncrementalBuild PENDING 0.59 seconds Details ############################## Test: CheckPatch - PENDING Desc: Run checkpatch.pl script Output: ############################## Test: GitLint - PENDING Desc: Run gitlint Output: ############################## Test: CheckSparse - WARNING Desc: Run sparse tool with linux kernel Output: drivers/bluetooth/btintel.c:47:14: warning: symbol 'btintel_guid_dsm' was not declared. Should it be static? ############################## Test: TestRunner_mgmt-tester - FAIL Desc: Run mgmt-tester with test-runner Output: Total: 490, Passed: 485 (99.0%), Failed: 1, Not Run: 4 Failed Test Cases LL Privacy - Set Flags 1 (Add to RL) Failed 0.150 seconds ############################## Test: IncrementalBuild - PENDING Desc: Incremental build with the patches in the series Output: --- Regards, Linux Bluetooth
On Fri, Mar 14, 2025 at 12:16:13PM +0200, Chandrashekar Devegowda wrote: > Support function level reset (flr) on hardware exception to recover > controller. Driver also implements the back-off time of 5 seconds and > the maximum number of retries are limited to 5 before giving up. Sort of weird that the commit log mentions FLR, but it's not mentioned in the patch itself except for BTINTEL_PCIE_FLR_RESET_MAX_RETRY. Apparently the assumption is that DSM_SET_RESET_METHOD_PCIE performs an FLR. Since this is an ACPI _DSM, presumably this mechanism only works for devices built into the platform, not for any potential plug-in devices that would not be described via ACPI. I guess this driver probably already only works for built-in devices because it also uses DSM_SET_WDISABLE2_DELAY and DSM_SET_RESET_METHOD. There is a generic PCI core way to do FLR (pcie_reset_flr()), so I assume the _DSM exists because the device needs some additional device-specific work around the FLR. > +static void btintel_pcie_removal_work(struct work_struct *wk) > +{ > + struct btintel_pcie_removal *removal = > + container_of(wk, struct btintel_pcie_removal, work); > + struct pci_dev *pdev = removal->pdev; > + struct pci_bus *bus; > + struct btintel_pcie_data *data; > + > + data = pci_get_drvdata(pdev); > + > + pci_lock_rescan_remove(); > + > + bus = pdev->bus; > + if (!bus) > + goto out; > + > + btintel_acpi_reset_method(data->hdev); > + pci_stop_and_remove_bus_device(pdev); > + pci_dev_put(pdev); > + > + if (bus->parent) > + bus = bus->parent; > + pci_rescan_bus(bus); This remove and rescan by a driver that's bound to the device subverts the driver model. pci_stop_and_remove_bus_device() detaches the driver from the device. After the driver is detached, we should not be running any driver code. There are a couple other drivers that remove their own device (ath9k, iwlwifi, asus_wmi, eeepc-laptop), but I think those are broken and it's a mistake to add this pattern to more drivers. What's the reason for doing the remove and rescan? The PCI core doesn't reset the device when you do this, so it's not a "bigger hammer reset". > +out: > + pci_unlock_rescan_remove(); > + kfree(removal); > +}
Hi Bjorn, On Fri, Mar 14, 2025 at 3:40 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > On Fri, Mar 14, 2025 at 12:16:13PM +0200, Chandrashekar Devegowda wrote: > > Support function level reset (flr) on hardware exception to recover > > controller. Driver also implements the back-off time of 5 seconds and > > the maximum number of retries are limited to 5 before giving up. > > Sort of weird that the commit log mentions FLR, but it's not mentioned > in the patch itself except for BTINTEL_PCIE_FLR_RESET_MAX_RETRY. > Apparently the assumption is that DSM_SET_RESET_METHOD_PCIE performs > an FLR. > > Since this is an ACPI _DSM, presumably this mechanism only works for > devices built into the platform, not for any potential plug-in devices > that would not be described via ACPI. I guess this driver probably > already only works for built-in devices because it also uses > DSM_SET_WDISABLE2_DELAY and DSM_SET_RESET_METHOD. > > There is a generic PCI core way to do FLR (pcie_reset_flr()), so I > assume the _DSM exists because the device needs some additional > device-specific work around the FLR. > > > +static void btintel_pcie_removal_work(struct work_struct *wk) > > +{ > > + struct btintel_pcie_removal *removal = > > + container_of(wk, struct btintel_pcie_removal, work); > > + struct pci_dev *pdev = removal->pdev; > > + struct pci_bus *bus; > > + struct btintel_pcie_data *data; > > + > > + data = pci_get_drvdata(pdev); > > + > > + pci_lock_rescan_remove(); > > + > > + bus = pdev->bus; > > + if (!bus) > > + goto out; > > + > > + btintel_acpi_reset_method(data->hdev); > > + pci_stop_and_remove_bus_device(pdev); > > + pci_dev_put(pdev); > > + > > + if (bus->parent) > > + bus = bus->parent; > > + pci_rescan_bus(bus); > > This remove and rescan by a driver that's bound to the device subverts > the driver model. pci_stop_and_remove_bus_device() detaches the > driver from the device. After the driver is detached, we should not > be running any driver code. Yeah, this self removal was sort of bugging me as well, although I'm not familiar enough with the pci subsystem, having the driver remove and continue running code like pci_rescan_bus seems wrong as we may end up with multiple instances of the same driver. > There are a couple other drivers that remove their own device (ath9k, > iwlwifi, asus_wmi, eeepc-laptop), but I think those are broken and > it's a mistake to add this pattern to more drivers. > > What's the reason for doing the remove and rescan? The PCI core > doesn't reset the device when you do this, so it's not a "bigger > hammer reset". I guess it was more of the expectation of Chandru to have a sort of hard reset, driver remove+probe, instead of a soft reset where the driver will just need to reinit itself after performing pcie_reset_flr. > > +out: > > + pci_unlock_rescan_remove(); > > + kfree(removal); > > +} >
On Tue, Mar 18, 2025 at 10:55:06AM -0400, Luiz Augusto von Dentz wrote: > On Fri, Mar 14, 2025 at 3:40 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > On Fri, Mar 14, 2025 at 12:16:13PM +0200, Chandrashekar Devegowda wrote: > > > Support function level reset (flr) on hardware exception to recover > > > controller. Driver also implements the back-off time of 5 seconds and > > > the maximum number of retries are limited to 5 before giving up. > > > > Sort of weird that the commit log mentions FLR, but it's not mentioned > > in the patch itself except for BTINTEL_PCIE_FLR_RESET_MAX_RETRY. > > Apparently the assumption is that DSM_SET_RESET_METHOD_PCIE performs > > an FLR. > > > > Since this is an ACPI _DSM, presumably this mechanism only works for > > devices built into the platform, not for any potential plug-in devices > > that would not be described via ACPI. I guess this driver probably > > already only works for built-in devices because it also uses > > DSM_SET_WDISABLE2_DELAY and DSM_SET_RESET_METHOD. > > > > There is a generic PCI core way to do FLR (pcie_reset_flr()), so I > > assume the _DSM exists because the device needs some additional > > device-specific work around the FLR. > > > > > +static void btintel_pcie_removal_work(struct work_struct *wk) > > > +{ > > > + struct btintel_pcie_removal *removal = > > > + container_of(wk, struct btintel_pcie_removal, work); > > > + struct pci_dev *pdev = removal->pdev; > > > + struct pci_bus *bus; > > > + struct btintel_pcie_data *data; > > > + > > > + data = pci_get_drvdata(pdev); > > > + > > > + pci_lock_rescan_remove(); > > > + > > > + bus = pdev->bus; > > > + if (!bus) > > > + goto out; > > > + > > > + btintel_acpi_reset_method(data->hdev); > > > + pci_stop_and_remove_bus_device(pdev); > > > + pci_dev_put(pdev); > > > + > > > + if (bus->parent) > > > + bus = bus->parent; > > > + pci_rescan_bus(bus); > > > > This remove and rescan by a driver that's bound to the device subverts > > the driver model. pci_stop_and_remove_bus_device() detaches the > > driver from the device. After the driver is detached, we should not > > be running any driver code. > > Yeah, this self removal was sort of bugging me as well, although I'm > not familiar enough with the pci subsystem, having the driver remove > and continue running code like pci_rescan_bus seems wrong as we may > end up with multiple instances of the same driver. > > > There are a couple other drivers that remove their own device (ath9k, > > iwlwifi, asus_wmi, eeepc-laptop), but I think those are broken and > > it's a mistake to add this pattern to more drivers. > > > > What's the reason for doing the remove and rescan? The PCI core > > doesn't reset the device when you do this, so it's not a "bigger > > hammer reset". > > I guess it was more of the expectation of Chandru to have a sort of > hard reset, driver remove+probe, instead of a soft reset where the > driver will just need to reinit itself after performing > pcie_reset_flr. If the object is just to reinitialize the driver, I think this hack of removing and rescanning is a bad way to do it. If you reset the device, you now know the state of the device and you can make the driver state match it. If necessary you can always reuse part or all of the .remove() and .probe() methods yourself, without this dance of calling pci_stop_and_remove_bus_device() and pci_rescan_bus(). Bjorn
diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index ec5e2c7a56ae..aae6a85d9f64 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -30,11 +30,6 @@ #define BTINTEL_EFI_DSBR L"UefiCnvCommonDSBR" -enum { - DSM_SET_WDISABLE2_DELAY = 1, - DSM_SET_RESET_METHOD = 3, -}; - #define CMD_WRITE_BOOT_PARAMS 0xfc0e struct cmd_write_boot_params { __le32 boot_addr; @@ -49,9 +44,10 @@ static struct { u32 fw_build_num; } coredump_info; -static const guid_t btintel_guid_dsm = +const guid_t btintel_guid_dsm = GUID_INIT(0xaa10f4e0, 0x81ac, 0x4233, 0xab, 0xf6, 0x3b, 0x2a, 0xc5, 0x0e, 0x28, 0xd9); +EXPORT_SYMBOL_GPL(btintel_guid_dsm); int btintel_check_bdaddr(struct hci_dev *hdev) { @@ -2547,7 +2543,7 @@ static void btintel_set_ppag(struct hci_dev *hdev, struct intel_version_tlv *ver kfree_skb(skb); } -static int btintel_acpi_reset_method(struct hci_dev *hdev) +int btintel_acpi_reset_method(struct hci_dev *hdev) { int ret = 0; acpi_status status; @@ -2586,6 +2582,7 @@ static int btintel_acpi_reset_method(struct hci_dev *hdev) kfree(buffer.pointer); return ret; } +EXPORT_SYMBOL_GPL(btintel_acpi_reset_method); static void btintel_set_dsm_reset_method(struct hci_dev *hdev, struct intel_version_tlv *ver_tlv) diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h index 19530ea14905..bc4edfe08216 100644 --- a/drivers/bluetooth/btintel.h +++ b/drivers/bluetooth/btintel.h @@ -64,6 +64,12 @@ struct intel_tlv { #define BTINTEL_FWID_MAXLEN 64 +enum { + DSM_SET_WDISABLE2_DELAY = 1, + DSM_SET_RESET_METHOD = 3, + DSM_SET_RESET_METHOD_PCIE = 5 /* Used for PCIe products */ +}; + struct intel_version_tlv { u32 cnvi_top; u32 cnvr_top; @@ -255,6 +261,7 @@ int btintel_shutdown_combined(struct hci_dev *hdev); void btintel_hw_error(struct hci_dev *hdev, u8 code); void btintel_print_fseq_info(struct hci_dev *hdev); int btintel_diagnostics(struct hci_dev *hdev, struct sk_buff *skb); +int btintel_acpi_reset_method(struct hci_dev *hdev); #else static inline int btintel_check_bdaddr(struct hci_dev *hdev) @@ -393,4 +400,9 @@ static inline int btintel_diagnostics(struct hci_dev *hdev, struct sk_buff *skb) { return -EOPNOTSUPP; } + +static int btintel_acpi_reset_method(struct hci_dev *hdev) +{ + return -EOPNOTSUPP; +} #endif diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c index 9114be1fc3ce..9346c8d68636 100644 --- a/drivers/bluetooth/btintel_pcie.c +++ b/drivers/bluetooth/btintel_pcie.c @@ -13,6 +13,7 @@ #include <linux/wait.h> #include <linux/delay.h> #include <linux/interrupt.h> +#include <linux/acpi.h> #include <linux/unaligned.h> @@ -22,6 +23,8 @@ #include "btintel.h" #include "btintel_pcie.h" +extern const guid_t btintel_guid_dsm; + #define VERSION "0.1" #define BTINTEL_PCI_DEVICE(dev, subdev) \ @@ -41,6 +44,13 @@ static const struct pci_device_id btintel_pcie_table[] = { }; MODULE_DEVICE_TABLE(pci, btintel_pcie_table); +struct btintel_pcie_dev_restart_data { + struct list_head list; + u8 restart_count; + time64_t last_error; + char name[]; +}; + /* Intel PCIe uses 4 bytes of HCI type instead of 1 byte BT SIG HCI type */ #define BTINTEL_PCIE_HCI_TYPE_LEN 4 #define BTINTEL_PCIE_HCI_CMD_PKT 0x00000001 @@ -62,6 +72,9 @@ MODULE_DEVICE_TABLE(pci, btintel_pcie_table); #define BTINTEL_PCIE_TRIGGER_REASON_USER_TRIGGER 0x17A2 #define BTINTEL_PCIE_TRIGGER_REASON_FW_ASSERT 0x1E61 +#define BTINTEL_PCIE_RESET_OK_TIME_SECS 5 +#define BTINTEL_PCIE_FLR_RESET_MAX_RETRY 5 + /* Alive interrupt context */ enum { BTINTEL_PCIE_ROM, @@ -99,6 +112,14 @@ struct btintel_pcie_dbgc_ctxt { struct btintel_pcie_dbgc_ctxt_buf bufs[BTINTEL_PCIE_DBGC_BUFFER_COUNT]; }; +struct btintel_pcie_removal { + struct pci_dev *pdev; + struct work_struct work; +}; + +static LIST_HEAD(btintel_pcie_restart_data_list); +static DEFINE_SPINLOCK(btintel_pcie_restart_data_lock); + /* This function initializes the memory for DBGC buffers and formats the * DBGC fragment which consists header info and DBGC buffer's LSB, MSB and * size as the payload @@ -1804,6 +1825,9 @@ static int btintel_pcie_send_frame(struct hci_dev *hdev, u32 type; u32 old_ctxt; + if (test_bit(BTINTEL_PCIE_CORE_HALTED, &data->flags)) + return -ENODEV; + /* Due to the fw limitation, the type header of the packet should be * 4 bytes unlike 1 byte for UART. In UART, the firmware can read * the first byte to get the packet type and redirect the rest of data @@ -2041,6 +2065,210 @@ static int btintel_pcie_setup(struct hci_dev *hdev) return err; } +static struct btintel_pcie_dev_restart_data *btintel_pcie_get_restart_data(struct pci_dev *pdev, + struct device *dev) +{ + struct btintel_pcie_dev_restart_data *tmp, *data = NULL; + const char *name = pci_name(pdev); + struct hci_dev *hdev = to_hci_dev(dev); + + spin_lock(&btintel_pcie_restart_data_lock); + list_for_each_entry(tmp, &btintel_pcie_restart_data_list, list) { + if (strcmp(tmp->name, name)) + continue; + data = tmp; + break; + } + spin_unlock(&btintel_pcie_restart_data_lock); + + if (data) { + bt_dev_dbg(hdev, "Found restart data for BDF:%s", data->name); + return data; + } + + /* First time allocate */ + data = kzalloc(struct_size(data, name, strlen(name) + 1), GFP_ATOMIC); + if (!data) + return NULL; + + strscpy(data->name, name, strlen(data->name) + 1); + spin_lock(&btintel_pcie_restart_data_lock); + list_add_tail(&data->list, &btintel_pcie_restart_data_list); + spin_unlock(&btintel_pcie_restart_data_lock); + + return data; +} + +static void btintel_pcie_free_restart_list(void) +{ + struct btintel_pcie_dev_restart_data *tmp; + + while ((tmp = list_first_entry_or_null(&btintel_pcie_restart_data_list, + typeof(*tmp), list))) { + list_del(&tmp->list); + kfree(tmp); + } +} + +static void btintel_pcie_inc_restart_count(struct pci_dev *pdev, struct device *dev) +{ + struct btintel_pcie_dev_restart_data *data; + struct hci_dev *hdev = to_hci_dev(dev); + time64_t retry_window; + + data = btintel_pcie_get_restart_data(pdev, dev); + if (!data) + return; + + retry_window = ktime_get_boottime_seconds() - data->last_error; + if (data->restart_count == 0) { + /* First iteration initialise the time and counter */ + data->last_error = ktime_get_boottime_seconds(); + data->restart_count++; + bt_dev_dbg(hdev, "First iteration initialise. last_error:%lld seconds restart_count:%d", + data->last_error, data->restart_count); + } else if (retry_window < BTINTEL_PCIE_RESET_OK_TIME_SECS && + data->restart_count <= BTINTEL_PCIE_FLR_RESET_MAX_RETRY) { + /* FLR triggered still within the Max retry time so + * increment the counter + */ + data->restart_count++; + bt_dev_err(hdev, "FLR triggered still within the Max retry time so increment the restart_count:%d", + data->restart_count); + } else if (retry_window > BTINTEL_PCIE_RESET_OK_TIME_SECS) { + /* FLR triggered out of the retry window so reset */ + bt_dev_err(hdev, "FLR triggered OUT of the retry window so RESET counters last_error:%lld seconds restart_count:%d", + data->last_error, data->restart_count); + data->last_error = 0; + data->restart_count = 0; + } +} + +static void btintel_pcie_removal_work(struct work_struct *wk) +{ + struct btintel_pcie_removal *removal = + container_of(wk, struct btintel_pcie_removal, work); + struct pci_dev *pdev = removal->pdev; + struct pci_bus *bus; + struct btintel_pcie_data *data; + + data = pci_get_drvdata(pdev); + + pci_lock_rescan_remove(); + + bus = pdev->bus; + if (!bus) + goto out; + + btintel_acpi_reset_method(data->hdev); + pci_stop_and_remove_bus_device(pdev); + pci_dev_put(pdev); + + if (bus->parent) + bus = bus->parent; + pci_rescan_bus(bus); + +out: + pci_unlock_rescan_remove(); + kfree(removal); +} + +static void btintel_pcie_reset(struct hci_dev *hdev) +{ + struct btintel_pcie_removal *removal; + struct btintel_pcie_data *data; + union acpi_object *obj, argv4; + acpi_handle handle; + struct pldr_mode { + u16 cmd_type; + u16 cmd_payload; + } __packed mode; + + data = hci_get_drvdata(hdev); + if (!btintel_test_flag(hdev, INTEL_FIRMWARE_LOADED)) { + bt_dev_dbg(hdev, "Firmware not loaded, so reset not supported"); + return; + } + + handle = ACPI_HANDLE(GET_HCIDEV_DEV(hdev)); + if (!handle) { + bt_dev_dbg(hdev, "No support for bluetooth device in ACPI firmware"); + return; + } + + if (!acpi_has_method(handle, "_PRR")) { + bt_dev_err(hdev, "No support for _PRR ACPI method"); + return; + } + + if (!acpi_check_dsm(handle, &btintel_guid_dsm, 0, + BIT(DSM_SET_RESET_METHOD_PCIE))) { + bt_dev_err(hdev, "No dsm support to set reset method for _PRR"); + return; + } + + /* set 1 for_PRR Mode */ + mode.cmd_type = 1; + /* 0 – BT Core Reset (Default) + * 1 – Product Reset (PLDR Abort flow) + */ + mode.cmd_payload = 0; + + argv4.buffer.type = ACPI_TYPE_BUFFER; + argv4.buffer.length = sizeof(mode); + argv4.buffer.pointer = (void *)&mode; + + obj = acpi_evaluate_dsm(handle, &btintel_guid_dsm, 0, + DSM_SET_RESET_METHOD_PCIE, &argv4); + if (!obj) { + bt_dev_err(hdev, "Failed to call dsm to set reset method"); + return; + } + ACPI_FREE(obj); + + removal = kzalloc(sizeof(*removal), GFP_ATOMIC); + if (!removal) + return; + + removal->pdev = data->pdev; + INIT_WORK(&removal->work, btintel_pcie_removal_work); + pci_dev_get(removal->pdev); + schedule_work(&removal->work); +} + +static void btintel_pcie_hw_error(struct hci_dev *hdev, u8 code) +{ + struct btintel_pcie_dev_restart_data *data; + struct btintel_pcie_data *dev_data = hci_get_drvdata(hdev); + struct pci_dev *pdev = dev_data->pdev; + time64_t retry_window; + + if (code == 0x13) { + bt_dev_err(hdev, "Encountered top exception"); + return; + } + + data = btintel_pcie_get_restart_data(pdev, &hdev->dev); + if (!data) + return; + + retry_window = ktime_get_boottime_seconds() - data->last_error; + + /* If within 5 seconds max 5 attempts have already been made + * then stop any more retry and indicate to user for cold boot + */ + if (retry_window < BTINTEL_PCIE_RESET_OK_TIME_SECS && + data->restart_count >= BTINTEL_PCIE_FLR_RESET_MAX_RETRY) { + bt_dev_err(hdev, "Recovery options exhausted, Please cold boot!"); + bt_dev_err(hdev, "Boot time:%lld seconds first_flr at:%lld seconds restart_count:%d", + ktime_get_boottime_seconds(), data->last_error, + data->restart_count); + return; + } + btintel_pcie_inc_restart_count(pdev, &hdev->dev); + btintel_pcie_reset(hdev); +} + static int btintel_pcie_setup_hdev(struct btintel_pcie_data *data) { int err; @@ -2062,9 +2290,10 @@ static int btintel_pcie_setup_hdev(struct btintel_pcie_data *data) hdev->send = btintel_pcie_send_frame; hdev->setup = btintel_pcie_setup; hdev->shutdown = btintel_shutdown_combined; - hdev->hw_error = btintel_hw_error; + hdev->hw_error = btintel_pcie_hw_error; hdev->set_diag = btintel_set_diag; hdev->set_bdaddr = btintel_set_bdaddr; + hdev->reset = btintel_pcie_reset; err = hci_register_dev(hdev); if (err < 0) { @@ -2208,7 +2437,20 @@ static struct pci_driver btintel_pcie_driver = { .driver.coredump = btintel_pcie_coredump #endif }; -module_pci_driver(btintel_pcie_driver); + +static int __init btintel_pcie_init(void) +{ + return pci_register_driver(&btintel_pcie_driver); +} + +static void __exit btintel_pcie_exit(void) +{ + pci_unregister_driver(&btintel_pcie_driver); + btintel_pcie_free_restart_list(); +} + +module_init(btintel_pcie_init); +module_exit(btintel_pcie_exit); MODULE_AUTHOR("Tedd Ho-Jeong An <tedd.an@intel.com>"); MODULE_DESCRIPTION("Intel Bluetooth PCIe transport driver ver " VERSION);