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

Commit c2aee376 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here is a number of USB gadget and other driver fixes for 4.18-rc3.

  There's a bunch of them here, most of them being gadget driver and
  xhci host controller fixes for reported issues (as normal), but there
  are also some new device ids, and some fixes for the typec code.

  There is an acpi core patch in here that was acked by the acpi
  maintainer as it is needed for the typec fixes in order to properly
  solve a problem in that driver.

  All of these have been in linux-next this week with no reported
  issues"

* tag 'usb-4.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (33 commits)
  usb: chipidea: host: fix disconnection detect issue
  usb: typec: tcpm: fix logbuffer index is wrong if _tcpm_log is re-entered
  typec: tcpm: Fix a msecs vs jiffies bug
  NFC: pn533: Fix wrong GFP flag usage
  usb: cdc_acm: Add quirk for Uniden UBC125 scanner
  staging/typec: fix tcpci_rt1711h build errors
  usb: typec: ucsi: Fix for incorrect status data issue
  usb: typec: ucsi: acpi: Workaround for cache mode issue
  acpi: Add helper for deactivating memory region
  usb: xhci: increase CRS timeout value
  usb: xhci: tegra: fix runtime PM error handling
  usb: xhci: remove the code build warning
  xhci: Fix kernel oops in trace_xhci_free_virt_device
  xhci: Fix perceived dead host due to runtime suspend race with event handler
  dwc2: gadget: Fix ISOC IN DDMA PID bitfield value calculation
  usb: gadget: dwc2: fix memory leak in gadget_init()
  usb: gadget: composite: fix delayed_status race condition when set_interface
  usb: dwc2: fix isoc split in transfer with no data
  usb: dwc2: alloc dma aligned buffer for isoc split in
  usb: dwc2: fix the incorrect bitmaps for the ports of multi_tt hub
  ...
parents c350d6d1 226e2d2d

Documentation/usb/gadget_configfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ $ rm configs/<config name>.<number>/<function> 
where <config name>.<number> specify the configuration and <function> is

a symlink to a function being removed from the configuration, e.g.:



$ rm configfs/c.1/ncm.usb0

$ rm configs/c.1/ncm.usb0



...

...

drivers/acpi/osl.c

+72 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 
#include <linux/uaccess.h>

#include <linux/io-64-nonatomic-lo-hi.h>



#include "acpica/accommon.h"

#include "acpica/acnamesp.h"

#include "internal.h"



#define _COMPONENT		ACPI_OS_SERVICES
@@ -1490,6 +1492,76 @@ int acpi_check_region(resource_size_t start, resource_size_t n, 
}

EXPORT_SYMBOL(acpi_check_region);



static acpi_status acpi_deactivate_mem_region(acpi_handle handle, u32 level,

					      void *_res, void **return_value)

{

	struct acpi_mem_space_context **mem_ctx;

	union acpi_operand_object *handler_obj;

	union acpi_operand_object *region_obj2;

	union acpi_operand_object *region_obj;

	struct resource *res = _res;

	acpi_status status;



	region_obj = acpi_ns_get_attached_object(handle);

	if (!region_obj)

		return AE_OK;



	handler_obj = region_obj->region.handler;

	if (!handler_obj)

		return AE_OK;



	if (region_obj->region.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)

		return AE_OK;



	if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE))

		return AE_OK;



	region_obj2 = acpi_ns_get_secondary_object(region_obj);

	if (!region_obj2)

		return AE_OK;



	mem_ctx = (void *)&region_obj2->extra.region_context;



	if (!(mem_ctx[0]->address >= res->start &&

	      mem_ctx[0]->address < res->end))

		return AE_OK;



	status = handler_obj->address_space.setup(region_obj,

						  ACPI_REGION_DEACTIVATE,

						  NULL, (void **)mem_ctx);

	if (ACPI_SUCCESS(status))

		region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);



	return status;

}



/**

 * acpi_release_memory - Release any mappings done to a memory region

 * @handle: Handle to namespace node

 * @res: Memory resource

 * @level: A level that terminates the search

 *

 * Walks through @handle and unmaps all SystemMemory Operation Regions that

 * overlap with @res and that have already been activated (mapped).

 *

 * This is a helper that allows drivers to place special requirements on memory

 * region that may overlap with operation regions, primarily allowing them to

 * safely map the region as non-cached memory.

 *

 * The unmapped Operation Regions will be automatically remapped next time they

 * are called, so the drivers do not need to do anything else.

 */

acpi_status acpi_release_memory(acpi_handle handle, struct resource *res,

				u32 level)

{

	if (!(res->flags & IORESOURCE_MEM))

		return AE_TYPE;



	return acpi_walk_namespace(ACPI_TYPE_REGION, handle, level,

				   acpi_deactivate_mem_region, NULL, res, NULL);

}

EXPORT_SYMBOL_GPL(acpi_release_memory);



/*

 * Let drivers know whether the resource checks are effective

 */

drivers/nfc/pn533/usb.c

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static void pn533_recv_response(struct urb *urb) 
	struct sk_buff *skb = NULL;



	if (!urb->status) {

		skb = alloc_skb(urb->actual_length, GFP_KERNEL);

		skb = alloc_skb(urb->actual_length, GFP_ATOMIC);

		if (!skb) {

			nfc_err(&phy->udev->dev, "failed to alloc memory\n");

		} else {
@@ -186,7 +186,7 @@ static int pn533_usb_send_frame(struct pn533 *dev, 


	if (dev->protocol_type == PN533_PROTO_REQ_RESP) {

		/* request for response for sent packet directly */

		rc = pn533_submit_urb_for_response(phy, GFP_ATOMIC);

		rc = pn533_submit_urb_for_response(phy, GFP_KERNEL);

		if (rc)

			goto error;

	} else if (dev->protocol_type == PN533_PROTO_REQ_ACK_RESP) {

drivers/staging/typec/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ config TYPEC_TCPCI 


config TYPEC_RT1711H

	tristate "Richtek RT1711H Type-C chip driver"

	depends on I2C

	select TYPEC_TCPCI

	help

	  Richtek RT1711H Type-C chip driver that works with

drivers/usb/chipidea/host.c

+4 −1
Original line number Diff line number Diff line
@@ -124,8 +124,11 @@ static int host_start(struct ci_hdrc *ci) 


	hcd->power_budget = ci->platdata->power_budget;

	hcd->tpl_support = ci->platdata->tpl_support;

	if (ci->phy || ci->usb_phy)

	if (ci->phy || ci->usb_phy) {

		hcd->skip_phy_initialization = 1;

		if (ci->usb_phy)

			hcd->usb_phy = ci->usb_phy;

	}



	ehci = hcd_to_ehci(hcd);

	ehci->caps = ci->hw_bank.cap;