Commit a7acb31d authored by Jiri Kosina's avatar Jiri Kosina

Merge branch 'for-4.16/hid-quirks-cleanup/_base' into for-linus

This series from Benjamin Tissoires finally removes one of the big PITAs
in the hid-core, which is the absolute need of having added all the new
device IDs into the horrid hid_have_special_driver[]
parents 7cb4774e 332347d4
...@@ -396,6 +396,17 @@ config HID_ITE ...@@ -396,6 +396,17 @@ config HID_ITE
---help--- ---help---
Support for ITE devices not fully compliant with HID standard. Support for ITE devices not fully compliant with HID standard.
config HID_JABRA
tristate "Jabra USB HID Driver"
depends on HID
---help---
Support for Jabra USB HID devices.
Prevents mapping of vendor defined HID usages to input events. Without
this driver HID reports from Jabra devices may incorrectly be seen as
mouse button events.
Say M here if you may ever plug in a Jabra USB device.
config HID_TWINHAN config HID_TWINHAN
tristate "Twinhan IR remote control" tristate "Twinhan IR remote control"
depends on HID depends on HID
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# Makefile for the HID driver # Makefile for the HID driver
# #
hid-y := hid-core.o hid-input.o hid-y := hid-core.o hid-input.o hid-quirks.o
hid-$(CONFIG_DEBUG_FS) += hid-debug.o hid-$(CONFIG_DEBUG_FS) += hid-debug.o
obj-$(CONFIG_HID) += hid.o obj-$(CONFIG_HID) += hid.o
...@@ -52,6 +52,7 @@ obj-$(CONFIG_HID_HOLTEK) += hid-holtekff.o ...@@ -52,6 +52,7 @@ obj-$(CONFIG_HID_HOLTEK) += hid-holtekff.o
obj-$(CONFIG_HID_HYPERV_MOUSE) += hid-hyperv.o obj-$(CONFIG_HID_HYPERV_MOUSE) += hid-hyperv.o
obj-$(CONFIG_HID_ICADE) += hid-icade.o obj-$(CONFIG_HID_ICADE) += hid-icade.o
obj-$(CONFIG_HID_ITE) += hid-ite.o obj-$(CONFIG_HID_ITE) += hid-ite.o
obj-$(CONFIG_HID_JABRA) += hid-jabra.o
obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o
obj-$(CONFIG_HID_KEYTOUCH) += hid-keytouch.o obj-$(CONFIG_HID_KEYTOUCH) += hid-keytouch.o
obj-$(CONFIG_HID_KYE) += hid-kye.o obj-$(CONFIG_HID_KYE) += hid-kye.o
......
This diff is collapsed.
...@@ -24,8 +24,71 @@ ...@@ -24,8 +24,71 @@
#include <linux/hid.h> #include <linux/hid.h>
static struct hid_driver hid_generic;
static int __unmap_hid_generic(struct device *dev, void *data)
{
struct hid_driver *hdrv = data;
struct hid_device *hdev = to_hid_device(dev);
/* only unbind matching devices already bound to hid-generic */
if (hdev->driver != &hid_generic ||
hid_match_device(hdev, hdrv) == NULL)
return 0;
if (dev->parent) /* Needed for USB */
device_lock(dev->parent);
device_release_driver(dev);
if (dev->parent)
device_unlock(dev->parent);
return 0;
}
static void hid_generic_add_driver(struct hid_driver *hdrv)
{
bus_for_each_dev(&hid_bus_type, NULL, hdrv, __unmap_hid_generic);
}
static void hid_generic_removed_driver(struct hid_driver *hdrv)
{
int ret;
ret = driver_attach(&hid_generic.driver);
}
static int __check_hid_generic(struct device_driver *drv, void *data)
{
struct hid_driver *hdrv = to_hid_driver(drv);
struct hid_device *hdev = data;
if (hdrv == &hid_generic)
return 0;
return hid_match_device(hdev, hdrv) != NULL;
}
static bool hid_generic_match(struct hid_device *hdev,
bool ignore_special_driver)
{
if (ignore_special_driver)
return true;
if (hdev->quirks & HID_QUIRK_HAVE_SPECIAL_DRIVER)
return false;
/*
* If any other driver wants the device, leave the device to this other
* driver.
*/
if (bus_for_each_drv(&hid_bus_type, NULL, hdev, __check_hid_generic))
return false;
return true;
}
static const struct hid_device_id hid_table[] = { static const struct hid_device_id hid_table[] = {
{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_GENERIC, HID_ANY_ID, HID_ANY_ID) }, { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, HID_ANY_ID, HID_ANY_ID) },
{ } { }
}; };
MODULE_DEVICE_TABLE(hid, hid_table); MODULE_DEVICE_TABLE(hid, hid_table);
...@@ -33,6 +96,9 @@ MODULE_DEVICE_TABLE(hid, hid_table); ...@@ -33,6 +96,9 @@ MODULE_DEVICE_TABLE(hid, hid_table);
static struct hid_driver hid_generic = { static struct hid_driver hid_generic = {
.name = "hid-generic", .name = "hid-generic",
.id_table = hid_table, .id_table = hid_table,
.match = hid_generic_match,
.bus_add_driver = hid_generic_add_driver,
.bus_removed_driver = hid_generic_removed_driver,
}; };
module_hid_driver(hid_generic); module_hid_driver(hid_generic);
......
/*
* Jabra USB HID Driver
*
* Copyright (c) 2017 Niels Skou Olsen <nolsen@jabra.com>
*/
/*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*/
#include <linux/hid.h>
#include <linux/module.h>
#include "hid-ids.h"
#define HID_UP_VENDOR_DEFINED_MIN 0xff000000
#define HID_UP_VENDOR_DEFINED_MAX 0xffff0000
static int jabra_input_mapping(struct hid_device *hdev,
struct hid_input *hi,
struct hid_field *field,
struct hid_usage *usage,
unsigned long **bit, int *max)
{
int is_vendor_defined =
((usage->hid & HID_USAGE_PAGE) >= HID_UP_VENDOR_DEFINED_MIN &&
(usage->hid & HID_USAGE_PAGE) <= HID_UP_VENDOR_DEFINED_MAX);
dbg_hid("hid=0x%08x appl=0x%08x coll_idx=0x%02x usage_idx=0x%02x: %s\n",
usage->hid,
field->application,
usage->collection_index,
usage->usage_index,
is_vendor_defined ? "ignored" : "defaulted");
/* Ignore vendor defined usages, default map standard usages */
return is_vendor_defined ? -1 : 0;
}
static const struct hid_device_id jabra_devices[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_JABRA, HID_ANY_ID) },
{ }
};
MODULE_DEVICE_TABLE(hid, jabra_devices);
static struct hid_driver jabra_driver = {
.name = "jabra",
.id_table = jabra_devices,
.input_mapping = jabra_input_mapping,
};
module_hid_driver(jabra_driver);
MODULE_AUTHOR("Niels Skou Olsen <nolsen@jabra.com>");
MODULE_DESCRIPTION("Jabra USB HID Driver");
MODULE_LICENSE("GPL");
This diff is collapsed.
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Makefile for the USB input drivers # Makefile for the USB input drivers
# #
usbhid-y := hid-core.o hid-quirks.o usbhid-y := hid-core.o
usbhid-$(CONFIG_USB_HIDDEV) += hiddev.o usbhid-$(CONFIG_USB_HIDDEV) += hiddev.o
usbhid-$(CONFIG_HID_PID) += hid-pidff.o usbhid-$(CONFIG_HID_PID) += hid-pidff.o
......
...@@ -978,8 +978,7 @@ static int usbhid_parse(struct hid_device *hid) ...@@ -978,8 +978,7 @@ static int usbhid_parse(struct hid_device *hid)
int num_descriptors; int num_descriptors;
size_t offset = offsetof(struct hid_descriptor, desc); size_t offset = offsetof(struct hid_descriptor, desc);
quirks = usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor), quirks = hid_lookup_quirk(hid);
le16_to_cpu(dev->descriptor.idProduct));
if (quirks & HID_QUIRK_IGNORE) if (quirks & HID_QUIRK_IGNORE)
return -ENODEV; return -ENODEV;
...@@ -1328,8 +1327,8 @@ static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id * ...@@ -1328,8 +1327,8 @@ static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *
hid->bus = BUS_USB; hid->bus = BUS_USB;
hid->vendor = le16_to_cpu(dev->descriptor.idVendor); hid->vendor = le16_to_cpu(dev->descriptor.idVendor);
hid->product = le16_to_cpu(dev->descriptor.idProduct); hid->product = le16_to_cpu(dev->descriptor.idProduct);
hid->version = le16_to_cpu(dev->descriptor.bcdDevice);
hid->name[0] = 0; hid->name[0] = 0;
hid->quirks = usbhid_lookup_quirk(hid->vendor, hid->product);
if (intf->cur_altsetting->desc.bInterfaceProtocol == if (intf->cur_altsetting->desc.bInterfaceProtocol ==
USB_INTERFACE_PROTOCOL_MOUSE) USB_INTERFACE_PROTOCOL_MOUSE)
hid->type = HID_TYPE_USBMOUSE; hid->type = HID_TYPE_USBMOUSE;
...@@ -1641,7 +1640,7 @@ static int __init hid_init(void) ...@@ -1641,7 +1640,7 @@ static int __init hid_init(void)
{ {
int retval = -ENOMEM; int retval = -ENOMEM;
retval = usbhid_quirks_init(quirks_param); retval = hid_quirks_init(quirks_param, BUS_USB, MAX_USBHID_BOOT_QUIRKS);
if (retval) if (retval)
goto usbhid_quirks_init_fail; goto usbhid_quirks_init_fail;
retval = usb_register(&hid_driver); retval = usb_register(&hid_driver);
...@@ -1651,7 +1650,7 @@ static int __init hid_init(void) ...@@ -1651,7 +1650,7 @@ static int __init hid_init(void)
return 0; return 0;
usb_register_fail: usb_register_fail:
usbhid_quirks_exit(); hid_quirks_exit(BUS_USB);
usbhid_quirks_init_fail: usbhid_quirks_init_fail:
return retval; return retval;
} }
...@@ -1659,7 +1658,7 @@ static int __init hid_init(void) ...@@ -1659,7 +1658,7 @@ static int __init hid_init(void)
static void __exit hid_exit(void) static void __exit hid_exit(void)
{ {
usb_deregister(&hid_driver); usb_deregister(&hid_driver);
usbhid_quirks_exit(); hid_quirks_exit(BUS_USB);
} }
module_init(hid_init); module_init(hid_init);
......
This diff is collapsed.
...@@ -342,6 +342,7 @@ struct hid_item { ...@@ -342,6 +342,7 @@ struct hid_item {
#define HID_QUIRK_SKIP_OUTPUT_REPORTS 0x00010000 #define HID_QUIRK_SKIP_OUTPUT_REPORTS 0x00010000
#define HID_QUIRK_SKIP_OUTPUT_REPORT_ID 0x00020000 #define HID_QUIRK_SKIP_OUTPUT_REPORT_ID 0x00020000
#define HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP 0x00040000 #define HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP 0x00040000
#define HID_QUIRK_HAVE_SPECIAL_DRIVER 0x00080000
#define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000 #define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000
#define HID_QUIRK_NO_INIT_REPORTS 0x20000000 #define HID_QUIRK_NO_INIT_REPORTS 0x20000000
#define HID_QUIRK_NO_IGNORE 0x40000000 #define HID_QUIRK_NO_IGNORE 0x40000000
...@@ -671,6 +672,7 @@ struct hid_usage_id { ...@@ -671,6 +672,7 @@ struct hid_usage_id {
* to be called) * to be called)
* @dyn_list: list of dynamically added device ids * @dyn_list: list of dynamically added device ids
* @dyn_lock: lock protecting @dyn_list * @dyn_lock: lock protecting @dyn_list
* @match: check if the given device is handled by this driver
* @probe: new device inserted * @probe: new device inserted
* @remove: device removed (NULL if not a hot-plug capable driver) * @remove: device removed (NULL if not a hot-plug capable driver)
* @report_table: on which reports to call raw_event (NULL means all) * @report_table: on which reports to call raw_event (NULL means all)
...@@ -683,6 +685,8 @@ struct hid_usage_id { ...@@ -683,6 +685,8 @@ struct hid_usage_id {
* @input_mapped: invoked on input registering after mapping an usage * @input_mapped: invoked on input registering after mapping an usage
* @input_configured: invoked just before the device is registered * @input_configured: invoked just before the device is registered
* @feature_mapping: invoked on feature registering * @feature_mapping: invoked on feature registering
* @bus_add_driver: invoked when a HID driver is about to be added
* @bus_removed_driver: invoked when a HID driver has been removed
* @suspend: invoked on suspend (NULL means nop) * @suspend: invoked on suspend (NULL means nop)
* @resume: invoked on resume if device was not reset (NULL means nop) * @resume: invoked on resume if device was not reset (NULL means nop)
* @reset_resume: invoked on resume if device was reset (NULL means nop) * @reset_resume: invoked on resume if device was reset (NULL means nop)
...@@ -711,6 +715,7 @@ struct hid_driver { ...@@ -711,6 +715,7 @@ struct hid_driver {
struct list_head dyn_list; struct list_head dyn_list;
spinlock_t dyn_lock; spinlock_t dyn_lock;
bool (*match)(struct hid_device *dev, bool ignore_special_driver);
int (*probe)(struct hid_device *dev, const struct hid_device_id *id); int (*probe)(struct hid_device *dev, const struct hid_device_id *id);
void (*remove)(struct hid_device *dev); void (*remove)(struct hid_device *dev);
...@@ -736,6 +741,8 @@ struct hid_driver { ...@@ -736,6 +741,8 @@ struct hid_driver {
void (*feature_mapping)(struct hid_device *hdev, void (*feature_mapping)(struct hid_device *hdev,
struct hid_field *field, struct hid_field *field,
struct hid_usage *usage); struct hid_usage *usage);
void (*bus_add_driver)(struct hid_driver *driver);
void (*bus_removed_driver)(struct hid_driver *driver);
#ifdef CONFIG_PM #ifdef CONFIG_PM
int (*suspend)(struct hid_device *hdev, pm_message_t message); int (*suspend)(struct hid_device *hdev, pm_message_t message);
int (*resume)(struct hid_device *hdev); int (*resume)(struct hid_device *hdev);
...@@ -814,6 +821,8 @@ extern bool hid_ignore(struct hid_device *); ...@@ -814,6 +821,8 @@ extern bool hid_ignore(struct hid_device *);
extern int hid_add_device(struct hid_device *); extern int hid_add_device(struct hid_device *);
extern void hid_destroy_device(struct hid_device *); extern void hid_destroy_device(struct hid_device *);
extern struct bus_type hid_bus_type;
extern int __must_check __hid_register_driver(struct hid_driver *, extern int __must_check __hid_register_driver(struct hid_driver *,
struct module *, const char *mod_name); struct module *, const char *mod_name);
...@@ -860,8 +869,12 @@ int hid_open_report(struct hid_device *device); ...@@ -860,8 +869,12 @@ int hid_open_report(struct hid_device *device);
int hid_check_keys_pressed(struct hid_device *hid); int hid_check_keys_pressed(struct hid_device *hid);
int hid_connect(struct hid_device *hid, unsigned int connect_mask); int hid_connect(struct hid_device *hid, unsigned int connect_mask);
void hid_disconnect(struct hid_device *hid); void hid_disconnect(struct hid_device *hid);
const struct hid_device_id *hid_match_id(struct hid_device *hdev, bool hid_match_one_id(const struct hid_device *hdev,
const struct hid_device_id *id);
const struct hid_device_id *hid_match_id(const struct hid_device *hdev,
const struct hid_device_id *id); const struct hid_device_id *id);
const struct hid_device_id *hid_match_device(struct hid_device *hdev,
struct hid_driver *hdrv);
s32 hid_snto32(__u32 value, unsigned n); s32 hid_snto32(__u32 value, unsigned n);
__u32 hid_field_extract(const struct hid_device *hid, __u8 *report, __u32 hid_field_extract(const struct hid_device *hid, __u8 *report,
unsigned offset, unsigned n); unsigned offset, unsigned n);
...@@ -1098,9 +1111,9 @@ int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size, ...@@ -1098,9 +1111,9 @@ int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size,
int interrupt); int interrupt);
/* HID quirks API */ /* HID quirks API */
u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct); unsigned long hid_lookup_quirk(const struct hid_device *hdev);
int usbhid_quirks_init(char **quirks_param); int hid_quirks_init(char **quirks_param, __u16 bus, int count);
void usbhid_quirks_exit(void); void hid_quirks_exit(__u16 bus);
#ifdef CONFIG_HID_PID #ifdef CONFIG_HID_PID
int hid_pidff_init(struct hid_device *hid); int hid_pidff_init(struct hid_device *hid);
......
...@@ -789,7 +789,7 @@ static int hidp_setup_hid(struct hidp_session *session, ...@@ -789,7 +789,7 @@ static int hidp_setup_hid(struct hidp_session *session,
hid->dev.parent = &session->conn->hcon->dev; hid->dev.parent = &session->conn->hcon->dev;
hid->ll_driver = &hidp_hid_driver; hid->ll_driver = &hidp_hid_driver;
/* True if device is blacklisted in drivers/hid/hid-core.c */ /* True if device is blacklisted in drivers/hid/hid-quirks.c */
if (hid_ignore(hid)) { if (hid_ignore(hid)) {
hid_destroy_device(session->hid); hid_destroy_device(session->hid);
session->hid = NULL; session->hid = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment