Skip to contentSkip to conversation

HID: Add quirk for Apple Magic Keyboard over Bluetooth

PATCH In review Daniel Lockyer 2 participants 3 messages Jan 30, 2020 – Jan 31, 2020 HID

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 HID: Add quirk for Apple Magic Keyboard over Bluetooth

The Apple Magic Keyboard works flawlessly over USB but has weird bugs over Bluetooth. This patch adds the missing quirk.

---
 drivers/hid/hid-quirks.c | 1 +
 1 file changed, 1 insertion(+)
drivers/hid/hid-quirks.c +1 -0
index 0e7b2d998395..6d68a9201e1d 100644
@@ -280,6 +280,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI) },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS) },
+	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
Signature · 1 line
2.25.0
#1 lore raw

Hi Daniel,

Quoted 14 lines · Daniel Lockyer

The Apple Magic Keyboard works flawlessly over USB but has weird bugs over Bluetooth. This patch adds the missing quirk.

---
 drivers/hid/hid-quirks.c | 1 +
 1 file changed, 1 insertion(+)
drivers/hid/hid-quirks.c +0 -0
index 0e7b2d998395..6d68a9201e1d 100644

drivers/hid/hid-quirks.c static const struct hid_device_id hid_have_special_driver[] = { · line 283

Quoted 4 lines
drivers/hid/hid-quirks.c +1 -0
@@ -280,6 +280,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS) },
+       { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI) },

That is weird. The whole purpose of this list (which I'd like to remove in the future) is to prevent hid-generic to ever bind to those devices. This can be problematic in situations where you do not have the corresponding driver, in the initrd for instance.

Can you share your dmesg before and after applying this patch so I get a grasp on why you need that change?

Cheers,
Benjamin

Quoted 6 lines
drivers/hid/hid-quirks.c +0 -1
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
--

2.25.0

#2 lore raw

Hi Benjamin,

Please ignore my patch. I was experiencing weird things with the hid-generic driver constantly binding over the hid-apple one, but can't seem to reproduce it now.

The actual fix for my issue was posted by Mansour Behabadi to this mailing list on January 29th - "HID: apple: Add support for recent firmware". I have tested this locally and it works great.

Kind regards,
Daniel

Quoted 41 lines · Benjamin Tissoires

Hi Daniel,

Quoted 14 lines · Daniel Lockyer

The Apple Magic Keyboard works flawlessly over USB but has weird bugs over Bluetooth. This patch adds the missing quirk.

---
 drivers/hid/hid-quirks.c | 1 +
 1 file changed, 1 insertion(+)
drivers/hid/hid-quirks.c +0 -0
index 0e7b2d998395..6d68a9201e1d 100644

drivers/hid/hid-quirks.c static const struct hid_device_id hid_have_special_driver[] = { · line 283

Quoted 4 lines
drivers/hid/hid-quirks.c +1 -0
@@ -280,6 +280,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS) },
+       { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI) },

That is weird. The whole purpose of this list (which I'd like to remove in the future) is to prevent hid-generic to ever bind to those devices. This can be problematic in situations where you do not have the corresponding driver, in the initrd for instance.

Can you share your dmesg before and after applying this patch so I get a grasp on why you need that change?

Cheers,
Benjamin

Quoted 6 lines
drivers/hid/hid-quirks.c +0 -1
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
--

2.25.0