2024-03-25 20:16:43

by Johan Hovold

[permalink] [raw]
Subject: Re: [PATCH] Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT"

On Mon, Mar 25, 2024 at 04:07:03PM -0400, Luiz Augusto von Dentz wrote:
> On Mon, Mar 25, 2024 at 3:48 PM Johan Hovold <[email protected]> wrote:
> > On Mon, Mar 25, 2024 at 03:39:03PM -0400, Luiz Augusto von Dentz wrote:
> > > On Mon, Mar 25, 2024 at 1:24 PM Johan Hovold <[email protected]> wrote:
> > > > On Mon, Mar 25, 2024 at 01:10:13PM -0400, Luiz Augusto von Dentz wrote:
> >
> > > > > I guess the following is the latest version:
> > > > >
> > > > > https://patchwork.kernel.org/project/bluetooth/list/?series=836664
> > > > >
> > > > > Or are you working on a v5?
> > > >
> > > > This patch (revert) fixes a separate issue than the series you link to
> > > > above, but it is also a prerequisite for that series.
> > > >
> > > > v4 is indeed the latest version, and it has been acked by Rob and Bjorn
> > > > so you can take it all through the Bluetooth tree. Just remember to
> > > > apply this patch (the revert) first.
> > >
> > > Doesn't seem to apply cleanly:
> > >
> > > Applying: Bluetooth: qca: fix device-address endianness
> > > error: patch failed: drivers/bluetooth/hci_qca.c:1904
> > > error: drivers/bluetooth/hci_qca.c: patch does not apply
> > > Patch failed at 0004 Bluetooth: qca: fix device-address endianness
> >
> > Did you apply this patch (the revert) before trying to apply the series?
>
> Probably needs rebasing:
>
> Applying: Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT"
> error: drivers/bluetooth/hci_qca.c: does not match index
> Patch failed at 0001 Revert "Bluetooth: hci_qca: Set BDA quirk bit if
> fwnode exists in DT"

I just verified that it applies cleanly to 6.9-rc1.

$ git checkout tmp v6.9-rc1
$ b4 am -sl [email protected]
...
$ git am ./20240314_johan_linaro_revert_bluetooth_hci_qca_set_bda_quirk_bit_if_fwnode_exists_in_dt.mbx
Applying: Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT"
$ b4 am -sl [email protected]
...
$ git am ./v4_20240320_johan_linaro_bluetooth_qca_fix_device_address_endianness.mbx
Applying: dt-bindings: bluetooth: add 'qcom,local-bd-address-broken'
Applying: arm64: dts: qcom: sc7180-trogdor: mark bluetooth address as broken
Applying: Bluetooth: add quirk for broken address properties
Applying: Bluetooth: qca: fix device-address endianness

Do you have anything else in your tree which may interfere? What tree is
that exactly?

Johan