From: Geert Uytterhoeven <geert@linux-m68k.org> To: Finn Thain <fthain@telegraphics.com.au> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Michael Ellerman <mpe@ellerman.id.au>, Joshua Thompson <funaho@jurai.org>, linuxppc-dev <linuxppc-dev@lists.ozlabs.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Subject: Re: [PATCH] macintosh/adb-iop: Always wait for reply message from IOP Date: Fri, 4 Dec 2020 11:08:11 +0100 [thread overview] Message-ID: <CAMuHMdX5yUaCWYsM7WgatYSDLZMcSckugOQxBBnBZOB_eJm=1g@mail.gmail.com> (raw) In-Reply-To: <0f0a25855391e7eaa53a50f651aea0124e8525dd.1605847196.git.fthain@telegraphics.com.au> Hi Finn, On Fri, Nov 20, 2020 at 5:54 AM Finn Thain <fthain@telegraphics.com.au> wrote: > A recent patch incorrectly altered the adb-iop state machine behaviour > and introduced a regression that can appear intermittently as a > malfunctioning ADB input device. This seems to be caused when reply > packets from different ADB commands become mixed up, especially during > the adb bus scan. Fix this by unconditionally entering the awaiting_reply > state after sending an explicit command, even when the ADB command won't > generate a reply from the ADB device. > > Cc: Joshua Thompson <funaho@jurai.org> > Fixes: e2954e5f727f ("macintosh/adb-iop: Implement sending -> idle state transition") > Tested-by: Stan Johnson <userm57@yahoo.com> > Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Thanks for your patch! > --- a/drivers/macintosh/adb-iop.c > +++ b/drivers/macintosh/adb-iop.c > @@ -84,10 +84,7 @@ static void adb_iop_complete(struct iop_msg *msg) > > local_irq_save(flags); > > - if (current_req->reply_expected) > - adb_iop_state = awaiting_reply; > - else > - adb_iop_done(); > + adb_iop_state = awaiting_reply; > > local_irq_restore(flags); > } > @@ -95,8 +92,9 @@ static void adb_iop_complete(struct iop_msg *msg) > /* > * Listen for ADB messages from the IOP. > * > - * This will be called when unsolicited messages (usually replies to TALK > - * commands or autopoll packets) are received. > + * This will be called when unsolicited IOP messages are received. > + * These IOP messages can carry ADB autopoll responses and also occur > + * after explicit ADB commands. > */ > > static void adb_iop_listen(struct iop_msg *msg) > @@ -123,8 +121,10 @@ static void adb_iop_listen(struct iop_msg *msg) > if (adb_iop_state == awaiting_reply) { > struct adb_request *req = current_req; > > - req->reply_len = amsg->count + 1; > - memcpy(req->reply, &amsg->cmd, req->reply_len); > + if (req->reply_expected) { > + req->reply_len = amsg->count + 1; > + memcpy(req->reply, &amsg->cmd, req->reply_len); > + } So if we're not expecting a reply. It's ignored. Just wondering: what kind of messages are being dropped? If reply packets from different ADB commands become mixed up, they are still (expected?) replies to messages we sent before. Why shouldn't we depend on receiving the replies? > > req_done = true; > } Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
WARNING: multiple messages have this Message-ID (diff)
From: Geert Uytterhoeven <geert@linux-m68k.org> To: Finn Thain <fthain@telegraphics.com.au> Cc: linuxppc-dev <linuxppc-dev@lists.ozlabs.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Joshua Thompson <funaho@jurai.org> Subject: Re: [PATCH] macintosh/adb-iop: Always wait for reply message from IOP Date: Fri, 4 Dec 2020 11:08:11 +0100 [thread overview] Message-ID: <CAMuHMdX5yUaCWYsM7WgatYSDLZMcSckugOQxBBnBZOB_eJm=1g@mail.gmail.com> (raw) In-Reply-To: <0f0a25855391e7eaa53a50f651aea0124e8525dd.1605847196.git.fthain@telegraphics.com.au> Hi Finn, On Fri, Nov 20, 2020 at 5:54 AM Finn Thain <fthain@telegraphics.com.au> wrote: > A recent patch incorrectly altered the adb-iop state machine behaviour > and introduced a regression that can appear intermittently as a > malfunctioning ADB input device. This seems to be caused when reply > packets from different ADB commands become mixed up, especially during > the adb bus scan. Fix this by unconditionally entering the awaiting_reply > state after sending an explicit command, even when the ADB command won't > generate a reply from the ADB device. > > Cc: Joshua Thompson <funaho@jurai.org> > Fixes: e2954e5f727f ("macintosh/adb-iop: Implement sending -> idle state transition") > Tested-by: Stan Johnson <userm57@yahoo.com> > Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Thanks for your patch! > --- a/drivers/macintosh/adb-iop.c > +++ b/drivers/macintosh/adb-iop.c > @@ -84,10 +84,7 @@ static void adb_iop_complete(struct iop_msg *msg) > > local_irq_save(flags); > > - if (current_req->reply_expected) > - adb_iop_state = awaiting_reply; > - else > - adb_iop_done(); > + adb_iop_state = awaiting_reply; > > local_irq_restore(flags); > } > @@ -95,8 +92,9 @@ static void adb_iop_complete(struct iop_msg *msg) > /* > * Listen for ADB messages from the IOP. > * > - * This will be called when unsolicited messages (usually replies to TALK > - * commands or autopoll packets) are received. > + * This will be called when unsolicited IOP messages are received. > + * These IOP messages can carry ADB autopoll responses and also occur > + * after explicit ADB commands. > */ > > static void adb_iop_listen(struct iop_msg *msg) > @@ -123,8 +121,10 @@ static void adb_iop_listen(struct iop_msg *msg) > if (adb_iop_state == awaiting_reply) { > struct adb_request *req = current_req; > > - req->reply_len = amsg->count + 1; > - memcpy(req->reply, &amsg->cmd, req->reply_len); > + if (req->reply_expected) { > + req->reply_len = amsg->count + 1; > + memcpy(req->reply, &amsg->cmd, req->reply_len); > + } So if we're not expecting a reply. It's ignored. Just wondering: what kind of messages are being dropped? If reply packets from different ADB commands become mixed up, they are still (expected?) replies to messages we sent before. Why shouldn't we depend on receiving the replies? > > req_done = true; > } Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
next prev parent reply other threads:[~2020-12-04 10:09 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-20 4:39 [PATCH] macintosh/adb-iop: Always wait for reply message from IOP Finn Thain 2020-11-20 4:39 ` Finn Thain 2020-12-04 10:08 ` Geert Uytterhoeven [this message] 2020-12-04 10:08 ` Geert Uytterhoeven 2020-12-05 3:09 ` Finn Thain 2020-12-05 3:09 ` Finn Thain
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='CAMuHMdX5yUaCWYsM7WgatYSDLZMcSckugOQxBBnBZOB_eJm=1g@mail.gmail.com' \ --to=geert@linux-m68k.org \ --cc=benh@kernel.crashing.org \ --cc=fthain@telegraphics.com.au \ --cc=funaho@jurai.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.