Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dc2808c authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: delete endpoints from bandwidth list before freeing whole device 



Lists of endpoints are stored for bandwidth calculation for roothub ports.
Make sure we remove all endpoints from the list before the whole device,
containing its endpoints list_head stuctures, is freed.

This used to be done in the wrong order in xhci_mem_cleanup(),
and triggered an oops in resume from S4 (hibernate).

Cc: stable <stable@vger.kernel.org>
Tested-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b38f09cc

drivers/usb/host/xhci-mem.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -1822,6 +1822,16 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci) 
		kfree(cur_cd);

		kfree(cur_cd);

	}

	}





	num_ports = HCS_MAX_PORTS(xhci->hcs_params1);

	for (i = 0; i < num_ports; i++) {

		struct xhci_interval_bw_table *bwt = &xhci->rh_bw[i].bw_table;

		for (j = 0; j < XHCI_MAX_INTERVAL; j++) {

			struct list_head *ep = &bwt->interval_bw[j].endpoints;

			while (!list_empty(ep))

				list_del_init(ep->next);

		}

	}



	for (i = 1; i < MAX_HC_SLOTS; ++i)

	for (i = 1; i < MAX_HC_SLOTS; ++i)

		xhci_free_virt_device(xhci, i);

		xhci_free_virt_device(xhci, i);
@@ -1857,16 +1867,6 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci) 
	if (!xhci->rh_bw)

	if (!xhci->rh_bw)

		goto no_bw;

		goto no_bw;





	num_ports = HCS_MAX_PORTS(xhci->hcs_params1);

	for (i = 0; i < num_ports; i++) {

		struct xhci_interval_bw_table *bwt = &xhci->rh_bw[i].bw_table;

		for (j = 0; j < XHCI_MAX_INTERVAL; j++) {

			struct list_head *ep = &bwt->interval_bw[j].endpoints;

			while (!list_empty(ep))

				list_del_init(ep->next);

		}

	}



	for (i = 0; i < num_ports; i++) {

	for (i = 0; i < num_ports; i++) {

		struct xhci_tt_bw_info *tt, *n;

		struct xhci_tt_bw_info *tt, *n;

		list_for_each_entry_safe(tt, n, &xhci->rh_bw[i].tts, tt_list) {

		list_for_each_entry_safe(tt, n, &xhci->rh_bw[i].tts, tt_list) {