From: Sasha Levin <Alexander.Levin@microsoft.com>
To: "stable@vger.kernel.org" <stable@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Marcel Holtmann <marcel@holtmann.org>,
Szymon Janc <szymon.janc@codecoup.pl>,
Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 3.18 014/101] Bluetooth: Send HCI Set Event Mask Page 2 command only when needed
Date: Mon, 9 Apr 2018 00:35:21 +0000 [thread overview]
Message-ID: <20180409003505.164715-14-alexander.levin@microsoft.com> (raw)
In-Reply-To: <20180409003505.164715-1-alexander.levin@microsoft.com>
From: Marcel Holtmann <marcel@holtmann.org>
[ Upstream commit 313f6888c8fbb1bc8b36c9012ce4e1de848df696 ]
The Broadcom BCM20702 Bluetooth controller in ThinkPad-T530 devices
report support for the Set Event Mask Page 2 command, but actually do
return an error when trying to use it.
< HCI Command: Read Local Supported Commands (0x04|0x0002) plen 0
> HCI Event: Command Complete (0x0e) plen 68
Read Local Supported Commands (0x04|0x0002) ncmd 1
Status: Success (0x00)
Commands: 162 entries
...
Set Event Mask Page 2 (Octet 22 - Bit 2)
...
< HCI Command: Set Event Mask Page 2 (0x03|0x0063) plen 8
Mask: 0x0000000000000000
> HCI Event: Command Complete (0x0e) plen 4
Set Event Mask Page 2 (0x03|0x0063) ncmd 1
Status: Unknown HCI Command (0x01)
Since these controllers do not support any feature that would require
the event mask page 2 to be modified, it is safe to not send this
command at all. The default value is all bits set to zero.
T: Bus=01 Lev=02 Prnt=02 Port=03 Cnt=03 Dev#= 9 Spd=12 MxCh= 0
D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=0a5c ProdID=21e6 Rev= 1.12
S: Manufacturer=Broadcom Corp
S: Product=BCM20702A0
S: SerialNumber=F82FA8E8CFC0
C:* #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr= 0mA
I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms
E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms
E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms
I: If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms
I: If#= 1 Alt= 2 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms
I: If#= 1 Alt= 3 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms
I: If#= 1 Alt= 4 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms
I: If#= 1 Alt= 5 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms
I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=btusb
E: Ad=84(I) Atr=02(Bulk) MxPS= 32 Ivl=0ms
E: Ad=04(O) Atr=02(Bulk) MxPS= 32 Ivl=0ms
I:* If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Reported-by: Sedat Dilek <sedat.dilek@gmail.com>
Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
net/bluetooth/hci_core.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index cb05d7f16a34..7aba8783c13d 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1635,6 +1635,7 @@ static void hci_set_event_mask_page_2(struct hci_request *req)
{
struct hci_dev *hdev = req->hdev;
u8 events[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+ bool changed = false;
/* If Connectionless Slave Broadcast master role is supported
* enable all necessary events for it.
@@ -1644,6 +1645,7 @@ static void hci_set_event_mask_page_2(struct hci_request *req)
events[1] |= 0x80; /* Synchronization Train Complete */
events[2] |= 0x10; /* Slave Page Response Timeout */
events[2] |= 0x20; /* CSB Channel Map Change */
+ changed = true;
}
/* If Connectionless Slave Broadcast slave role is supported
@@ -1654,13 +1656,24 @@ static void hci_set_event_mask_page_2(struct hci_request *req)
events[2] |= 0x02; /* CSB Receive */
events[2] |= 0x04; /* CSB Timeout */
events[2] |= 0x08; /* Truncated Page Complete */
+ changed = true;
}
/* Enable Authenticated Payload Timeout Expired event if supported */
- if (lmp_ping_capable(hdev) || hdev->le_features[0] & HCI_LE_PING)
+ if (lmp_ping_capable(hdev) || hdev->le_features[0] & HCI_LE_PING) {
events[2] |= 0x80;
+ changed = true;
+ }
- hci_req_add(req, HCI_OP_SET_EVENT_MASK_PAGE_2, sizeof(events), events);
+ /* Some Broadcom based controllers indicate support for Set Event
+ * Mask Page 2 command, but then actually do not support it. Since
+ * the default value is all bits set to zero, the command is only
+ * required if the event mask has to be changed. In case no change
+ * to the event mask is needed, skip this command.
+ */
+ if (changed)
+ hci_req_add(req, HCI_OP_SET_EVENT_MASK_PAGE_2,
+ sizeof(events), events);
}
static void hci_init3_req(struct hci_request *req, unsigned long opt)
--
2.15.1
next prev parent reply other threads:[~2018-04-09 0:39 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-09 0:35 [PATCH AUTOSEL for 3.18 001/101] ALSA: timer: Wrap with spinlock for queue access Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 002/101] e1000e: Undo e1000e_pm_freeze if __e1000_shutdown fails Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 003/101] perf/core: Correct event creation with PERF_FORMAT_GROUP Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 004/101] MIPS: mm: fixed mappings: correct initialisation Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 005/101] MIPS: kprobes: flush_insn_slot should flush only if probe initialised Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 006/101] net: emac: fix reset timeout with AR8035 phy Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 007/101] perf tests: Decompress kernel module before objdump Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 008/101] xen: avoid type warning in xchg_xen_ulong Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 009/101] KEYS: put keyring if install_session_keyring_to_cred() fails Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 010/101] bnx2x: Allow vfs to disable txvlan offload Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 011/101] sctp: fix recursive locking warning in sctp_do_peeloff Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 012/101] sparc64: ldc abort during vds iso boot Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 013/101] iio: magnetometer: st_magn_spi: fix spi_device_id table Sasha Levin
2018-04-09 0:35 ` Sasha Levin [this message]
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 015/101] ACPICA: Events: Add runtime stub support for event APIs Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 016/101] ACPICA: Disassembler: Abort on an invalid/unknown AML opcode Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 017/101] s390/dasd: Display read-only attribute correctly Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 018/101] vxlan: dont migrate permanent fdb entries during learn Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 019/101] scsi: csiostor: Avoid content leaks and casts Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 020/101] scsi: megaraid: Fix a sleep-in-atomic bug Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 021/101] scsi: lpfc: Fix return value of board_mode store routine in case of online failure Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 022/101] usb: usbip tool: Check the return of get_nports() Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 023/101] usb: usbip tool: Fix refresh_imported_device_list() Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 024/101] PCI: Correct PCI_STD_RESOURCE_END usage Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 025/101] PCI: Add domain number check to find_smbios_instance_string() Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 026/101] mtd: handle partitioning on devices with 0 erasesize Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 027/101] platform/x86: acer-wmi: Detect RF Button capability Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 028/101] caif: Add sockaddr length check before accessing sa_family in connect handler Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 029/101] ixgbe: avoid permanent lock of *_PTP_TX_IN_PROGRESS Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 030/101] net_sched: move tcf_lock down after gen_replace_estimator() Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 031/101] PCI: Protect pci_error_handlers->reset_notify() usage with device_lock() Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 032/101] firmware: dmi_scan: Check DMI structure length Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 033/101] i2c: ismt: fix wrong device address when unmap the data buffer Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 034/101] drm/mgag200: Fix to always set HiPri for G200e4 V2 Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 035/101] r8152: add byte_enable for ocp_read_word function Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 036/101] Btrfs: skip commit transaction if we don't have enough pinned bytes Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 037/101] scsi: lpfc: Fix crash after firmware flash when IO is running Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 038/101] mmc: sdhci-esdhc: Add SDHCI_QUIRK_32BIT_DMA_ADDR Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 039/101] x86/nmi: Fix timeout test in test_nmi_ipi() Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 040/101] arm64: pass machine size to sparse Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 041/101] fib_rules: Resolve goto rules target on delete Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 042/101] dccp: call inet_add_protocol after register_pernet_subsys in dccp_v4_init Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 043/101] arm64: ptrace: Fix VFP register dumping in compat coredumps Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 044/101] veth: Be more robust on network device creation when no attributes Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 045/101] macvlan: Do not return error when setting the same mac address Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 046/101] sctp: adjust ssthresh when transport is idle Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 047/101] arm64: pass endianness info to sparse Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 048/101] scsi: bnx2i: missing error code in bnx2i_ep_connect() Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 049/101] powerpc: Fix /proc/cpuinfo revision for POWER9 DD2 Sasha Levin
2018-04-09 0:36 ` [PATCH AUTOSEL for 3.18 050/101] ACPI: EC: Fix EC command visibility for dynamic debug Sasha Levin
2018-04-09 0:36 ` [PATCH AUTOSEL for 3.18 051/101] scsi: sun_esp: fix device reference leaks Sasha Levin
2018-04-09 0:41 ` [PATCH AUTOSEL for 3.18 052/101] powerpc/fadump: avoid duplicates in crash memory ranges Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180409003505.164715-14-alexander.levin@microsoft.com \
--to=alexander.levin@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=stable@vger.kernel.org \
--cc=szymon.janc@codecoup.pl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).