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

Commit 7b4d930e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-v4.16-rc4' of... 

Merge tag 'fixes-for-v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

Felipe writes:

usb: fixes for v4.16-rc4

Just small fixes now. The two most important are a fix for a a lock up
on USB ID pin change during system suspend/resume on dwc3 and a
use-after-free fix in ffs_fs_kill_sb().

Apart from that, some DT compatible fixes.
parents 6f566af3 c6ba5084

Documentation/devicetree/bindings/usb/dwc2.txt

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Required properties: 
  configured in FS mode;

  - "st,stm32f4x9-hsotg": The DWC2 USB HS controller instance in STM32F4x9 SoCs

  configured in HS mode;

  - "st,stm32f7xx-hsotg": The DWC2 USB HS controller instance in STM32F7xx SoCs

  - "st,stm32f7-hsotg": The DWC2 USB HS controller instance in STM32F7 SoCs

    configured in HS mode;

- reg : Should contain 1 register range (address and length)

- interrupts : Should contain 1 interrupt

Documentation/devicetree/bindings/usb/renesas_usb3.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
  - compatible: Must contain one of the following:

	- "renesas,r8a7795-usb3-peri"

	- "renesas,r8a7796-usb3-peri"

	- "renesas,r8a77965-usb3-peri"

	- "renesas,rcar-gen3-usb3-peri" for a generic R-Car Gen3 compatible

	  device

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Required properties: 
	- "renesas,usbhs-r8a7794" for r8a7794 (R-Car E2) compatible device

	- "renesas,usbhs-r8a7795" for r8a7795 (R-Car H3) compatible device

	- "renesas,usbhs-r8a7796" for r8a7796 (R-Car M3-W) compatible device

	- "renesas,usbhs-r8a77965" for r8a77965 (R-Car M3-N) compatible device

	- "renesas,usbhs-r8a77995" for r8a77995 (R-Car D3) compatible device

	- "renesas,usbhs-r7s72100" for r7s72100 (RZ/A1) compatible device

	- "renesas,rcar-gen2-usbhs" for R-Car Gen2 or RZ/G1 compatible devices

drivers/usb/dwc2/params.c

+3 −3
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static void dwc2_set_stm32f4x9_fsotg_params(struct dwc2_hsotg *hsotg) 
	p->activate_stm_fs_transceiver = true;

}



static void dwc2_set_stm32f7xx_hsotg_params(struct dwc2_hsotg *hsotg)

static void dwc2_set_stm32f7_hsotg_params(struct dwc2_hsotg *hsotg)

{

	struct dwc2_core_params *p = &hsotg->params;
@@ -164,8 +164,8 @@ const struct of_device_id dwc2_of_match_table[] = { 
	{ .compatible = "st,stm32f4x9-fsotg",

	  .data = dwc2_set_stm32f4x9_fsotg_params },

	{ .compatible = "st,stm32f4x9-hsotg" },

	{ .compatible = "st,stm32f7xx-hsotg",

	  .data = dwc2_set_stm32f7xx_hsotg_params },

	{ .compatible = "st,stm32f7-hsotg",

	  .data = dwc2_set_stm32f7_hsotg_params },

	{},

};

MODULE_DEVICE_TABLE(of, dwc2_of_match_table);

drivers/usb/dwc3/core.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ void dwc3_set_mode(struct dwc3 *dwc, u32 mode) 
	dwc->desired_dr_role = mode;

	spin_unlock_irqrestore(&dwc->lock, flags);



	queue_work(system_power_efficient_wq, &dwc->drd_work);

	queue_work(system_freezable_wq, &dwc->drd_work);

}



u32 dwc3_core_fifo_space(struct dwc3_ep *dep, u8 type)