Commit d181b34b authored by Milan Broz's avatar Milan Broz Committed by Greg Kroah-Hartman
Browse files

usb-storage,uas: make internal quirks flags 64bit 



Switch internal usb-storage quirk value to 64-bit as quirks currently
use all 32 bits.

Signed-off-by: default avatarMilan Broz <gmazyland@gmail.com>
Reviewed-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20231016072604.40179-3-gmazyland@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 35b62f6f

drivers/usb/storage/uas-detect.h

+2 −2
Original line number Diff line number Diff line
@@ -54,12 +54,12 @@ static int uas_find_endpoints(struct usb_host_interface *alt, 


static int uas_use_uas_driver(struct usb_interface *intf,

			      const struct usb_device_id *id,

			      unsigned long *flags_ret)

			      u64 *flags_ret)

{

	struct usb_host_endpoint *eps[4] = { };

	struct usb_device *udev = interface_to_usbdev(intf);

	struct usb_hcd *hcd = bus_to_hcd(udev->bus);

	unsigned long flags = id->driver_info;

	u64 flags = id->driver_info;

	struct usb_host_interface *alt;

	int r;

drivers/usb/storage/uas.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ struct uas_dev_info { 
	struct usb_anchor cmd_urbs;

	struct usb_anchor sense_urbs;

	struct usb_anchor data_urbs;

	unsigned long flags;

	u64 flags;

	int qdepth, resetting;

	unsigned cmd_pipe, status_pipe, data_in_pipe, data_out_pipe;

	unsigned use_streams:1;
@@ -988,7 +988,7 @@ static int uas_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	struct Scsi_Host *shost = NULL;

	struct uas_dev_info *devinfo;

	struct usb_device *udev = interface_to_usbdev(intf);

	unsigned long dev_flags;

	u64 dev_flags;



	if (!uas_use_uas_driver(intf, id, &dev_flags))

		return -ENODEV;

drivers/usb/storage/usb.c

+4 −4
Original line number Diff line number Diff line
@@ -460,13 +460,13 @@ static int associate_dev(struct us_data *us, struct usb_interface *intf) 
#define TOLOWER(x) ((x) | 0x20)



/* Adjust device flags based on the "quirks=" module parameter */

void usb_stor_adjust_quirks(struct usb_device *udev, unsigned long *fflags)

void usb_stor_adjust_quirks(struct usb_device *udev, u64 *fflags)

{

	char *p;

	u16 vid = le16_to_cpu(udev->descriptor.idVendor);

	u16 pid = le16_to_cpu(udev->descriptor.idProduct);

	unsigned f = 0;

	unsigned int mask = (US_FL_SANE_SENSE | US_FL_BAD_SENSE |

	u64 f = 0;

	u64 mask = (US_FL_SANE_SENSE | US_FL_BAD_SENSE |

			US_FL_FIX_CAPACITY | US_FL_IGNORE_UAS |

			US_FL_CAPACITY_HEURISTICS | US_FL_IGNORE_DEVICE |

			US_FL_NOT_LOCKABLE | US_FL_MAX_SECTORS_64 |
@@ -605,7 +605,7 @@ static int get_device_info(struct us_data *us, const struct usb_device_id *id, 
		us->fflags &= ~US_FL_GO_SLOW;



	if (us->fflags)

		dev_info(pdev, "Quirks match for vid %04x pid %04x: %lx\n",

		dev_info(pdev, "Quirks match for vid %04x pid %04x: %llx\n",

				le16_to_cpu(dev->descriptor.idVendor),

				le16_to_cpu(dev->descriptor.idProduct),

				us->fflags);

drivers/usb/storage/usb.h

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ struct us_data { 
	struct usb_interface	*pusb_intf;	 /* this interface */

	const struct us_unusual_dev   *unusual_dev;

						/* device-filter entry     */

	unsigned long		fflags;		 /* fixed flags from filter */

	u64			fflags;		 /* fixed flags from filter */

	unsigned long		dflags;		 /* dynamic atomic bitflags */

	unsigned int		send_bulk_pipe;	 /* cached pipe values */

	unsigned int		recv_bulk_pipe;
@@ -192,7 +192,7 @@ extern int usb_stor_probe2(struct us_data *us); 
extern void usb_stor_disconnect(struct usb_interface *intf);



extern void usb_stor_adjust_quirks(struct usb_device *dev,

		unsigned long *fflags);

		u64 *fflags);



#define module_usb_stor_driver(__driver, __sht, __name) \

static int __init __driver##_init(void) \

drivers/usb/storage/usual-tables.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
		    vendorName, productName, useProtocol, useTransport, \

		    initFunction, flags) \

{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \

  .driver_info = (flags) }

  .driver_info = (kernel_ulong_t)(flags) }



#define COMPLIANT_DEV	UNUSUAL_DEV