[Qemu-devel] [PULL 0/5] OpenRISC SMP Support

Stafford Horne posted 5 patches 6 years, 6 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
default-configs/or1k-softmmu.mak |   1 +
hw/intc/Makefile.objs            |   1 +
hw/intc/ompic.c                  | 179 +++++++++++++++++++++++++++++++++++++++
hw/openrisc/cputimer.c           |  64 ++++++++++----
hw/openrisc/openrisc_sim.c       |  84 +++++++++++++-----
target/openrisc/cpu.c            |   1 -
target/openrisc/cpu.h            |   4 +-
target/openrisc/machine.c        |   1 -
target/openrisc/sys_helper.c     |   9 +-
9 files changed, 298 insertions(+), 46 deletions(-)
create mode 100644 hw/intc/ompic.c
[Qemu-devel] [PULL 0/5] OpenRISC SMP Support
Posted by Stafford Horne 6 years, 6 months ago
Hello,

Please consider for pull.

The following changes since commit 7851197b812b383ae1208c5d86391c5179c8209d:

  Update version for 2.10.1 release (2017-10-02 12:42:58 -0500)

are available in the git repository at:

  git://github.com/stffrdhrn/qemu.git tags/openrisc-20171113-smp-pr

for you to fetch changes up to 017a118ebed8757ccdce6fa217640963579aeb13:

  openrisc: Only kick cpu on timeout, not on update (2017-10-13 23:31:22 +0900)

----------------------------------------------------------------
OpenRISC SMP patchset 20171113

----------------------------------------------------------------
Stafford Horne (5):
  openrisc/ompic: Add OpenRISC Multicore PIC (OMPIC)
  target/openrisc: Make coreid and numcores variable
  openrisc/cputimer: Perparation for Multicore
  openrisc: Initial SMP support
  openrisc: Only kick cpu on timeout, not on update

 default-configs/or1k-softmmu.mak |   1 +
 hw/intc/Makefile.objs            |   1 +
 hw/intc/ompic.c                  | 179 +++++++++++++++++++++++++++++++++++++++
 hw/openrisc/cputimer.c           |  64 ++++++++++----
 hw/openrisc/openrisc_sim.c       |  84 +++++++++++++-----
 target/openrisc/cpu.c            |   1 -
 target/openrisc/cpu.h            |   4 +-
 target/openrisc/machine.c        |   1 -
 target/openrisc/sys_helper.c     |   9 +-
 9 files changed, 298 insertions(+), 46 deletions(-)
 create mode 100644 hw/intc/ompic.c

-- 
2.13.6


Re: [Qemu-devel] [PULL 0/5] OpenRISC SMP Support
Posted by Stafford Horne 6 years, 6 months ago
Hello Peter,

It looks like I didn't send this directly to you.  Please let me know if
there are any issues.


On 13 Oct 2017 11:57 p.m., "Stafford Horne" <shorne@gmail.com> wrote:

Hello,

Please consider for pull.

The following changes since commit 7851197b812b383ae1208c5d86391c5179c8209d:

  Update version for 2.10.1 release (2017-10-02 12:42:58 -0500)

are available in the git repository at:

  git://github.com/stffrdhrn/qemu.git tags/openrisc-20171113-smp-pr

for you to fetch changes up to 017a118ebed8757ccdce6fa217640963579aeb13:

  openrisc: Only kick cpu on timeout, not on update (2017-10-13 23:31:22
+0900)

----------------------------------------------------------------
OpenRISC SMP patchset 20171113

----------------------------------------------------------------
Stafford Horne (5):
  openrisc/ompic: Add OpenRISC Multicore PIC (OMPIC)
  target/openrisc: Make coreid and numcores variable
  openrisc/cputimer: Perparation for Multicore
  openrisc: Initial SMP support
  openrisc: Only kick cpu on timeout, not on update

 default-configs/or1k-softmmu.mak |   1 +
 hw/intc/Makefile.objs            |   1 +
 hw/intc/ompic.c                  | 179 ++++++++++++++++++++++++++++++
+++++++++
 hw/openrisc/cputimer.c           |  64 ++++++++++----
 hw/openrisc/openrisc_sim.c       |  84 +++++++++++++-----
 target/openrisc/cpu.c            |   1 -
 target/openrisc/cpu.h            |   4 +-
 target/openrisc/machine.c        |   1 -
 target/openrisc/sys_helper.c     |   9 +-
 9 files changed, 298 insertions(+), 46 deletions(-)
 create mode 100644 hw/intc/ompic.c

--
2.13.6
Re: [Qemu-devel] [PULL 0/5] OpenRISC SMP Support
Posted by Peter Maydell 6 years, 6 months ago
On 20 October 2017 at 10:39, Stafford Horne <shorne@gmail.com> wrote:
> Hello Peter,
>
> It looks like I didn't send this directly to you.  Please let me know if
> there are any issues.

It's on my list to deal with, yes, but it's at the bottom of
the pile because pull requests from people who I haven't
pulled from before require more scrutiny.

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/5] OpenRISC SMP Support
Posted by Peter Maydell 6 years, 6 months ago
On 13 October 2017 at 15:57, Stafford Horne <shorne@gmail.com> wrote:
> Hello,
>
> Please consider for pull.
>
> The following changes since commit 7851197b812b383ae1208c5d86391c5179c8209d:
>
>   Update version for 2.10.1 release (2017-10-02 12:42:58 -0500)
>
> are available in the git repository at:
>
>   git://github.com/stffrdhrn/qemu.git tags/openrisc-20171113-smp-pr
>
> for you to fetch changes up to 017a118ebed8757ccdce6fa217640963579aeb13:
>
>   openrisc: Only kick cpu on timeout, not on update (2017-10-13 23:31:22 +0900)
>
> ----------------------------------------------------------------
> OpenRISC SMP patchset 20171113
>
> ----------------------------------------------------------------
> Stafford Horne (5):
>   openrisc/ompic: Add OpenRISC Multicore PIC (OMPIC)
>   target/openrisc: Make coreid and numcores variable
>   openrisc/cputimer: Perparation for Multicore
>   openrisc: Initial SMP support
>   openrisc: Only kick cpu on timeout, not on update

Hi -- I'm afraid this pull request doesn't apply to master.
Looking at it, that seems to be because you've based it on the
2.10.1 branch. All pull requests for master need to be based
on master -- can you rebase to the right thing and resubmit,
please?

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/5] OpenRISC SMP Support
Posted by Stafford Horne 6 years, 6 months ago
On Fri, Oct 20, 2017 at 05:51:13PM +0100, Peter Maydell wrote:
> On 13 October 2017 at 15:57, Stafford Horne <shorne@gmail.com> wrote:
> > Hello,
> >
> > Please consider for pull.
> >
> > The following changes since commit 7851197b812b383ae1208c5d86391c5179c8209d:
> >
> >   Update version for 2.10.1 release (2017-10-02 12:42:58 -0500)
> >
> > are available in the git repository at:
> >
> >   git://github.com/stffrdhrn/qemu.git tags/openrisc-20171113-smp-pr
> >
> > for you to fetch changes up to 017a118ebed8757ccdce6fa217640963579aeb13:
> >
> >   openrisc: Only kick cpu on timeout, not on update (2017-10-13 23:31:22 +0900)
> >
> > ----------------------------------------------------------------
> > OpenRISC SMP patchset 20171113
> >
> > ----------------------------------------------------------------
> > Stafford Horne (5):
> >   openrisc/ompic: Add OpenRISC Multicore PIC (OMPIC)
> >   target/openrisc: Make coreid and numcores variable
> >   openrisc/cputimer: Perparation for Multicore
> >   openrisc: Initial SMP support
> >   openrisc: Only kick cpu on timeout, not on update
> 
> Hi -- I'm afraid this pull request doesn't apply to master.
> Looking at it, that seems to be because you've based it on the
> 2.10.1 branch. All pull requests for master need to be based
> on master -- can you rebase to the right thing and resubmit,
> please?

Yes, sorry.  I didnt realize 2.10.1 was a branch, I will stick to master from
now on.

I have done the rebase and there was one minor conflict due to the
cpu_generic_init() changes.  I retested and everything looks good, please look
out for the v2 PULL series.

-Stafford