* [PATCH 1/4] dma: Let st*_dma() take MemTxAttrs argument
2021-12-18 14:51 [PATCH 0/4] hw: Have DMA API take MemTxAttrs arg & propagate MemTxResult (part 3) Philippe Mathieu-Daudé
@ 2021-12-18 14:51 ` Philippe Mathieu-Daudé
2021-12-21 23:05 ` Richard Henderson
2021-12-22 6:44 ` Cédric Le Goater
2021-12-18 14:51 ` [PATCH 2/4] dma: Let ld*_dma() " Philippe Mathieu-Daudé
` (2 subsequent siblings)
3 siblings, 2 replies; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-12-18 14:51 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel Henrique Barboza, Michael S. Tsirkin, David Hildenbrand,
Li Qiang, Qiuhao Li, Peter Xu, Greg Kurz, Alexander Bulekov,
qemu-ppc, Cédric Le Goater, Paolo Bonzini, David Gibson,
Philippe Mathieu-Daudé,
Gerd Hoffmann
Let devices specify transaction attributes when calling st*_dma().
Keep the default MEMTXATTRS_UNSPECIFIED in the few callers.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/pci/pci.h | 3 ++-
include/hw/ppc/spapr_vio.h | 12 ++++++++----
include/sysemu/dma.h | 10 ++++++----
hw/nvram/fw_cfg.c | 4 ++--
4 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index a751ab5a75d..d07e9707b48 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -859,7 +859,8 @@ static inline MemTxResult pci_dma_write(PCIDevice *dev, dma_addr_t addr,
static inline void st##_s##_pci_dma(PCIDevice *dev, \
dma_addr_t addr, uint##_bits##_t val) \
{ \
- st##_s##_dma(pci_get_address_space(dev), addr, val); \
+ st##_s##_dma(pci_get_address_space(dev), addr, val, \
+ MEMTXATTRS_UNSPECIFIED); \
}
PCI_DMA_DEFINE_LDST(ub, b, 8);
diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h
index 5d2ea8e6656..e87f8e6f596 100644
--- a/include/hw/ppc/spapr_vio.h
+++ b/include/hw/ppc/spapr_vio.h
@@ -118,10 +118,14 @@ static inline int spapr_vio_dma_set(SpaprVioDevice *dev, uint64_t taddr,
H_DEST_PARM : H_SUCCESS;
}
-#define vio_stb(_dev, _addr, _val) (stb_dma(&(_dev)->as, (_addr), (_val)))
-#define vio_sth(_dev, _addr, _val) (stw_be_dma(&(_dev)->as, (_addr), (_val)))
-#define vio_stl(_dev, _addr, _val) (stl_be_dma(&(_dev)->as, (_addr), (_val)))
-#define vio_stq(_dev, _addr, _val) (stq_be_dma(&(_dev)->as, (_addr), (_val)))
+#define vio_stb(_dev, _addr, _val) \
+ (stb_dma(&(_dev)->as, (_addr), (_val), MEMTXATTRS_UNSPECIFIED))
+#define vio_sth(_dev, _addr, _val) \
+ (stw_be_dma(&(_dev)->as, (_addr), (_val), MEMTXATTRS_UNSPECIFIED))
+#define vio_stl(_dev, _addr, _val) \
+ (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)))
int spapr_vio_send_crq(SpaprVioDevice *dev, uint8_t *crq);
diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
index 9f998edbea4..2a60d2c5d61 100644
--- a/include/sysemu/dma.h
+++ b/include/sysemu/dma.h
@@ -250,10 +250,11 @@ static inline void dma_memory_unmap(AddressSpace *as,
} \
static inline void st##_sname##_##_end##_dma(AddressSpace *as, \
dma_addr_t addr, \
- uint##_bits##_t val) \
+ uint##_bits##_t val, \
+ MemTxAttrs attrs) \
{ \
val = cpu_to_##_end##_bits(val); \
- dma_memory_write(as, addr, &val, (_bits) / 8, MEMTXATTRS_UNSPECIFIED); \
+ dma_memory_write(as, addr, &val, (_bits) / 8, attrs); \
}
static inline uint8_t ldub_dma(AddressSpace *as, dma_addr_t addr)
@@ -264,9 +265,10 @@ static inline uint8_t ldub_dma(AddressSpace *as, dma_addr_t addr)
return val;
}
-static inline void stb_dma(AddressSpace *as, dma_addr_t addr, uint8_t val)
+static inline void stb_dma(AddressSpace *as, dma_addr_t addr,
+ uint8_t val, MemTxAttrs attrs)
{
- dma_memory_write(as, addr, &val, 1, MEMTXATTRS_UNSPECIFIED);
+ dma_memory_write(as, addr, &val, 1, attrs);
}
DEFINE_LDST_DMA(uw, w, 16, le);
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 9b91b15cb08..e5f3c981841 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -360,7 +360,7 @@ static void fw_cfg_dma_transfer(FWCfgState *s)
if (dma_memory_read(s->dma_as, dma_addr,
&dma, sizeof(dma), MEMTXATTRS_UNSPECIFIED)) {
stl_be_dma(s->dma_as, dma_addr + offsetof(FWCfgDmaAccess, control),
- FW_CFG_DMA_CTL_ERROR);
+ FW_CFG_DMA_CTL_ERROR, MEMTXATTRS_UNSPECIFIED);
return;
}
@@ -446,7 +446,7 @@ static void fw_cfg_dma_transfer(FWCfgState *s)
}
stl_be_dma(s->dma_as, dma_addr + offsetof(FWCfgDmaAccess, control),
- dma.control);
+ dma.control, MEMTXATTRS_UNSPECIFIED);
trace_fw_cfg_read(s, 0);
}
--
2.33.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 1/4] dma: Let st*_dma() take MemTxAttrs argument
2021-12-18 14:51 ` [PATCH 1/4] dma: Let st*_dma() take MemTxAttrs argument Philippe Mathieu-Daudé
@ 2021-12-21 23:05 ` Richard Henderson
2021-12-22 6:44 ` Cédric Le Goater
1 sibling, 0 replies; 13+ messages in thread
From: Richard Henderson @ 2021-12-21 23:05 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Gerd Hoffmann, David Hildenbrand, Daniel Henrique Barboza,
Li Qiang, Qiuhao Li, Peter Xu, Greg Kurz, Alexander Bulekov,
Michael S. Tsirkin, Cédric Le Goater, Paolo Bonzini,
qemu-ppc, David Gibson
On 12/18/21 6:51 AM, Philippe Mathieu-Daudé wrote:
> Let devices specify transaction attributes when calling st*_dma().
>
> Keep the default MEMTXATTRS_UNSPECIFIED in the few callers.
>
> Signed-off-by: Philippe Mathieu-Daudé<philmd@redhat.com>
> ---
> include/hw/pci/pci.h | 3 ++-
> include/hw/ppc/spapr_vio.h | 12 ++++++++----
> include/sysemu/dma.h | 10 ++++++----
> hw/nvram/fw_cfg.c | 4 ++--
> 4 files changed, 18 insertions(+), 11 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/4] dma: Let st*_dma() take MemTxAttrs argument
2021-12-18 14:51 ` [PATCH 1/4] dma: Let st*_dma() take MemTxAttrs argument Philippe Mathieu-Daudé
2021-12-21 23:05 ` Richard Henderson
@ 2021-12-22 6:44 ` Cédric Le Goater
1 sibling, 0 replies; 13+ messages in thread
From: Cédric Le Goater @ 2021-12-22 6:44 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Daniel Henrique Barboza, Michael S. Tsirkin, David Hildenbrand,
Li Qiang, Qiuhao Li, Peter Xu, Greg Kurz, Alexander Bulekov,
qemu-ppc, Gerd Hoffmann, Paolo Bonzini, David Gibson
On 12/18/21 15:51, Philippe Mathieu-Daudé wrote:
> Let devices specify transaction attributes when calling st*_dma().
>
> Keep the default MEMTXATTRS_UNSPECIFIED in the few callers.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Thanks,
C.
> ---
> include/hw/pci/pci.h | 3 ++-
> include/hw/ppc/spapr_vio.h | 12 ++++++++----
> include/sysemu/dma.h | 10 ++++++----
> hw/nvram/fw_cfg.c | 4 ++--
> 4 files changed, 18 insertions(+), 11 deletions(-)
>
> diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> index a751ab5a75d..d07e9707b48 100644
> --- a/include/hw/pci/pci.h
> +++ b/include/hw/pci/pci.h
> @@ -859,7 +859,8 @@ static inline MemTxResult pci_dma_write(PCIDevice *dev, dma_addr_t addr,
> static inline void st##_s##_pci_dma(PCIDevice *dev, \
> dma_addr_t addr, uint##_bits##_t val) \
> { \
> - st##_s##_dma(pci_get_address_space(dev), addr, val); \
> + st##_s##_dma(pci_get_address_space(dev), addr, val, \
> + MEMTXATTRS_UNSPECIFIED); \
> }
>
> PCI_DMA_DEFINE_LDST(ub, b, 8);
> diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h
> index 5d2ea8e6656..e87f8e6f596 100644
> --- a/include/hw/ppc/spapr_vio.h
> +++ b/include/hw/ppc/spapr_vio.h
> @@ -118,10 +118,14 @@ static inline int spapr_vio_dma_set(SpaprVioDevice *dev, uint64_t taddr,
> H_DEST_PARM : H_SUCCESS;
> }
>
> -#define vio_stb(_dev, _addr, _val) (stb_dma(&(_dev)->as, (_addr), (_val)))
> -#define vio_sth(_dev, _addr, _val) (stw_be_dma(&(_dev)->as, (_addr), (_val)))
> -#define vio_stl(_dev, _addr, _val) (stl_be_dma(&(_dev)->as, (_addr), (_val)))
> -#define vio_stq(_dev, _addr, _val) (stq_be_dma(&(_dev)->as, (_addr), (_val)))
> +#define vio_stb(_dev, _addr, _val) \
> + (stb_dma(&(_dev)->as, (_addr), (_val), MEMTXATTRS_UNSPECIFIED))
> +#define vio_sth(_dev, _addr, _val) \
> + (stw_be_dma(&(_dev)->as, (_addr), (_val), MEMTXATTRS_UNSPECIFIED))
> +#define vio_stl(_dev, _addr, _val) \
> + (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)))
>
> int spapr_vio_send_crq(SpaprVioDevice *dev, uint8_t *crq);
> diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
> index 9f998edbea4..2a60d2c5d61 100644
> --- a/include/sysemu/dma.h
> +++ b/include/sysemu/dma.h
> @@ -250,10 +250,11 @@ static inline void dma_memory_unmap(AddressSpace *as,
> } \
> static inline void st##_sname##_##_end##_dma(AddressSpace *as, \
> dma_addr_t addr, \
> - uint##_bits##_t val) \
> + uint##_bits##_t val, \
> + MemTxAttrs attrs) \
> { \
> val = cpu_to_##_end##_bits(val); \
> - dma_memory_write(as, addr, &val, (_bits) / 8, MEMTXATTRS_UNSPECIFIED); \
> + dma_memory_write(as, addr, &val, (_bits) / 8, attrs); \
> }
>
> static inline uint8_t ldub_dma(AddressSpace *as, dma_addr_t addr)
> @@ -264,9 +265,10 @@ static inline uint8_t ldub_dma(AddressSpace *as, dma_addr_t addr)
> return val;
> }
>
> -static inline void stb_dma(AddressSpace *as, dma_addr_t addr, uint8_t val)
> +static inline void stb_dma(AddressSpace *as, dma_addr_t addr,
> + uint8_t val, MemTxAttrs attrs)
> {
> - dma_memory_write(as, addr, &val, 1, MEMTXATTRS_UNSPECIFIED);
> + dma_memory_write(as, addr, &val, 1, attrs);
> }
>
> DEFINE_LDST_DMA(uw, w, 16, le);
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index 9b91b15cb08..e5f3c981841 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -360,7 +360,7 @@ static void fw_cfg_dma_transfer(FWCfgState *s)
> if (dma_memory_read(s->dma_as, dma_addr,
> &dma, sizeof(dma), MEMTXATTRS_UNSPECIFIED)) {
> stl_be_dma(s->dma_as, dma_addr + offsetof(FWCfgDmaAccess, control),
> - FW_CFG_DMA_CTL_ERROR);
> + FW_CFG_DMA_CTL_ERROR, MEMTXATTRS_UNSPECIFIED);
> return;
> }
>
> @@ -446,7 +446,7 @@ static void fw_cfg_dma_transfer(FWCfgState *s)
> }
>
> stl_be_dma(s->dma_as, dma_addr + offsetof(FWCfgDmaAccess, control),
> - dma.control);
> + dma.control, MEMTXATTRS_UNSPECIFIED);
>
> trace_fw_cfg_read(s, 0);
> }
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 2/4] dma: Let ld*_dma() take MemTxAttrs argument
2021-12-18 14:51 [PATCH 0/4] hw: Have DMA API take MemTxAttrs arg & propagate MemTxResult (part 3) Philippe Mathieu-Daudé
2021-12-18 14:51 ` [PATCH 1/4] dma: Let st*_dma() take MemTxAttrs argument Philippe Mathieu-Daudé
@ 2021-12-18 14:51 ` Philippe Mathieu-Daudé
2021-12-21 23:06 ` Richard Henderson
2021-12-22 6:44 ` Cédric Le Goater
2021-12-18 14:51 ` [PATCH 3/4] dma: Let st*_dma() propagate MemTxResult Philippe Mathieu-Daudé
2021-12-18 14:51 ` [PATCH 4/4] dma: Let ld*_dma() " Philippe Mathieu-Daudé
3 siblings, 2 replies; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-12-18 14:51 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel Henrique Barboza, Michael S. Tsirkin, David Hildenbrand,
Li Qiang, Qiuhao Li, Peter Xu, Greg Kurz, Alexander Bulekov,
qemu-ppc, Cédric Le Goater, Paolo Bonzini, David Gibson,
Philippe Mathieu-Daudé,
Gerd Hoffmann
Let devices specify transaction attributes when calling ld*_dma().
Keep the default MEMTXATTRS_UNSPECIFIED in the few callers.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/pci/pci.h | 3 ++-
include/hw/ppc/spapr_vio.h | 3 ++-
include/sysemu/dma.h | 11 ++++++-----
hw/intc/pnv_xive.c | 7 ++++---
hw/usb/hcd-xhci.c | 6 +++---
5 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index d07e9707b48..0613308b1b6 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -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) \
diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h
index e87f8e6f596..d2ec9b0637f 100644
--- a/include/hw/ppc/spapr_vio.h
+++ b/include/hw/ppc/spapr_vio.h
@@ -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);
diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
index 2a60d2c5d61..b711d390a4f 100644
--- a/include/sysemu/dma.h
+++ b/include/sysemu/dma.h
@@ -242,10 +242,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, \
@@ -254,14 +255,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;
}
diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c
index ad43483612e..d9249bbc0c1 100644
--- a/hw/intc/pnv_xive.c
+++ b/hw/intc/pnv_xive.c
@@ -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
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index ed2b9ea456e..d960b814587 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -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) {
--
2.33.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 2/4] dma: Let ld*_dma() take MemTxAttrs argument
2021-12-18 14:51 ` [PATCH 2/4] dma: Let ld*_dma() " Philippe Mathieu-Daudé
@ 2021-12-21 23:06 ` Richard Henderson
2021-12-22 6:44 ` Cédric Le Goater
1 sibling, 0 replies; 13+ messages in thread
From: Richard Henderson @ 2021-12-21 23:06 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Gerd Hoffmann, David Hildenbrand, Daniel Henrique Barboza,
Li Qiang, Qiuhao Li, Peter Xu, Greg Kurz, Alexander Bulekov,
Michael S. Tsirkin, Cédric Le Goater, Paolo Bonzini,
qemu-ppc, David Gibson
On 12/18/21 6:51 AM, Philippe Mathieu-Daudé wrote:
> Let devices specify transaction attributes when calling ld*_dma().
>
> Keep the default MEMTXATTRS_UNSPECIFIED in the few callers.
>
> Signed-off-by: Philippe Mathieu-Daudé<philmd@redhat.com>
> ---
> include/hw/pci/pci.h | 3 ++-
> include/hw/ppc/spapr_vio.h | 3 ++-
> include/sysemu/dma.h | 11 ++++++-----
> hw/intc/pnv_xive.c | 7 ++++---
> hw/usb/hcd-xhci.c | 6 +++---
> 5 files changed, 17 insertions(+), 13 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 2/4] dma: Let ld*_dma() take MemTxAttrs argument
2021-12-18 14:51 ` [PATCH 2/4] dma: Let ld*_dma() " Philippe Mathieu-Daudé
2021-12-21 23:06 ` Richard Henderson
@ 2021-12-22 6:44 ` Cédric Le Goater
1 sibling, 0 replies; 13+ messages in thread
From: Cédric Le Goater @ 2021-12-22 6:44 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Daniel Henrique Barboza, Michael S. Tsirkin, David Hildenbrand,
Li Qiang, Qiuhao Li, Peter Xu, Greg Kurz, Alexander Bulekov,
qemu-ppc, Gerd Hoffmann, Paolo Bonzini, David Gibson
On 12/18/21 15:51, Philippe Mathieu-Daudé wrote:
> Let devices specify transaction attributes when calling ld*_dma().
>
> Keep the default MEMTXATTRS_UNSPECIFIED in the few callers.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Thanks,
C.
> ---
> include/hw/pci/pci.h | 3 ++-
> include/hw/ppc/spapr_vio.h | 3 ++-
> include/sysemu/dma.h | 11 ++++++-----
> hw/intc/pnv_xive.c | 7 ++++---
> hw/usb/hcd-xhci.c | 6 +++---
> 5 files changed, 17 insertions(+), 13 deletions(-)
>
> diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> index d07e9707b48..0613308b1b6 100644
> --- a/include/hw/pci/pci.h
> +++ b/include/hw/pci/pci.h
> @@ -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) \
> diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h
> index e87f8e6f596..d2ec9b0637f 100644
> --- a/include/hw/ppc/spapr_vio.h
> +++ b/include/hw/ppc/spapr_vio.h
> @@ -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);
>
> diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
> index 2a60d2c5d61..b711d390a4f 100644
> --- a/include/sysemu/dma.h
> +++ b/include/sysemu/dma.h
> @@ -242,10 +242,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, \
> @@ -254,14 +255,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;
> }
>
> diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c
> index ad43483612e..d9249bbc0c1 100644
> --- a/hw/intc/pnv_xive.c
> +++ b/hw/intc/pnv_xive.c
> @@ -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
> diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
> index ed2b9ea456e..d960b814587 100644
> --- a/hw/usb/hcd-xhci.c
> +++ b/hw/usb/hcd-xhci.c
> @@ -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) {
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/4] dma: Let st*_dma() propagate MemTxResult
2021-12-18 14:51 [PATCH 0/4] hw: Have DMA API take MemTxAttrs arg & propagate MemTxResult (part 3) Philippe Mathieu-Daudé
2021-12-18 14:51 ` [PATCH 1/4] dma: Let st*_dma() take MemTxAttrs argument Philippe Mathieu-Daudé
2021-12-18 14:51 ` [PATCH 2/4] dma: Let ld*_dma() " Philippe Mathieu-Daudé
@ 2021-12-18 14:51 ` Philippe Mathieu-Daudé
2021-12-21 23:07 ` Richard Henderson
2021-12-22 6:45 ` Cédric Le Goater
2021-12-18 14:51 ` [PATCH 4/4] dma: Let ld*_dma() " Philippe Mathieu-Daudé
3 siblings, 2 replies; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-12-18 14:51 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel Henrique Barboza, Michael S. Tsirkin, David Hildenbrand,
Li Qiang, Qiuhao Li, Peter Xu, Greg Kurz, Alexander Bulekov,
qemu-ppc, Cédric Le Goater, Paolo Bonzini, David Gibson,
Philippe Mathieu-Daudé,
Gerd Hoffmann
dma_memory_write() returns a MemTxResult type. Do not discard
it, return it to the caller.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/sysemu/dma.h | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
index b711d390a4f..191cf0b271a 100644
--- a/include/sysemu/dma.h
+++ b/include/sysemu/dma.h
@@ -249,13 +249,13 @@ static inline void dma_memory_unmap(AddressSpace *as,
dma_memory_read(as, addr, &val, (_bits) / 8, attrs); \
return _end##_bits##_to_cpu(val); \
} \
- static inline void st##_sname##_##_end##_dma(AddressSpace *as, \
- dma_addr_t addr, \
- uint##_bits##_t val, \
- MemTxAttrs attrs) \
- { \
- val = cpu_to_##_end##_bits(val); \
- dma_memory_write(as, addr, &val, (_bits) / 8, attrs); \
+ static inline MemTxResult st##_sname##_##_end##_dma(AddressSpace *as, \
+ dma_addr_t addr, \
+ uint##_bits##_t val, \
+ MemTxAttrs attrs) \
+ { \
+ val = cpu_to_##_end##_bits(val); \
+ return dma_memory_write(as, addr, &val, (_bits) / 8, attrs); \
}
static inline uint8_t ldub_dma(AddressSpace *as, dma_addr_t addr, MemTxAttrs attrs)
@@ -266,10 +266,10 @@ static inline uint8_t ldub_dma(AddressSpace *as, dma_addr_t addr, MemTxAttrs att
return val;
}
-static inline void stb_dma(AddressSpace *as, dma_addr_t addr,
- uint8_t val, MemTxAttrs attrs)
+static inline MemTxResult stb_dma(AddressSpace *as, dma_addr_t addr,
+ uint8_t val, MemTxAttrs attrs)
{
- dma_memory_write(as, addr, &val, 1, attrs);
+ return dma_memory_write(as, addr, &val, 1, attrs);
}
DEFINE_LDST_DMA(uw, w, 16, le);
--
2.33.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 3/4] dma: Let st*_dma() propagate MemTxResult
2021-12-18 14:51 ` [PATCH 3/4] dma: Let st*_dma() propagate MemTxResult Philippe Mathieu-Daudé
@ 2021-12-21 23:07 ` Richard Henderson
2021-12-22 6:45 ` Cédric Le Goater
1 sibling, 0 replies; 13+ messages in thread
From: Richard Henderson @ 2021-12-21 23:07 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Gerd Hoffmann, David Hildenbrand, Daniel Henrique Barboza,
Li Qiang, Qiuhao Li, Peter Xu, Greg Kurz, Alexander Bulekov,
Michael S. Tsirkin, Cédric Le Goater, Paolo Bonzini,
qemu-ppc, David Gibson
On 12/18/21 6:51 AM, Philippe Mathieu-Daudé wrote:
> dma_memory_write() returns a MemTxResult type. Do not discard
> it, return it to the caller.
>
> Signed-off-by: Philippe Mathieu-Daudé<philmd@redhat.com>
> ---
> include/sysemu/dma.h | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/4] dma: Let st*_dma() propagate MemTxResult
2021-12-18 14:51 ` [PATCH 3/4] dma: Let st*_dma() propagate MemTxResult Philippe Mathieu-Daudé
2021-12-21 23:07 ` Richard Henderson
@ 2021-12-22 6:45 ` Cédric Le Goater
1 sibling, 0 replies; 13+ messages in thread
From: Cédric Le Goater @ 2021-12-22 6:45 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Daniel Henrique Barboza, Michael S. Tsirkin, David Hildenbrand,
Li Qiang, Qiuhao Li, Peter Xu, Greg Kurz, Alexander Bulekov,
qemu-ppc, Gerd Hoffmann, Paolo Bonzini, David Gibson
On 12/18/21 15:51, Philippe Mathieu-Daudé wrote:
> dma_memory_write() returns a MemTxResult type. Do not discard
> it, return it to the caller.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Thanks,
C.
> ---
> include/sysemu/dma.h | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
> index b711d390a4f..191cf0b271a 100644
> --- a/include/sysemu/dma.h
> +++ b/include/sysemu/dma.h
> @@ -249,13 +249,13 @@ static inline void dma_memory_unmap(AddressSpace *as,
> dma_memory_read(as, addr, &val, (_bits) / 8, attrs); \
> return _end##_bits##_to_cpu(val); \
> } \
> - static inline void st##_sname##_##_end##_dma(AddressSpace *as, \
> - dma_addr_t addr, \
> - uint##_bits##_t val, \
> - MemTxAttrs attrs) \
> - { \
> - val = cpu_to_##_end##_bits(val); \
> - dma_memory_write(as, addr, &val, (_bits) / 8, attrs); \
> + static inline MemTxResult st##_sname##_##_end##_dma(AddressSpace *as, \
> + dma_addr_t addr, \
> + uint##_bits##_t val, \
> + MemTxAttrs attrs) \
> + { \
> + val = cpu_to_##_end##_bits(val); \
> + return dma_memory_write(as, addr, &val, (_bits) / 8, attrs); \
> }
>
> static inline uint8_t ldub_dma(AddressSpace *as, dma_addr_t addr, MemTxAttrs attrs)
> @@ -266,10 +266,10 @@ static inline uint8_t ldub_dma(AddressSpace *as, dma_addr_t addr, MemTxAttrs att
> return val;
> }
>
> -static inline void stb_dma(AddressSpace *as, dma_addr_t addr,
> - uint8_t val, MemTxAttrs attrs)
> +static inline MemTxResult stb_dma(AddressSpace *as, dma_addr_t addr,
> + uint8_t val, MemTxAttrs attrs)
> {
> - dma_memory_write(as, addr, &val, 1, attrs);
> + return dma_memory_write(as, addr, &val, 1, attrs);
> }
>
> DEFINE_LDST_DMA(uw, w, 16, le);
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 4/4] dma: Let ld*_dma() propagate MemTxResult
2021-12-18 14:51 [PATCH 0/4] hw: Have DMA API take MemTxAttrs arg & propagate MemTxResult (part 3) Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2021-12-18 14:51 ` [PATCH 3/4] dma: Let st*_dma() propagate MemTxResult Philippe Mathieu-Daudé
@ 2021-12-18 14:51 ` Philippe Mathieu-Daudé
2021-12-21 23:09 ` Richard Henderson
2021-12-22 6:45 ` Cédric Le Goater
3 siblings, 2 replies; 13+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-12-18 14:51 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel Henrique Barboza, Michael S. Tsirkin, David Hildenbrand,
Li Qiang, Qiuhao Li, Peter Xu, Greg Kurz, Alexander Bulekov,
qemu-ppc, Cédric Le Goater, Paolo Bonzini, David Gibson,
Philippe Mathieu-Daudé,
Gerd Hoffmann
dma_memory_read() returns a MemTxResult type. Do not discard
it, return it to the caller.
Update the few callers.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/pci/pci.h | 6 ++++--
include/hw/ppc/spapr_vio.h | 6 +++++-
include/sysemu/dma.h | 25 ++++++++++++-------------
hw/intc/pnv_xive.c | 8 ++++----
hw/usb/hcd-xhci.c | 7 ++++---
5 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 0613308b1b6..8c5f2ed5054 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -854,8 +854,10 @@ 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, \
- MEMTXATTRS_UNSPECIFIED); \
+ uint##_bits##_t val; \
+ ld##_l##_dma(pci_get_address_space(dev), addr, &val, \
+ MEMTXATTRS_UNSPECIFIED); \
+ return val; \
} \
static inline void st##_s##_pci_dma(PCIDevice *dev, \
dma_addr_t addr, uint##_bits##_t val) \
diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h
index d2ec9b0637f..7eae1a48478 100644
--- a/include/hw/ppc/spapr_vio.h
+++ b/include/hw/ppc/spapr_vio.h
@@ -127,7 +127,11 @@ static inline int spapr_vio_dma_set(SpaprVioDevice *dev, uint64_t taddr,
#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), MEMTXATTRS_UNSPECIFIED))
+ ({ \
+ uint64_t _val; \
+ ldq_be_dma(&(_dev)->as, (_addr), &_val, MEMTXATTRS_UNSPECIFIED); \
+ _val; \
+ })
int spapr_vio_send_crq(SpaprVioDevice *dev, uint8_t *crq);
diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
index 191cf0b271a..589f5ba52a2 100644
--- a/include/sysemu/dma.h
+++ b/include/sysemu/dma.h
@@ -241,14 +241,15 @@ 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, \
- MemTxAttrs attrs) \
- { \
- uint##_bits##_t val; \
- dma_memory_read(as, addr, &val, (_bits) / 8, attrs); \
- return _end##_bits##_to_cpu(val); \
- } \
+ static inline MemTxResult ld##_lname##_##_end##_dma(AddressSpace *as, \
+ dma_addr_t addr, \
+ uint##_bits##_t *pval, \
+ MemTxAttrs attrs) \
+ { \
+ MemTxResult res = dma_memory_read(as, addr, pval, (_bits) / 8, attrs); \
+ _end##_bits##_to_cpus(pval); \
+ return res; \
+ } \
static inline MemTxResult st##_sname##_##_end##_dma(AddressSpace *as, \
dma_addr_t addr, \
uint##_bits##_t val, \
@@ -258,12 +259,10 @@ static inline void dma_memory_unmap(AddressSpace *as,
return dma_memory_write(as, addr, &val, (_bits) / 8, attrs); \
}
-static inline uint8_t ldub_dma(AddressSpace *as, dma_addr_t addr, MemTxAttrs attrs)
+static inline MemTxResult ldub_dma(AddressSpace *as, dma_addr_t addr,
+ uint8_t *val, MemTxAttrs attrs)
{
- uint8_t val;
-
- dma_memory_read(as, addr, &val, 1, attrs);
- return val;
+ return dma_memory_read(as, addr, val, 1, attrs);
}
static inline MemTxResult stb_dma(AddressSpace *as, dma_addr_t addr,
diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c
index d9249bbc0c1..bb207514f2d 100644
--- a/hw/intc/pnv_xive.c
+++ b/hw/intc/pnv_xive.c
@@ -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, MEMTXATTRS_UNSPECIFIED);
+ ldq_be_dma(&address_space_memory, vsd_addr, &vsd, MEMTXATTRS_UNSPECIFIED);
if (!(vsd & VSD_ADDRESS_MASK)) {
#ifdef XIVE_DEBUG
@@ -195,8 +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,
- MEMTXATTRS_UNSPECIFIED);
+ ldq_be_dma(&address_space_memory, vsd_addr, &vsd,
+ MEMTXATTRS_UNSPECIFIED);
if (!(vsd & VSD_ADDRESS_MASK)) {
#ifdef XIVE_DEBUG
@@ -543,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, MEMTXATTRS_UNSPECIFIED);
+ ldq_be_dma(&address_space_memory, vsd_addr, &vsd, MEMTXATTRS_UNSPECIFIED);
if (!(vsd & VSD_ADDRESS_MASK)) {
#ifdef XIVE_DEBUG
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index d960b814587..da5a4072107 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -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, MEMTXATTRS_UNSPECIFIED);
+ ldq_le_dma(xhci->as, dcbaap + 8 * slotid, &poctx, MEMTXATTRS_UNSPECIFIED);
ictx = xhci_mask64(pictx);
octx = xhci_mask64(poctx);
@@ -3429,6 +3429,7 @@ static int usb_xhci_post_load(void *opaque, int version_id)
uint32_t slot_ctx[4];
uint32_t ep_ctx[5];
int slotid, epid, state;
+ uint64_t addr;
dcbaap = xhci_addr64(xhci->dcbaap_low, xhci->dcbaap_high);
@@ -3437,8 +3438,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,
- MEMTXATTRS_UNSPECIFIED));
+ ldq_le_dma(xhci->as, dcbaap + 8 * slotid, &addr, MEMTXATTRS_UNSPECIFIED);
+ slot->ctx = xhci_mask64(addr);
xhci_dma_read_u32s(xhci, slot->ctx, slot_ctx, sizeof(slot_ctx));
slot->uport = xhci_lookup_uport(xhci, slot_ctx);
if (!slot->uport) {
--
2.33.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 4/4] dma: Let ld*_dma() propagate MemTxResult
2021-12-18 14:51 ` [PATCH 4/4] dma: Let ld*_dma() " Philippe Mathieu-Daudé
@ 2021-12-21 23:09 ` Richard Henderson
2021-12-22 6:45 ` Cédric Le Goater
1 sibling, 0 replies; 13+ messages in thread
From: Richard Henderson @ 2021-12-21 23:09 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Gerd Hoffmann, David Hildenbrand, Daniel Henrique Barboza,
Li Qiang, Qiuhao Li, Peter Xu, Greg Kurz, Alexander Bulekov,
Michael S. Tsirkin, Cédric Le Goater, Paolo Bonzini,
qemu-ppc, David Gibson
On 12/18/21 6:51 AM, Philippe Mathieu-Daudé wrote:
> dma_memory_read() returns a MemTxResult type. Do not discard
> it, return it to the caller.
>
> Update the few callers.
>
> Signed-off-by: Philippe Mathieu-Daudé<philmd@redhat.com>
> ---
> include/hw/pci/pci.h | 6 ++++--
> include/hw/ppc/spapr_vio.h | 6 +++++-
> include/sysemu/dma.h | 25 ++++++++++++-------------
> hw/intc/pnv_xive.c | 8 ++++----
> hw/usb/hcd-xhci.c | 7 ++++---
> 5 files changed, 29 insertions(+), 23 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 4/4] dma: Let ld*_dma() propagate MemTxResult
2021-12-18 14:51 ` [PATCH 4/4] dma: Let ld*_dma() " Philippe Mathieu-Daudé
2021-12-21 23:09 ` Richard Henderson
@ 2021-12-22 6:45 ` Cédric Le Goater
1 sibling, 0 replies; 13+ messages in thread
From: Cédric Le Goater @ 2021-12-22 6:45 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Daniel Henrique Barboza, Michael S. Tsirkin, David Hildenbrand,
Li Qiang, Qiuhao Li, Peter Xu, Greg Kurz, Alexander Bulekov,
qemu-ppc, Gerd Hoffmann, Paolo Bonzini, David Gibson
On 12/18/21 15:51, Philippe Mathieu-Daudé wrote:
> dma_memory_read() returns a MemTxResult type. Do not discard
> it, return it to the caller.
Good ! We should be using it in XIVE.
> Update the few callers.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Thanks,
C.
> ---
> include/hw/pci/pci.h | 6 ++++--
> include/hw/ppc/spapr_vio.h | 6 +++++-
> include/sysemu/dma.h | 25 ++++++++++++-------------
> hw/intc/pnv_xive.c | 8 ++++----
> hw/usb/hcd-xhci.c | 7 ++++---
> 5 files changed, 29 insertions(+), 23 deletions(-)
>
> diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> index 0613308b1b6..8c5f2ed5054 100644
> --- a/include/hw/pci/pci.h
> +++ b/include/hw/pci/pci.h
> @@ -854,8 +854,10 @@ 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, \
> - MEMTXATTRS_UNSPECIFIED); \
> + uint##_bits##_t val; \
> + ld##_l##_dma(pci_get_address_space(dev), addr, &val, \
> + MEMTXATTRS_UNSPECIFIED); \
> + return val; \
> } \
> static inline void st##_s##_pci_dma(PCIDevice *dev, \
> dma_addr_t addr, uint##_bits##_t val) \
> diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h
> index d2ec9b0637f..7eae1a48478 100644
> --- a/include/hw/ppc/spapr_vio.h
> +++ b/include/hw/ppc/spapr_vio.h
> @@ -127,7 +127,11 @@ static inline int spapr_vio_dma_set(SpaprVioDevice *dev, uint64_t taddr,
> #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), MEMTXATTRS_UNSPECIFIED))
> + ({ \
> + uint64_t _val; \
> + ldq_be_dma(&(_dev)->as, (_addr), &_val, MEMTXATTRS_UNSPECIFIED); \
> + _val; \
> + })
>
> int spapr_vio_send_crq(SpaprVioDevice *dev, uint8_t *crq);
>
> diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
> index 191cf0b271a..589f5ba52a2 100644
> --- a/include/sysemu/dma.h
> +++ b/include/sysemu/dma.h
> @@ -241,14 +241,15 @@ 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, \
> - MemTxAttrs attrs) \
> - { \
> - uint##_bits##_t val; \
> - dma_memory_read(as, addr, &val, (_bits) / 8, attrs); \
> - return _end##_bits##_to_cpu(val); \
> - } \
> + static inline MemTxResult ld##_lname##_##_end##_dma(AddressSpace *as, \
> + dma_addr_t addr, \
> + uint##_bits##_t *pval, \
> + MemTxAttrs attrs) \
> + { \
> + MemTxResult res = dma_memory_read(as, addr, pval, (_bits) / 8, attrs); \
> + _end##_bits##_to_cpus(pval); \
> + return res; \
> + } \
> static inline MemTxResult st##_sname##_##_end##_dma(AddressSpace *as, \
> dma_addr_t addr, \
> uint##_bits##_t val, \
> @@ -258,12 +259,10 @@ static inline void dma_memory_unmap(AddressSpace *as,
> return dma_memory_write(as, addr, &val, (_bits) / 8, attrs); \
> }
>
> -static inline uint8_t ldub_dma(AddressSpace *as, dma_addr_t addr, MemTxAttrs attrs)
> +static inline MemTxResult ldub_dma(AddressSpace *as, dma_addr_t addr,
> + uint8_t *val, MemTxAttrs attrs)
> {
> - uint8_t val;
> -
> - dma_memory_read(as, addr, &val, 1, attrs);
> - return val;
> + return dma_memory_read(as, addr, val, 1, attrs);
> }
>
> static inline MemTxResult stb_dma(AddressSpace *as, dma_addr_t addr,
> diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c
> index d9249bbc0c1..bb207514f2d 100644
> --- a/hw/intc/pnv_xive.c
> +++ b/hw/intc/pnv_xive.c
> @@ -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, MEMTXATTRS_UNSPECIFIED);
> + ldq_be_dma(&address_space_memory, vsd_addr, &vsd, MEMTXATTRS_UNSPECIFIED);
>
> if (!(vsd & VSD_ADDRESS_MASK)) {
> #ifdef XIVE_DEBUG
> @@ -195,8 +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,
> - MEMTXATTRS_UNSPECIFIED);
> + ldq_be_dma(&address_space_memory, vsd_addr, &vsd,
> + MEMTXATTRS_UNSPECIFIED);
>
> if (!(vsd & VSD_ADDRESS_MASK)) {
> #ifdef XIVE_DEBUG
> @@ -543,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, MEMTXATTRS_UNSPECIFIED);
> + ldq_be_dma(&address_space_memory, vsd_addr, &vsd, MEMTXATTRS_UNSPECIFIED);
>
> if (!(vsd & VSD_ADDRESS_MASK)) {
> #ifdef XIVE_DEBUG
> diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
> index d960b814587..da5a4072107 100644
> --- a/hw/usb/hcd-xhci.c
> +++ b/hw/usb/hcd-xhci.c
> @@ -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, MEMTXATTRS_UNSPECIFIED);
> + ldq_le_dma(xhci->as, dcbaap + 8 * slotid, &poctx, MEMTXATTRS_UNSPECIFIED);
> ictx = xhci_mask64(pictx);
> octx = xhci_mask64(poctx);
>
> @@ -3429,6 +3429,7 @@ static int usb_xhci_post_load(void *opaque, int version_id)
> uint32_t slot_ctx[4];
> uint32_t ep_ctx[5];
> int slotid, epid, state;
> + uint64_t addr;
>
> dcbaap = xhci_addr64(xhci->dcbaap_low, xhci->dcbaap_high);
>
> @@ -3437,8 +3438,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,
> - MEMTXATTRS_UNSPECIFIED));
> + ldq_le_dma(xhci->as, dcbaap + 8 * slotid, &addr, MEMTXATTRS_UNSPECIFIED);
> + slot->ctx = xhci_mask64(addr);
> xhci_dma_read_u32s(xhci, slot->ctx, slot_ctx, sizeof(slot_ctx));
> slot->uport = xhci_lookup_uport(xhci, slot_ctx);
> if (!slot->uport) {
>
^ permalink raw reply [flat|nested] 13+ messages in thread