ce81843be2
During system suspend, advertisement monitoring is disabled by setting the HCI_VS_MSFT_LE_Set_Advertisement_Filter_Enable to False. This disables the monitoring during suspend, however, if the controller is monitoring a device, it sends HCI_VS_MSFT_LE_Monitor_Device_Event to indicate that the monitoring has been stopped for that particular device. This event may occur after suspend depending on the low_threshold_timeout and peer device advertisement frequency, which causes early wake up. Right way to disable the monitoring for suspend is by removing all the monitors before suspend and re-monitor after resume to ensure no events are received during suspend. This patch fixes this suspend/resume issue. Following tests are performed: - Add monitors before suspend and make sure DeviceFound gets triggered - Suspend the system and verify that all monitors are removed by kernel but not Released by bluetoothd - Wake up and verify that all monitors are added again and DeviceFound gets triggered Signed-off-by: Manish Mandlik <mmandlik@google.com> Reviewed-by: Archie Pusaka <apusaka@google.com> Reviewed-by: Miao-chen Chou <mcchou@google.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
73 lines
2.3 KiB
C
73 lines
2.3 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2020 Google Corporation
|
|
*/
|
|
|
|
#define MSFT_FEATURE_MASK_BREDR_RSSI_MONITOR BIT(0)
|
|
#define MSFT_FEATURE_MASK_LE_CONN_RSSI_MONITOR BIT(1)
|
|
#define MSFT_FEATURE_MASK_LE_ADV_RSSI_MONITOR BIT(2)
|
|
#define MSFT_FEATURE_MASK_LE_ADV_MONITOR BIT(3)
|
|
#define MSFT_FEATURE_MASK_CURVE_VALIDITY BIT(4)
|
|
#define MSFT_FEATURE_MASK_CONCURRENT_ADV_MONITOR BIT(5)
|
|
|
|
#if IS_ENABLED(CONFIG_BT_MSFTEXT)
|
|
|
|
bool msft_monitor_supported(struct hci_dev *hdev);
|
|
void msft_register(struct hci_dev *hdev);
|
|
void msft_unregister(struct hci_dev *hdev);
|
|
void msft_do_open(struct hci_dev *hdev);
|
|
void msft_do_close(struct hci_dev *hdev);
|
|
void msft_vendor_evt(struct hci_dev *hdev, struct sk_buff *skb);
|
|
__u64 msft_get_features(struct hci_dev *hdev);
|
|
int msft_add_monitor_pattern(struct hci_dev *hdev, struct adv_monitor *monitor);
|
|
int msft_remove_monitor(struct hci_dev *hdev, struct adv_monitor *monitor,
|
|
u16 handle);
|
|
void msft_req_add_set_filter_enable(struct hci_request *req, bool enable);
|
|
int msft_set_filter_enable(struct hci_dev *hdev, bool enable);
|
|
void msft_suspend(struct hci_dev *hdev);
|
|
void msft_resume(struct hci_dev *hdev);
|
|
bool msft_curve_validity(struct hci_dev *hdev);
|
|
|
|
#else
|
|
|
|
static inline bool msft_monitor_supported(struct hci_dev *hdev)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
static inline void msft_register(struct hci_dev *hdev) {}
|
|
static inline void msft_unregister(struct hci_dev *hdev) {}
|
|
static inline void msft_do_open(struct hci_dev *hdev) {}
|
|
static inline void msft_do_close(struct hci_dev *hdev) {}
|
|
static inline void msft_vendor_evt(struct hci_dev *hdev, struct sk_buff *skb) {}
|
|
static inline __u64 msft_get_features(struct hci_dev *hdev) { return 0; }
|
|
static inline int msft_add_monitor_pattern(struct hci_dev *hdev,
|
|
struct adv_monitor *monitor)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline int msft_remove_monitor(struct hci_dev *hdev,
|
|
struct adv_monitor *monitor,
|
|
u16 handle)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline void msft_req_add_set_filter_enable(struct hci_request *req,
|
|
bool enable) {}
|
|
static inline int msft_set_filter_enable(struct hci_dev *hdev, bool enable)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline void msft_suspend(struct hci_dev *hdev) {}
|
|
static inline void msft_resume(struct hci_dev *hdev) {}
|
|
|
|
static inline bool msft_curve_validity(struct hci_dev *hdev)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
#endif
|