renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-18 18:43:59 +08:00
Code

usbcore: Check both id_table and match() when both available

Browse Source 
From: Bastien Nocera <hadess@hadess.net>

When a USB device driver has both an id_table and a match() function, make
sure to check both to find a match, first matching the id_table, then
checking the match() function.

This makes it possible to have module autoloading done through the
id_table when devices are plugged in, before checking for further
device eligibility in the match() function.

Cc: <stable@vger.kernel.org> # 5.8
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Alan Stern <stern@rowland.harvard.edu>
Co-developed-by: M. Vefa Bicakci <m.v.b@runbox.com>
Tested-by: Bastien Nocera <hadess@hadess.net>
Signed-off-by: Bastien Nocera <hadess@hadess.net>
Signed-off-by: M. Vefa Bicakci <m.v.b@runbox.com>
Tested-by: Pan (Pany) YUAN <pany@fedoraproject.org>
Link: https://lore.kernel.org/r/20201022135521.375211-2-m.v.b@runbox.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bastien Nocera 2020-10-22 09:55:20 -04:00 committed by Greg Kroah-Hartman
parent 32d174d2d5
commit 0942d59b0a
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/usb/core/driver.c
View File

@ -839,6 +839,22 @@ const struct usb_device_id *usb_device_match_id(struct usb_device *udev,
return NULL; return NULL;
} }
bool usb_driver_applicable(struct usb_device *udev,
struct usb_device_driver *udrv)
{
if (udrv->id_table && udrv->match)
return usb_device_match_id(udev, udrv->id_table) != NULL &&
udrv->match(udev);
if (udrv->id_table)
return usb_device_match_id(udev, udrv->id_table) != NULL;
if (udrv->match)
return udrv->match(udev);
return false;
}
static int usb_device_match(struct device *dev, struct device_driver *drv) static int usb_device_match(struct device *dev, struct device_driver *drv)
{ {
/* devices and interfaces are handled separately */ /* devices and interfaces are handled separately */
@ -853,17 +869,14 @@ static int usb_device_match(struct device *dev, struct device_driver *drv)
udev = to_usb_device(dev); udev = to_usb_device(dev);
udrv = to_usb_device_driver(drv); udrv = to_usb_device_driver(drv);
if (udrv->id_table)
return usb_device_match_id(udev, udrv->id_table) != NULL;
if (udrv->match)
return udrv->match(udev);
/* If the device driver under consideration does not have a /* If the device driver under consideration does not have a
* id_table or a match function, then let the driver's probe * id_table or a match function, then let the driver's probe
* function decide. * function decide.
*/ */
return 1; if (!udrv->id_table && !udrv->match)
return 1;
return usb_driver_applicable(udev, udrv);
} else if (is_usb_interface(dev)) { } else if (is_usb_interface(dev)) {
struct usb_interface *intf; struct usb_interface *intf;
@ -941,8 +954,7 @@ static int __usb_bus_reprobe_drivers(struct device *dev, void *data)
return 0; return 0;
udev = to_usb_device(dev); udev = to_usb_device(dev);
if (usb_device_match_id(udev, new_udriver->id_table) == NULL && if (!usb_driver_applicable(udev, new_udriver))
(!new_udriver->match || new_udriver->match(udev) == 0))
return 0; return 0;
ret = device_reprobe(dev); ret = device_reprobe(dev);

4
drivers/usb/core/generic.c
View File

@ -205,9 +205,7 @@ static int __check_for_non_generic_match(struct device_driver *drv, void *data)
udrv = to_usb_device_driver(drv); udrv = to_usb_device_driver(drv);
if (udrv == &usb_generic_driver) if (udrv == &usb_generic_driver)
return 0; return 0;
if (usb_device_match_id(udev, udrv->id_table) != NULL) return usb_driver_applicable(udev, udrv);
return 1;
return (udrv->match && udrv->match(udev));
} }
static bool usb_generic_driver_match(struct usb_device *udev) static bool usb_generic_driver_match(struct usb_device *udev)

2
drivers/usb/core/usb.h
View File

@ -74,6 +74,8 @@ extern int usb_match_device(struct usb_device *dev,
const struct usb_device_id *id); const struct usb_device_id *id);
extern const struct usb_device_id *usb_device_match_id(struct usb_device *udev, extern const struct usb_device_id *usb_device_match_id(struct usb_device *udev,
const struct usb_device_id *id); const struct usb_device_id *id);
extern bool usb_driver_applicable(struct usb_device *udev,
struct usb_device_driver *udrv);
extern void usb_forced_unbind_intf(struct usb_interface *intf); extern void usb_forced_unbind_intf(struct usb_interface *intf);
extern void usb_unbind_and_rebind_marked_interfaces(struct usb_device *udev); extern void usb_unbind_and_rebind_marked_interfaces(struct usb_device *udev);