qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 7e450a: target/sparc: remove MemoryRegionSect


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 7e450a: target/sparc: remove MemoryRegionSection check cod...
Date: Thu, 11 Jan 2018 03:07:19 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7e450a8f50ac12fc8f69b6ce555254c84efcf407
      
https://github.com/qemu/qemu/commit/7e450a8f50ac12fc8f69b6ce555254c84efcf407
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M target/sparc/mmu_helper.c

  Log Message:
  -----------
  target/sparc: remove MemoryRegionSection check code from 
sparc_cpu_get_phys_page_debug()

This code is preventing the MMU debug code from displaying virtual
mappings of IO devices (anything that is not located in the RAM).

Before this patch, Qemu would output 0xffffffffffffffff (-1) as the
physical address corresponding to an IO device virtual address.

With this patch the intended physical address is displayed.

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Signed-off-by: Mark Cave-Ayland <address@hidden>


  Commit: 28edc7c92a7491a9c077fd5b5686e5a226b8138b
      
https://github.com/qemu/qemu/commit/28edc7c92a7491a9c077fd5b5686e5a226b8138b
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/pci-host/apb.c
    M include/hw/pci-host/apb.h

  Log Message:
  -----------
  apb: move QOM macros and typedefs from apb.c to apb.h

This also includes the related IOMMUState typedef and defines.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: ad6856e875ee0f60fb89c74b0410fd99c2c5e9a2
      
https://github.com/qemu/qemu/commit/ad6856e875ee0f60fb89c74b0410fd99c2c5e9a2
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/sparc64/sun4u.c

  Log Message:
  -----------
  sun4u: ebus QOMify tidy-up

The main change here is to introduce the proper TYPE_EBUS/EBUS QOM macros
and remove the use of DO_UPCAST.

Alongside this there are some a couple of minor cosmetic changes and a rename
of pci_ebus_realize() to ebus_realize() since the ebus device is always what
is effectively a PCI-ISA bridge.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 8c40b8d9fb596cd1e9517d0176043c478bb8e7e2
      
https://github.com/qemu/qemu/commit/8c40b8d9fb596cd1e9517d0176043c478bb8e7e2
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/sparc64/sun4u.c

  Log Message:
  -----------
  sun4u: move ISABus inside of EBusState

Since the EBus is effectively a PCI-ISA bridge then the underlying ISA bus
should be contained within the PCI bridge itself.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: c796eddaad58301611315ae3c16f3ef26ccf207a
      
https://github.com/qemu/qemu/commit/c796eddaad58301611315ae3c16f3ef26ccf207a
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/pci-host/apb.c
    M hw/sparc64/sun4u.c
    M include/hw/pci-host/apb.h

  Log Message:
  -----------
  sun4u: remove pci_ebus_init() function

This is initialisation that should really take place in the ebus realize
function. As part of this we also rework the ebus IRQ mapping so that
instead of having to pass in the array of pbm_irqs, we obtain a reference
to them by looking up the APB device during ebus realize.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 0fe22ffbbc6b65fe6bd453b37120edba91fc169e
      
https://github.com/qemu/qemu/commit/0fe22ffbbc6b65fe6bd453b37120edba91fc169e
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/sparc64/sun4u.c

  Log Message:
  -----------
  sun4u: move initialisation of all ISABus devices into ebus_realize()

This belongs in the PCI-ISA bridge rather than at the machine level.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>


  Commit: b26f441903f8d6efcd0501ec6d0a2c8a51a13eae
      
https://github.com/qemu/qemu/commit/b26f441903f8d6efcd0501ec6d0a2c8a51a13eae
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/pci-host/apb.c

  Log Message:
  -----------
  apb: APB QOMify tidy-up

Use DeviceClass rather than SysBusDeviceClass in pbm_host_class_init() and
adjust pci_pbm_init_device() accordingly.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 588978c0a1e9f5596a12d124b530bdf698ed9104
      
https://github.com/qemu/qemu/commit/588978c0a1e9f5596a12d124b530bdf698ed9104
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/pci-host/apb.c
    M hw/sparc64/sun4u.c
    M include/hw/pci-host/apb.h

  Log Message:
  -----------
  apb: return APBState from pci_apb_init() rather than PCIBus

This is a first step towards removing pci_apb_init() completely.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>


  Commit: 2a4d6af51b8330bfd7a7dd677927b8dd2f5f5f08
      
https://github.com/qemu/qemu/commit/2a4d6af51b8330bfd7a7dd677927b8dd2f5f5f08
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/pci-host/apb.c
    M hw/sparc64/sparc64.c
    M hw/sparc64/sun4u.c
    M include/hw/pci-host/apb.h
    M include/hw/sparc/sparc64.h

  Log Message:
  -----------
  apb: use gpios to wire up the apb device to the SPARC CPU IRQs

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>


  Commit: 4272ad40189c73324da59047f5232ec795111c4b
      
https://github.com/qemu/qemu/commit/4272ad40189c73324da59047f5232ec795111c4b
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/pci-host/apb.c
    M hw/sparc64/sun4u.c
    M include/hw/pci-host/apb.h

  Log Message:
  -----------
  apb: move the two secondary PCI bridges objects into APBState

This enables us to remove these parameters from pci_apb_init().

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: cacd05805eeea393ec929fe841f9a68aa2140d92
      
https://github.com/qemu/qemu/commit/cacd05805eeea393ec929fe841f9a68aa2140d92
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/pci-host/apb.c
    M hw/sparc64/sun4u.c
    M include/hw/pci-host/apb.h

  Log Message:
  -----------
  apb: remove pci_apb_init() and instantiate APB device using qdev

By making the special_base and mem_base values qdev properties, we can move
the remaining parts of pci_apb_init() into the pbm init() and realize()
functions.

This finally allows us to instantiate the APB directly using standard qdev
create/init functions in sun4u.c.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: d9e4d6829c14d3e3d71906b0dc7e7ec9a77654bf
      
https://github.com/qemu/qemu/commit/d9e4d6829c14d3e3d71906b0dc7e7ec9a77654bf
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/pci-host/apb.c

  Log Message:
  -----------
  apb: split pci_pbm_map_irq() into separate functions for bus A and bus B

After the previous refactoring it is now possible to use separate functions
to improve the clarity of the interrupt paths.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>


  Commit: 33c5eb02c4f51515896a5a13cb68f6f01ce8d0af
      
https://github.com/qemu/qemu/commit/33c5eb02c4f51515896a5a13cb68f6f01ce8d0af
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/pci-host/apb.c
    M include/hw/pci-host/apb.h

  Log Message:
  -----------
  apb: remove busA property from PBMPCIBridge state

Since the previous commit the only remaining use of the qdev busA property is
to configure the PCI bridge in front of the onboard ebus devices differently
to allow early OpenBIOS serial console access.

Instead we can now manually update the PCI configuration for bridge A in
pci_pbm_reset() and thus completely remove the busA property from the
PBMPCIBridge state.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>


  Commit: 4b10c8d7012eea39e96819545eb21d28228831c6
      
https://github.com/qemu/qemu/commit/4b10c8d7012eea39e96819545eb21d28228831c6
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/pci-host/apb.c
    M hw/sparc64/sun4u.c
    M include/hw/pci-host/apb.h

  Log Message:
  -----------
  ebus: wire up OBIO interrupts to APB pbm via qdev GPIOs

This enables us to remove the static array mapping in the ISA IRQ
handler (and the embedded reference to the APB device) by formalising
the interrupt wiring via the qdev GPIO API.

For more clarity we replace the APB OBIO interrupt numbers with constants
designating the interrupt source, and rename isa_irq_handler() to
ebus_isa_irq_handler().

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: a5546222e3eafc9b6bc784c1bffbc8e1614d5e5b
      
https://github.com/qemu/qemu/commit/a5546222e3eafc9b6bc784c1bffbc8e1614d5e5b
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/pci-host/apb.c
    M include/hw/pci-host/apb.h

  Log Message:
  -----------
  apb: replace OBIO interrupt numbers in pci_pbmA_map_irq() with constants

Following on from the previous commit, we can also do the same with
with legacy OBIO interrupts in pci_pbmA_map_irq().

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 8bcf1c7962c297ea4cf47a8f7400afca38bc270f
      
https://github.com/qemu/qemu/commit/8bcf1c7962c297ea4cf47a8f7400afca38bc270f
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M Makefile.objs
    A hw/sparc64/trace-events

  Log Message:
  -----------
  sparc64: introduce trace-events for hw/sparc64

This is in preparation for switching code in hw/sparc64 from DPRINTF over to
trace events.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 69520948e10dde53cb2f49a0c2809847347ae042
      
https://github.com/qemu/qemu/commit/69520948e10dde53cb2f49a0c2809847347ae042
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/sparc64/sun4u.c
    M hw/sparc64/trace-events

  Log Message:
  -----------
  sun4u: switch from EBUS_DPRINTF() macro to trace-events

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>


  Commit: ba51ef25571c58d09dcfe1f67056b30327dfaa46
      
https://github.com/qemu/qemu/commit/ba51ef25571c58d09dcfe1f67056b30327dfaa46
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/dma/Makefile.objs
    R hw/dma/sun4m_iommu.c
    M hw/dma/trace-events
    M hw/sparc/Makefile.objs
    A hw/sparc/sun4m_iommu.c
    M hw/sparc/trace-events

  Log Message:
  -----------
  sun4m: move sun4m_iommu.c from hw/dma to hw/sparc

This seems more appropriate and brings sun4m in line with the other
architectures.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Acked-by: Artyom Tarasenko <address@hidden>


  Commit: 1527f4886c88c8ac7faf507122580e964c2259a7
      
https://github.com/qemu/qemu/commit/1527f4886c88c8ac7faf507122580e964c2259a7
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/dma/sparc32_dma.c
    M hw/sparc/sun4m.c
    M hw/sparc/sun4m_iommu.c
    M include/hw/sparc/sun4m.h
    A include/hw/sparc/sun4m_iommu.h

  Log Message:
  -----------
  sun4m: move IOMMU declarations from sun4m.h to sun4m_iommu.h

Also updating the relevant .c files as required.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Acked-by: Artyom Tarasenko <address@hidden>


  Commit: f5980f757c028ec68ff8442c418db8462415af2a
      
https://github.com/qemu/qemu/commit/f5980f757c028ec68ff8442c418db8462415af2a
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/dma/sparc32_dma.c
    M hw/intc/slavio_intctl.c
    M hw/net/lance.c
    M hw/sparc/sun4m.c
    M hw/sparc/sun4m_iommu.c
    M hw/timer/slavio_timer.c
    R include/hw/sparc/sun4m.h

  Log Message:
  -----------
  sun4m: remove include/hw/sparc/sun4m.h and all references to it

With the previous commit there is now nothing left in sun4m.h so it can be
removed, along with all remaining references to it.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Acked-by: Artyom Tarasenko <address@hidden>


  Commit: aea5b071012d3507885724362913d0b71dd6c303
      
https://github.com/qemu/qemu/commit/aea5b071012d3507885724362913d0b71dd6c303
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/pci-host/apb.c
    M hw/sparc64/sun4u.c
    M include/hw/pci-host/apb.h

  Log Message:
  -----------
  apb: QOMify IOMMU

This is in preparation to split the IOMMU device out of the APB. As part of
this commit we also enforce separation of the IOMMU and APB devices by using
a QOM object link to pass the IOMMU reference and accessing the IOMMU registers
via a separate memory region mapped into the APB config space rather than
directly.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Acked-by: Artyom Tarasenko <address@hidden>


  Commit: 0ea833c24999093be6369f9145333bd10acfad76
      
https://github.com/qemu/qemu/commit/0ea833c24999093be6369f9145333bd10acfad76
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/pci-host/apb.c
    M hw/sparc64/Makefile.objs
    M hw/sparc64/sun4u.c
    A hw/sparc64/sun4u_iommu.c
    M include/hw/pci-host/apb.h
    A include/hw/sparc/sun4u_iommu.h

  Log Message:
  -----------
  sun4u: split IOMMU device out from apb.c to sun4u_iommu.c

By separating the sun4u IOMMU device into new sun4u_iommu.c and sun4m_iommu.h
files we noticeably simplify apb.c whilst bringing sun4u in line with all the
other IOMMU-supporting architectures.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Acked-by: Artyom Tarasenko <address@hidden>


  Commit: 4c9fbc38e3559d7540c8bd5cf76915dd21ccad7f
      
https://github.com/qemu/qemu/commit/4c9fbc38e3559d7540c8bd5cf76915dd21ccad7f
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/sparc64/sun4u_iommu.c
    M include/hw/sparc/sun4u_iommu.h

  Log Message:
  -----------
  sun4u_iommu: update to reflect IOMMU is no longer part of the APB device

Signed-off-by: Mark Cave-Ayland <address@hidden>
Acked-by: Artyom Tarasenko <address@hidden>


  Commit: 09ecbb785b7f84053d835fd360bffaf871418566
      
https://github.com/qemu/qemu/commit/09ecbb785b7f84053d835fd360bffaf871418566
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/sparc64/sun4u_iommu.c
    M hw/sparc64/trace-events

  Log Message:
  -----------
  sun4u_iommu: convert from IOMMU_DPRINTF to trace-events

Signed-off-by: Mark Cave-Ayland <address@hidden>
Acked-by: Artyom Tarasenko <address@hidden>


  Commit: 602c993a3e7d26a10967cd6ddc8349384e1fb53b
      
https://github.com/qemu/qemu/commit/602c993a3e7d26a10967cd6ddc8349384e1fb53b
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M hw/sparc64/sun4u_iommu.c
    M hw/sparc64/trace-events

  Log Message:
  -----------
  sun4u_iommu: add trace event for IOMMU translations

Signed-off-by: Mark Cave-Ayland <address@hidden>
Acked-by: Artyom Tarasenko <address@hidden>


  Commit: 7642f96e6015ea0c6a8334f8e36f824f70378b5d
      
https://github.com/qemu/qemu/commit/7642f96e6015ea0c6a8334f8e36f824f70378b5d
  Author: Peter Maydell <address@hidden>
  Date:   2018-01-11 (Thu, 11 Jan 2018)

  Changed paths:
    M Makefile.objs
    M hw/dma/Makefile.objs
    M hw/dma/sparc32_dma.c
    R hw/dma/sun4m_iommu.c
    M hw/dma/trace-events
    M hw/intc/slavio_intctl.c
    M hw/net/lance.c
    M hw/pci-host/apb.c
    M hw/sparc/Makefile.objs
    M hw/sparc/sun4m.c
    A hw/sparc/sun4m_iommu.c
    M hw/sparc/trace-events
    M hw/sparc64/Makefile.objs
    M hw/sparc64/sparc64.c
    M hw/sparc64/sun4u.c
    A hw/sparc64/sun4u_iommu.c
    A hw/sparc64/trace-events
    M hw/timer/slavio_timer.c
    M include/hw/pci-host/apb.h
    M include/hw/sparc/sparc64.h
    R include/hw/sparc/sun4m.h
    A include/hw/sparc/sun4m_iommu.h
    A include/hw/sparc/sun4u_iommu.h
    M target/sparc/mmu_helper.c

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

qemu-sparc update

# gpg: Signature made Tue 09 Jan 2018 22:12:22 GMT
# gpg:                using RSA key 0x5BC2C56FAE0F321F
# gpg: Good signature from "Mark Cave-Ayland <address@hidden>"
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* remotes/mcayland/tags/qemu-sparc-signed: (25 commits)
  sun4u_iommu: add trace event for IOMMU translations
  sun4u_iommu: convert from IOMMU_DPRINTF to trace-events
  sun4u_iommu: update to reflect IOMMU is no longer part of the APB device
  sun4u: split IOMMU device out from apb.c to sun4u_iommu.c
  apb: QOMify IOMMU
  sun4m: remove include/hw/sparc/sun4m.h and all references to it
  sun4m: move IOMMU declarations from sun4m.h to sun4m_iommu.h
  sun4m: move sun4m_iommu.c from hw/dma to hw/sparc
  sun4u: switch from EBUS_DPRINTF() macro to trace-events
  sparc64: introduce trace-events for hw/sparc64
  apb: replace OBIO interrupt numbers in pci_pbmA_map_irq() with constants
  ebus: wire up OBIO interrupts to APB pbm via qdev GPIOs
  apb: remove busA property from PBMPCIBridge state
  apb: split pci_pbm_map_irq() into separate functions for bus A and bus B
  apb: remove pci_apb_init() and instantiate APB device using qdev
  apb: move the two secondary PCI bridges objects into APBState
  apb: use gpios to wire up the apb device to the SPARC CPU IRQs
  apb: return APBState from pci_apb_init() rather than PCIBus
  apb: APB QOMify tidy-up
  sun4u: move initialisation of all ISABus devices into ebus_realize()
  ...

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/76302a95e759...7642f96e6015

reply via email to

[Prev in Thread] Current Thread [Next in Thread]