diff mbox series

[for,linux-6.1.y-cip] usb: xhci-plat: Don't include xhci.h

Message ID 1716510288-3420-1-git-send-email-nobuhiro1.iwamatsu@toshiba.co.jp (mailing list archive)
State New
Headers show
Series [for,linux-6.1.y-cip] usb: xhci-plat: Don't include xhci.h | expand

Commit Message

Nobuhiro Iwamatsu May 24, 2024, 12:24 a.m. UTC 
From: Thinh Nguyen <Thinh.Nguyen@synopsys.com>

commit 4a237d55446ff67655dc3eed2d4a41997536fc4c upstream.

The xhci_plat.h should not need to include the entire xhci.h header.
This can cause redefinition in dwc3 if it selectively includes some xHCI
definitions. This is a prerequisite change for a fix to disable suspend
during initialization for dwc3.

Cc: stable@vger.kernel.org
Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Link: https://lore.kernel.org/r/310acfa01c957a10d9feaca3f7206269866ba2eb.1713394973.git.Thinh.Nguyen@synopsys.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[iwamatsu: The original commnit of this has been applied to linux-6.1.y tree as
           bf3b0ab6fbae ("usb: xhci-plat: Don't include xhci.h") without
	   xhci-rzv2m.c. Therefore, this applied fixes for xhci-rzv2m.c only.]
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 drivers/usb/host/xhci-rzv2m.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Nobuhiro Iwamatsu May 24, 2024, 12:30 a.m. UTC | #1 
Hi,

> [iwamatsu: The original commnit of this has been applied to linux-6.1.y tree as
>            bf3b0ab6fbae ("usb: xhci-plat: Don't include xhci.h") without
> 	   xhci-rzv2m.c. Therefore, this applied fixes for xhci-rzv2m.c only.]

Note: This fixes an issue when merging 6.1.91. There is no problem with v6.1.90-cip20.

Best regards,
  Nobuhiro

> -----Original Message-----
> From: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> Sent: Friday, May 24, 2024 9:25 AM
> To: cip-dev@lists.cip-project.org
> Cc: biju.das.jz@bp.renesas.com; iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□
> ＤＩＴ○ＯＳＴ) <nobuhiro1.iwamatsu@toshiba.co.jp>
> Subject: [PATCH for linux-6.1.y-cip] usb: xhci-plat: Don't include xhci.h
> 
> From: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
> 
> commit 4a237d55446ff67655dc3eed2d4a41997536fc4c upstream.
> 
> The xhci_plat.h should not need to include the entire xhci.h header.
> This can cause redefinition in dwc3 if it selectively includes some xHCI
> definitions. This is a prerequisite change for a fix to disable suspend during
> initialization for dwc3.
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
> Link:
> https://lore.kernel.org/r/310acfa01c957a10d9feaca3f7206269866ba2eb.17133
> 94973.git.Thinh.Nguyen@synopsys.com
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> [iwamatsu: The original commnit of this has been applied to linux-6.1.y tree as
>            bf3b0ab6fbae ("usb: xhci-plat: Don't include xhci.h") without
> 	   xhci-rzv2m.c. Therefore, this applied fixes for xhci-rzv2m.c only.]
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> ---
>  drivers/usb/host/xhci-rzv2m.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/usb/host/xhci-rzv2m.c b/drivers/usb/host/xhci-rzv2m.c
> index ec65b24eafa8..4f59867d7117 100644
> --- a/drivers/usb/host/xhci-rzv2m.c
> +++ b/drivers/usb/host/xhci-rzv2m.c
> @@ -6,6 +6,7 @@
>   */
> 
>  #include <linux/usb/rzv2m_usb3drd.h>
> +#include "xhci.h"
>  #include "xhci-plat.h"
>  #include "xhci-rzv2m.h"
> 
> --
> 2.43.0
diff mbox series

Patch

diff --git a/drivers/usb/host/xhci-rzv2m.c b/drivers/usb/host/xhci-rzv2m.c
index ec65b24eafa8..4f59867d7117 100644
--- a/drivers/usb/host/xhci-rzv2m.c
+++ b/drivers/usb/host/xhci-rzv2m.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <linux/usb/rzv2m_usb3drd.h>
+#include "xhci.h"
 #include "xhci-plat.h"
 #include "xhci-rzv2m.h"