[Qemu-commits] [qemu/qemu] 79095e: pcie: modify the capability size asse

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 79095e: pcie: modify the capability size asse

From:	GitHub
Subject:	[Qemu-commits] [qemu/qemu] 79095e: pcie: modify the capability size assert
Date:	Fri, 19 Feb 2016 11:00:10 -0800
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 79095ef717957e24dbcba026bb21f5990ceace88
      
https://github.com/qemu/qemu/commit/79095ef717957e24dbcba026bb21f5990ceace88
  Author: Chen Fan <address@hidden>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M hw/pci/pcie.c

  Log Message:
  -----------
  pcie: modify the capability size assert

Device's Offset and size can reach PCIE_CONFIG_SPACE_SIZE,
fix the corresponding assert.

Signed-off-by: Chen Fan <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: 88caf177ace1063e5b566ce994f50c5b9c21998d
      
https://github.com/qemu/qemu/commit/88caf177ace1063e5b566ce994f50c5b9c21998d
  Author: Chen Fan <address@hidden>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M hw/vfio/pci.c

  Log Message:
  -----------
  vfio: make the 4 bytes aligned for capability size

this function search the capability from the end, the last
size should 0x100 - pos, not 0xff - pos.

Signed-off-by: Chen Fan <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: 8d86ada2a7a2fe6d9f4209e042d2c5785fa5e0c1
      
https://github.com/qemu/qemu/commit/8d86ada2a7a2fe6d9f4209e042d2c5785fa5e0c1
  Author: Chen Fan <address@hidden>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M hw/pci-bridge/ioh3420.c
    M hw/pci-bridge/xio3130_downstream.c
    M hw/pci-bridge/xio3130_upstream.c
    M hw/pci/pcie_aer.c
    M include/hw/pci/pcie_aer.h

  Log Message:
  -----------
  aer: impove pcie_aer_init to support vfio device

pcie_aer_init was used to emulate an aer capability for pcie device,
but for vfio device, the aer config space size is mutable and is not
always equal to PCI_ERR_SIZEOF(0x48). it depends on where the TLP Prefix
register required, so here we add a size argument.

Signed-off-by: Chen Fan <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: 40f8f0c31b6009e802175463c97f3b9e6f7c5d0f
      
https://github.com/qemu/qemu/commit/40f8f0c31b6009e802175463c97f3b9e6f7c5d0f
  Author: Chen Fan <address@hidden>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M hw/pci/pcie_aer.c
    M include/hw/pci/pcie_aer.h

  Log Message:
  -----------
  pcie_aer: expose pcie_aer_msg() interface

For vfio device, we need to propagate the aer error to
Guest OS. we use the pcie_aer_msg() to send aer error
to guest.

Signed-off-by: Chen Fan <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: 3fc1c182c1c1131ab16ce282b3d9567f334a96df
      
https://github.com/qemu/qemu/commit/3fc1c182c1c1131ab16ce282b3d9567f334a96df
  Author: Wei Yang <address@hidden>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M hw/vfio/pci.c

  Log Message:
  -----------
  vfio/pci: replace 1 with PCI_CAP_LIST_NEXT to make code self-explain

Use the macro PCI_CAP_LIST_NEXT instead of 1, so that the code would be
more self-explain.

This patch makes this change and also fixs one typo in comment.

Signed-off-by: Wei Yang <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: 62d9551247a2db3937d99e5495bc36b32abb41be
      
https://github.com/qemu/qemu/commit/62d9551247a2db3937d99e5495bc36b32abb41be
  Author: Eric Auger <address@hidden>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M hw/vfio/Makefile.objs
    A hw/vfio/amd-xgbe.c
    A include/hw/vfio/vfio-amd-xgbe.h

  Log Message:
  -----------
  hw/vfio/platform: amd-xgbe device

This patch introduces the amd-xgbe VFIO platform device. It
allows the guest to do passthrough on a device exposing an
"amd,xgbe-seattle-v1a" compat string.

Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: 60e43e987c3d188855dc7e95ff4979be78db3574
      
https://github.com/qemu/qemu/commit/60e43e987c3d188855dc7e95ff4979be78db3574
  Author: Eric Auger <address@hidden>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M device_tree.c
    M include/sysemu/device_tree.h

  Log Message:
  -----------
  device_tree: introduce load_device_tree_from_sysfs

This function returns the host device tree blob from sysfs
(/proc/device-tree). It uses a recursive function inspired
from dtc read_fstree.

Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: 6d79566ae6592056bbba106e6544a5746c741f15
      
https://github.com/qemu/qemu/commit/6d79566ae6592056bbba106e6544a5746c741f15
  Author: Eric Auger <address@hidden>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M device_tree.c
    M include/sysemu/device_tree.h

  Log Message:
  -----------
  device_tree: introduce qemu_fdt_node_path

This new helper routine returns a NULL terminated array of
node paths matching a node name and a compat string.

Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: 78e24f235eda4d3313917a50e135b7e06a046407
      
https://github.com/qemu/qemu/commit/78e24f235eda4d3313917a50e135b7e06a046407
  Author: Eric Auger <address@hidden>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M device_tree.c
    M include/sysemu/device_tree.h

  Log Message:
  -----------
  device_tree: qemu_fdt_getprop converted to use the error API

Current qemu_fdt_getprop exits if the property is not found. It is
sometimes needed to read an optional property, in which case we do
not wish to exit but simply returns a null value.

This patch converts qemu_fdt_getprop to accept an Error **, and existing
users are converted to pass &error_fatal. This preserves the existing
behaviour. Then to use the API with your optional semantic a null
parameter can be conveyed.

Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: 58e71097ced49600de1b38d2b59a823a9db66f19
      
https://github.com/qemu/qemu/commit/58e71097ced49600de1b38d2b59a823a9db66f19
  Author: Eric Auger <address@hidden>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M device_tree.c
    M hw/arm/boot.c
    M hw/arm/vexpress.c
    M include/sysemu/device_tree.h

  Log Message:
  -----------
  device_tree: qemu_fdt_getprop_cell converted to use the error API

This patch aligns the prototype with qemu_fdt_getprop. The caller
can choose whether the function self-asserts on error (passing
&error_fatal as Error ** argument, corresponding to the legacy behavior),
or behaves differently such as simply output a message.

In this later case the caller can use the new lenp parameter to interpret
the error if any.

Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: 9481cf2e5f2f2bb679d8bbda19f917a37a11034b
      
https://github.com/qemu/qemu/commit/9481cf2e5f2f2bb679d8bbda19f917a37a11034b
  Author: Eric Auger <address@hidden>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M hw/arm/sysbus-fdt.c

  Log Message:
  -----------
  hw/arm/sysbus-fdt: helpers for clock node generation

Some passthrough'ed devices depend on clock nodes. Those need to be
generated in the guest device tree. This patch introduces some helpers
to build a clock node from information retrieved in the host device tree.

- copy_properties_from_host copies properties from a host device tree
  node to a guest device tree node
- fdt_build_clock_node builds a guest clock node and checks the host
  fellow clock is a fixed one.

fdt_build_clock_node will become static as soon as it gets used. A
dummy pre-declaration is needed for compilation of this patch.

Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: cf5a13e370afad57f1cfab0a8871ed839f5eda48
      
https://github.com/qemu/qemu/commit/cf5a13e370afad57f1cfab0a8871ed839f5eda48
  Author: Eric Auger <address@hidden>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M hw/arm/sysbus-fdt.c

  Log Message:
  -----------
  hw/arm/sysbus-fdt: enable amd-xgbe dynamic instantiation

This patch allows the instantiation of the vfio-amd-xgbe device
from the QEMU command line (-device vfio-amd-xgbe,host="<device>").

The guest is exposed with a device tree node that combines the description
of both XGBE and PHY (representation supported from 4.2 onwards kernel):
Documentation/devicetree/bindings/net/amd-xgbe.txt.

There are 5 register regions, 6 interrupts including 4 optional
edge-sensitive per-channel interrupts.

Some property values are inherited from host device tree. Host device tree
must feature a combined XGBE/PHY representation (>= 4.2 host kernel).

2 clock nodes (dma and ptp) also are created. It is checked those clocks
are fixed on host side.

AMD XGBE node creation function has a dependency on vfio Linux header and
more generally node creation function for VFIO platform devices only make
sense with CONFIG_LINUX so let's protect this code with #ifdef CONFIG_LINUX.

Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: c89e91a76b361feaa09a48c20e6d18ae92ad0b4a
      
https://github.com/qemu/qemu/commit/c89e91a76b361feaa09a48c20e6d18ae92ad0b4a
  Author: Eric Auger <address@hidden>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M hw/arm/sysbus-fdt.c

  Log Message:
  -----------
  hw/arm/sysbus-fdt: remove qemu_fdt_setprop returned value check

qemu_fdt_setprop asserts in case of error hence no need to check
the returned value.

Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: b58b17f744b5465d0fc76eba1be549a9f5704bab
      
https://github.com/qemu/qemu/commit/b58b17f744b5465d0fc76eba1be549a9f5704bab
  Author: Wei Yang <address@hidden>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M hw/vfio/pci.c

  Log Message:
  -----------
  vfio/pci: use PCI_MSIX_FLAGS on retrieving the MSIX entries

Even PCI_CAP_FLAGS has the same value as PCI_MSIX_FLAGS, the later one is
the more proper on retrieving MSIX entries.

This patch uses PCI_MSIX_FLAGS to retrieve the MSIX entries.

Signed-off-by: Wei Yang <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: 586d1a99ff1253ac97c07459743e952abfff2a54
      
https://github.com/qemu/qemu/commit/586d1a99ff1253ac97c07459743e952abfff2a54
  Author: Peter Maydell <address@hidden>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M device_tree.c
    M hw/arm/boot.c
    M hw/arm/sysbus-fdt.c
    M hw/arm/vexpress.c
    M hw/pci-bridge/ioh3420.c
    M hw/pci-bridge/xio3130_downstream.c
    M hw/pci-bridge/xio3130_upstream.c
    M hw/pci/pcie.c
    M hw/pci/pcie_aer.c
    M hw/vfio/Makefile.objs
    A hw/vfio/amd-xgbe.c
    M hw/vfio/pci.c
    M include/hw/pci/pcie_aer.h
    A include/hw/vfio/vfio-amd-xgbe.h
    M include/sysemu/device_tree.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20160219.1' 
into staging

VFIO updates 2016-02-19

 - AER pre-enable and misc fixes (Cao jin and Chen Fan)
 - PCI_CAP_LIST_NEXT & PCI_MSIX_FLAGS cleanup (Wei Yang)
 - AMD XGBE KVM platform passthrough (Eric Auger)

# gpg: Signature made Fri 19 Feb 2016 17:28:36 GMT using RSA key ID 3BB08B22
# gpg: Good signature from "Alex Williamson <address@hidden>"
# gpg:                 aka "Alex Williamson <address@hidden>"
# gpg:                 aka "Alex Williamson <address@hidden>"
# gpg:                 aka "Alex Williamson <address@hidden>"

* remotes/awilliam/tags/vfio-update-20160219.1:
  vfio/pci: use PCI_MSIX_FLAGS on retrieving the MSIX entries
  hw/arm/sysbus-fdt: remove qemu_fdt_setprop returned value check
  hw/arm/sysbus-fdt: enable amd-xgbe dynamic instantiation
  hw/arm/sysbus-fdt: helpers for clock node generation
  device_tree: qemu_fdt_getprop_cell converted to use the error API
  device_tree: qemu_fdt_getprop converted to use the error API
  device_tree: introduce qemu_fdt_node_path
  device_tree: introduce load_device_tree_from_sysfs
  hw/vfio/platform: amd-xgbe device
  vfio/pci: replace 1 with PCI_CAP_LIST_NEXT to make code self-explain
  pcie_aer: expose pcie_aer_msg() interface
  aer: impove pcie_aer_init to support vfio device
  vfio: make the 4 bytes aligned for capability size
  pcie: modify the capability size assert

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


Compare: https://github.com/qemu/qemu/compare/3ba32c100a51...586d1a99ff12
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] 79095e: pcie: modify the capability size assert, GitHub <=
Prev by Date: [Qemu-commits] [qemu/qemu] d783f7: target-mips: Stop using uint_fast*_t types in r4k_...
Next by Date: [Qemu-commits] [qemu/qemu] c3bce9: etraxfs_dma: Dont forward zero-length payload to c...
Previous by thread: [Qemu-commits] [qemu/qemu] d783f7: target-mips: Stop using uint_fast*_t types in r4k_...
Next by thread: [Qemu-commits] [qemu/qemu] c3bce9: etraxfs_dma: Dont forward zero-length payload to c...
Index(es):
- Date
- Thread