[Qemu-commits] [qemu/qemu] 1f10fd: sparc32-dma: use object_initialize_child() for esp...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1f10fd53cbee9830db3e8d2f4ff0c7a507655fae
      
https://github.com/qemu/qemu/commit/1f10fd53cbee9830db3e8d2f4ff0c7a507655fae
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

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

  Log Message:
  -----------
  sparc32-dma: use object_initialize_child() for espdma and ledma child objects

Store the child objects directly within the sparc32-dma object rather than using
link properties.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200926140216.7368-2-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: bce83ed9981bd8920499921e9931f46db56b77ff
      
https://github.com/qemu/qemu/commit/bce83ed9981bd8920499921e9931f46db56b77ff
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

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

  Log Message:
  -----------
  sparc32-ledma: use object_initialize_child() for lance child object

Store the child object directly within the sparc32-ledma object rather than
using link properties.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200926140216.7368-3-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: d19265eaf543c1305754212002d28cb2277609a2
      
https://github.com/qemu/qemu/commit/d19265eaf543c1305754212002d28cb2277609a2
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

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

  Log Message:
  -----------
  sparc32-espdma: use object_initialize_child() for esp child object

Store the child object directly within the sparc32-espdma object rather than
using link properties.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200926140216.7368-4-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: c4210bc17d5a78e63c3ed28049d70d2bf2261783
      
https://github.com/qemu/qemu/commit/c4210bc17d5a78e63c3ed28049d70d2bf2261783
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

  Changed paths:
    M hw/dma/sparc32_dma.c
    M hw/sparc/sun4m.c

  Log Message:
  -----------
  sparc32-ledma: don't reference nd_table directly within the device

Instead use qdev_set_nic_properties() to configure the on-board NIC at the
sun4m machine level.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200926140216.7368-5-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: e237e1c2985e705155bf23390c80f4d2fa245742
      
https://github.com/qemu/qemu/commit/e237e1c2985e705155bf23390c80f4d2fa245742
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

  Changed paths:
    M hw/pci-host/sabre.c
    M hw/sparc64/sun4u.c

  Log Message:
  -----------
  sabre: don't call sysbus_mmio_map() in sabre_realize()

The device should not map itself but instead should be mapped to sysbus by the
sun4u machine.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200926140216.7368-7-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: ae5643ecc672ca2f3716359e1bb9b5ce52c1518c
      
https://github.com/qemu/qemu/commit/ae5643ecc672ca2f3716359e1bb9b5ce52c1518c
  Author: Philippe Mathieu-Daudé <1892540@bugs.launchpad.net>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

  Changed paths:
    M hw/display/tcx.c

  Log Message:
  -----------
  hw/display/tcx: Allow 64-bit accesses to framebuffer stippler and blitter

The S24/TCX datasheet is listed as "Unable to locate" on [1].

However the NetBSD revision 1.32 of the driver introduced
64-bit accesses to the stippler and blitter [2]. It is safe
to assume these memory regions are 64-bit accessible.
QEMU implementation is 32-bit, so fill the 'impl' fields.

Michael Lorenz (author of the NetBSD code [2]) provided us with more
information in [3]:

> IIRC the real hardware *requires* 64bit accesses for stipple and
> blitter operations to work. For stipples you write a 64bit word into
> STIP space, the address defines where in the framebuffer you want to
> draw, the data contain a 32bit bitmask, foreground colour and a ROP.
> BLIT space works similarly, the 64bit word contains an offset were to
> read pixels from, and how many you want to copy.
>
> One more thing since there seems to be some confusion - 64bit accesses
> on the framebuffer are fine as well. TCX/S24 is *not* an SBus device,
> even though its node says it is.
> S24 is a card that plugs into a special slot on the SS5 mainboard,
> which is shared with an SBus slot and looks a lot like a horizontal
> UPA slot. Both S24 and TCX are accessed through the Micro/TurboSPARC's
> AFX bus which is 64bit wide and intended for graphics.
> Early FFB docs even mentioned connecting to both AFX and UPA,
> no idea if that was ever realized in hardware though.

[1] 
http://web.archive.org/web/20111209011516/http://wikis.sun.com/display/FOSSdocs/Home
[2] 
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/dev/sbus/tcx.c.diff?r1=1.31&r2=1.32
[3] https://www.mail-archive.com/qemu-devel@nongnu.org/msg734928.html

Cc: qemu-stable@nongnu.org
Reported-by: Andreas Gustafsson <gson@gson.org>
Buglink: https://bugs.launchpad.net/bugs/1892540
Fixes: 55d7bfe2293 ("tcx: Implement hardware acceleration")
Tested-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Andreas Gustafsson <gson@gson.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201024205100.3623006-1-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: ef905eff421c5a06a01714e11ed67a92e4e7a9f1
      
https://github.com/qemu/qemu/commit/ef905eff421c5a06a01714e11ed67a92e4e7a9f1
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

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

  Log Message:
  -----------
  sabre: increase number of PCI bus IRQs from 32 to 64

The rework of the sabre IRQs in commit 6864fa3897 "sun4u: update PCI topology to
include simba PCI bridges" changed the IRQ routing so that both PCI and legacy
OBIO IRQs are routed through the sabre PCI host bridge to the CPU.

Unfortunately this commit failed to increase the number of PCI bus IRQs
accordingly meaning that access to the legacy IRQs OBIO (irqnum >= 0x20) would
overflow the PCI bus IRQ array causing strange failures running 
qemu-system-sparc64
in NetBSD.

Cc: qemu-stable@nongnu.org
Reported-by: Harold Gutch <logix@foobar.franken.de>
Fixes: https://bugs.launchpad.net/qemu/+bug/1838658
Fixes: 6864fa3897 ("sun4u: update PCI topology to include simba PCI bridges")
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201011081347.2146-1-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: c092bfe5f4f5f63920170764ca7cd992947e60c7
      
https://github.com/qemu/qemu/commit/c092bfe5f4f5f63920170764ca7cd992947e60c7
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

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

  Log Message:
  -----------
  hw/pci-host/sabre: Update documentation link

The current link redirects to https://www.oracle.com/sun/
announcing "Oracle acquired Sun Microsystems in 2010, ..."
but does not give hint where to find the datasheet.

Use the archived PDF on the Wayback Machine, which works.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20201012170950.3491912-2-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: a0376c0311bad493ef9e4cd9ed596463410c1965
      
https://github.com/qemu/qemu/commit/a0376c0311bad493ef9e4cd9ed596463410c1965
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

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

  Log Message:
  -----------
  hw/pci-host/sabre: Remove superfluous address range check

The region is registered as 64KiB in sabre_init():

    memory_region_init_io(&s->sabre_config, OBJECT(s), &sabre_config_ops, s,
                          "sabre-config", 0x10000);

Remove the superfluous check.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20201012170950.3491912-3-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 0980307e705b5677d9b4158a0a0346abf5041f33
      
https://github.com/qemu/qemu/commit/0980307e705b5677d9b4158a0a0346abf5041f33
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

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

  Log Message:
  -----------
  hw/pci-host/sabre: Simplify code initializing variable once

We only need to zero-initialize 'val' once.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20201012170950.3491912-4-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 69d7eab0b8bb14f8d52539618ae33918032eaaf7
      
https://github.com/qemu/qemu/commit/69d7eab0b8bb14f8d52539618ae33918032eaaf7
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-10-31 (Sat, 31 Oct 2020)

  Changed paths:
    M hw/display/tcx.c
    M hw/dma/sparc32_dma.c
    M hw/pci-host/sabre.c
    M hw/sparc/sun4m.c
    M hw/sparc64/sun4u.c
    M include/hw/sparc/sparc32_dma.h

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

qemu-sparc queue

# gpg: Signature made Wed 28 Oct 2020 08:17:23 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-sparc-20201028:
  hw/pci-host/sabre: Simplify code initializing variable once
  hw/pci-host/sabre: Remove superfluous address range check
  hw/pci-host/sabre: Update documentation link
  sabre: increase number of PCI bus IRQs from 32 to 64
  hw/display/tcx: Allow 64-bit accesses to framebuffer stippler and blitter
  sabre: don't call sysbus_mmio_map() in sabre_realize()
  sparc32-ledma: don't reference nd_table directly within the device
  sparc32-espdma: use object_initialize_child() for esp child object
  sparc32-ledma: use object_initialize_child() for lance child object
  sparc32-dma: use object_initialize_child() for espdma and ledma child objects

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


Compare: https://github.com/qemu/qemu/compare/c3dee4de9252...69d7eab0b8bb