| Message ID | 20201009040001.310868-8-amitay@ozlabs.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Fix thread status for sbefifo thread driver | expand |
On Fri, 9 Oct 2020 at 04:01, Amitay Isaacs <amitay@ozlabs.org> wrote: > > Signed-off-by: Amitay Isaacs <amitay@ozlabs.org> Reviewed-by: Joel Stanley <joel@jms.id.au> > --- > libpdbg/sbefifo.c | 41 ++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 38 insertions(+), 3 deletions(-) > > diff --git a/libpdbg/sbefifo.c b/libpdbg/sbefifo.c > index 8c9f467..fae2ab7 100644 > --- a/libpdbg/sbefifo.c > +++ b/libpdbg/sbefifo.c > @@ -291,6 +291,7 @@ static int sbefifo_thread_probe(struct pdbg_target *target) > struct thread *thread = target_to_thread(target); > > thread->id = pdbg_target_index(target); > + thread->status = thread->state(thread); > > return 0; > } > @@ -328,18 +329,42 @@ static struct thread_state sbefifo_thread_state(struct thread *thread) > > static int sbefifo_thread_start(struct thread *thread) > { > - return sbefifo_thread_op(thread, SBEFIFO_INSN_OP_START); > + int rc; > + > + /* Can only start if a thread is quiesced */ > + if (!(thread->status.quiesced)) > + return 1; > + > + rc = sbefifo_thread_op(thread, SBEFIFO_INSN_OP_START); > + > + thread->status = thread->state(thread); > + > + return rc; > } > > static int sbefifo_thread_stop(struct thread *thread) > { > - return sbefifo_thread_op(thread, SBEFIFO_INSN_OP_STOP); > + int rc; > + > + rc = sbefifo_thread_op(thread, SBEFIFO_INSN_OP_STOP); > + > + thread->status = thread->state(thread); > + > + return rc; > } > > static int sbefifo_thread_step(struct thread *thread, int count) > { > int i, rc = 0; > > + /* Can only step if a thread is quiesced */ > + if (!(thread->status.quiesced)) > + return 1; > + > + /* Core must be active to step */ > + if (!(thread->status.active)) > + return 1; > + > for (i = 0; i < count; i++) > rc |= sbefifo_thread_op(thread, SBEFIFO_INSN_OP_STEP); > > @@ -348,7 +373,17 @@ static int sbefifo_thread_step(struct thread *thread, int count) > > static int sbefifo_thread_sreset(struct thread *thread) > { > - return sbefifo_thread_op(thread, SBEFIFO_INSN_OP_SRESET); > + int rc; > + > + /* Can only sreset if a thread is quiesced */ > + if (!(thread->status.quiesced)) > + return 1; > + > + rc = sbefifo_thread_op(thread, SBEFIFO_INSN_OP_SRESET); > + > + thread->status = thread->state(thread); > + > + return rc; > } > > static int sbefifo_thread_getregs(struct thread *thread, struct thread_regs *regs) > -- > 2.26.2 > > -- > Pdbg mailing list > Pdbg@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/pdbg
diff --git a/libpdbg/sbefifo.c b/libpdbg/sbefifo.c index 8c9f467..fae2ab7 100644 --- a/libpdbg/sbefifo.c +++ b/libpdbg/sbefifo.c @@ -291,6 +291,7 @@ static int sbefifo_thread_probe(struct pdbg_target *target) struct thread *thread = target_to_thread(target); thread->id = pdbg_target_index(target); + thread->status = thread->state(thread); return 0; } @@ -328,18 +329,42 @@ static struct thread_state sbefifo_thread_state(struct thread *thread) static int sbefifo_thread_start(struct thread *thread) { - return sbefifo_thread_op(thread, SBEFIFO_INSN_OP_START); + int rc; + + /* Can only start if a thread is quiesced */ + if (!(thread->status.quiesced)) + return 1; + + rc = sbefifo_thread_op(thread, SBEFIFO_INSN_OP_START); + + thread->status = thread->state(thread); + + return rc; } static int sbefifo_thread_stop(struct thread *thread) { - return sbefifo_thread_op(thread, SBEFIFO_INSN_OP_STOP); + int rc; + + rc = sbefifo_thread_op(thread, SBEFIFO_INSN_OP_STOP); + + thread->status = thread->state(thread); + + return rc; } static int sbefifo_thread_step(struct thread *thread, int count) { int i, rc = 0; + /* Can only step if a thread is quiesced */ + if (!(thread->status.quiesced)) + return 1; + + /* Core must be active to step */ + if (!(thread->status.active)) + return 1; + for (i = 0; i < count; i++) rc |= sbefifo_thread_op(thread, SBEFIFO_INSN_OP_STEP); @@ -348,7 +373,17 @@ static int sbefifo_thread_step(struct thread *thread, int count) static int sbefifo_thread_sreset(struct thread *thread) { - return sbefifo_thread_op(thread, SBEFIFO_INSN_OP_SRESET); + int rc; + + /* Can only sreset if a thread is quiesced */ + if (!(thread->status.quiesced)) + return 1; + + rc = sbefifo_thread_op(thread, SBEFIFO_INSN_OP_SRESET); + + thread->status = thread->state(thread); + + return rc; } static int sbefifo_thread_getregs(struct thread *thread, struct thread_regs *regs)
Signed-off-by: Amitay Isaacs <amitay@ozlabs.org> --- libpdbg/sbefifo.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-)