diff options
| author | Eric Auger | 2018-07-09 15:51:34 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-07-09 15:51:34 +0200 |
| commit | b78aae9bb65876baa47b73d5cf63372171630bf9 (patch) | |
| tree | 6a0e584381f524cd9c68225b82481c69127ebadf | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-3.0-20180709' into... (diff) | |
| download | qemu-b78aae9bb65876baa47b73d5cf63372171630bf9.tar.gz qemu-b78aae9bb65876baa47b73d5cf63372171630bf9.tar.xz qemu-b78aae9bb65876baa47b73d5cf63372171630bf9.zip | |
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 32cfd7f39e08 ("hw/arm/smmuv3: Cache/invalidate config data")
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Message-id: 1530775623-32399-1-git-send-email-eric.auger@redhat.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/arm/smmu-common.c | 2 | ||||
| -rw-r--r-- | include/hw/arm/smmu-common.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 3098915d07..55c75d65d2 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -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; diff --git a/include/hw/arm/smmu-common.h b/include/hw/arm/smmu-common.h index 50e2912a95..b07cadd0ef 100644 --- a/include/hw/arm/smmu-common.h +++ b/include/hw/arm/smmu-common.h @@ -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 |