qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 5d9d37: mac_oldworld: remove duplicate bus ch

From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 5d9d37: mac_oldworld: remove duplicate bus check for PPC_I...
Date: Wed, 13 Jan 2021 11:25:05 -0800 
  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 5d9d37697939375310fbcfd507481ae78116411a
      
https://github.com/qemu/qemu/commit/5d9d37697939375310fbcfd507481ae78116411a
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-01-13 (Wed, 13 Jan 2021)

  Changed paths:
    M hw/ppc/mac_oldworld.c

  Log Message:
  -----------
  mac_oldworld: remove duplicate bus check for PPC_INPUT(env)

This condition will have already been caught when wiring the heathrow PIC
IRQs to the CPU.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20201229175619.6051-2-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 49ac51ae8048661c8fa9ad45b008e15bce1decaf
      
https://github.com/qemu/qemu/commit/49ac51ae8048661c8fa9ad45b008e15bce1decaf
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-01-13 (Wed, 13 Jan 2021)

  Changed paths:
    M hw/ppc/mac_oldworld.c

  Log Message:
  -----------
  mac_oldworld: move initialisation of grackle before heathrow

In order to move the heathrow PIC to the macio device, the PCI bus needs to be
initialised before the macio device and also before wiring the PIC IRQs.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20201229175619.6051-3-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 370022ce313d0e797c969bd5be2be545c97f004d
      
https://github.com/qemu/qemu/commit/370022ce313d0e797c969bd5be2be545c97f004d
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-01-13 (Wed, 13 Jan 2021)

  Changed paths:
    M hw/misc/macio/macio.c
    M hw/ppc/mac_oldworld.c
    M include/hw/misc/macio/macio.h

  Log Message:
  -----------
  macio: move heathrow PIC inside macio-oldworld device

The heathrow PIC is located within the macio device on real hardware so make it
a child of the macio-oldworld device. This also removes the need for setting and
checking a separate PIC object property link on the macio-oldworld device which
currently causes the automated QOM introspection tests to fail.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20201229175619.6051-4-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 6ce97b225eeba491f843cd01f28d1b3566d56f90
      
https://github.com/qemu/qemu/commit/6ce97b225eeba491f843cd01f28d1b3566d56f90
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-01-13 (Wed, 13 Jan 2021)

  Changed paths:
    M hw/ppc/mac_newworld.c

  Log Message:
  -----------
  mac_newworld: delay wiring of PCI IRQs in New World machine

In order to move the OpenPIC device to the macio device, the PCI bus needs to be
initialised before the macio device and also before wiring the OpenPIC IRQs.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20201229175619.6051-5-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 7e4d62dfee40e7d94c72644d2d29bbd33db91bed
      
https://github.com/qemu/qemu/commit/7e4d62dfee40e7d94c72644d2d29bbd33db91bed
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-01-13 (Wed, 13 Jan 2021)

  Changed paths:
    M hw/misc/macio/macio.c
    M hw/ppc/mac_newworld.c
    M include/hw/misc/macio/macio.h

  Log Message:
  -----------
  macio: move OpenPIC inside macio-newworld device

The OpenPIC device is located within the macio device on real hardware so make 
it
a child of the macio-newworld device. This also removes the need for setting and
checking a separate PIC object property link on the macio-newworld device which
currently causes the automated QOM introspection tests to fail.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20201229175619.6051-6-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: b73eb72792c831fb79583b80a2a60cf5192441ab
      
https://github.com/qemu/qemu/commit/b73eb72792c831fb79583b80a2a60cf5192441ab
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-01-13 (Wed, 13 Jan 2021)

  Changed paths:
    M hw/misc/macio/gpio.c
    M hw/misc/macio/macio.c
    M include/hw/misc/macio/gpio.h

  Log Message:
  -----------
  macio: wire macio GPIOs to OpenPIC using sysbus IRQs

This both allows the wiring to be done as Ben suggested in his original comment 
in
gpio.c and also enables the OpenPIC object property link to be removed.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20201229175619.6051-7-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 7b3180f9110e1cee00e9acb36cb4d16bd7efabee
      
https://github.com/qemu/qemu/commit/7b3180f9110e1cee00e9acb36cb4d16bd7efabee
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2021-01-13 (Wed, 13 Jan 2021)

  Changed paths:
    M hw/misc/macio/macio.c

  Log Message:
  -----------
  macio: don't set user_creatable to false

Now that all of the object property links to the heathrow PIC and OpenPIC have
been removed from the macio devices, it is safe to allow the macio-oldworld
and macio-neworld devices to be marked as user_creatable.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20201229175619.6051-8-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: c0dd6654f207810b16a75b673258f5ce2ceffbf0
      
https://github.com/qemu/qemu/commit/c0dd6654f207810b16a75b673258f5ce2ceffbf0
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-01-13 (Wed, 13 Jan 2021)

  Changed paths:
    M hw/misc/macio/gpio.c
    M hw/misc/macio/macio.c
    M hw/ppc/mac_newworld.c
    M hw/ppc/mac_oldworld.c
    M include/hw/misc/macio/gpio.h
    M include/hw/misc/macio/macio.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mcayland/tags/qemu-macppc-20210113' 
into staging

qemu-macppc updates

# gpg: Signature made Wed 13 Jan 2021 13:02:20 GMT
# gpg:                using RSA key CC621AB98E82200D915CC9C45BC2C56FAE0F321F
# gpg:                issuer "mark.cave-ayland@ilande.co.uk"
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>" 
[full]
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* remotes/mcayland/tags/qemu-macppc-20210113:
  macio: don't set user_creatable to false
  macio: wire macio GPIOs to OpenPIC using sysbus IRQs
  macio: move OpenPIC inside macio-newworld device
  mac_newworld: delay wiring of PCI IRQs in New World machine
  macio: move heathrow PIC inside macio-oldworld device
  mac_oldworld: move initialisation of grackle before heathrow
  mac_oldworld: remove duplicate bus check for PPC_INPUT(env)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/45240eed4f06...c0dd6654f207
reply via email to
[Prev in Thread] Current Thread [Next in Thread]