Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 2 Oct 2019 22:31:49 +0200
From:   Sebastian Reichel <sre@kernel.org>
To:     Adam Ford <aford173@gmail.com>
Cc:     linux-bluetooth@vger.kernel.org, marcel@holtmann.org,
        johan.hedberg@gmail.com, linux-kernel@vger.kernel.org,
        adam.ford@logicpd.com
Subject: Re: [PATCH] Revert "Bluetooth: hci_ll: set operational frequency
 earlier"
Message-ID: <20191002203149.g22igmfndbve7m3n@earth.universe>
References: <20191002114626.12407-1-aford173@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="oce6v5i3llqwjvjc"
Content-Disposition: inline
In-Reply-To: <20191002114626.12407-1-aford173@gmail.com>
User-Agent: NeoMutt/20180716
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk


--oce6v5i3llqwjvjc
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

On Wed, Oct 02, 2019 at 06:46:26AM -0500, Adam Ford wrote:
> As nice as it would be to update firmware faster, that patch broke
> at least two different boards, an OMAP4+WL1285 based Motorola Droid
> 4, as reported by Sebasian Reichel and the Logic PD i.MX6Q +
> WL1837MOD.
>=20
> This reverts commit a2e02f38eff84f199c8e32359eb213f81f270047.
>
> Signed-off-by: Adam Ford <aford173@gmail.com>

Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>

This should be backported stable

-- Sebastian

> diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
> index 285706618f8a..d9a4c6c691e0 100644
> --- a/drivers/bluetooth/hci_ll.c
> +++ b/drivers/bluetooth/hci_ll.c
> @@ -621,13 +621,6 @@ static int ll_setup(struct hci_uart *hu)
> =20
>  	serdev_device_set_flow_control(serdev, true);
> =20
> -	if (hu->oper_speed)
> -		speed =3D hu->oper_speed;
> -	else if (hu->proto->oper_speed)
> -		speed =3D hu->proto->oper_speed;
> -	else
> -		speed =3D 0;
> -
>  	do {
>  		/* Reset the Bluetooth device */
>  		gpiod_set_value_cansleep(lldev->enable_gpio, 0);
> @@ -639,20 +632,6 @@ static int ll_setup(struct hci_uart *hu)
>  			return err;
>  		}
> =20
> -		if (speed) {
> -			__le32 speed_le =3D cpu_to_le32(speed);
> -			struct sk_buff *skb;
> -
> -			skb =3D __hci_cmd_sync(hu->hdev,
> -					     HCI_VS_UPDATE_UART_HCI_BAUDRATE,
> -					     sizeof(speed_le), &speed_le,
> -					     HCI_INIT_TIMEOUT);
> -			if (!IS_ERR(skb)) {
> -				kfree_skb(skb);
> -				serdev_device_set_baudrate(serdev, speed);
> -			}
> -		}
> -
>  		err =3D download_firmware(lldev);
>  		if (!err)
>  			break;
> @@ -677,7 +656,25 @@ static int ll_setup(struct hci_uart *hu)
>  	}
> =20
>  	/* Operational speed if any */
> +	if (hu->oper_speed)
> +		speed =3D hu->oper_speed;
> +	else if (hu->proto->oper_speed)
> +		speed =3D hu->proto->oper_speed;
> +	else
> +		speed =3D 0;
> +
> +	if (speed) {
> +		__le32 speed_le =3D cpu_to_le32(speed);
> +		struct sk_buff *skb;
> =20
> +		skb =3D __hci_cmd_sync(hu->hdev, HCI_VS_UPDATE_UART_HCI_BAUDRATE,
> +				     sizeof(speed_le), &speed_le,
> +				     HCI_INIT_TIMEOUT);
> +		if (!IS_ERR(skb)) {
> +			kfree_skb(skb);
> +			serdev_device_set_baudrate(serdev, speed);
> +		}
> +	}
> =20
>  	return 0;
>  }
> --=20
> 2.17.1
>=20

--oce6v5i3llqwjvjc
Content-Type: application/pgp-signature; name="signature.asc"

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

iQIzBAEBCgAdFiEE72YNB0Y/i3JqeVQT2O7X88g7+poFAl2VCSkACgkQ2O7X88g7
+priwg//WmOF0VYpnbAnBIyU0dH6K9I3h+5P5hx3bKGWzJo5y943l8m5CDt0Egq1
qvsw7K4b9SinxoG7Em1DVbhIEiuExf3bHqeX6tv+VlpFI1tmAPkrkuUPiItV4pRl
mAk142dQaiLNMlQNevvw9bx0lC0T1P2vWrjELRK9IWZWe4HshRhHc2jULBZNuQrP
SpZjEgZ6t6jr3U3NrFIgfHef9A6QClzsDsf8ekPBABsVm3FwJpf/UENsANi0oEE9
QseUbGmu65ROKtP7rRRB3tnlZfklQm71CHVHh6yChqeGLvgLmdvNpzV26v3vb0LH
vpU4Z4wvHUSlN9as1tJGQffzqyoH0E3E/3OrQjYZWIZbQCvU5+CjHiXsbj/Bw48U
cgXSWnXAMtE+1g04Tus2lGrNEAJQiOZcyGvpjaGKVaCbWEFjwQ5k4jUXFSIaVbh+
8rsoeeDkQxDPmWjf5XtVj4mQtDyEZcc4WZ+NoU4gMot4R733Yj29vd/V7AE6YTuT
qP/a1MygeuJ5YmLSpmPmcJ4dUNbVlCUQjBQUPkWeDPIMUdZsEUZmI5fv+f0ltZmJ
OsNccPHJLsfFJ2+s2TRk+XO4RnuQtpTNC+mrQkAQE72y4c3za6Jyhl10InmJ2fvM
Q7iV9O3i5Ovuk77ekTp9c4O6SOARLVEECtJNSglNirRpxhhP69k=
=gWno
-----END PGP SIGNATURE-----

--oce6v5i3llqwjvjc--