| Message ID | 20200629202053.1223342-2-its@irrelevant.dk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/block/nvme: handle transient dma errors | expand |
On Mon, Jun 29, 2020 at 10:20:52PM +0200, Klaus Jensen wrote: > From: Klaus Jensen <k.jensen@samsung.com> > > Some devices might want to know the return value of dma_memory_rw, so > pass it along instead of ignoring it. > > There are no existing users of the return value, so this patch should be > safe. > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > Acked-by: Keith Busch <kbusch@kernel.org> Feel free to merge with patch 2/2. > --- > include/hw/pci/pci.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index a4e9c3341615..2347dc36bfb5 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -786,8 +786,7 @@ static inline AddressSpace *pci_get_address_space(PCIDevice *dev) > static inline int pci_dma_rw(PCIDevice *dev, dma_addr_t addr, > void *buf, dma_addr_t len, DMADirection dir) > { > - dma_memory_rw(pci_get_address_space(dev), addr, buf, len, dir); > - return 0; > + return dma_memory_rw(pci_get_address_space(dev), addr, buf, len, dir); > } > > static inline int pci_dma_read(PCIDevice *dev, dma_addr_t addr, > -- > 2.27.0
On Mon, Jun 29, 2020 at 10:20:52PM +0200, Klaus Jensen wrote: > From: Klaus Jensen <k.jensen@samsung.com> > > Some devices might want to know the return value of dma_memory_rw, so > pass it along instead of ignoring it. > > There are no existing users of the return value, so this patch should be > safe. > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > Acked-by: Keith Busch <kbusch@kernel.org> Please feel free to merge this with the patch that uses the return value. > --- > include/hw/pci/pci.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index a4e9c3341615..2347dc36bfb5 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -786,8 +786,7 @@ static inline AddressSpace *pci_get_address_space(PCIDevice *dev) > static inline int pci_dma_rw(PCIDevice *dev, dma_addr_t addr, > void *buf, dma_addr_t len, DMADirection dir) > { > - dma_memory_rw(pci_get_address_space(dev), addr, buf, len, dir); > - return 0; > + return dma_memory_rw(pci_get_address_space(dev), addr, buf, len, dir); > } > > static inline int pci_dma_read(PCIDevice *dev, dma_addr_t addr, > -- > 2.27.0 > >
On Jul 22 07:48, Michael S. Tsirkin wrote: > On Mon, Jun 29, 2020 at 10:20:52PM +0200, Klaus Jensen wrote: > > From: Klaus Jensen <k.jensen@samsung.com> > > > > Some devices might want to know the return value of dma_memory_rw, so > > pass it along instead of ignoring it. > > > > There are no existing users of the return value, so this patch should be > > safe. > > > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > > Acked-by: Keith Busch <kbusch@kernel.org> > > > Please feel free to merge this with the patch that uses the > return value. > Hi Michael, Noted. The patch depends on another series that have not been merged yet, so this is why it is lying around and waiting to be added. Thanks, Klaus
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index a4e9c3341615..2347dc36bfb5 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -786,8 +786,7 @@ static inline AddressSpace *pci_get_address_space(PCIDevice *dev) static inline int pci_dma_rw(PCIDevice *dev, dma_addr_t addr, void *buf, dma_addr_t len, DMADirection dir) { - dma_memory_rw(pci_get_address_space(dev), addr, buf, len, dir); - return 0; + return dma_memory_rw(pci_get_address_space(dev), addr, buf, len, dir); } static inline int pci_dma_read(PCIDevice *dev, dma_addr_t addr,