Commit 2c91bcf2 authored by Peter Maydell's avatar Peter Maydell
Browse files

iommu: Add IOMMU index argument to translate method 



Add an IOMMU index argument to the translate method of
IOMMUs. Since all of our current IOMMU implementations
support only a single IOMMU index, this has no effect
on the behaviour.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Message-id: 20180604152941.20374-4-peter.maydell@linaro.org
parent cb1efcf4

exec.c

+9 −2
Original line number Diff line number Diff line
@@ -501,8 +501,15 @@ static MemoryRegionSection address_space_translate_iommu(IOMMUMemoryRegion *iomm 
    do {

        hwaddr addr = *xlat;

        IOMMUMemoryRegionClass *imrc = memory_region_get_iommu_class_nocheck(iommu_mr);

        IOMMUTLBEntry iotlb = imrc->translate(iommu_mr, addr, is_write ?

                                              IOMMU_WO : IOMMU_RO);

        int iommu_idx = 0;

        IOMMUTLBEntry iotlb;



        if (imrc->attrs_to_index) {

            iommu_idx = imrc->attrs_to_index(iommu_mr, attrs);

        }



        iotlb = imrc->translate(iommu_mr, addr, is_write ?

                                IOMMU_WO : IOMMU_RO, iommu_idx);



        if (!(iotlb.perm & (1 << is_write))) {

            goto unassigned;

hw/alpha/typhoon.c

+2 −1
Original line number Diff line number Diff line
@@ -666,7 +666,8 @@ static bool window_translate(TyphoonWindow *win, hwaddr addr, 
   Pchip and generate a machine check interrupt.  */

static IOMMUTLBEntry typhoon_translate_iommu(IOMMUMemoryRegion *iommu,

                                             hwaddr addr,

                                             IOMMUAccessFlags flag)

                                             IOMMUAccessFlags flag,

                                             int iommu_idx)

{

    TyphoonPchip *pchip = container_of(iommu, TyphoonPchip, iommu);

    IOMMUTLBEntry ret;

hw/arm/smmuv3.c

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ static int smmuv3_decode_config(IOMMUMemoryRegion *mr, SMMUTransCfg *cfg, 
}



static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr,

                                      IOMMUAccessFlags flag)

                                      IOMMUAccessFlags flag, int iommu_idx)

{

    SMMUDevice *sdev = container_of(mr, SMMUDevice, iommu);

    SMMUv3State *s = sdev->smmu;

hw/dma/rc4030.c

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ static const MemoryRegionOps jazzio_ops = { 
};



static IOMMUTLBEntry rc4030_dma_translate(IOMMUMemoryRegion *iommu, hwaddr addr,

                                          IOMMUAccessFlags flag)

                                          IOMMUAccessFlags flag, int iommu_idx)

{

    rc4030State *s = container_of(iommu, rc4030State, dma_mr);

    IOMMUTLBEntry ret = {

hw/i386/amd_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -991,7 +991,7 @@ static inline bool amdvi_is_interrupt_addr(hwaddr addr) 
}



static IOMMUTLBEntry amdvi_translate(IOMMUMemoryRegion *iommu, hwaddr addr,

                                     IOMMUAccessFlags flag)

                                     IOMMUAccessFlags flag, int iommu_idx)

{

    AMDVIAddressSpace *as = container_of(iommu, AMDVIAddressSpace, iommu);

    AMDVIState *s = as->iommu_state;