Commit 96478592 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

spapr_vio: take care of creating our own AddressSpace/DMAContext 



Fetch the root region from the sPAPRTCETable, and use it to build
an AddressSpace and DMAContext.

Now, everywhere we have a DMAContext we also have access to the
corresponding AddressSpace (either because we create it just before
the DMAContext, or because dma_context_memory's AddressSpace is
trivially address_space_memory).

Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e00387d5

hw/ppc/spapr_iommu.c

+0 −11
Original line number Diff line number Diff line
@@ -37,10 +37,6 @@ enum sPAPRTCEAccess { 
};



struct sPAPRTCETable {

    /* temporary until everyone has its own AddressSpace */

    DMAContext dma;

    AddressSpace as;



    uint32_t liobn;

    uint32_t window_size;

    sPAPRTCE *table;
@@ -157,8 +153,6 @@ sPAPRTCETable *spapr_tce_new_table(uint32_t liobn, size_t window_size) 


    memory_region_init_iommu(&tcet->iommu, &spapr_iommu_ops,

                             "iommu-spapr", UINT64_MAX);

    address_space_init(&tcet->as, &tcet->iommu);

    dma_context_init(&tcet->dma, &tcet->as);



    QLIST_INSERT_HEAD(&spapr_tce_tables, tcet, list);
@@ -178,11 +172,6 @@ void spapr_tce_free(sPAPRTCETable *tcet) 
    g_free(tcet);

}



DMAContext *spapr_tce_get_dma(sPAPRTCETable *tcet)

{

    return &tcet->dma;

}



MemoryRegion *spapr_tce_get_iommu(sPAPRTCETable *tcet)

{

    return &tcet->iommu;

hw/ppc/spapr_vio.c

+2 −1
Original line number Diff line number Diff line
@@ -454,7 +454,8 @@ static int spapr_vio_busdev_init(DeviceState *qdev) 
    if (pc->rtce_window_size) {

        uint32_t liobn = SPAPR_VIO_BASE_LIOBN | dev->reg;

        dev->tcet = spapr_tce_new_table(liobn, pc->rtce_window_size);

        dev->dma = spapr_tce_get_dma(dev->tcet);

        address_space_init(&dev->as, spapr_tce_get_iommu(dev->tcet));

        dma_context_init(&dev->dma, &dev->as);

    }



    return pc->init(dev);

include/hw/ppc/spapr.h

+0 −1
Original line number Diff line number Diff line
@@ -348,7 +348,6 @@ void spapr_iommu_init(void); 
void spapr_events_init(sPAPREnvironment *spapr);

void spapr_events_fdt_skel(void *fdt, uint32_t epow_irq);

sPAPRTCETable *spapr_tce_new_table(uint32_t liobn, size_t window_size);

DMAContext *spapr_tce_get_dma(sPAPRTCETable *tcet);

MemoryRegion *spapr_tce_get_iommu(sPAPRTCETable *tcet);

void spapr_tce_free(sPAPRTCETable *tcet);

void spapr_tce_reset(sPAPRTCETable *tcet);

include/hw/ppc/spapr_vio.h

+11 −10
Original line number Diff line number Diff line
@@ -63,8 +63,9 @@ struct VIOsPAPRDevice { 
    uint32_t irq;

    target_ulong signal_state;

    VIOsPAPR_CRQ crq;

    AddressSpace as;

    DMAContext dma;

    sPAPRTCETable *tcet;

    DMAContext *dma;

};



#define DEFINE_SPAPR_PROPERTIES(type, field)           \
@@ -92,35 +93,35 @@ static inline qemu_irq spapr_vio_qirq(VIOsPAPRDevice *dev) 
static inline bool spapr_vio_dma_valid(VIOsPAPRDevice *dev, uint64_t taddr,

                                       uint32_t size, DMADirection dir)

{

    return dma_memory_valid(dev->dma, taddr, size, dir);

    return dma_memory_valid(&dev->dma, taddr, size, dir);

}



static inline int spapr_vio_dma_read(VIOsPAPRDevice *dev, uint64_t taddr,

                                     void *buf, uint32_t size)

{

    return (dma_memory_read(dev->dma, taddr, buf, size) != 0) ?

    return (dma_memory_read(&dev->dma, taddr, buf, size) != 0) ?

        H_DEST_PARM : H_SUCCESS;

}



static inline int spapr_vio_dma_write(VIOsPAPRDevice *dev, uint64_t taddr,

                                      const void *buf, uint32_t size)

{

    return (dma_memory_write(dev->dma, taddr, buf, size) != 0) ?

    return (dma_memory_write(&dev->dma, taddr, buf, size) != 0) ?

        H_DEST_PARM : H_SUCCESS;

}



static inline int spapr_vio_dma_set(VIOsPAPRDevice *dev, uint64_t taddr,

                                    uint8_t c, uint32_t size)

{

    return (dma_memory_set(dev->dma, taddr, c, size) != 0) ?

    return (dma_memory_set(&dev->dma, taddr, c, size) != 0) ?

        H_DEST_PARM : H_SUCCESS;

}



#define vio_stb(_dev, _addr, _val) (stb_dma((_dev)->dma, (_addr), (_val)))

#define vio_sth(_dev, _addr, _val) (stw_be_dma((_dev)->dma, (_addr), (_val)))

#define vio_stl(_dev, _addr, _val) (stl_be_dma((_dev)->dma, (_addr), (_val)))

#define vio_stq(_dev, _addr, _val) (stq_be_dma((_dev)->dma, (_addr), (_val)))

#define vio_ldq(_dev, _addr) (ldq_be_dma((_dev)->dma, (_addr)))

#define vio_stb(_dev, _addr, _val) (stb_dma(&(_dev)->dma, (_addr), (_val)))

#define vio_sth(_dev, _addr, _val) (stw_be_dma(&(_dev)->dma, (_addr), (_val)))

#define vio_stl(_dev, _addr, _val) (stl_be_dma(&(_dev)->dma, (_addr), (_val)))

#define vio_stq(_dev, _addr, _val) (stq_be_dma(&(_dev)->dma, (_addr), (_val)))

#define vio_ldq(_dev, _addr) (ldq_be_dma(&(_dev)->dma, (_addr)))



int spapr_vio_send_crq(VIOsPAPRDevice *dev, uint8_t *crq);