Commit 548b1af4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-5.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes from Greg KH:
 "Here are a number of small USB driver fixes for 5.17-rc6 to resolve
  reported problems and add new device ids. They include:

   - dwc3:
      - device mapping fix
      - new device ids
      - driver fixes

   - xhci driver fixes

   - gadget driver fixes

   - usb-serial driver device id updates

  All of these have been in linux-next with no reported problems"

* tag 'usb-5.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: gadget: rndis: add spinlock for rndis response list
  usb: dwc3: gadget: Let the interrupt handler disable bottom halves.
  USB: gadget: validate endpoint index for xilinx udc
  USB: serial: option: add Telit LE910R1 compositions
  USB: serial: option: add support for DW5829e
  Revert "USB: serial: ch341: add new Product ID for CH341A"
  usb: dwc2: drd: fix soft connect when gadget is unconfigured
  usb: dwc3: pci: Fix Bay Trail phy GPIO mappings
  tps6598x: clear int mask on probe failure
  xhci: Prevent futile URB re-submissions due to incorrect return value.
  xhci: re-initialize the HC during resume if HCE was set
  usb: dwc3: pci: Add "snps,dis_u2_susphy_quirk" for Intel Bay Trail
  usb: dwc3: pci: add support for the Intel Raptor Lake-S
parents 78081594 19eae24b

drivers/usb/dwc2/core.h

+2 −0
Original line number Diff line number Diff line
@@ -1418,6 +1418,7 @@ void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg); 
void dwc2_hsotg_disconnect(struct dwc2_hsotg *dwc2);

int dwc2_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode);

#define dwc2_is_device_connected(hsotg) (hsotg->connected)

#define dwc2_is_device_enabled(hsotg) (hsotg->enabled)

int dwc2_backup_device_registers(struct dwc2_hsotg *hsotg);

int dwc2_restore_device_registers(struct dwc2_hsotg *hsotg, int remote_wakeup);

int dwc2_gadget_enter_hibernation(struct dwc2_hsotg *hsotg);
@@ -1454,6 +1455,7 @@ static inline int dwc2_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, 
					   int testmode)

{ return 0; }

#define dwc2_is_device_connected(hsotg) (0)

#define dwc2_is_device_enabled(hsotg) (0)

static inline int dwc2_backup_device_registers(struct dwc2_hsotg *hsotg)

{ return 0; }

static inline int dwc2_restore_device_registers(struct dwc2_hsotg *hsotg,

drivers/usb/dwc2/drd.c

+4 −2
Original line number Diff line number Diff line
@@ -130,8 +130,10 @@ static int dwc2_drd_role_sw_set(struct usb_role_switch *sw, enum usb_role role) 
		already = dwc2_ovr_avalid(hsotg, true);

	} else if (role == USB_ROLE_DEVICE) {

		already = dwc2_ovr_bvalid(hsotg, true);

		if (dwc2_is_device_enabled(hsotg)) {

			/* This clear DCTL.SFTDISCON bit */

			dwc2_hsotg_core_connect(hsotg);

		}

	} else {

		if (dwc2_is_device_mode(hsotg)) {

			if (!dwc2_ovr_bvalid(hsotg, false))

drivers/usb/dwc3/dwc3-pci.c

+18 −3
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#define PCI_DEVICE_ID_INTEL_ADLP		0x51ee

#define PCI_DEVICE_ID_INTEL_ADLM		0x54ee

#define PCI_DEVICE_ID_INTEL_ADLS		0x7ae1

#define PCI_DEVICE_ID_INTEL_RPLS		0x7a61

#define PCI_DEVICE_ID_INTEL_TGL			0x9a15

#define PCI_DEVICE_ID_AMD_MR			0x163a
@@ -85,8 +86,8 @@ static const struct acpi_gpio_mapping acpi_dwc3_byt_gpios[] = { 
static struct gpiod_lookup_table platform_bytcr_gpios = {

	.dev_id		= "0000:00:16.0",

	.table		= {

		GPIO_LOOKUP("INT33FC:00", 54, "reset", GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP("INT33FC:02", 14, "cs", GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP("INT33FC:00", 54, "cs", GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP("INT33FC:02", 14, "reset", GPIO_ACTIVE_HIGH),

		{}

	},

};
@@ -119,6 +120,13 @@ static const struct property_entry dwc3_pci_intel_properties[] = { 
	{}

};



static const struct property_entry dwc3_pci_intel_byt_properties[] = {

	PROPERTY_ENTRY_STRING("dr_mode", "peripheral"),

	PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"),

	PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),

	{}

};



static const struct property_entry dwc3_pci_mrfld_properties[] = {

	PROPERTY_ENTRY_STRING("dr_mode", "otg"),

	PROPERTY_ENTRY_STRING("linux,extcon-name", "mrfld_bcove_pwrsrc"),
@@ -161,6 +169,10 @@ static const struct software_node dwc3_pci_intel_swnode = { 
	.properties = dwc3_pci_intel_properties,

};



static const struct software_node dwc3_pci_intel_byt_swnode = {

	.properties = dwc3_pci_intel_byt_properties,

};



static const struct software_node dwc3_pci_intel_mrfld_swnode = {

	.properties = dwc3_pci_mrfld_properties,

};
@@ -344,7 +356,7 @@ static const struct pci_device_id dwc3_pci_id_table[] = { 
	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },



	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BYT),

	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },

	  (kernel_ulong_t) &dwc3_pci_intel_byt_swnode, },



	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MRFLD),

	  (kernel_ulong_t) &dwc3_pci_intel_mrfld_swnode, },
@@ -409,6 +421,9 @@ static const struct pci_device_id dwc3_pci_id_table[] = { 
	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADLS),

	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },



	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_RPLS),

	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },



	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL),

	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },

drivers/usb/dwc3/gadget.c

+2 −0
Original line number Diff line number Diff line
@@ -4160,9 +4160,11 @@ static irqreturn_t dwc3_thread_interrupt(int irq, void *_evt) 
	unsigned long flags;

	irqreturn_t ret = IRQ_NONE;



	local_bh_disable();

	spin_lock_irqsave(&dwc->lock, flags);

	ret = dwc3_process_event_buf(evt);

	spin_unlock_irqrestore(&dwc->lock, flags);

	local_bh_enable();



	return ret;

}

drivers/usb/gadget/function/rndis.c

+8 −0
Original line number Diff line number Diff line
@@ -922,6 +922,7 @@ struct rndis_params *rndis_register(void (*resp_avail)(void *v), void *v) 
	params->resp_avail = resp_avail;

	params->v = v;

	INIT_LIST_HEAD(&params->resp_queue);

	spin_lock_init(&params->resp_lock);

	pr_debug("%s: configNr = %d\n", __func__, i);



	return params;
@@ -1015,12 +1016,14 @@ void rndis_free_response(struct rndis_params *params, u8 *buf) 
{

	rndis_resp_t *r, *n;



	spin_lock(&params->resp_lock);

	list_for_each_entry_safe(r, n, &params->resp_queue, list) {

		if (r->buf == buf) {

			list_del(&r->list);

			kfree(r);

		}

	}

	spin_unlock(&params->resp_lock);

}

EXPORT_SYMBOL_GPL(rndis_free_response);
@@ -1030,14 +1033,17 @@ u8 *rndis_get_next_response(struct rndis_params *params, u32 *length) 


	if (!length) return NULL;



	spin_lock(&params->resp_lock);

	list_for_each_entry_safe(r, n, &params->resp_queue, list) {

		if (!r->send) {

			r->send = 1;

			*length = r->length;

			spin_unlock(&params->resp_lock);

			return r->buf;

		}

	}



	spin_unlock(&params->resp_lock);

	return NULL;

}

EXPORT_SYMBOL_GPL(rndis_get_next_response);
@@ -1054,7 +1060,9 @@ static rndis_resp_t *rndis_add_response(struct rndis_params *params, u32 length) 
	r->length = length;

	r->send = 0;



	spin_lock(&params->resp_lock);

	list_add_tail(&r->list, &params->resp_queue);

	spin_unlock(&params->resp_lock);

	return r;

}