pull request: bluetooth 2022-01-07

pull request: bluetooth 2022-01-07

[Luiz Augusto von Dentz]

The following changes since commit 710ad98c363a66a0cd8526465426c5c5f8377ee0:

  veth: Do not record rx queue hint in veth_xmit (2022-01-06 13:49:54 +0000)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git tags/for-net-next-2022-01-07

for you to fetch changes up to b9f9dbad0bd1c302d357fdd327c398f51f5fc2b1:

  Bluetooth: hci_sock: fix endian bug in hci_sock_setsockopt() (2022-01-07 08:41:38 +0100)

----------------------------------------------------------------
bluetooth-next pull request for net-next:

 - Add support for Foxconn QCA 0xe0d0
 - Fix HCI init sequence on MacBook Air 8,1 and 8,2
 - Fix Intel firmware loading on legacy ROM devices

----------------------------------------------------------------
Aaron Ma (1):
      Bluetooth: btusb: Add support for Foxconn QCA 0xe0d0

Aditya Garg (1):
      Bluetooth: btbcm: disable read tx power for MacBook Air 8,1 and 8,2

Dan Carpenter (2):
      Bluetooth: L2CAP: uninitialized variables in l2cap_sock_setsockopt()
      Bluetooth: hci_sock: fix endian bug in hci_sock_setsockopt()

Jiasheng Jiang (1):
      Bluetooth: hci_bcm: Check for error irq

Luiz Augusto von Dentz (1):
      Bluetooth: hci_event: Rework hci_inquiry_result_with_rssi_evt

Miaoqian Lin (1):
      Bluetooth: hci_qca: Fix NULL vs IS_ERR_OR_NULL check in qca_serdev_probe

Sai Teja Aluvala (1):
      Bluetooth: btqca: sequential validation

Tedd Ho-Jeong An (1):
      Bluetooth: btintel: Fix broken LED quirk for legacy ROM devices

 drivers/bluetooth/btbcm.c   | 12 ++++++++++++
 drivers/bluetooth/btintel.c | 20 ++++++++++---------
 drivers/bluetooth/btintel.h |  2 +-
 drivers/bluetooth/btqca.c   | 47 +++++++++++++++++++++++++++++++++++++++++++++
 drivers/bluetooth/btqca.h   |  2 ++
 drivers/bluetooth/btusb.c   | 16 ++++++++++++---
 drivers/bluetooth/hci_bcm.c |  7 ++++++-
 drivers/bluetooth/hci_qca.c |  6 +++---
 include/net/bluetooth/hci.h |  6 +-----
 net/bluetooth/hci_event.c   | 19 +++++++++---------
 net/bluetooth/hci_sock.c    |  5 +++--
 net/bluetooth/l2cap_sock.c  | 14 ++++++++------
 12 files changed, 116 insertions(+), 40 deletions(-)

Re: pull request: bluetooth 2022-01-07

[Jakub Kicinski]

On Fri,  7 Jan 2022 13:09:42 -0800 Luiz Augusto von Dentz wrote:
> The following changes since commit 710ad98c363a66a0cd8526465426c5c5f8377ee0:
> 
>   veth: Do not record rx queue hint in veth_xmit (2022-01-06 13:49:54 +0000)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git tags/for-net-next-2022-01-07
> 
> for you to fetch changes up to b9f9dbad0bd1c302d357fdd327c398f51f5fc2b1:
> 
>   Bluetooth: hci_sock: fix endian bug in hci_sock_setsockopt() (2022-01-07 08:41:38 +0100)
> 
> ----------------------------------------------------------------
> bluetooth-next pull request for net-next:
> 
>  - Add support for Foxconn QCA 0xe0d0
>  - Fix HCI init sequence on MacBook Air 8,1 and 8,2
>  - Fix Intel firmware loading on legacy ROM devices

A few warnings here that may be worth addressing - in particular this
one makes me feel that kbuild bot hasn't looked at the patches:

net/bluetooth/hci_sync.c:5143:5: warning: no previous prototype for ‘hci_le_ext_create_conn_sync’ [-Wmissing-prototypes]
 5143 | int hci_le_ext_create_conn_sync(struct hci_dev *hdev, struct hci_conn *conn,
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~

Also this Fixes tag could be mended:

Commit: 6845667146a2 ("Bluetooth: hci_qca: Fix NULL vs IS_ERR_OR_NULL check in qca_serdev_probe")
	Fixes tag: Fixes: 77131dfe ("Bluetooth: hci_qca: Replace devm_gpiod_get() with devm_gpiod_get_optional()")
	Has these problem(s):
		- SHA1 should be at least 12 digits long
		  Can be fixed by setting core.abbrev to 12 (or more) or (for git v2.11
		  or later) just making sure it is not set (or set to "auto").


Would you be able to fix the new warnings and resend the PR or are you
confident that there isn't much serious breakage here and follow ups
will be enough?

FWIW to see the new warnings check out net-next, do a allmodconfig build
with W=1 C=1, pull in your code, reset back to net-next (this will
"touch" all the files that need rebuilding), do a single threaded build
and save (2>file) the warnings, pull in your code, do another build
(2>file2), diff the warnings from the build of just net-next and after
pull.

Re: pull request: bluetooth 2022-01-07

[Luiz Augusto von Dentz]

Hi Jakub,

On Fri, Jan 7, 2022 at 6:27 PM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Fri,  7 Jan 2022 13:09:42 -0800 Luiz Augusto von Dentz wrote:
> > The following changes since commit 710ad98c363a66a0cd8526465426c5c5f8377ee0:
> >
> >   veth: Do not record rx queue hint in veth_xmit (2022-01-06 13:49:54 +0000)
> >
> > are available in the Git repository at:
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git tags/for-net-next-2022-01-07
> >
> > for you to fetch changes up to b9f9dbad0bd1c302d357fdd327c398f51f5fc2b1:
> >
> >   Bluetooth: hci_sock: fix endian bug in hci_sock_setsockopt() (2022-01-07 08:41:38 +0100)
> >
> > ----------------------------------------------------------------
> > bluetooth-next pull request for net-next:
> >
> >  - Add support for Foxconn QCA 0xe0d0
> >  - Fix HCI init sequence on MacBook Air 8,1 and 8,2
> >  - Fix Intel firmware loading on legacy ROM devices
>
> A few warnings here that may be worth addressing - in particular this
> one makes me feel that kbuild bot hasn't looked at the patches:
>
> net/bluetooth/hci_sync.c:5143:5: warning: no previous prototype for ‘hci_le_ext_create_conn_sync’ [-Wmissing-prototypes]
>  5143 | int hci_le_ext_create_conn_sync(struct hci_dev *hdev, struct hci_conn *conn,
>       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~

Interesting that it doesn't show up when I compile it, perhaps we need
to turn on some warnings?

> Also this Fixes tag could be mended:
>
> Commit: 6845667146a2 ("Bluetooth: hci_qca: Fix NULL vs IS_ERR_OR_NULL check in qca_serdev_probe")
>         Fixes tag: Fixes: 77131dfe ("Bluetooth: hci_qca: Replace devm_gpiod_get() with devm_gpiod_get_optional()")
>         Has these problem(s):
>                 - SHA1 should be at least 12 digits long
>                   Can be fixed by setting core.abbrev to 12 (or more) or (for git v2.11
>                   or later) just making sure it is not set (or set to "auto").

Right, I will check with Marcel why we didn't end up fixing up in place.

>
> Would you be able to fix the new warnings and resend the PR or are you
> confident that there isn't much serious breakage here and follow ups
> will be enough?

I think we might want to do the fixup but the one lacking a prototype
I'm afraid was caused by the previous PR, anyway I will try to send a
fix for that over the weekend.

> FWIW to see the new warnings check out net-next, do a allmodconfig build
> with W=1 C=1, pull in your code, reset back to net-next (this will
> "touch" all the files that need rebuilding), do a single threaded build
> and save (2>file) the warnings, pull in your code, do another build
> (2>file2), diff the warnings from the build of just net-next and after
> pull.

Hmm, we might as well do that in our CI then, but isn't that gonna
cause all sorts of warnings in different subsystem/drivers to appear?
I get that the diff should come clean if we do this 2 stage builds
like you suggested but I'm not sure that is the best approach for CI,
what do you think @An, Tedd? I'd guess we could keep our minimal
config to keep building times in check but add a 2 stage build per
patch so we can detect if they produce new warnings.

-- 
Luiz Augusto von Dentz

Re: pull request: bluetooth 2022-01-07

[Marcel Holtmann]

Hi Jakub,

>> The following changes since commit 710ad98c363a66a0cd8526465426c5c5f8377ee0:
>> 
>>  veth: Do not record rx queue hint in veth_xmit (2022-01-06 13:49:54 +0000)
>> 
>> are available in the Git repository at:
>> 
>>  git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git tags/for-net-next-2022-01-07
>> 
>> for you to fetch changes up to b9f9dbad0bd1c302d357fdd327c398f51f5fc2b1:
>> 
>>  Bluetooth: hci_sock: fix endian bug in hci_sock_setsockopt() (2022-01-07 08:41:38 +0100)
>> 
>> ----------------------------------------------------------------
>> bluetooth-next pull request for net-next:
>> 
>> - Add support for Foxconn QCA 0xe0d0
>> - Fix HCI init sequence on MacBook Air 8,1 and 8,2
>> - Fix Intel firmware loading on legacy ROM devices
> 
> A few warnings here that may be worth addressing - in particular this
> one makes me feel that kbuild bot hasn't looked at the patches:
> 
> net/bluetooth/hci_sync.c:5143:5: warning: no previous prototype for ‘hci_le_ext_create_conn_sync’ [-Wmissing-prototypes]
> 5143 | int hci_le_ext_create_conn_sync(struct hci_dev *hdev, struct hci_conn *conn,
>      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~

this we have to fix with a patch since none of the commits were touching this. It really must have slipped through earlier.

> Also this Fixes tag could be mended:
> 
> Commit: 6845667146a2 ("Bluetooth: hci_qca: Fix NULL vs IS_ERR_OR_NULL check in qca_serdev_probe")
> 	Fixes tag: Fixes: 77131dfe ("Bluetooth: hci_qca: Replace devm_gpiod_get() with devm_gpiod_get_optional()")
> 	Has these problem(s):
> 		- SHA1 should be at least 12 digits long
> 		  Can be fixed by setting core.abbrev to 12 (or more) or (for git v2.11
> 		  or later) just making sure it is not set (or set to "auto").

I fixed that now and re-pushed the tree. Funny part is that I always check that the Fixes SHA1 is actually valid, but I never thought about checking that it is at least 12 digits long. I totally missed that and keep it in mind going forward.

Regards

Marcel

Re: pull request: bluetooth 2022-01-07

[Luiz Augusto von Dentz]

Hi Marcel,

On Sat, Jan 8, 2022 at 6:41 AM Marcel Holtmann <marcel@holtmann.org> wrote:
>
> Hi Jakub,
>
> >> The following changes since commit 710ad98c363a66a0cd8526465426c5c5f8377ee0:
> >>
> >>  veth: Do not record rx queue hint in veth_xmit (2022-01-06 13:49:54 +0000)
> >>
> >> are available in the Git repository at:
> >>
> >>  git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git tags/for-net-next-2022-01-07
> >>
> >> for you to fetch changes up to b9f9dbad0bd1c302d357fdd327c398f51f5fc2b1:
> >>
> >>  Bluetooth: hci_sock: fix endian bug in hci_sock_setsockopt() (2022-01-07 08:41:38 +0100)
> >>
> >> ----------------------------------------------------------------
> >> bluetooth-next pull request for net-next:
> >>
> >> - Add support for Foxconn QCA 0xe0d0
> >> - Fix HCI init sequence on MacBook Air 8,1 and 8,2
> >> - Fix Intel firmware loading on legacy ROM devices
> >
> > A few warnings here that may be worth addressing - in particular this
> > one makes me feel that kbuild bot hasn't looked at the patches:
> >
> > net/bluetooth/hci_sync.c:5143:5: warning: no previous prototype for ‘hci_le_ext_create_conn_sync’ [-Wmissing-prototypes]
> > 5143 | int hci_le_ext_create_conn_sync(struct hci_dev *hdev, struct hci_conn *conn,
> >      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> this we have to fix with a patch since none of the commits were touching this. It really must have slipped through earlier.

Just sent a patch fixing the warning, once that is applied I will
create a new tag and send the pull request.

> > Also this Fixes tag could be mended:
> >
> > Commit: 6845667146a2 ("Bluetooth: hci_qca: Fix NULL vs IS_ERR_OR_NULL check in qca_serdev_probe")
> >       Fixes tag: Fixes: 77131dfe ("Bluetooth: hci_qca: Replace devm_gpiod_get() with devm_gpiod_get_optional()")
> >       Has these problem(s):
> >               - SHA1 should be at least 12 digits long
> >                 Can be fixed by setting core.abbrev to 12 (or more) or (for git v2.11
> >                 or later) just making sure it is not set (or set to "auto").
>
> I fixed that now and re-pushed the tree. Funny part is that I always check that the Fixes SHA1 is actually valid, but I never thought about checking that it is at least 12 digits long. I totally missed that and keep it in mind going forward.
>
> Regards
>
> Marcel
>


-- 
Luiz Augusto von Dentz

Re: pull request: bluetooth 2022-01-07

[Jakub Kicinski]

On Fri, 7 Jan 2022 23:50:40 -0800 Luiz Augusto von Dentz wrote:
> > FWIW to see the new warnings check out net-next, do a allmodconfig build
> > with W=1 C=1, pull in your code, reset back to net-next (this will
> > "touch" all the files that need rebuilding), do a single threaded build
> > and save (2>file) the warnings, pull in your code, do another build  
> > (2>file2), diff the warnings from the build of just net-next and after  
> > pull.  
> 
> Hmm, we might as well do that in our CI then, but isn't that gonna
> cause all sorts of warnings in different subsystem/drivers to appear?
> I get that the diff should come clean if we do this 2 stage builds
> like you suggested but I'm not sure that is the best approach for CI,
> what do you think @An, Tedd? I'd guess we could keep our minimal
> config to keep building times in check but add a 2 stage build per
> patch so we can detect if they produce new warnings.

FWIW if you use patchwork you can try to massage our scripts to do the
building: https://github.com/kuba-moo/nipa That said our setup is far
from perfect as well.

Re: pull request: bluetooth 2022-01-07

[Jakub Kicinski]

On Sat, 8 Jan 2022 15:40:59 +0100 Marcel Holtmann wrote:
> >> The following changes since commit 710ad98c363a66a0cd8526465426c5c5f8377ee0:
> >> 
> >>  veth: Do not record rx queue hint in veth_xmit (2022-01-06 13:49:54 +0000)
> >> 
> >> are available in the Git repository at:
> >> 
> >>  git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git tags/for-net-next-2022-01-07
> >> 
> >> for you to fetch changes up to b9f9dbad0bd1c302d357fdd327c398f51f5fc2b1:
> >> 
> >>  Bluetooth: hci_sock: fix endian bug in hci_sock_setsockopt() (2022-01-07 08:41:38 +0100)
> >> 
> >> ----------------------------------------------------------------
> >> bluetooth-next pull request for net-next:
> >> 
> >> - Add support for Foxconn QCA 0xe0d0
> >> - Fix HCI init sequence on MacBook Air 8,1 and 8,2
> >> - Fix Intel firmware loading on legacy ROM devices  
> > 
> > A few warnings here that may be worth addressing - in particular this
> > one makes me feel that kbuild bot hasn't looked at the patches:
> > 
> > net/bluetooth/hci_sync.c:5143:5: warning: no previous prototype for ‘hci_le_ext_create_conn_sync’ [-Wmissing-prototypes]
> > 5143 | int hci_le_ext_create_conn_sync(struct hci_dev *hdev, struct hci_conn *conn,
> >      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~  
> 
> this we have to fix with a patch since none of the commits were
> touching this. It really must have slipped through earlier.
> 
> > Also this Fixes tag could be mended:
> > 
> > Commit: 6845667146a2 ("Bluetooth: hci_qca: Fix NULL vs
> > IS_ERR_OR_NULL check in qca_serdev_probe") Fixes tag: Fixes:
> > 77131dfe ("Bluetooth: hci_qca: Replace devm_gpiod_get() with
> > devm_gpiod_get_optional()") Has these problem(s):
> > 		- SHA1 should be at least 12 digits long
> > 		  Can be fixed by setting core.abbrev to 12 (or
> > more) or (for git v2.11 or later) just making sure it is not set
> > (or set to "auto").  
> 
> I fixed that now and re-pushed the tree. Funny part is that I always
> check that the Fixes SHA1 is actually valid, but I never thought
> about checking that it is at least 12 digits long. I totally missed
> that and keep it in mind going forward.

You're right. I think our patchwork build bot got confused about the
direction of the merge and displayed old warnings :S You know what..
let me just pull this as is and we can take the fixes in the next PR,
then. Apologies for the extra work!

Re: pull request: bluetooth 2022-01-07

[Luiz Augusto von Dentz]

Hi Jakub,

On Sun, Jan 9, 2022 at 2:18 PM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Sat, 8 Jan 2022 15:40:59 +0100 Marcel Holtmann wrote:
> > >> The following changes since commit 710ad98c363a66a0cd8526465426c5c5f8377ee0:
> > >>
> > >>  veth: Do not record rx queue hint in veth_xmit (2022-01-06 13:49:54 +0000)
> > >>
> > >> are available in the Git repository at:
> > >>
> > >>  git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git tags/for-net-next-2022-01-07
> > >>
> > >> for you to fetch changes up to b9f9dbad0bd1c302d357fdd327c398f51f5fc2b1:
> > >>
> > >>  Bluetooth: hci_sock: fix endian bug in hci_sock_setsockopt() (2022-01-07 08:41:38 +0100)
> > >>
> > >> ----------------------------------------------------------------
> > >> bluetooth-next pull request for net-next:
> > >>
> > >> - Add support for Foxconn QCA 0xe0d0
> > >> - Fix HCI init sequence on MacBook Air 8,1 and 8,2
> > >> - Fix Intel firmware loading on legacy ROM devices
> > >
> > > A few warnings here that may be worth addressing - in particular this
> > > one makes me feel that kbuild bot hasn't looked at the patches:
> > >
> > > net/bluetooth/hci_sync.c:5143:5: warning: no previous prototype for ‘hci_le_ext_create_conn_sync’ [-Wmissing-prototypes]
> > > 5143 | int hci_le_ext_create_conn_sync(struct hci_dev *hdev, struct hci_conn *conn,
> > >      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> >
> > this we have to fix with a patch since none of the commits were
> > touching this. It really must have slipped through earlier.
> >
> > > Also this Fixes tag could be mended:
> > >
> > > Commit: 6845667146a2 ("Bluetooth: hci_qca: Fix NULL vs
> > > IS_ERR_OR_NULL check in qca_serdev_probe") Fixes tag: Fixes:
> > > 77131dfe ("Bluetooth: hci_qca: Replace devm_gpiod_get() with
> > > devm_gpiod_get_optional()") Has these problem(s):
> > >             - SHA1 should be at least 12 digits long
> > >               Can be fixed by setting core.abbrev to 12 (or
> > > more) or (for git v2.11 or later) just making sure it is not set
> > > (or set to "auto").
> >
> > I fixed that now and re-pushed the tree. Funny part is that I always
> > check that the Fixes SHA1 is actually valid, but I never thought
> > about checking that it is at least 12 digits long. I totally missed
> > that and keep it in mind going forward.
>
> You're right. I think our patchwork build bot got confused about the
> direction of the merge and displayed old warnings :S You know what..
> let me just pull this as is and we can take the fixes in the next PR,
> then. Apologies for the extra work!

Im planning to send a new pull request later today, that should
address the warning and also takes cares of sort hash since that has
been fixup in place.

-- 
Luiz Augusto von Dentz

Re: pull request: bluetooth 2022-01-07

[Jakub Kicinski]

On Sun, 9 Jan 2022 18:46:05 -0800 Luiz Augusto von Dentz wrote:
> > You're right. I think our patchwork build bot got confused about the
> > direction of the merge and displayed old warnings :S You know what..
> > let me just pull this as is and we can take the fixes in the next PR,
> > then. Apologies for the extra work!  
> 
> Im planning to send a new pull request later today, that should
> address the warning and also takes cares of sort hash since that has
> been fixup in place.

But I already pulled..

Re: pull request: bluetooth 2022-01-07

[Luiz Augusto von Dentz]

Hi Jakub,

On Sun, Jan 9, 2022 at 6:56 PM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Sun, 9 Jan 2022 18:46:05 -0800 Luiz Augusto von Dentz wrote:
> > > You're right. I think our patchwork build bot got confused about the
> > > direction of the merge and displayed old warnings :S You know what..
> > > let me just pull this as is and we can take the fixes in the next PR,
> > > then. Apologies for the extra work!
> >
> > Im planning to send a new pull request later today, that should
> > address the warning and also takes cares of sort hash since that has
> > been fixup in place.
>
> But I already pulled..

Nevermind then, shall I send the warning fix directly to net-next
then? Or you actually pulled the head of bluetooth-next not tag?

-- 
Luiz Augusto von Dentz

Re: pull request: bluetooth 2022-01-07

[Jakub Kicinski]

On Sun, 9 Jan 2022 19:57:20 -0800 Luiz Augusto von Dentz wrote:
> On Sun, Jan 9, 2022 at 6:56 PM Jakub Kicinski <kuba@kernel.org> wrote:
> > > Im planning to send a new pull request later today, that should
> > > address the warning and also takes cares of sort hash since that has
> > > been fixup in place.  
> >
> > But I already pulled..  
> 
> Nevermind then, shall I send the warning fix directly to net-next
> then?

Maybe send it in a week or so with other fixes which accumulate
up to that point?

> Or you actually pulled the head of bluetooth-next not tag?

I pulled the tag.

Re: pull request: bluetooth 2022-01-07

[Luiz Augusto von Dentz]

Hi Jakub,

On Sun, Jan 9, 2022 at 9:53 PM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Sun, 9 Jan 2022 19:57:20 -0800 Luiz Augusto von Dentz wrote:
> > On Sun, Jan 9, 2022 at 6:56 PM Jakub Kicinski <kuba@kernel.org> wrote:
> > > > Im planning to send a new pull request later today, that should
> > > > address the warning and also takes cares of sort hash since that has
> > > > been fixup in place.
> > >
> > > But I already pulled..
> >
> > Nevermind then, shall I send the warning fix directly to net-next
> > then?
>
> Maybe send it in a week or so with other fixes which accumulate
> up to that point?
>
> > Or you actually pulled the head of bluetooth-next not tag?
>
> I pulled the tag.

Fair enough, if you would like to merge the warning fix here is the commit:

https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/commit/?id=219de95995fb6526b96687c5001f61fe41bed41e

-- 
Luiz Augusto von Dentz