Commit b78aae9b authored by Eric Auger's avatar Eric Auger Committed by Peter Maydell
Browse files

hw/arm/smmu-common: Fix devfn computation in smmu_iommu_mr 



smmu_iommu_mr() aims at returning the IOMMUMemoryRegion corresponding
to a given sid. The function extracts both the PCIe bus number and
the devfn to return this data. Current computation of devfn is wrong
as it only returns the PCIe function instead of slot | function.

Fixes 32cfd7f3 ("hw/arm/smmuv3: Cache/invalidate config data")

Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Message-id: 1530775623-32399-1-git-send-email-eric.auger@redhat.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent a98ff0ec

hw/arm/smmu-common.c

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ IOMMUMemoryRegion *smmu_iommu_mr(SMMUState *s, uint32_t sid) 
    bus_n = PCI_BUS_NUM(sid);

    smmu_bus = smmu_find_smmu_pcibus(s, bus_n);

    if (smmu_bus) {

        devfn = sid & 0x7;

        devfn = SMMU_PCI_DEVFN(sid);

        smmu = smmu_bus->pbdev[devfn];

        if (smmu) {

            return &smmu->iommu;

include/hw/arm/smmu-common.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#define SMMU_PCI_BUS_MAX      256

#define SMMU_PCI_DEVFN_MAX    256

#define SMMU_PCI_DEVFN(sid)   (sid & 0xFF)



#define SMMU_MAX_VA_BITS      48