From: Francesco Dolcini <francesco@dolcini.it>
To: Jiri Slaby <jirislaby@kernel.org>
Cc: Francesco Dolcini <francesco@dolcini.it>,
Amitkumar Karwar <amitkumar.karwar@nxp.com>,
Neeraj Kale <neeraj.sanjaykale@nxp.com>,
Marcel Holtmann <marcel@holtmann.org>,
Johan Hedberg <johan.hedberg@gmail.com>,
Luiz Augusto von Dentz <luiz.dentz@gmail.com>,
Francesco Dolcini <francesco.dolcini@toradex.com>,
linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-serial@vger.kernel.org
Subject: Re: [PATCH v1 1/3] Bluetooth: btnxpuart: fix recv_buf() return value
Date: Tue, 28 Nov 2023 08:40:21 +0100 [thread overview]
Message-ID: <ZWWZZQUzZpnTm4i5@francesco-nb.int.toradex.com> (raw)
In-Reply-To: <5f2995d5-3c7c-4234-82ef-dd43bc73a730@kernel.org>
On Tue, Nov 28, 2023 at 06:23:21AM +0100, Jiri Slaby wrote:
> On 27. 11. 23, 20:14, Francesco Dolcini wrote:
> > From: Francesco Dolcini <francesco.dolcini@toradex.com>
> >
> > Serdev recv_buf() callback is supposed to return the amount of bytes
> > consumed, therefore an int in between 0 and count.
> >
> > Do not return negative number in case of issue, just print an error and
> > return count. This fixes a WARN in ttyport_receive_buf().
...
> > drivers/bluetooth/btnxpuart.c | 7 +++----
> > 1 file changed, 3 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/bluetooth/btnxpuart.c b/drivers/bluetooth/btnxpuart.c
> > index b7e66b7ac570..951fe3014a3f 100644
> > --- a/drivers/bluetooth/btnxpuart.c
> > +++ b/drivers/bluetooth/btnxpuart.c
> > @@ -1276,11 +1276,10 @@ static int btnxpuart_receive_buf(struct serdev_device *serdev, const u8 *data,
> > if (IS_ERR(nxpdev->rx_skb)) {
> > int err = PTR_ERR(nxpdev->rx_skb);
> > /* Safe to ignore out-of-sync bootloader signatures */
> > - if (is_fw_downloading(nxpdev))
> > - return count;
> > - bt_dev_err(nxpdev->hdev, "Frame reassembly failed (%d)", err);
> > + if (!is_fw_downloading(nxpdev))
> > + bt_dev_err(nxpdev->hdev, "Frame reassembly failed (%d)", err);
> > nxpdev->rx_skb = NULL;
>
> Is this NULLing not needed in the good case?
NULLing in the good case would be a bug, in addition to that NULLing is
not needed at all even in the bad case and it will be removed in the
last patch, as a cleanup. Here I just maintained the existing logic.
> > - return err;
> > + return count;
>
> Should you return 0? I don't know, maybe not
My reasoning is that we have some corrupted data, so we should just
use it all and maybe we'll get something valid at a later point, this is
what was already done before this change in the is_fw_downloading()
branch.
In my specific case it makes no difference, it will never recover from
this state.
Any other opinion?
> but you should document it in the commit log.
Ack
Francesco
next prev parent reply other threads:[~2023-11-28 7:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-27 19:14 [PATCH v1 0/3] Bluetooth: fix recv_buf() return value Francesco Dolcini
2023-11-27 19:14 ` [PATCH v1 1/3] Bluetooth: btnxpuart: " Francesco Dolcini
2023-11-27 19:24 ` Greg KH
2023-11-28 5:23 ` Jiri Slaby
2023-11-28 7:40 ` Francesco Dolcini [this message]
2023-11-27 19:14 ` [PATCH v1 2/3] Bluetooth: btmtkuart: " Francesco Dolcini
2023-11-27 19:23 ` [PATCH v1 0/3] Bluetooth: " Francesco Dolcini
2023-11-28 5:17 ` Jiri Slaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZWWZZQUzZpnTm4i5@francesco-nb.int.toradex.com \
--to=francesco@dolcini.it \
--cc=amitkumar.karwar@nxp.com \
--cc=francesco.dolcini@toradex.com \
--cc=jirislaby@kernel.org \
--cc=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
--cc=marcel@holtmann.org \
--cc=neeraj.sanjaykale@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox