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

spapr_iommu: Introduce bus_offset in sPAPRTCETable 

This adds @bus_offset into sPAPRTCETable to tell where TCE table starts
from. It is set to 0 for emulated devices. Dynamic DMA windows will use
other offset.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexey Kardashevskiy 2014-05-27 15:36:37 +10:00 committed by Alexander Graf
parent 650f33adbd
commit 1b8eceee28
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/ppc/spapr_iommu.c
View File

@ -140,6 +140,7 @@ static int spapr_tce_table_realize(DeviceState *dev)
} }
sPAPRTCETable *spapr_tce_new_table(DeviceState *owner, uint32_t liobn, sPAPRTCETable *spapr_tce_new_table(DeviceState *owner, uint32_t liobn,
uint64_t bus_offset,
uint32_t page_shift, uint32_t page_shift,
uint32_t nb_table) uint32_t nb_table)
{ {
@ -157,6 +158,7 @@ sPAPRTCETable *spapr_tce_new_table(DeviceState *owner, uint32_t liobn,
tcet = SPAPR_TCE_TABLE(object_new(TYPE_SPAPR_TCE_TABLE)); tcet = SPAPR_TCE_TABLE(object_new(TYPE_SPAPR_TCE_TABLE));
tcet->liobn = liobn; tcet->liobn = liobn;
tcet->bus_offset = bus_offset;
tcet->page_shift = page_shift; tcet->page_shift = page_shift;
tcet->nb_table = nb_table; tcet->nb_table = nb_table;
@ -204,14 +206,15 @@ static target_ulong put_tce_emu(sPAPRTCETable *tcet, target_ulong ioba,
{ {
IOMMUTLBEntry entry; IOMMUTLBEntry entry;
hwaddr page_mask = IOMMU_PAGE_MASK(tcet->page_shift); hwaddr page_mask = IOMMU_PAGE_MASK(tcet->page_shift);
unsigned long index = (ioba - tcet->bus_offset) >> tcet->page_shift;
if ((ioba >> tcet->page_shift) >= tcet->nb_table) { if (index >= tcet->nb_table) {
hcall_dprintf("spapr_vio_put_tce on out-of-bounds IOBA 0x" hcall_dprintf("spapr_vio_put_tce on out-of-bounds IOBA 0x"
TARGET_FMT_lx "\n", ioba); TARGET_FMT_lx "\n", ioba);
return H_PARAMETER; return H_PARAMETER;
} }
tcet->table[ioba >> tcet->page_shift] = tce; tcet->table[index] = tce;
entry.target_as = &address_space_memory, entry.target_as = &address_space_memory,
entry.iova = ioba & page_mask; entry.iova = ioba & page_mask;
@ -330,13 +333,15 @@ static target_ulong h_put_tce(PowerPCCPU *cpu, sPAPREnvironment *spapr,
static target_ulong get_tce_emu(sPAPRTCETable *tcet, target_ulong ioba, static target_ulong get_tce_emu(sPAPRTCETable *tcet, target_ulong ioba,
target_ulong *tce) target_ulong *tce)
{ {
if ((ioba >> tcet->page_shift) >= tcet->nb_table) { unsigned long index = (ioba - tcet->bus_offset) >> tcet->page_shift;
if (index >= tcet->nb_table) {
hcall_dprintf("spapr_iommu_get_tce on out-of-bounds IOBA 0x" hcall_dprintf("spapr_iommu_get_tce on out-of-bounds IOBA 0x"
TARGET_FMT_lx "\n", ioba); TARGET_FMT_lx "\n", ioba);
return H_PARAMETER; return H_PARAMETER;
} }
*tce = tcet->table[ioba >> tcet->page_shift]; *tce = tcet->table[index];
return H_SUCCESS; return H_SUCCESS;
} }

5
hw/ppc/spapr_pci.c
View File

@ -656,6 +656,7 @@ static void spapr_phb_finish_realize(sPAPRPHBState *sphb, Error **errp)
sPAPRTCETable *tcet; sPAPRTCETable *tcet;
tcet = spapr_tce_new_table(DEVICE(sphb), sphb->dma_liobn, tcet = spapr_tce_new_table(DEVICE(sphb), sphb->dma_liobn,
0,
SPAPR_TCE_PAGE_SHIFT, SPAPR_TCE_PAGE_SHIFT,
0x40000000 >> SPAPR_TCE_PAGE_SHIFT); 0x40000000 >> SPAPR_TCE_PAGE_SHIFT);
if (!tcet) { if (!tcet) {
@ -813,8 +814,8 @@ static int spapr_phb_children_dt(Object *child, void *opaque)
} }
spapr_dma_dt(p->fdt, p->node_off, "ibm,dma-window", spapr_dma_dt(p->fdt, p->node_off, "ibm,dma-window",
tcet->liobn, 0, tcet->liobn, tcet->bus_offset,
tcet->nb_table << SPAPR_TCE_PAGE_SHIFT); tcet->nb_table << tcet->page_shift);
/* Stop after the first window */ /* Stop after the first window */
return 1; return 1;

1
hw/ppc/spapr_vio.c
View File

@ -457,6 +457,7 @@ static int spapr_vio_busdev_init(DeviceState *qdev)
if (pc->rtce_window_size) { if (pc->rtce_window_size) {
uint32_t liobn = SPAPR_VIO_BASE_LIOBN | dev->reg; uint32_t liobn = SPAPR_VIO_BASE_LIOBN | dev->reg;
dev->tcet = spapr_tce_new_table(qdev, liobn, dev->tcet = spapr_tce_new_table(qdev, liobn,
0,
SPAPR_TCE_PAGE_SHIFT, SPAPR_TCE_PAGE_SHIFT,
pc->rtce_window_size >> pc->rtce_window_size >>
SPAPR_TCE_PAGE_SHIFT); SPAPR_TCE_PAGE_SHIFT);

2
include/hw/ppc/spapr.h
View File

@ -398,6 +398,7 @@ struct sPAPRTCETable {
DeviceState parent; DeviceState parent;
uint32_t liobn; uint32_t liobn;
uint32_t nb_table; uint32_t nb_table;
uint64_t bus_offset;
uint32_t page_shift; uint32_t page_shift;
uint64_t *table; uint64_t *table;
bool bypass; bool bypass;
@ -410,6 +411,7 @@ void spapr_events_init(sPAPREnvironment *spapr);
void spapr_events_fdt_skel(void *fdt, uint32_t epow_irq); void spapr_events_fdt_skel(void *fdt, uint32_t epow_irq);
int spapr_h_cas_compose_response(target_ulong addr, target_ulong size); int spapr_h_cas_compose_response(target_ulong addr, target_ulong size);
sPAPRTCETable *spapr_tce_new_table(DeviceState *owner, uint32_t liobn, sPAPRTCETable *spapr_tce_new_table(DeviceState *owner, uint32_t liobn,
uint64_t bus_offset,
uint32_t page_shift, uint32_t page_shift,
uint32_t nb_table); uint32_t nb_table);
MemoryRegion *spapr_tce_get_iommu(sPAPRTCETable *tcet); MemoryRegion *spapr_tce_get_iommu(sPAPRTCETable *tcet);