Commit 2dd0d98d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB / Thunderbolt fixes from Greg KH:
 "Here are some USB fixes for 6.4-rc3, as well as a driver core fix that
  resolves a memory leak that shows up in USB devices easier than other
  subsystems.

  Included in here are:

   - driver core memory leak as reported and tested by syzbot and
     developers

   - dwc3 driver fixes for reported problems

   - xhci driver fixes for reported problems

   - USB gadget driver reverts to resolve regressions

   - usbtmc driver fix for syzbot reported problem

   - thunderbolt driver fixes for reported issues

   - other small USB fixes

  All of these, except for the driver core fix, have been in linux-next
  with no reported problems. The driver core fix was tested and verified
  to solve the issue by syzbot and the original reporter"

* tag 'usb-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  driver core: class: properly reference count class_dev_iter()
  xhci: Fix incorrect tracking of free space on transfer rings
  xhci-pci: Only run d3cold avoidance quirk for s2idle
  usb-storage: fix deadlock when a scsi command timeouts more than once
  usb: dwc3: fix a test for error in dwc3_core_init()
  usb: typec: tps6598x: Fix fault at module removal
  usb: gadget: u_ether: Fix host MAC address case
  usb: typec: altmodes/displayport: fix pin_assignment_show
  Revert "usb: gadget: udc: core: Invoke usb_gadget_connect only when started"
  Revert "usb: gadget: udc: core: Prevent redundant calls to pullup"
  usb: gadget: drop superfluous ':' in doc string
  usb: dwc3: debugfs: Resume dwc3 before accessing registers
  USB: UHCI: adjust zhaoxin UHCI controllers OverCurrent bit value
  usb: dwc3: fix gadget mode suspend interrupt handler issue
  usb: dwc3: gadget: Improve dwc3_gadget_suspend() and dwc3_gadget_resume()
  USB: usbtmc: Fix direction for 0-length ioctl control messages
  thunderbolt: Clear registers properly when auto clear isn't in use
parents 98be58a6 ddaf098e

drivers/base/class.c

+2 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ void class_dev_iter_init(struct class_dev_iter *iter, const struct class *class, 
		start_knode = &start->p->knode_class;

	klist_iter_init_node(&sp->klist_devices, &iter->ki, start_knode);

	iter->type = type;

	iter->sp = sp;

}

EXPORT_SYMBOL_GPL(class_dev_iter_init);
@@ -361,6 +362,7 @@ EXPORT_SYMBOL_GPL(class_dev_iter_next); 
void class_dev_iter_exit(struct class_dev_iter *iter)

{

	klist_iter_exit(&iter->ki);

	subsys_put(iter->sp);

}

EXPORT_SYMBOL_GPL(class_dev_iter_exit);

drivers/thunderbolt/nhi.c

+24 −5
Original line number Diff line number Diff line
@@ -54,6 +54,21 @@ static int ring_interrupt_index(const struct tb_ring *ring) 
	return bit;

}



static void nhi_mask_interrupt(struct tb_nhi *nhi, int mask, int ring)

{

	if (nhi->quirks & QUIRK_AUTO_CLEAR_INT)

		return;

	iowrite32(mask, nhi->iobase + REG_RING_INTERRUPT_MASK_CLEAR_BASE + ring);

}



static void nhi_clear_interrupt(struct tb_nhi *nhi, int ring)

{

	if (nhi->quirks & QUIRK_AUTO_CLEAR_INT)

		ioread32(nhi->iobase + REG_RING_NOTIFY_BASE + ring);

	else

		iowrite32(~0, nhi->iobase + REG_RING_INT_CLEAR + ring);

}



/*

 * ring_interrupt_active() - activate/deactivate interrupts for a single ring

 *
@@ -61,8 +76,8 @@ static int ring_interrupt_index(const struct tb_ring *ring) 
 */

static void ring_interrupt_active(struct tb_ring *ring, bool active)

{

	int reg = REG_RING_INTERRUPT_BASE +

		  ring_interrupt_index(ring) / 32 * 4;

	int index = ring_interrupt_index(ring) / 32 * 4;

	int reg = REG_RING_INTERRUPT_BASE + index;

	int interrupt_bit = ring_interrupt_index(ring) & 31;

	int mask = 1 << interrupt_bit;

	u32 old, new;
@@ -123,7 +138,11 @@ static void ring_interrupt_active(struct tb_ring *ring, bool active) 
					 "interrupt for %s %d is already %s\n",

					 RING_TYPE(ring), ring->hop,

					 active ? "enabled" : "disabled");



	if (active)

		iowrite32(new, ring->nhi->iobase + reg);

	else

		nhi_mask_interrupt(ring->nhi, mask, index);

}



/*
@@ -136,11 +155,11 @@ static void nhi_disable_interrupts(struct tb_nhi *nhi) 
	int i = 0;

	/* disable interrupts */

	for (i = 0; i < RING_INTERRUPT_REG_COUNT(nhi); i++)

		iowrite32(0, nhi->iobase + REG_RING_INTERRUPT_BASE + 4 * i);

		nhi_mask_interrupt(nhi, ~0, 4 * i);



	/* clear interrupt status bits */

	for (i = 0; i < RING_NOTIFY_REG_COUNT(nhi); i++)

		ioread32(nhi->iobase + REG_RING_NOTIFY_BASE + 4 * i);

		nhi_clear_interrupt(nhi, 4 * i);

}



/* ring helper methods */

drivers/thunderbolt/nhi_regs.h

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ struct ring_desc { 
#define REG_RING_INTERRUPT_BASE	0x38200

#define RING_INTERRUPT_REG_COUNT(nhi) ((31 + 2 * nhi->hop_count) / 32)



#define REG_RING_INTERRUPT_MASK_CLEAR_BASE	0x38208



#define REG_INT_THROTTLING_RATE	0x38c00



/* Interrupt Vector Allocation */

drivers/usb/class/usbtmc.c

+2 −0
Original line number Diff line number Diff line
@@ -1928,6 +1928,8 @@ static int usbtmc_ioctl_request(struct usbtmc_device_data *data, 


	if (request.req.wLength > USBTMC_BUFSIZE)

		return -EMSGSIZE;

	if (request.req.wLength == 0)	/* Length-0 requests are never IN */

		request.req.bRequestType &= ~USB_DIR_IN;



	is_in = request.req.bRequestType & USB_DIR_IN;

drivers/usb/dwc3/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1137,7 +1137,7 @@ static int dwc3_core_init(struct dwc3 *dwc) 


	dwc3_set_incr_burst_type(dwc);



	dwc3_phy_power_on(dwc);

	ret = dwc3_phy_power_on(dwc);

	if (ret)

		goto err_exit_phy;