mirror of
https://github.com/qemu/qemu.git
synced 2024-12-11 20:53:51 +08:00
dma: Let ld*_dma() take MemTxAttrs argument
Let devices specify transaction attributes when calling ld*_dma(). Keep the default MEMTXATTRS_UNSPECIFIED in the few callers. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20211223115554.3155328-17-philmd@redhat.com>
This commit is contained in:
parent
2280c27afc
commit
34cdea1db6
@ -172,7 +172,7 @@ static uint64_t pnv_xive_vst_addr_indirect(PnvXive *xive, uint32_t type,
|
||||
|
||||
/* Get the page size of the indirect table. */
|
||||
vsd_addr = vsd & VSD_ADDRESS_MASK;
|
||||
vsd = ldq_be_dma(&address_space_memory, vsd_addr);
|
||||
vsd = ldq_be_dma(&address_space_memory, vsd_addr, MEMTXATTRS_UNSPECIFIED);
|
||||
|
||||
if (!(vsd & VSD_ADDRESS_MASK)) {
|
||||
#ifdef XIVE_DEBUG
|
||||
@ -195,7 +195,8 @@ static uint64_t pnv_xive_vst_addr_indirect(PnvXive *xive, uint32_t type,
|
||||
/* Load the VSD we are looking for, if not already done */
|
||||
if (vsd_idx) {
|
||||
vsd_addr = vsd_addr + vsd_idx * XIVE_VSD_SIZE;
|
||||
vsd = ldq_be_dma(&address_space_memory, vsd_addr);
|
||||
vsd = ldq_be_dma(&address_space_memory, vsd_addr,
|
||||
MEMTXATTRS_UNSPECIFIED);
|
||||
|
||||
if (!(vsd & VSD_ADDRESS_MASK)) {
|
||||
#ifdef XIVE_DEBUG
|
||||
@ -542,7 +543,7 @@ static uint64_t pnv_xive_vst_per_subpage(PnvXive *xive, uint32_t type)
|
||||
|
||||
/* Get the page size of the indirect table. */
|
||||
vsd_addr = vsd & VSD_ADDRESS_MASK;
|
||||
vsd = ldq_be_dma(&address_space_memory, vsd_addr);
|
||||
vsd = ldq_be_dma(&address_space_memory, vsd_addr, MEMTXATTRS_UNSPECIFIED);
|
||||
|
||||
if (!(vsd & VSD_ADDRESS_MASK)) {
|
||||
#ifdef XIVE_DEBUG
|
||||
|
@ -2062,7 +2062,7 @@ static TRBCCode xhci_address_slot(XHCIState *xhci, unsigned int slotid,
|
||||
assert(slotid >= 1 && slotid <= xhci->numslots);
|
||||
|
||||
dcbaap = xhci_addr64(xhci->dcbaap_low, xhci->dcbaap_high);
|
||||
poctx = ldq_le_dma(xhci->as, dcbaap + 8 * slotid);
|
||||
poctx = ldq_le_dma(xhci->as, dcbaap + 8 * slotid, MEMTXATTRS_UNSPECIFIED);
|
||||
ictx = xhci_mask64(pictx);
|
||||
octx = xhci_mask64(poctx);
|
||||
|
||||
@ -3437,8 +3437,8 @@ static int usb_xhci_post_load(void *opaque, int version_id)
|
||||
if (!slot->addressed) {
|
||||
continue;
|
||||
}
|
||||
slot->ctx =
|
||||
xhci_mask64(ldq_le_dma(xhci->as, dcbaap + 8 * slotid));
|
||||
slot->ctx = xhci_mask64(ldq_le_dma(xhci->as, dcbaap + 8 * slotid,
|
||||
MEMTXATTRS_UNSPECIFIED));
|
||||
xhci_dma_read_u32s(xhci, slot->ctx, slot_ctx, sizeof(slot_ctx));
|
||||
slot->uport = xhci_lookup_uport(xhci, slot_ctx);
|
||||
if (!slot->uport) {
|
||||
|
@ -854,7 +854,8 @@ static inline MemTxResult pci_dma_write(PCIDevice *dev, dma_addr_t addr,
|
||||
static inline uint##_bits##_t ld##_l##_pci_dma(PCIDevice *dev, \
|
||||
dma_addr_t addr) \
|
||||
{ \
|
||||
return ld##_l##_dma(pci_get_address_space(dev), addr); \
|
||||
return ld##_l##_dma(pci_get_address_space(dev), addr, \
|
||||
MEMTXATTRS_UNSPECIFIED); \
|
||||
} \
|
||||
static inline void st##_s##_pci_dma(PCIDevice *dev, \
|
||||
dma_addr_t addr, uint##_bits##_t val) \
|
||||
|
@ -126,7 +126,8 @@ static inline int spapr_vio_dma_set(SpaprVioDevice *dev, uint64_t taddr,
|
||||
(stl_be_dma(&(_dev)->as, (_addr), (_val), MEMTXATTRS_UNSPECIFIED))
|
||||
#define vio_stq(_dev, _addr, _val) \
|
||||
(stq_be_dma(&(_dev)->as, (_addr), (_val), MEMTXATTRS_UNSPECIFIED))
|
||||
#define vio_ldq(_dev, _addr) (ldq_be_dma(&(_dev)->as, (_addr)))
|
||||
#define vio_ldq(_dev, _addr) \
|
||||
(ldq_be_dma(&(_dev)->as, (_addr), MEMTXATTRS_UNSPECIFIED))
|
||||
|
||||
int spapr_vio_send_crq(SpaprVioDevice *dev, uint8_t *crq);
|
||||
|
||||
|
@ -241,10 +241,11 @@ static inline void dma_memory_unmap(AddressSpace *as,
|
||||
|
||||
#define DEFINE_LDST_DMA(_lname, _sname, _bits, _end) \
|
||||
static inline uint##_bits##_t ld##_lname##_##_end##_dma(AddressSpace *as, \
|
||||
dma_addr_t addr) \
|
||||
dma_addr_t addr, \
|
||||
MemTxAttrs attrs) \
|
||||
{ \
|
||||
uint##_bits##_t val; \
|
||||
dma_memory_read(as, addr, &val, (_bits) / 8, MEMTXATTRS_UNSPECIFIED); \
|
||||
dma_memory_read(as, addr, &val, (_bits) / 8, attrs); \
|
||||
return _end##_bits##_to_cpu(val); \
|
||||
} \
|
||||
static inline void st##_sname##_##_end##_dma(AddressSpace *as, \
|
||||
@ -253,14 +254,14 @@ static inline void dma_memory_unmap(AddressSpace *as,
|
||||
MemTxAttrs attrs) \
|
||||
{ \
|
||||
val = cpu_to_##_end##_bits(val); \
|
||||
dma_memory_write(as, addr, &val, (_bits) / 8, attrs); \
|
||||
dma_memory_write(as, addr, &val, (_bits) / 8, attrs); \
|
||||
}
|
||||
|
||||
static inline uint8_t ldub_dma(AddressSpace *as, dma_addr_t addr)
|
||||
static inline uint8_t ldub_dma(AddressSpace *as, dma_addr_t addr, MemTxAttrs attrs)
|
||||
{
|
||||
uint8_t val;
|
||||
|
||||
dma_memory_read(as, addr, &val, 1, MEMTXATTRS_UNSPECIFIED);
|
||||
dma_memory_read(as, addr, &val, 1, attrs);
|
||||
return val;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user