ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x/pci: use a PCI Function structure 

We use a ClpRspQueryPci structure to hold the information related to a
zPCI Function.

This allows us to be ready to support different zPCI functions and to
retrieve the zPCI function information from the host.

Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Pierre Morel 2020-10-26 11:34:39 -04:00 committed by Alex Williamson
parent b354d5d804
commit 9670ee7527
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/s390x/s390-pci-bus.c
View File

@ -778,6 +778,17 @@ static void s390_pci_init_default_group(void)
resgrp->version = 0; resgrp->version = 0;
} }
static void set_pbdev_info(S390PCIBusDevice *pbdev)
{
pbdev->zpci_fn.sdma = ZPCI_SDMA_ADDR;
pbdev->zpci_fn.edma = ZPCI_EDMA_ADDR;
pbdev->zpci_fn.pchid = 0;
pbdev->zpci_fn.ug = ZPCI_DEFAULT_FN_GRP;
pbdev->zpci_fn.fid = pbdev->fid;
pbdev->zpci_fn.uid = pbdev->uid;
pbdev->pci_group = s390_group_find(ZPCI_DEFAULT_FN_GRP);
}
static void s390_pcihost_realize(DeviceState *dev, Error **errp) static void s390_pcihost_realize(DeviceState *dev, Error **errp)
{ {
PCIBus *b; PCIBus *b;
@ -1000,6 +1011,7 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
pbdev->iommu = s390_pci_get_iommu(s, pci_get_bus(pdev), pdev->devfn); pbdev->iommu = s390_pci_get_iommu(s, pci_get_bus(pdev), pdev->devfn);
pbdev->iommu->pbdev = pbdev; pbdev->iommu->pbdev = pbdev;
pbdev->state = ZPCI_FS_DISABLED; pbdev->state = ZPCI_FS_DISABLED;
set_pbdev_info(pbdev);
if (object_dynamic_cast(OBJECT(dev), "vfio-pci")) { if (object_dynamic_cast(OBJECT(dev), "vfio-pci")) {
pbdev->fh |= FH_SHM_VFIO; pbdev->fh |= FH_SHM_VFIO;

8
hw/s390x/s390-pci-inst.c
View File

@ -281,6 +281,8 @@ int clp_service_call(S390CPU *cpu, uint8_t r2, uintptr_t ra)
goto out; goto out;
} }
memcpy(resquery, &pbdev->zpci_fn, sizeof(*resquery));
for (i = 0; i < PCI_BAR_COUNT; i++) { for (i = 0; i < PCI_BAR_COUNT; i++) {
uint32_t data = pci_get_long(pbdev->pdev->config + uint32_t data = pci_get_long(pbdev->pdev->config +
PCI_BASE_ADDRESS_0 + (i * 4)); PCI_BASE_ADDRESS_0 + (i * 4));
@ -294,12 +296,6 @@ int clp_service_call(S390CPU *cpu, uint8_t r2, uintptr_t ra)
resquery->bar_size[i]); resquery->bar_size[i]);
} }
stq_p(&resquery->sdma, ZPCI_SDMA_ADDR);
stq_p(&resquery->edma, ZPCI_EDMA_ADDR);
stl_p(&resquery->fid, pbdev->fid);
stw_p(&resquery->pchid, 0);
stw_p(&resquery->ug, ZPCI_DEFAULT_FN_GRP);
stl_p(&resquery->uid, pbdev->uid);
stw_p(&resquery->hdr.rsp, CLP_RC_OK); stw_p(&resquery->hdr.rsp, CLP_RC_OK);
break; break;
} }

1
include/hw/s390x/s390-pci-bus.h
View File

@ -342,6 +342,7 @@ struct S390PCIBusDevice {
uint16_t maxstbl; uint16_t maxstbl;
uint8_t sum; uint8_t sum;
S390PCIGroup *pci_group; S390PCIGroup *pci_group;
ClpRspQueryPci zpci_fn;
S390MsixInfo msix; S390MsixInfo msix;
AdapterRoutes routes; AdapterRoutes routes;
S390PCIIOMMU *iommu; S390PCIIOMMU *iommu;