Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230424133542.14383-1-johan+linaro@kernel.org> <20230424133542.14383-2-johan+linaro@kernel.org>
In-Reply-To: <20230424133542.14383-2-johan+linaro@kernel.org>
From:   Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date:   Tue, 2 May 2023 16:44:48 -0700
Message-ID: <CABBYNZ++1hjeP9r-3Y4j6gPx42-Gk6dNZOYzuRe5bgdz+YHL6g@mail.gmail.com>
Subject: Re: [PATCH 1/2] Bluetooth: fix invalid-bdaddr quirk for
 non-persistent setup
To:     Johan Hovold <johan+linaro@kernel.org>
Cc:     Marcel Holtmann <marcel@holtmann.org>,
        Johan Hedberg <johan.hedberg@gmail.com>,
        Matthias Kaehlcke <mka@chromium.org>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org,
        netdev@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi Johan,

On Mon, Apr 24, 2023 at 6:35=E2=80=AFAM Johan Hovold <johan+linaro@kernel.o=
rg> wrote:
>
> Devices that lack persistent storage for the device address can indicate
> this by setting the HCI_QUIRK_INVALID_BDADDR which causes the controller
> to be marked as unconfigured until user space has set a valid address.
>
> Once configured, the device address must be set on every setup for
> controllers with HCI_QUIRK_NON_PERSISTENT_SETUP to avoid marking the
> controller as unconfigured and requiring the address to be set again.
>
> Fixes: 740011cfe948 ("Bluetooth: Add new quirk for non-persistent setup s=
ettings")
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
> ---
>  net/bluetooth/hci_sync.c | 28 +++++++++++-----------------
>  1 file changed, 11 insertions(+), 17 deletions(-)
>
> diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
> index a8785126df75..f45598b5a532 100644
> --- a/net/bluetooth/hci_sync.c
> +++ b/net/bluetooth/hci_sync.c
> @@ -4573,23 +4573,17 @@ static int hci_dev_setup_sync(struct hci_dev *hde=
v)
>         invalid_bdaddr =3D test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quir=
ks);
>
>         if (!ret) {
> -               if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks=
)) {
> -                       if (!bacmp(&hdev->public_addr, BDADDR_ANY))
> -                               hci_dev_get_bd_addr_from_property(hdev);
> -
> -                       if (bacmp(&hdev->public_addr, BDADDR_ANY) &&
> -                           hdev->set_bdaddr) {
> -                               ret =3D hdev->set_bdaddr(hdev,
> -                                                      &hdev->public_addr=
);
> -
> -                               /* If setting of the BD_ADDR from the dev=
ice
> -                                * property succeeds, then treat the addr=
ess
> -                                * as valid even if the invalid BD_ADDR
> -                                * quirk indicates otherwise.
> -                                */
> -                               if (!ret)
> -                                       invalid_bdaddr =3D false;
> -                       }
> +               if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks=
) &&
> +                   !bacmp(&hdev->public_addr, BDADDR_ANY))
> +                       hci_dev_get_bd_addr_from_property(hdev);
> +
> +               if ((invalid_bdaddr ||
> +                    test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirk=
s)) &&
> +                   bacmp(&hdev->public_addr, BDADDR_ANY) &&
> +                   hdev->set_bdaddr) {
> +                       ret =3D hdev->set_bdaddr(hdev, &hdev->public_addr=
);
> +                       if (!ret)
> +                               invalid_bdaddr =3D false;

I'd keep the original comments since it appears you haven't changed
its logic with respect to invalid_bdaddr.

>                 }
>         }
>
> --
> 2.39.2
>


--=20
Luiz Augusto von Dentz