Commit e07fb4b5 authored by Knut Omang's avatar Knut Omang Committed by Michael S. Tsirkin
Browse files

gen_pcie_root_port: Add ACS (Access Control Services) capability 



Claim ACS support in the generic PCIe root port to allow
passthrough of individual functions of a device to different
guests (in a nested virt.setting) with VFIO.
Without this patch, all functions of a device, such as all VFs of
an SR/IOV device, will end up in the same IOMMU group.
A similar situation occurs on Windows with Hyper-V.

In the single function device case, it also has a small cosmetic
benefit in that the root port itself is not grouped with
the device. VFIO handles that situation in that binding rules
only apply to endpoints, so it does not limit passthrough in
those cases.

Signed-off-by: default avatarKnut Omang <knut.omang@oracle.com>
Reviewed-by: default avatarMarcel Apfelbaum <marcel.apfelbaum@gmail.com>
Message-Id: <319460b483f566dd57487eb3dd340ed4c10aa53c.1550768238.git-series.knut.omang@oracle.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent db891a9b

hw/pci-bridge/gen_pcie_root_port.c

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 
        OBJECT_CHECK(GenPCIERootPort, (obj), TYPE_GEN_PCIE_ROOT_PORT)



#define GEN_PCIE_ROOT_PORT_AER_OFFSET           0x100

#define GEN_PCIE_ROOT_PORT_ACS_OFFSET \

        (GEN_PCIE_ROOT_PORT_AER_OFFSET + PCI_ERR_SIZEOF)



#define GEN_PCIE_ROOT_PORT_MSIX_NR_VECTOR       1



typedef struct GenPCIERootPort {
@@ -149,6 +152,7 @@ static void gen_rp_dev_class_init(ObjectClass *klass, void *data) 
    rpc->interrupts_init = gen_rp_interrupts_init;

    rpc->interrupts_uninit = gen_rp_interrupts_uninit;

    rpc->aer_offset = GEN_PCIE_ROOT_PORT_AER_OFFSET;

    rpc->acs_offset = GEN_PCIE_ROOT_PORT_ACS_OFFSET;

}



static const TypeInfo gen_rp_dev_info = {

hw/pci-bridge/pcie_root_port.c

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static void rp_reset(DeviceState *qdev) 
    pcie_cap_deverr_reset(d);

    pcie_cap_slot_reset(d);

    pcie_cap_arifwd_reset(d);

    pcie_acs_reset(d);

    pcie_aer_root_reset(d);

    pci_bridge_reset(qdev);

    pci_bridge_disable_base_limit(d);
@@ -106,6 +107,9 @@ static void rp_realize(PCIDevice *d, Error **errp) 
    pcie_aer_root_init(d);

    rp_aer_vector_update(d);



    if (rpc->acs_offset) {

        pcie_acs_init(d, rpc->acs_offset);

    }

    return;



err:

include/hw/pci/pcie_port.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ typedef struct PCIERootPortClass { 
    int exp_offset;

    int aer_offset;

    int ssvid_offset;

    int acs_offset;    /* If nonzero, optional ACS capability offset */

    int ssid;

} PCIERootPortClass;