Received-SPF: pass (google.com: domain of linux-kernel+bounces-159507-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Fri, 26 Apr 2024 14:48:48 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Krishna Kurapati
 <quic_kriskura@quicinc.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Subject: linux-next: manual merge of the usb tree with the usb.current tree
Message-ID: <20240426144848.42539084@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/MSf8mbwjGh7ewI70lSjVUnn";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/MSf8mbwjGh7ewI70lSjVUnn
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the usb tree got a conflict in:

  drivers/usb/dwc3/core.c

between commit:

  6d735722063a ("usb: dwc3: core: Prevent phy suspend during init")

from the usb.current tree and commit:

  30a46746ca5a ("usb: dwc3: core: Refactor PHY logic to support Multiport C=
ontroller")

from the usb tree.

I fixed it up (I think - see below) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/usb/dwc3/core.c
index 100041320e8d,4dc6fc79c6d9..000000000000
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@@ -104,27 -105,6 +105,30 @@@ static int dwc3_get_dr_mode(struct dwc
  	return 0;
  }
 =20
 +void dwc3_enable_susphy(struct dwc3 *dwc, bool enable)
 +{
 +	u32 reg;
++	int i;
 +
- 	reg =3D dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0));
- 	if (enable && !dwc->dis_u3_susphy_quirk)
- 		reg |=3D DWC3_GUSB3PIPECTL_SUSPHY;
- 	else
- 		reg &=3D ~DWC3_GUSB3PIPECTL_SUSPHY;
++	for (i =3D 0; i < dwc->num_usb3_ports; i++) {
++		reg =3D dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(i));
++		if (enable && !dwc->dis_u3_susphy_quirk)
++			reg |=3D DWC3_GUSB3PIPECTL_SUSPHY;
++		else
++			reg &=3D ~DWC3_GUSB3PIPECTL_SUSPHY;
++		dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(i), reg);
++	}
 +
- 	dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg);
-=20
- 	reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
- 	if (enable && !dwc->dis_u2_susphy_quirk)
- 		reg |=3D DWC3_GUSB2PHYCFG_SUSPHY;
- 	else
- 		reg &=3D ~DWC3_GUSB2PHYCFG_SUSPHY;
-=20
- 	dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
++	for (i =3D 0; i < dwc->num_usb2_ports; i++) {
++		reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(i));
++		if (enable && !dwc->dis_u2_susphy_quirk)
++			reg |=3D DWC3_GUSB2PHYCFG_SUSPHY;
++		else
++			reg &=3D ~DWC3_GUSB2PHYCFG_SUSPHY;
++		dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg);
++	}
 +}
 +
  void dwc3_set_prtcap(struct dwc3 *dwc, u32 mode)
  {
  	u32 reg;
@@@ -596,19 -594,14 +618,11 @@@ static int dwc3_core_ulpi_init(struct d
  	return ret;
  }
 =20
- /**
-  * dwc3_phy_setup - Configure USB PHY Interface of DWC3 Core
-  * @dwc: Pointer to our controller context structure
-  *
-  * Returns 0 on success. The USB PHY interfaces are configured but not
-  * initialized. The PHY interfaces and the PHYs get initialized together =
with
-  * the core in dwc3_core_init.
-  */
- static int dwc3_phy_setup(struct dwc3 *dwc)
+ static int dwc3_ss_phy_setup(struct dwc3 *dwc, int index)
  {
 -	unsigned int hw_mode;
  	u32 reg;
 =20
- 	reg =3D dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0));
 -	hw_mode =3D DWC3_GHWPARAMS0_MODE(dwc->hwparams.hwparams0);
 -
+ 	reg =3D dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(index));
 =20
  	/*
  	 * Make sure UX_EXIT_PX is cleared as that causes issues with some

--Sig_/MSf8mbwjGh7ewI70lSjVUnn
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYrMjAACgkQAVBC80lX
0GxUlQf7Bps09f2YPz14hSjRHunWPt1Rdinyg7YIJjURyWA5jK6x22n4rOObioZw
5Vi7BbXT1fYzUsZ4JdSwoKKvn0HPo5q7TN9Y7zV1I+1r7kWxOQ9qdmPeiCkOefa3
7vHFXiHE+wcsWOEuElbqyoc9n0P/9ak3o0FyaEof5a03AhhFAcmY4vkNx9Ar+5VI
LXLXjJ7wFeB3F1ghFGoUBbfMjKZtEUHjRaGROVab2kdVlbsGHnz8m3KZIJeXhPBv
EePxt1gqN8Sq6p1nWP2NVqFuGWgePctnFfsqRspxNqGXafO+zffKLv145B49XHgB
7bF2LQS/B+JIYULKnegT4q5tnL3Lew==
=JKky
-----END PGP SIGNATURE-----

--Sig_/MSf8mbwjGh7ewI70lSjVUnn--