Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-5215-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Message-ID: <74eb0c7120f0f26db090810be2386eadd7137495.camel@iki.fi>
Subject: Re: [PATCH] Bluetooth: fix connection setup in l2cap_connect
From: Pauli Virtanen <pav@iki.fi>
To: Timo =?ISO-8859-1?Q?Schr=F6der?= <der.timosch@gmail.com>
Cc: linux-bluetooth@vger.kernel.org, stable@vger.kernel.org, 
	luiz.von.dentz@intel.com
Date: Sun, 09 Jun 2024 18:01:32 +0300
In-Reply-To: <CAGew7Bsdb4iOKrZ+1pBRXs38+GwVJDgQh7N1Zn4DP73fZ_ejeA@mail.gmail.com>
References: 
	<CAGew7BttU+g40uRnSCN5XmbXs1KX1ZBbz+xyXC_nw5p4dR2dGA@mail.gmail.com>
	 <de9169c3e607696a9430f5beb182c914c136edcf.1717883849.git.pav@iki.fi>
	 <CAGew7Bsdb4iOKrZ+1pBRXs38+GwVJDgQh7N1Zn4DP73fZ_ejeA@mail.gmail.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.52.2 (3.52.2-1.fc40) 
Precedence: bulk
MIME-Version: 1.0

Hi,

su, 2024-06-09 kello 14:49 +0200, Timo Schr=C3=B6der kirjoitti:
> Hi Pauli,
>=20
> unfortunately it doesn't fix the issue. I'm still experiencing the
> same behaviour. I attached btmon traces and bluetoothd log.

Right, sorry, I see now the patch is wrong and did it for the wrong if
branch... I'll send a v2.

	Pauli

>=20
> Best regards,
> Timo
>=20
> Am So., 9. Juni 2024 um 00:02 Uhr schrieb Pauli Virtanen <pav@iki.fi>:
> >=20
> > The amp_id argument of l2cap_connect() was removed in
> > commit 84a4bb6548a2 ("Bluetooth: HCI: Remove HCI_AMP support")
> >=20
> > It was always called with amp_id =3D=3D 0, i.e. AMP_ID_BREDR =3D=3D 0x0=
0 (ie.
> > non-AMP controller).  In the above commit, the code path for amp_id !=
=3D 0
> > was preserved, although it should have used the amp_id =3D=3D 0 one.
> >=20
> > Restore the previous behavior of the non-AMP code path, to fix problems
> > with L2CAP connections.
> >=20
> > Fixes: 84a4bb6548a2 ("Bluetooth: HCI: Remove HCI_AMP support")
> > Signed-off-by: Pauli Virtanen <pav@iki.fi>
> > ---
> >=20
> > Notes:
> >     Tried proofreading the commit, and this part seemed suspicious.
> >     Can you try if this fixes the problem?
> >=20
> >  net/bluetooth/l2cap_core.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >=20
> > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> > index c49e0d4b3c0d..fc633feb12a1 100644
> > --- a/net/bluetooth/l2cap_core.c
> > +++ b/net/bluetooth/l2cap_core.c
> > @@ -4016,8 +4016,8 @@ static void l2cap_connect(struct l2cap_conn *conn=
, struct l2cap_cmd_hdr *cmd,
> >                                 status =3D L2CAP_CS_NO_INFO;
> >                         }
> >                 } else {
> > -                       l2cap_state_change(chan, BT_CONNECT2);
> > -                       result =3D L2CAP_CR_PEND;
> > +                       l2cap_state_change(chan, BT_CONFIG);
> > +                       result =3D L2CAP_CR_SUCCESS;
> >                         status =3D L2CAP_CS_AUTHEN_PEND;
> >                 }
> >         } else {
> > --
> > 2.45.2
> >=20